1From a66b1806350a9bed7b188c7d115991f6cdee51a9 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/Makefile.in | 3 + 13 bfd/configure | 1333 +++++++++--- 14 bfd/configure.ac | 2 +- 15 binutils/Makefile.in | 3 + 16 binutils/configure | 1331 +++++++++--- 17 gas/Makefile.in | 3 + 18 gas/configure | 1331 +++++++++--- 19 gprof/Makefile.in | 3 + 20 gprof/configure | 1331 +++++++++--- 21 gprofng/Makefile.in | 2 + 22 gprofng/configure | 1701 ++++++++++++---- 23 gprofng/doc/Makefile.in | 2 + 24 gprofng/gp-display-html/Makefile.in | 2 + 25 gprofng/libcollector/Makefile.in | 2 + 26 gprofng/libcollector/configure | 1703 ++++++++++++---- 27 gprofng/src/Makefile.in | 2 + 28 ld/Makefile.in | 3 + 29 ld/configure | 1704 ++++++++++++---- 30 libbacktrace/Makefile.in | 3 + 31 libbacktrace/configure | 1331 +++++++++--- 32 libctf/Makefile.in | 2 + 33 libctf/configure | 1330 +++++++++--- 34 libsframe/Makefile.in | 249 ++- 35 libsframe/aclocal.m4 | 220 +- 36 libsframe/configure | 1553 ++++++++++---- 37 libtool.m4 | 1093 ++++++---- 38 ltmain.sh | 2925 ++++++++++++++++++--------- 39 ltoptions.m4 | 2 +- 40 ltversion.m4 | 12 +- 41 lt~obsolete.m4 | 2 +- 42 opcodes/Makefile.in | 3 + 43 opcodes/configure | 1331 +++++++++--- 44 sim/Makefile.in | 3 + 45 sim/configure | 1331 +++++++++--- 46 zlib/Makefile.in | 3 + 47 zlib/configure | 1331 +++++++++--- 48 36 files changed, 16896 insertions(+), 6289 deletions(-) 49 50diff --git a/bfd/Makefile.in b/bfd/Makefile.in 51index 80aed657643..106ec256a79 100644 52--- a/bfd/Makefile.in 53+++ b/bfd/Makefile.in 54@@ -347,6 +347,7 @@ DATADIRNAME = @DATADIRNAME@ 55 DEBUGDIR = @DEBUGDIR@ 56 DEFS = @DEFS@ 57 DEPDIR = @DEPDIR@ 58+DLLTOOL = @DLLTOOL@ 59 DSYMUTIL = @DSYMUTIL@ 60 DUMPBIN = @DUMPBIN@ 61 ECHO_C = @ECHO_C@ 62@@ -381,6 +382,7 @@ LN_S = @LN_S@ 63 LTLIBOBJS = @LTLIBOBJS@ 64 MAINT = @MAINT@ 65 MAKEINFO = @MAKEINFO@ 66+MANIFEST_TOOL = @MANIFEST_TOOL@ 67 MKDIR_P = @MKDIR_P@ 68 MKINSTALLDIRS = @MKINSTALLDIRS@ 69 MSGFMT = @MSGFMT@ 70@@ -427,6 +429,7 @@ abs_builddir = @abs_builddir@ 71 abs_srcdir = @abs_srcdir@ 72 abs_top_builddir = @abs_top_builddir@ 73 abs_top_srcdir = @abs_top_srcdir@ 74+ac_ct_AR = @ac_ct_AR@ 75 ac_ct_CC = @ac_ct_CC@ 76 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ 77 all_backends = @all_backends@ 78diff --git a/bfd/configure b/bfd/configure 79index 60ea6becab2..84dcdf167ba 100755 80--- a/bfd/configure 81+++ b/bfd/configure 82@@ -706,6 +706,9 @@ OTOOL 83 LIPO 84 NMEDIT 85 DSYMUTIL 86+MANIFEST_TOOL 87+ac_ct_AR 88+DLLTOOL 89 OBJDUMP 90 LN_S 91 NM 92@@ -824,6 +827,7 @@ enable_static 93 with_pic 94 enable_fast_install 95 with_gnu_ld 96+with_libtool_sysroot 97 enable_libtool_lock 98 enable_plugins 99 enable_largefile 100@@ -1514,6 +1518,8 @@ Optional Packages: 101 --with-pic try to use only PIC/non-PIC objects [default=use 102 both] 103 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 104+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR 105+ (or the compiler's sysroot if not specified). 106 --with-mmap try using mmap for BFD input files if available 107 --with-separate-debug-dir=DIR 108 Look for global separate debug info in DIR 109@@ -5043,8 +5049,8 @@ esac 110 111 112 113-macro_version='2.2.7a' 114-macro_revision='1.3134' 115+macro_version='2.4' 116+macro_revision='1.3293' 117 118 119 120@@ -5084,7 +5090,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 121 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 122 $as_echo_n "checking how to print strings... " >&6; } 123 # Test print first, because it will be a builtin if present. 124-if test "X`print -r -- -n 2>/dev/null`" = X-n && \ 125+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ 126 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 127 ECHO='print -r --' 128 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 129@@ -5777,8 +5783,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 130 # Try some XSI features 131 xsi_shell=no 132 ( _lt_dummy="a/b/c" 133- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ 134- = c,a/b,, \ 135+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ 136+ = c,a/b,b/c, \ 137 && eval 'test $(( 1 + 1 )) -eq 2 \ 138 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 139 && xsi_shell=yes 140@@ -5827,6 +5833,80 @@ esac 141 142 143 144+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 145+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } 146+if ${lt_cv_to_host_file_cmd+:} false; then : 147+ $as_echo_n "(cached) " >&6 148+else 149+ case $host in 150+ *-*-mingw* ) 151+ case $build in 152+ *-*-mingw* ) # actually msys 153+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 154+ ;; 155+ *-*-cygwin* ) 156+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 157+ ;; 158+ * ) # otherwise, assume *nix 159+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 160+ ;; 161+ esac 162+ ;; 163+ *-*-cygwin* ) 164+ case $build in 165+ *-*-mingw* ) # actually msys 166+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin 167+ ;; 168+ *-*-cygwin* ) 169+ lt_cv_to_host_file_cmd=func_convert_file_noop 170+ ;; 171+ * ) # otherwise, assume *nix 172+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin 173+ ;; 174+ esac 175+ ;; 176+ * ) # unhandled hosts (and "normal" native builds) 177+ lt_cv_to_host_file_cmd=func_convert_file_noop 178+ ;; 179+esac 180+ 181+fi 182+ 183+to_host_file_cmd=$lt_cv_to_host_file_cmd 184+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 185+$as_echo "$lt_cv_to_host_file_cmd" >&6; } 186+ 187+ 188+ 189+ 190+ 191+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 192+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } 193+if ${lt_cv_to_tool_file_cmd+:} false; then : 194+ $as_echo_n "(cached) " >&6 195+else 196+ #assume ordinary cross tools, or native build. 197+lt_cv_to_tool_file_cmd=func_convert_file_noop 198+case $host in 199+ *-*-mingw* ) 200+ case $build in 201+ *-*-mingw* ) # actually msys 202+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 203+ ;; 204+ esac 205+ ;; 206+esac 207+ 208+fi 209+ 210+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 211+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 212+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } 213+ 214+ 215+ 216+ 217+ 218 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 219 $as_echo_n "checking for $LD option to reload object files... " >&6; } 220 if ${lt_cv_ld_reload_flag+:} false; then : 221@@ -5843,6 +5923,11 @@ case $reload_flag in 222 esac 223 reload_cmds='$LD$reload_flag -o $output$reload_objs' 224 case $host_os in 225+ cygwin* | mingw* | pw32* | cegcc*) 226+ if test "$GCC" != yes; then 227+ reload_cmds=false 228+ fi 229+ ;; 230 darwin*) 231 if test "$GCC" = yes; then 232 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 233@@ -6011,7 +6096,8 @@ mingw* | pw32*) 234 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 235 lt_cv_file_magic_cmd='func_win32_libid' 236 else 237- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' 238+ # Keep this pattern in sync with the one in func_win32_libid. 239+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' 240 lt_cv_file_magic_cmd='$OBJDUMP -f' 241 fi 242 ;; 243@@ -6165,6 +6251,21 @@ esac 244 fi 245 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 246 $as_echo "$lt_cv_deplibs_check_method" >&6; } 247+ 248+file_magic_glob= 249+want_nocaseglob=no 250+if test "$build" = "$host"; then 251+ case $host_os in 252+ mingw* | pw32*) 253+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then 254+ want_nocaseglob=yes 255+ else 256+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` 257+ fi 258+ ;; 259+ esac 260+fi 261+ 262 file_magic_cmd=$lt_cv_file_magic_cmd 263 deplibs_check_method=$lt_cv_deplibs_check_method 264 test -z "$deplibs_check_method" && deplibs_check_method=unknown 265@@ -6180,6 +6281,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 266 267 268 269+ 270+ 271+ 272+ 273+ 274+ 275+ 276+ 277+ 278+ 279+if test -n "$ac_tool_prefix"; then 280+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. 281+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 282+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 283+$as_echo_n "checking for $ac_word... " >&6; } 284+if ${ac_cv_prog_DLLTOOL+:} false; then : 285+ $as_echo_n "(cached) " >&6 286+else 287+ if test -n "$DLLTOOL"; then 288+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. 289+else 290+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 291+for as_dir in $PATH 292+do 293+ IFS=$as_save_IFS 294+ test -z "$as_dir" && as_dir=. 295+ for ac_exec_ext in '' $ac_executable_extensions; do 296+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 297+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" 298+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 299+ break 2 300+ fi 301+done 302+ done 303+IFS=$as_save_IFS 304+ 305+fi 306+fi 307+DLLTOOL=$ac_cv_prog_DLLTOOL 308+if test -n "$DLLTOOL"; then 309+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 310+$as_echo "$DLLTOOL" >&6; } 311+else 312+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 313+$as_echo "no" >&6; } 314+fi 315+ 316+ 317+fi 318+if test -z "$ac_cv_prog_DLLTOOL"; then 319+ ac_ct_DLLTOOL=$DLLTOOL 320+ # Extract the first word of "dlltool", so it can be a program name with args. 321+set dummy dlltool; ac_word=$2 322+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 323+$as_echo_n "checking for $ac_word... " >&6; } 324+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : 325+ $as_echo_n "(cached) " >&6 326+else 327+ if test -n "$ac_ct_DLLTOOL"; then 328+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. 329+else 330+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 331+for as_dir in $PATH 332+do 333+ IFS=$as_save_IFS 334+ test -z "$as_dir" && as_dir=. 335+ for ac_exec_ext in '' $ac_executable_extensions; do 336+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 337+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" 338+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 339+ break 2 340+ fi 341+done 342+ done 343+IFS=$as_save_IFS 344+ 345+fi 346+fi 347+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL 348+if test -n "$ac_ct_DLLTOOL"; then 349+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 350+$as_echo "$ac_ct_DLLTOOL" >&6; } 351+else 352+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 353+$as_echo "no" >&6; } 354+fi 355+ 356+ if test "x$ac_ct_DLLTOOL" = x; then 357+ DLLTOOL="false" 358+ else 359+ case $cross_compiling:$ac_tool_warned in 360+yes:) 361+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 362+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 363+ac_tool_warned=yes ;; 364+esac 365+ DLLTOOL=$ac_ct_DLLTOOL 366+ fi 367+else 368+ DLLTOOL="$ac_cv_prog_DLLTOOL" 369+fi 370+ 371+test -z "$DLLTOOL" && DLLTOOL=dlltool 372+ 373+ 374+ 375+ 376+ 377+ 378+ 379+ 380+ 381+ 382+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 383+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } 384+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : 385+ $as_echo_n "(cached) " >&6 386+else 387+ lt_cv_sharedlib_from_linklib_cmd='unknown' 388+ 389+case $host_os in 390+cygwin* | mingw* | pw32* | cegcc*) 391+ # two different shell functions defined in ltmain.sh 392+ # decide which to use based on capabilities of $DLLTOOL 393+ case `$DLLTOOL --help 2>&1` in 394+ *--identify-strict*) 395+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib 396+ ;; 397+ *) 398+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback 399+ ;; 400+ esac 401+ ;; 402+*) 403+ # fallback: assume linklib IS sharedlib 404+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" 405+ ;; 406+esac 407+ 408+fi 409+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 410+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } 411+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd 412+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO 413+ 414+ 415+ 416+ 417+ 418+ 419+ 420 plugin_option= 421 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 422 for plugin in $plugin_names; do 423@@ -6194,8 +6446,10 @@ for plugin in $plugin_names; do 424 done 425 426 if test -n "$ac_tool_prefix"; then 427- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 428-set dummy ${ac_tool_prefix}ar; ac_word=$2 429+ for ac_prog in ar 430+ do 431+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 432+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 433 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 434 $as_echo_n "checking for $ac_word... " >&6; } 435 if ${ac_cv_prog_AR+:} false; then : 436@@ -6211,7 +6465,7 @@ do 437 test -z "$as_dir" && as_dir=. 438 for ac_exec_ext in '' $ac_executable_extensions; do 439 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 440- ac_cv_prog_AR="${ac_tool_prefix}ar" 441+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" 442 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 443 break 2 444 fi 445@@ -6231,11 +6485,15 @@ $as_echo "no" >&6; } 446 fi 447 448 449+ test -n "$AR" && break 450+ done 451 fi 452-if test -z "$ac_cv_prog_AR"; then 453+if test -z "$AR"; then 454 ac_ct_AR=$AR 455- # Extract the first word of "ar", so it can be a program name with args. 456-set dummy ar; ac_word=$2 457+ for ac_prog in ar 458+do 459+ # Extract the first word of "$ac_prog", so it can be a program name with args. 460+set dummy $ac_prog; ac_word=$2 461 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 462 $as_echo_n "checking for $ac_word... " >&6; } 463 if ${ac_cv_prog_ac_ct_AR+:} false; then : 464@@ -6251,7 +6509,7 @@ do 465 test -z "$as_dir" && as_dir=. 466 for ac_exec_ext in '' $ac_executable_extensions; do 467 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 468- ac_cv_prog_ac_ct_AR="ar" 469+ ac_cv_prog_ac_ct_AR="$ac_prog" 470 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 471 break 2 472 fi 473@@ -6270,6 +6528,10 @@ else 474 $as_echo "no" >&6; } 475 fi 476 477+ 478+ test -n "$ac_ct_AR" && break 479+done 480+ 481 if test "x$ac_ct_AR" = x; then 482 AR="false" 483 else 484@@ -6281,25 +6543,20 @@ ac_tool_warned=yes ;; 485 esac 486 AR=$ac_ct_AR 487 fi 488-else 489- AR="$ac_cv_prog_AR" 490 fi 491 492-test -z "$AR" && AR=ar 493-if test -n "$plugin_option"; then 494- if $AR --help 2>&1 | grep -q "\--plugin"; then 495- touch conftest.c 496- $AR $plugin_option rc conftest.a conftest.c 497- if test "$?" != 0; then 498- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 499+ touch conftest.c 500+ $AR $plugin_option rc conftest.a conftest.c 501+ if test "$?" != 0; then 502+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 503 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} 504- else 505- AR="$AR $plugin_option" 506- fi 507- rm -f conftest.* 508+ else 509+ AR="$AR $plugin_option" 510 fi 511-fi 512-test -z "$AR_FLAGS" && AR_FLAGS=cru 513+ rm -f conftest.* 514+: ${AR=ar} 515+: ${AR_FLAGS=cru} 516+ 517 518 519 520@@ -6310,6 +6567,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 521 522 523 524+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 525+$as_echo_n "checking for archiver @FILE support... " >&6; } 526+if ${lt_cv_ar_at_file+:} false; then : 527+ $as_echo_n "(cached) " >&6 528+else 529+ lt_cv_ar_at_file=no 530+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 531+/* end confdefs.h. */ 532+ 533+int 534+main () 535+{ 536+ 537+ ; 538+ return 0; 539+} 540+_ACEOF 541+if ac_fn_c_try_compile "$LINENO"; then : 542+ echo conftest.$ac_objext > conftest.lst 543+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' 544+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 545+ (eval $lt_ar_try) 2>&5 546+ ac_status=$? 547+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 548+ test $ac_status = 0; } 549+ if test "$ac_status" -eq 0; then 550+ # Ensure the archiver fails upon bogus file names. 551+ rm -f conftest.$ac_objext libconftest.a 552+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 553+ (eval $lt_ar_try) 2>&5 554+ ac_status=$? 555+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 556+ test $ac_status = 0; } 557+ if test "$ac_status" -ne 0; then 558+ lt_cv_ar_at_file=@ 559+ fi 560+ fi 561+ rm -f conftest.* libconftest.a 562+ 563+fi 564+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 565+ 566+fi 567+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 568+$as_echo "$lt_cv_ar_at_file" >&6; } 569+ 570+if test "x$lt_cv_ar_at_file" = xno; then 571+ archiver_list_spec= 572+else 573+ archiver_list_spec=$lt_cv_ar_at_file 574+fi 575+ 576+ 577+ 578+ 579+ 580+ 581 582 if test -n "$ac_tool_prefix"; then 583 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 584@@ -6650,8 +6964,8 @@ esac 585 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 586 587 # Transform an extracted symbol line into symbol name and symbol address 588-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 589-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" 590+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 591+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'" 592 593 # Handle CRLF in mingw tool chain 594 opt_cr= 595@@ -6687,6 +7001,7 @@ for ac_symprfx in "" "_"; do 596 else 597 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 598 fi 599+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" 600 601 # Check to see that the pipe works correctly. 602 pipe_works=no 603@@ -6728,6 +7043,18 @@ _LT_EOF 604 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 605 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 606 cat <<_LT_EOF > conftest.$ac_ext 607+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ 608+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) 609+/* DATA imports from DLLs on WIN32 con't be const, because runtime 610+ relocations are performed -- see ld's documentation on pseudo-relocs. */ 611+# define LT_DLSYM_CONST 612+#elif defined(__osf__) 613+/* This system does not cope well with relocations in const data. */ 614+# define LT_DLSYM_CONST 615+#else 616+# define LT_DLSYM_CONST const 617+#endif 618+ 619 #ifdef __cplusplus 620 extern "C" { 621 #endif 622@@ -6739,7 +7066,7 @@ _LT_EOF 623 cat <<_LT_EOF >> conftest.$ac_ext 624 625 /* The mapping between symbol names and symbols. */ 626-const struct { 627+LT_DLSYM_CONST struct { 628 const char *name; 629 void *address; 630 } 631@@ -6765,8 +7092,8 @@ static const void *lt_preloaded_setup() { 632 _LT_EOF 633 # Now try linking the two files. 634 mv conftest.$ac_objext conftstm.$ac_objext 635- lt_save_LIBS="$LIBS" 636- lt_save_CFLAGS="$CFLAGS" 637+ lt_globsym_save_LIBS=$LIBS 638+ lt_globsym_save_CFLAGS=$CFLAGS 639 LIBS="conftstm.$ac_objext" 640 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 641 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 642@@ -6776,8 +7103,8 @@ _LT_EOF 643 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 644 pipe_works=yes 645 fi 646- LIBS="$lt_save_LIBS" 647- CFLAGS="$lt_save_CFLAGS" 648+ LIBS=$lt_globsym_save_LIBS 649+ CFLAGS=$lt_globsym_save_CFLAGS 650 else 651 echo "cannot find nm_test_func in $nlist" >&5 652 fi 653@@ -6814,6 +7141,14 @@ else 654 $as_echo "ok" >&6; } 655 fi 656 657+# Response file support. 658+if test "$lt_cv_nm_interface" = "MS dumpbin"; then 659+ nm_file_list_spec='@' 660+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then 661+ nm_file_list_spec='@' 662+fi 663+ 664+ 665 666 667 668@@ -6832,6 +7167,47 @@ fi 669 670 671 672+ 673+ 674+ 675+ 676+ 677+ 678+ 679+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 680+$as_echo_n "checking for sysroot... " >&6; } 681+ 682+# Check whether --with-libtool-sysroot was given. 683+if test "${with_libtool_sysroot+set}" = set; then : 684+ withval=$with_libtool_sysroot; 685+else 686+ with_libtool_sysroot=no 687+fi 688+ 689+ 690+lt_sysroot= 691+case ${with_libtool_sysroot} in #( 692+ yes) 693+ if test "$GCC" = yes; then 694+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` 695+ fi 696+ ;; #( 697+ /*) 698+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` 699+ ;; #( 700+ no|'') 701+ ;; #( 702+ *) 703+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 704+$as_echo "${with_libtool_sysroot}" >&6; } 705+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 706+ ;; 707+esac 708+ 709+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 710+$as_echo "${lt_sysroot:-no}" >&6; } 711+ 712+ 713 714 715 716@@ -7041,6 +7417,123 @@ esac 717 718 need_locks="$enable_libtool_lock" 719 720+if test -n "$ac_tool_prefix"; then 721+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. 722+set dummy ${ac_tool_prefix}mt; ac_word=$2 723+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 724+$as_echo_n "checking for $ac_word... " >&6; } 725+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : 726+ $as_echo_n "(cached) " >&6 727+else 728+ if test -n "$MANIFEST_TOOL"; then 729+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. 730+else 731+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 732+for as_dir in $PATH 733+do 734+ IFS=$as_save_IFS 735+ test -z "$as_dir" && as_dir=. 736+ for ac_exec_ext in '' $ac_executable_extensions; do 737+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 738+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" 739+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 740+ break 2 741+ fi 742+done 743+ done 744+IFS=$as_save_IFS 745+ 746+fi 747+fi 748+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL 749+if test -n "$MANIFEST_TOOL"; then 750+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 751+$as_echo "$MANIFEST_TOOL" >&6; } 752+else 753+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 754+$as_echo "no" >&6; } 755+fi 756+ 757+ 758+fi 759+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then 760+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL 761+ # Extract the first word of "mt", so it can be a program name with args. 762+set dummy mt; ac_word=$2 763+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 764+$as_echo_n "checking for $ac_word... " >&6; } 765+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : 766+ $as_echo_n "(cached) " >&6 767+else 768+ if test -n "$ac_ct_MANIFEST_TOOL"; then 769+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. 770+else 771+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 772+for as_dir in $PATH 773+do 774+ IFS=$as_save_IFS 775+ test -z "$as_dir" && as_dir=. 776+ for ac_exec_ext in '' $ac_executable_extensions; do 777+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 778+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" 779+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 780+ break 2 781+ fi 782+done 783+ done 784+IFS=$as_save_IFS 785+ 786+fi 787+fi 788+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL 789+if test -n "$ac_ct_MANIFEST_TOOL"; then 790+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 791+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } 792+else 793+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 794+$as_echo "no" >&6; } 795+fi 796+ 797+ if test "x$ac_ct_MANIFEST_TOOL" = x; then 798+ MANIFEST_TOOL=":" 799+ else 800+ case $cross_compiling:$ac_tool_warned in 801+yes:) 802+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 803+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 804+ac_tool_warned=yes ;; 805+esac 806+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL 807+ fi 808+else 809+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" 810+fi 811+ 812+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt 813+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 814+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } 815+if ${lt_cv_path_mainfest_tool+:} false; then : 816+ $as_echo_n "(cached) " >&6 817+else 818+ lt_cv_path_mainfest_tool=no 819+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 820+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out 821+ cat conftest.err >&5 822+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then 823+ lt_cv_path_mainfest_tool=yes 824+ fi 825+ rm -f conftest* 826+fi 827+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 828+$as_echo "$lt_cv_path_mainfest_tool" >&6; } 829+if test "x$lt_cv_path_mainfest_tool" != xyes; then 830+ MANIFEST_TOOL=: 831+fi 832+ 833+ 834+ 835+ 836+ 837 838 case $host_os in 839 rhapsody* | darwin*) 840@@ -7604,6 +8097,8 @@ _LT_EOF 841 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 842 echo "$AR cru libconftest.a conftest.o" >&5 843 $AR cru libconftest.a conftest.o 2>&5 844+ echo "$RANLIB libconftest.a" >&5 845+ $RANLIB libconftest.a 2>&5 846 cat > conftest.c << _LT_EOF 847 int main() { return 0;} 848 _LT_EOF 849@@ -8155,8 +8650,6 @@ fi 850 lt_prog_compiler_pic= 851 lt_prog_compiler_static= 852 853-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 854-$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 855 856 if test "$GCC" = yes; then 857 lt_prog_compiler_wl='-Wl,' 858@@ -8322,6 +8815,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 859 lt_prog_compiler_pic='--shared' 860 lt_prog_compiler_static='--static' 861 ;; 862+ nagfor*) 863+ # NAG Fortran compiler 864+ lt_prog_compiler_wl='-Wl,-Wl,,' 865+ lt_prog_compiler_pic='-PIC' 866+ lt_prog_compiler_static='-Bstatic' 867+ ;; 868 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 869 # Portland Group compilers (*not* the Pentium gcc compiler, 870 # which looks to be a dead project) 871@@ -8384,7 +8883,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 872 lt_prog_compiler_pic='-KPIC' 873 lt_prog_compiler_static='-Bstatic' 874 case $cc_basename in 875- f77* | f90* | f95*) 876+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) 877 lt_prog_compiler_wl='-Qoption ld ';; 878 *) 879 lt_prog_compiler_wl='-Wl,';; 880@@ -8441,13 +8940,17 @@ case $host_os in 881 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 882 ;; 883 esac 884-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 885-$as_echo "$lt_prog_compiler_pic" >&6; } 886- 887- 888- 889- 890 891+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 892+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 893+if ${lt_cv_prog_compiler_pic+:} false; then : 894+ $as_echo_n "(cached) " >&6 895+else 896+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic 897+fi 898+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 899+$as_echo "$lt_cv_prog_compiler_pic" >&6; } 900+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic 901 902 # 903 # Check to make sure the PIC flag actually works. 904@@ -8508,6 +9011,11 @@ fi 905 906 907 908+ 909+ 910+ 911+ 912+ 913 # 914 # Check to make sure the static flag actually works. 915 # 916@@ -8858,7 +9366,8 @@ _LT_EOF 917 allow_undefined_flag=unsupported 918 always_export_symbols=no 919 enable_shared_with_static_runtimes=yes 920- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 921+ 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' 922+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' 923 924 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 925 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 926@@ -8957,12 +9466,12 @@ _LT_EOF 927 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 928 hardcode_libdir_flag_spec= 929 hardcode_libdir_flag_spec_ld='-rpath $libdir' 930- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' 931+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' 932 if test "x$supports_anon_versioning" = xyes; then 933 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ 934 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ 935 echo "local: *; };" >> $output_objdir/$libname.ver~ 936- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 937+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 938 fi 939 ;; 940 esac 941@@ -8976,8 +9485,8 @@ _LT_EOF 942 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 943 wlarc= 944 else 945- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 946- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 947+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 948+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 949 fi 950 ;; 951 952@@ -8995,8 +9504,8 @@ _LT_EOF 953 954 _LT_EOF 955 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 956- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 957- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 958+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 959+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 960 else 961 ld_shlibs=no 962 fi 963@@ -9042,8 +9551,8 @@ _LT_EOF 964 965 *) 966 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 967- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 968- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 969+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 970+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 971 else 972 ld_shlibs=no 973 fi 974@@ -9173,7 +9682,13 @@ _LT_EOF 975 allow_undefined_flag='-berok' 976 # Determine the default libpath from the value encoded in an 977 # empty executable. 978- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 979+ if test "${lt_cv_aix_libpath+set}" = set; then 980+ aix_libpath=$lt_cv_aix_libpath 981+else 982+ if ${lt_cv_aix_libpath_+:} false; then : 983+ $as_echo_n "(cached) " >&6 984+else 985+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 986 /* end confdefs.h. */ 987 988 int 989@@ -9186,22 +9701,29 @@ main () 990 _ACEOF 991 if ac_fn_c_try_link "$LINENO"; then : 992 993-lt_aix_libpath_sed=' 994- /Import File Strings/,/^$/ { 995- /^0/ { 996- s/^0 *\(.*\)$/\1/ 997- p 998- } 999- }' 1000-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 1001-# Check for a 64-bit object if we didn't find anything. 1002-if test -z "$aix_libpath"; then 1003- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 1004-fi 1005+ lt_aix_libpath_sed=' 1006+ /Import File Strings/,/^$/ { 1007+ /^0/ { 1008+ s/^0 *\([^ ]*\) *$/\1/ 1009+ p 1010+ } 1011+ }' 1012+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 1013+ # Check for a 64-bit object if we didn't find anything. 1014+ if test -z "$lt_cv_aix_libpath_"; then 1015+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 1016+ fi 1017 fi 1018 rm -f core conftest.err conftest.$ac_objext \ 1019 conftest$ac_exeext conftest.$ac_ext 1020-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1021+ if test -z "$lt_cv_aix_libpath_"; then 1022+ lt_cv_aix_libpath_="/usr/lib:/lib" 1023+ fi 1024+ 1025+fi 1026+ 1027+ aix_libpath=$lt_cv_aix_libpath_ 1028+fi 1029 1030 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 1031 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" 1032@@ -9213,7 +9735,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1033 else 1034 # Determine the default libpath from the value encoded in an 1035 # empty executable. 1036- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1037+ if test "${lt_cv_aix_libpath+set}" = set; then 1038+ aix_libpath=$lt_cv_aix_libpath 1039+else 1040+ if ${lt_cv_aix_libpath_+:} false; then : 1041+ $as_echo_n "(cached) " >&6 1042+else 1043+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1044 /* end confdefs.h. */ 1045 1046 int 1047@@ -9226,22 +9754,29 @@ main () 1048 _ACEOF 1049 if ac_fn_c_try_link "$LINENO"; then : 1050 1051-lt_aix_libpath_sed=' 1052- /Import File Strings/,/^$/ { 1053- /^0/ { 1054- s/^0 *\(.*\)$/\1/ 1055- p 1056- } 1057- }' 1058-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 1059-# Check for a 64-bit object if we didn't find anything. 1060-if test -z "$aix_libpath"; then 1061- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 1062-fi 1063+ lt_aix_libpath_sed=' 1064+ /Import File Strings/,/^$/ { 1065+ /^0/ { 1066+ s/^0 *\([^ ]*\) *$/\1/ 1067+ p 1068+ } 1069+ }' 1070+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 1071+ # Check for a 64-bit object if we didn't find anything. 1072+ if test -z "$lt_cv_aix_libpath_"; then 1073+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 1074+ fi 1075 fi 1076 rm -f core conftest.err conftest.$ac_objext \ 1077 conftest$ac_exeext conftest.$ac_ext 1078-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1079+ if test -z "$lt_cv_aix_libpath_"; then 1080+ lt_cv_aix_libpath_="/usr/lib:/lib" 1081+ fi 1082+ 1083+fi 1084+ 1085+ aix_libpath=$lt_cv_aix_libpath_ 1086+fi 1087 1088 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 1089 # Warning - without using the other run time loading flags, 1090@@ -9286,20 +9821,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1091 # Microsoft Visual C++. 1092 # hardcode_libdir_flag_spec is actually meaningless, as there is 1093 # no search path for DLLs. 1094- hardcode_libdir_flag_spec=' ' 1095- allow_undefined_flag=unsupported 1096- # Tell ltmain to make .lib files, not .a files. 1097- libext=lib 1098- # Tell ltmain to make .dll files, not .so files. 1099- shrext_cmds=".dll" 1100- # FIXME: Setting linknames here is a bad hack. 1101- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 1102- # The linker will automatically build a .lib file if we build a DLL. 1103- old_archive_from_new_cmds='true' 1104- # FIXME: Should let the user specify the lib program. 1105- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 1106- fix_srcfile_path='`cygpath -w "$srcfile"`' 1107- enable_shared_with_static_runtimes=yes 1108+ case $cc_basename in 1109+ cl*) 1110+ # Native MSVC 1111+ hardcode_libdir_flag_spec=' ' 1112+ allow_undefined_flag=unsupported 1113+ always_export_symbols=yes 1114+ file_list_spec='@' 1115+ # Tell ltmain to make .lib files, not .a files. 1116+ libext=lib 1117+ # Tell ltmain to make .dll files, not .so files. 1118+ shrext_cmds=".dll" 1119+ # FIXME: Setting linknames here is a bad hack. 1120+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' 1121+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 1122+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; 1123+ else 1124+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; 1125+ fi~ 1126+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ 1127+ linknames=' 1128+ # The linker will not automatically build a static lib if we build a DLL. 1129+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' 1130+ enable_shared_with_static_runtimes=yes 1131+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 1132+ # Don't use ranlib 1133+ old_postinstall_cmds='chmod 644 $oldlib' 1134+ postlink_cmds='lt_outputfile="@OUTPUT@"~ 1135+ lt_tool_outputfile="@TOOL_OUTPUT@"~ 1136+ case $lt_outputfile in 1137+ *.exe|*.EXE) ;; 1138+ *) 1139+ lt_outputfile="$lt_outputfile.exe" 1140+ lt_tool_outputfile="$lt_tool_outputfile.exe" 1141+ ;; 1142+ esac~ 1143+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then 1144+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; 1145+ $RM "$lt_outputfile.manifest"; 1146+ fi' 1147+ ;; 1148+ *) 1149+ # Assume MSVC wrapper 1150+ hardcode_libdir_flag_spec=' ' 1151+ allow_undefined_flag=unsupported 1152+ # Tell ltmain to make .lib files, not .a files. 1153+ libext=lib 1154+ # Tell ltmain to make .dll files, not .so files. 1155+ shrext_cmds=".dll" 1156+ # FIXME: Setting linknames here is a bad hack. 1157+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 1158+ # The linker will automatically build a .lib file if we build a DLL. 1159+ old_archive_from_new_cmds='true' 1160+ # FIXME: Should let the user specify the lib program. 1161+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 1162+ enable_shared_with_static_runtimes=yes 1163+ ;; 1164+ esac 1165 ;; 1166 1167 darwin* | rhapsody*) 1168@@ -9360,7 +9938,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1169 1170 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 1171 freebsd* | dragonfly*) 1172- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' 1173+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' 1174 hardcode_libdir_flag_spec='-R$libdir' 1175 hardcode_direct=yes 1176 hardcode_shlibpath_var=no 1177@@ -9368,7 +9946,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1178 1179 hpux9*) 1180 if test "$GCC" = yes; then 1181- 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' 1182+ 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' 1183 else 1184 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' 1185 fi 1186@@ -9384,7 +9962,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1187 1188 hpux10*) 1189 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 1190- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 1191+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 1192 else 1193 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 1194 fi 1195@@ -9408,10 +9986,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1196 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 1197 ;; 1198 ia64*) 1199- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 1200+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 1201 ;; 1202 *) 1203- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 1204+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 1205 ;; 1206 esac 1207 else 1208@@ -9490,23 +10068,36 @@ fi 1209 1210 irix5* | irix6* | nonstopux*) 1211 if test "$GCC" = yes; then 1212- 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' 1213+ 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' 1214 # Try to use the -exported_symbol ld option, if it does not 1215 # work, assume that -exports_file does not work either and 1216 # implicitly export all symbols. 1217- save_LDFLAGS="$LDFLAGS" 1218- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 1219- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1220+ # This should be the same for all languages, so no per-tag cache variable. 1221+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 1222+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } 1223+if ${lt_cv_irix_exported_symbol+:} false; then : 1224+ $as_echo_n "(cached) " >&6 1225+else 1226+ save_LDFLAGS="$LDFLAGS" 1227+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 1228+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1229 /* end confdefs.h. */ 1230-int foo(void) {} 1231+int foo (void) { return 0; } 1232 _ACEOF 1233 if ac_fn_c_try_link "$LINENO"; then : 1234- 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' 1235- 1236+ lt_cv_irix_exported_symbol=yes 1237+else 1238+ lt_cv_irix_exported_symbol=no 1239 fi 1240 rm -f core conftest.err conftest.$ac_objext \ 1241 conftest$ac_exeext conftest.$ac_ext 1242- LDFLAGS="$save_LDFLAGS" 1243+ LDFLAGS="$save_LDFLAGS" 1244+fi 1245+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 1246+$as_echo "$lt_cv_irix_exported_symbol" >&6; } 1247+ if test "$lt_cv_irix_exported_symbol" = yes; then 1248+ 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' 1249+ fi 1250 else 1251 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' 1252 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' 1253@@ -9591,7 +10182,7 @@ rm -f core conftest.err conftest.$ac_objext \ 1254 osf4* | osf5*) # as osf3* with the addition of -msym flag 1255 if test "$GCC" = yes; then 1256 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 1257- 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' 1258+ 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' 1259 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 1260 else 1261 allow_undefined_flag=' -expect_unresolved \*' 1262@@ -9610,9 +10201,9 @@ rm -f core conftest.err conftest.$ac_objext \ 1263 no_undefined_flag=' -z defs' 1264 if test "$GCC" = yes; then 1265 wlarc='${wl}' 1266- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 1267+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 1268 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ 1269- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' 1270+ $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' 1271 else 1272 case `$CC -V 2>&1` in 1273 *"Compilers 5.0"*) 1274@@ -10188,8 +10779,9 @@ cygwin* | mingw* | pw32* | cegcc*) 1275 need_version=no 1276 need_lib_prefix=no 1277 1278- case $GCC,$host_os in 1279- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) 1280+ case $GCC,$cc_basename in 1281+ yes,*) 1282+ # gcc 1283 library_names_spec='$libname.dll.a' 1284 # DLL is installed to $(libdir)/../bin by postinstall_cmds 1285 postinstall_cmds='base_file=`basename \${file}`~ 1286@@ -10222,13 +10814,71 @@ cygwin* | mingw* | pw32* | cegcc*) 1287 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 1288 ;; 1289 esac 1290+ dynamic_linker='Win32 ld.exe' 1291+ ;; 1292+ 1293+ *,cl*) 1294+ # Native MSVC 1295+ libname_spec='$name' 1296+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 1297+ library_names_spec='${libname}.dll.lib' 1298+ 1299+ case $build_os in 1300+ mingw*) 1301+ sys_lib_search_path_spec= 1302+ lt_save_ifs=$IFS 1303+ IFS=';' 1304+ for lt_path in $LIB 1305+ do 1306+ IFS=$lt_save_ifs 1307+ # Let DOS variable expansion print the short 8.3 style file name. 1308+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` 1309+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" 1310+ done 1311+ IFS=$lt_save_ifs 1312+ # Convert to MSYS style. 1313+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` 1314+ ;; 1315+ cygwin*) 1316+ # Convert to unix form, then to dos form, then back to unix form 1317+ # but this time dos style (no spaces!) so that the unix form looks 1318+ # like /cygdrive/c/PROGRA~1:/cygdr... 1319+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` 1320+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` 1321+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 1322+ ;; 1323+ *) 1324+ sys_lib_search_path_spec="$LIB" 1325+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then 1326+ # It is most probably a Windows format PATH. 1327+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` 1328+ else 1329+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 1330+ fi 1331+ # FIXME: find the short name or the path components, as spaces are 1332+ # common. (e.g. "Program Files" -> "PROGRA~1") 1333+ ;; 1334+ esac 1335+ 1336+ # DLL is installed to $(libdir)/../bin by postinstall_cmds 1337+ postinstall_cmds='base_file=`basename \${file}`~ 1338+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ 1339+ dldir=$destdir/`dirname \$dlpath`~ 1340+ test -d \$dldir || mkdir -p \$dldir~ 1341+ $install_prog $dir/$dlname \$dldir/$dlname' 1342+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ 1343+ dlpath=$dir/\$dldll~ 1344+ $RM \$dlpath' 1345+ shlibpath_overrides_runpath=yes 1346+ dynamic_linker='Win32 link.exe' 1347 ;; 1348 1349 *) 1350+ # Assume MSVC wrapper 1351 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' 1352+ dynamic_linker='Win32 ld.exe' 1353 ;; 1354 esac 1355- dynamic_linker='Win32 ld.exe' 1356 # FIXME: first we should search . and the directory the executable is in 1357 shlibpath_var=PATH 1358 ;; 1359@@ -11106,7 +11756,7 @@ else 1360 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 1361 lt_status=$lt_dlunknown 1362 cat > conftest.$ac_ext <<_LT_EOF 1363-#line 11109 "configure" 1364+#line $LINENO "configure" 1365 #include "confdefs.h" 1366 1367 #if HAVE_DLFCN_H 1368@@ -11150,10 +11800,10 @@ else 1369 /* When -fvisbility=hidden is used, assume the code has been annotated 1370 correspondingly for the symbols needed. */ 1371 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 1372-void fnord () __attribute__((visibility("default"))); 1373+int fnord () __attribute__((visibility("default"))); 1374 #endif 1375 1376-void fnord () { int i=42; } 1377+int fnord () { return 42; } 1378 int main () 1379 { 1380 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 1381@@ -11212,7 +11862,7 @@ else 1382 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 1383 lt_status=$lt_dlunknown 1384 cat > conftest.$ac_ext <<_LT_EOF 1385-#line 11215 "configure" 1386+#line $LINENO "configure" 1387 #include "confdefs.h" 1388 1389 #if HAVE_DLFCN_H 1390@@ -11256,10 +11906,10 @@ else 1391 /* When -fvisbility=hidden is used, assume the code has been annotated 1392 correspondingly for the symbols needed. */ 1393 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 1394-void fnord () __attribute__((visibility("default"))); 1395+int fnord () __attribute__((visibility("default"))); 1396 #endif 1397 1398-void fnord () { int i=42; } 1399+int fnord () { return 42; } 1400 int main () 1401 { 1402 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 1403@@ -13482,7 +14132,7 @@ SHARED_LDFLAGS= 1404 if test "$enable_shared" = "yes"; then 1405 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` 1406 if test -n "$x"; then 1407- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" 1408+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" 1409 fi 1410 fi 1411 1412@@ -16129,13 +16779,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 1413 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 1414 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 1415 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 1416+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' 1417+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' 1418 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' 1419 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' 1420 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' 1421 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' 1422 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' 1423+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' 1424+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' 1425+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' 1426+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' 1427 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' 1428 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' 1429+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' 1430 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 1431 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 1432 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 1433@@ -16150,14 +16807,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 1434 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 1435 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 1436 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"`' 1437+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' 1438+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' 1439 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' 1440 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' 1441 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' 1442-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 1443 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' 1444+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 1445 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' 1446 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' 1447 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' 1448+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' 1449 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 1450 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 1451 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 1452@@ -16190,12 +16850,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 1453 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 1454 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 1455 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 1456-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' 1457 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' 1458 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' 1459 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' 1460 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' 1461 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' 1462+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' 1463 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 1464 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 1465 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 1466@@ -16250,8 +16910,13 @@ reload_flag \ 1467 OBJDUMP \ 1468 deplibs_check_method \ 1469 file_magic_cmd \ 1470+file_magic_glob \ 1471+want_nocaseglob \ 1472+DLLTOOL \ 1473+sharedlib_from_linklib_cmd \ 1474 AR \ 1475 AR_FLAGS \ 1476+archiver_list_spec \ 1477 STRIP \ 1478 RANLIB \ 1479 CC \ 1480@@ -16261,12 +16926,14 @@ lt_cv_sys_global_symbol_pipe \ 1481 lt_cv_sys_global_symbol_to_cdecl \ 1482 lt_cv_sys_global_symbol_to_c_name_address \ 1483 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 1484+nm_file_list_spec \ 1485 lt_prog_compiler_no_builtin_flag \ 1486-lt_prog_compiler_wl \ 1487 lt_prog_compiler_pic \ 1488+lt_prog_compiler_wl \ 1489 lt_prog_compiler_static \ 1490 lt_cv_prog_compiler_c_o \ 1491 need_locks \ 1492+MANIFEST_TOOL \ 1493 DSYMUTIL \ 1494 NMEDIT \ 1495 LIPO \ 1496@@ -16282,7 +16949,6 @@ no_undefined_flag \ 1497 hardcode_libdir_flag_spec \ 1498 hardcode_libdir_flag_spec_ld \ 1499 hardcode_libdir_separator \ 1500-fix_srcfile_path \ 1501 exclude_expsyms \ 1502 include_expsyms \ 1503 file_list_spec \ 1504@@ -16318,6 +16984,7 @@ module_cmds \ 1505 module_expsym_cmds \ 1506 export_symbols_cmds \ 1507 prelink_cmds \ 1508+postlink_cmds \ 1509 postinstall_cmds \ 1510 postuninstall_cmds \ 1511 finish_cmds \ 1512@@ -17086,7 +17753,8 @@ $as_echo X"$file" | 1513 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 1514 # 1515 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 1516-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. 1517+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, 1518+# Inc. 1519 # Written by Gordon Matzigkeit, 1996 1520 # 1521 # This file is part of GNU Libtool. 1522@@ -17189,19 +17857,42 @@ SP2NL=$lt_lt_SP2NL 1523 # turn newlines into spaces. 1524 NL2SP=$lt_lt_NL2SP 1525 1526+# convert \$build file names to \$host format. 1527+to_host_file_cmd=$lt_cv_to_host_file_cmd 1528+ 1529+# convert \$build files to toolchain format. 1530+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 1531+ 1532 # An object symbol dumper. 1533 OBJDUMP=$lt_OBJDUMP 1534 1535 # Method to check whether dependent libraries are shared objects. 1536 deplibs_check_method=$lt_deplibs_check_method 1537 1538-# Command to use when deplibs_check_method == "file_magic". 1539+# Command to use when deplibs_check_method = "file_magic". 1540 file_magic_cmd=$lt_file_magic_cmd 1541 1542+# How to find potential files when deplibs_check_method = "file_magic". 1543+file_magic_glob=$lt_file_magic_glob 1544+ 1545+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". 1546+want_nocaseglob=$lt_want_nocaseglob 1547+ 1548+# DLL creation program. 1549+DLLTOOL=$lt_DLLTOOL 1550+ 1551+# Command to associate shared and link libraries. 1552+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd 1553+ 1554 # The archiver. 1555 AR=$lt_AR 1556+ 1557+# Flags to create an archive. 1558 AR_FLAGS=$lt_AR_FLAGS 1559 1560+# How to feed a file listing to the archiver. 1561+archiver_list_spec=$lt_archiver_list_spec 1562+ 1563 # A symbol stripping program. 1564 STRIP=$lt_STRIP 1565 1566@@ -17231,6 +17922,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 1567 # Transform the output of nm in a C name address pair when lib prefix is needed. 1568 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 1569 1570+# Specify filename containing input files for \$NM. 1571+nm_file_list_spec=$lt_nm_file_list_spec 1572+ 1573+# The root where to search for dependent libraries,and in which our libraries should be installed. 1574+lt_sysroot=$lt_sysroot 1575+ 1576 # The name of the directory that contains temporary libtool files. 1577 objdir=$objdir 1578 1579@@ -17240,6 +17937,9 @@ MAGIC_CMD=$MAGIC_CMD 1580 # Must we lock files when doing compilation? 1581 need_locks=$lt_need_locks 1582 1583+# Manifest tool. 1584+MANIFEST_TOOL=$lt_MANIFEST_TOOL 1585+ 1586 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 1587 DSYMUTIL=$lt_DSYMUTIL 1588 1589@@ -17354,12 +18054,12 @@ with_gcc=$GCC 1590 # Compiler flag to turn off builtin functions. 1591 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 1592 1593-# How to pass a linker flag through the compiler. 1594-wl=$lt_lt_prog_compiler_wl 1595- 1596 # Additional compiler flags for building library objects. 1597 pic_flag=$lt_lt_prog_compiler_pic 1598 1599+# How to pass a linker flag through the compiler. 1600+wl=$lt_lt_prog_compiler_wl 1601+ 1602 # Compiler flag to prevent dynamic linking. 1603 link_static_flag=$lt_lt_prog_compiler_static 1604 1605@@ -17446,9 +18146,6 @@ inherit_rpath=$inherit_rpath 1606 # Whether libtool must link a program against all its dependency libraries. 1607 link_all_deplibs=$link_all_deplibs 1608 1609-# Fix the shell variable \$srcfile for the compiler. 1610-fix_srcfile_path=$lt_fix_srcfile_path 1611- 1612 # Set to "yes" if exported symbols are required. 1613 always_export_symbols=$always_export_symbols 1614 1615@@ -17464,6 +18161,9 @@ include_expsyms=$lt_include_expsyms 1616 # Commands necessary for linking programs (against libraries) with templates. 1617 prelink_cmds=$lt_prelink_cmds 1618 1619+# Commands necessary for finishing linking programs. 1620+postlink_cmds=$lt_postlink_cmds 1621+ 1622 # Specify filename containing input files. 1623 file_list_spec=$lt_file_list_spec 1624 1625@@ -17496,210 +18196,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 1626 # if finds mixed CR/LF and LF-only lines. Since sed operates in 1627 # text mode, it properly converts lines to CR/LF. This bash problem 1628 # is reportedly fixed, but why not run on old versions too? 1629- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ 1630- || (rm -f "$cfgfile"; exit 1) 1631- 1632- case $xsi_shell in 1633- yes) 1634- cat << \_LT_EOF >> "$cfgfile" 1635- 1636-# func_dirname file append nondir_replacement 1637-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 1638-# otherwise set result to NONDIR_REPLACEMENT. 1639-func_dirname () 1640-{ 1641- case ${1} in 1642- */*) func_dirname_result="${1%/*}${2}" ;; 1643- * ) func_dirname_result="${3}" ;; 1644- esac 1645-} 1646- 1647-# func_basename file 1648-func_basename () 1649-{ 1650- func_basename_result="${1##*/}" 1651-} 1652- 1653-# func_dirname_and_basename file append nondir_replacement 1654-# perform func_basename and func_dirname in a single function 1655-# call: 1656-# dirname: Compute the dirname of FILE. If nonempty, 1657-# add APPEND to the result, otherwise set result 1658-# to NONDIR_REPLACEMENT. 1659-# value returned in "$func_dirname_result" 1660-# basename: Compute filename of FILE. 1661-# value retuned in "$func_basename_result" 1662-# Implementation must be kept synchronized with func_dirname 1663-# and func_basename. For efficiency, we do not delegate to 1664-# those functions but instead duplicate the functionality here. 1665-func_dirname_and_basename () 1666-{ 1667- case ${1} in 1668- */*) func_dirname_result="${1%/*}${2}" ;; 1669- * ) func_dirname_result="${3}" ;; 1670- esac 1671- func_basename_result="${1##*/}" 1672-} 1673- 1674-# func_stripname prefix suffix name 1675-# strip PREFIX and SUFFIX off of NAME. 1676-# PREFIX and SUFFIX must not contain globbing or regex special 1677-# characters, hashes, percent signs, but SUFFIX may contain a leading 1678-# dot (in which case that matches only a dot). 1679-func_stripname () 1680-{ 1681- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are 1682- # positional parameters, so assign one to ordinary parameter first. 1683- func_stripname_result=${3} 1684- func_stripname_result=${func_stripname_result#"${1}"} 1685- func_stripname_result=${func_stripname_result%"${2}"} 1686-} 1687- 1688-# func_opt_split 1689-func_opt_split () 1690-{ 1691- func_opt_split_opt=${1%%=*} 1692- func_opt_split_arg=${1#*=} 1693-} 1694- 1695-# func_lo2o object 1696-func_lo2o () 1697-{ 1698- case ${1} in 1699- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; 1700- *) func_lo2o_result=${1} ;; 1701- esac 1702-} 1703- 1704-# func_xform libobj-or-source 1705-func_xform () 1706-{ 1707- func_xform_result=${1%.*}.lo 1708-} 1709- 1710-# func_arith arithmetic-term... 1711-func_arith () 1712-{ 1713- func_arith_result=$(( $* )) 1714-} 1715- 1716-# func_len string 1717-# STRING may not start with a hyphen. 1718-func_len () 1719-{ 1720- func_len_result=${#1} 1721-} 1722- 1723-_LT_EOF 1724- ;; 1725- *) # Bourne compatible functions. 1726- cat << \_LT_EOF >> "$cfgfile" 1727- 1728-# func_dirname file append nondir_replacement 1729-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 1730-# otherwise set result to NONDIR_REPLACEMENT. 1731-func_dirname () 1732-{ 1733- # Extract subdirectory from the argument. 1734- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` 1735- if test "X$func_dirname_result" = "X${1}"; then 1736- func_dirname_result="${3}" 1737- else 1738- func_dirname_result="$func_dirname_result${2}" 1739- fi 1740-} 1741- 1742-# func_basename file 1743-func_basename () 1744-{ 1745- func_basename_result=`$ECHO "${1}" | $SED "$basename"` 1746-} 1747- 1748- 1749-# func_stripname prefix suffix name 1750-# strip PREFIX and SUFFIX off of NAME. 1751-# PREFIX and SUFFIX must not contain globbing or regex special 1752-# characters, hashes, percent signs, but SUFFIX may contain a leading 1753-# dot (in which case that matches only a dot). 1754-# func_strip_suffix prefix name 1755-func_stripname () 1756-{ 1757- case ${2} in 1758- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; 1759- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; 1760- esac 1761-} 1762- 1763-# sed scripts: 1764-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' 1765-my_sed_long_arg='1s/^-[^=]*=//' 1766- 1767-# func_opt_split 1768-func_opt_split () 1769-{ 1770- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` 1771- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` 1772-} 1773- 1774-# func_lo2o object 1775-func_lo2o () 1776-{ 1777- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` 1778-} 1779- 1780-# func_xform libobj-or-source 1781-func_xform () 1782-{ 1783- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` 1784-} 1785- 1786-# func_arith arithmetic-term... 1787-func_arith () 1788-{ 1789- func_arith_result=`expr "$@"` 1790-} 1791- 1792-# func_len string 1793-# STRING may not start with a hyphen. 1794-func_len () 1795-{ 1796- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` 1797-} 1798- 1799-_LT_EOF 1800-esac 1801- 1802-case $lt_shell_append in 1803- yes) 1804- cat << \_LT_EOF >> "$cfgfile" 1805- 1806-# func_append var value 1807-# Append VALUE to the end of shell variable VAR. 1808-func_append () 1809-{ 1810- eval "$1+=\$2" 1811-} 1812-_LT_EOF 1813- ;; 1814- *) 1815- cat << \_LT_EOF >> "$cfgfile" 1816- 1817-# func_append var value 1818-# Append VALUE to the end of shell variable VAR. 1819-func_append () 1820-{ 1821- eval "$1=\$$1\$2" 1822-} 1823- 1824-_LT_EOF 1825- ;; 1826- esac 1827- 1828- 1829- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ 1830- || (rm -f "$cfgfile"; exit 1) 1831- 1832- mv -f "$cfgfile" "$ofile" || 1833+ sed '$q' "$ltmain" >> "$cfgfile" \ 1834+ || (rm -f "$cfgfile"; exit 1) 1835+ 1836+ if test x"$xsi_shell" = xyes; then 1837+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ 1838+func_dirname ()\ 1839+{\ 1840+\ case ${1} in\ 1841+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 1842+\ * ) func_dirname_result="${3}" ;;\ 1843+\ esac\ 1844+} # Extended-shell func_dirname 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_basename ()$/,/^} # func_basename /c\ 1851+func_basename ()\ 1852+{\ 1853+\ func_basename_result="${1##*/}"\ 1854+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ 1855+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 1856+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 1857+test 0 -eq $? || _lt_function_replace_fail=: 1858+ 1859+ 1860+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ 1861+func_dirname_and_basename ()\ 1862+{\ 1863+\ case ${1} in\ 1864+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 1865+\ * ) func_dirname_result="${3}" ;;\ 1866+\ esac\ 1867+\ func_basename_result="${1##*/}"\ 1868+} # Extended-shell func_dirname_and_basename 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_stripname ()$/,/^} # func_stripname /c\ 1875+func_stripname ()\ 1876+{\ 1877+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ 1878+\ # positional parameters, so assign one to ordinary parameter first.\ 1879+\ func_stripname_result=${3}\ 1880+\ func_stripname_result=${func_stripname_result#"${1}"}\ 1881+\ func_stripname_result=${func_stripname_result%"${2}"}\ 1882+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ 1883+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 1884+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 1885+test 0 -eq $? || _lt_function_replace_fail=: 1886+ 1887+ 1888+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ 1889+func_split_long_opt ()\ 1890+{\ 1891+\ func_split_long_opt_name=${1%%=*}\ 1892+\ func_split_long_opt_arg=${1#*=}\ 1893+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ 1894+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 1895+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 1896+test 0 -eq $? || _lt_function_replace_fail=: 1897+ 1898+ 1899+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ 1900+func_split_short_opt ()\ 1901+{\ 1902+\ func_split_short_opt_arg=${1#??}\ 1903+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ 1904+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ 1905+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 1906+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 1907+test 0 -eq $? || _lt_function_replace_fail=: 1908+ 1909+ 1910+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ 1911+func_lo2o ()\ 1912+{\ 1913+\ case ${1} in\ 1914+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ 1915+\ *) func_lo2o_result=${1} ;;\ 1916+\ esac\ 1917+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ 1918+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 1919+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 1920+test 0 -eq $? || _lt_function_replace_fail=: 1921+ 1922+ 1923+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ 1924+func_xform ()\ 1925+{\ 1926+ func_xform_result=${1%.*}.lo\ 1927+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ 1928+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 1929+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 1930+test 0 -eq $? || _lt_function_replace_fail=: 1931+ 1932+ 1933+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ 1934+func_arith ()\ 1935+{\ 1936+ func_arith_result=$(( $* ))\ 1937+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ 1938+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 1939+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 1940+test 0 -eq $? || _lt_function_replace_fail=: 1941+ 1942+ 1943+ sed -e '/^func_len ()$/,/^} # func_len /c\ 1944+func_len ()\ 1945+{\ 1946+ func_len_result=${#1}\ 1947+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ 1948+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 1949+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 1950+test 0 -eq $? || _lt_function_replace_fail=: 1951+ 1952+fi 1953+ 1954+if test x"$lt_shell_append" = xyes; then 1955+ sed -e '/^func_append ()$/,/^} # func_append /c\ 1956+func_append ()\ 1957+{\ 1958+ eval "${1}+=\\${2}"\ 1959+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ 1960+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 1961+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 1962+test 0 -eq $? || _lt_function_replace_fail=: 1963+ 1964+ 1965+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ 1966+func_append_quoted ()\ 1967+{\ 1968+\ func_quote_for_eval "${2}"\ 1969+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ 1970+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ 1971+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 1972+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 1973+test 0 -eq $? || _lt_function_replace_fail=: 1974+ 1975+ 1976+ # Save a `func_append' function call where possible by direct use of '+=' 1977+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ 1978+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 1979+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 1980+ test 0 -eq $? || _lt_function_replace_fail=: 1981+else 1982+ # Save a `func_append' function call even when '+=' is not available 1983+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ 1984+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 1985+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 1986+ test 0 -eq $? || _lt_function_replace_fail=: 1987+fi 1988+ 1989+if test x"$_lt_function_replace_fail" = x":"; then 1990+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 1991+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} 1992+fi 1993+ 1994+ 1995+ mv -f "$cfgfile" "$ofile" || 1996 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 1997 chmod +x "$ofile" 1998 1999diff --git a/bfd/configure.ac b/bfd/configure.ac 2000index 015fd011893..58f73ec709c 100644 2001--- a/bfd/configure.ac 2002+++ b/bfd/configure.ac 2003@@ -272,7 +272,7 @@ changequote(,)dnl 2004 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` 2005 changequote([,])dnl 2006 if test -n "$x"; then 2007- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" 2008+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" 2009 fi 2010 fi 2011 2012diff --git a/binutils/Makefile.in b/binutils/Makefile.in 2013index 27315addc0f..5ddd5a42a7d 100644 2014--- a/binutils/Makefile.in 2015+++ b/binutils/Makefile.in 2016@@ -493,6 +493,7 @@ DEBUGINFOD_LIBS = @DEBUGINFOD_LIBS@ 2017 DEFS = @DEFS@ 2018 DEMANGLER_NAME = @DEMANGLER_NAME@ 2019 DEPDIR = @DEPDIR@ 2020+DLLTOOL = @DLLTOOL@ 2021 DLLTOOL_DEFS = @DLLTOOL_DEFS@ 2022 DSYMUTIL = @DSYMUTIL@ 2023 DUMPBIN = @DUMPBIN@ 2024@@ -534,6 +535,7 @@ LTLIBICONV = @LTLIBICONV@ 2025 LTLIBOBJS = @LTLIBOBJS@ 2026 MAINT = @MAINT@ 2027 MAKEINFO = @MAKEINFO@ 2028+MANIFEST_TOOL = @MANIFEST_TOOL@ 2029 MKDIR_P = @MKDIR_P@ 2030 MKINSTALLDIRS = @MKINSTALLDIRS@ 2031 MSGFMT = @MSGFMT@ 2032@@ -582,6 +584,7 @@ abs_builddir = @abs_builddir@ 2033 abs_srcdir = @abs_srcdir@ 2034 abs_top_builddir = @abs_top_builddir@ 2035 abs_top_srcdir = @abs_top_srcdir@ 2036+ac_ct_AR = @ac_ct_AR@ 2037 ac_ct_CC = @ac_ct_CC@ 2038 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ 2039 am__include = @am__include@ 2040diff --git a/binutils/configure b/binutils/configure 2041index c7bd42049c3..06285371350 100755 2042--- a/binutils/configure 2043+++ b/binutils/configure 2044@@ -700,8 +700,11 @@ OTOOL 2045 LIPO 2046 NMEDIT 2047 DSYMUTIL 2048+MANIFEST_TOOL 2049 RANLIB 2050+ac_ct_AR 2051 AR 2052+DLLTOOL 2053 OBJDUMP 2054 LN_S 2055 NM 2056@@ -818,6 +821,7 @@ enable_static 2057 with_pic 2058 enable_fast_install 2059 with_gnu_ld 2060+with_libtool_sysroot 2061 enable_libtool_lock 2062 enable_plugins 2063 enable_largefile 2064@@ -1523,6 +1527,8 @@ Optional Packages: 2065 --with-pic try to use only PIC/non-PIC objects [default=use 2066 both] 2067 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 2068+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR 2069+ (or the compiler's sysroot if not specified). 2070 --with-debuginfod Enable debuginfo lookups with debuginfod 2071 (auto/yes/no) 2072 --with-system-zlib use installed libz 2073@@ -4723,8 +4729,8 @@ esac 2074 2075 2076 2077-macro_version='2.2.7a' 2078-macro_revision='1.3134' 2079+macro_version='2.4' 2080+macro_revision='1.3293' 2081 2082 2083 2084@@ -4764,7 +4770,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 2085 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 2086 $as_echo_n "checking how to print strings... " >&6; } 2087 # Test print first, because it will be a builtin if present. 2088-if test "X`print -r -- -n 2>/dev/null`" = X-n && \ 2089+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ 2090 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 2091 ECHO='print -r --' 2092 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 2093@@ -5457,8 +5463,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 2094 # Try some XSI features 2095 xsi_shell=no 2096 ( _lt_dummy="a/b/c" 2097- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ 2098- = c,a/b,, \ 2099+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ 2100+ = c,a/b,b/c, \ 2101 && eval 'test $(( 1 + 1 )) -eq 2 \ 2102 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 2103 && xsi_shell=yes 2104@@ -5507,6 +5513,80 @@ esac 2105 2106 2107 2108+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 2109+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } 2110+if ${lt_cv_to_host_file_cmd+:} false; then : 2111+ $as_echo_n "(cached) " >&6 2112+else 2113+ case $host in 2114+ *-*-mingw* ) 2115+ case $build in 2116+ *-*-mingw* ) # actually msys 2117+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 2118+ ;; 2119+ *-*-cygwin* ) 2120+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 2121+ ;; 2122+ * ) # otherwise, assume *nix 2123+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 2124+ ;; 2125+ esac 2126+ ;; 2127+ *-*-cygwin* ) 2128+ case $build in 2129+ *-*-mingw* ) # actually msys 2130+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin 2131+ ;; 2132+ *-*-cygwin* ) 2133+ lt_cv_to_host_file_cmd=func_convert_file_noop 2134+ ;; 2135+ * ) # otherwise, assume *nix 2136+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin 2137+ ;; 2138+ esac 2139+ ;; 2140+ * ) # unhandled hosts (and "normal" native builds) 2141+ lt_cv_to_host_file_cmd=func_convert_file_noop 2142+ ;; 2143+esac 2144+ 2145+fi 2146+ 2147+to_host_file_cmd=$lt_cv_to_host_file_cmd 2148+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 2149+$as_echo "$lt_cv_to_host_file_cmd" >&6; } 2150+ 2151+ 2152+ 2153+ 2154+ 2155+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 2156+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } 2157+if ${lt_cv_to_tool_file_cmd+:} false; then : 2158+ $as_echo_n "(cached) " >&6 2159+else 2160+ #assume ordinary cross tools, or native build. 2161+lt_cv_to_tool_file_cmd=func_convert_file_noop 2162+case $host in 2163+ *-*-mingw* ) 2164+ case $build in 2165+ *-*-mingw* ) # actually msys 2166+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 2167+ ;; 2168+ esac 2169+ ;; 2170+esac 2171+ 2172+fi 2173+ 2174+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 2175+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 2176+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } 2177+ 2178+ 2179+ 2180+ 2181+ 2182 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 2183 $as_echo_n "checking for $LD option to reload object files... " >&6; } 2184 if ${lt_cv_ld_reload_flag+:} false; then : 2185@@ -5523,6 +5603,11 @@ case $reload_flag in 2186 esac 2187 reload_cmds='$LD$reload_flag -o $output$reload_objs' 2188 case $host_os in 2189+ cygwin* | mingw* | pw32* | cegcc*) 2190+ if test "$GCC" != yes; then 2191+ reload_cmds=false 2192+ fi 2193+ ;; 2194 darwin*) 2195 if test "$GCC" = yes; then 2196 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 2197@@ -5691,7 +5776,8 @@ mingw* | pw32*) 2198 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 2199 lt_cv_file_magic_cmd='func_win32_libid' 2200 else 2201- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' 2202+ # Keep this pattern in sync with the one in func_win32_libid. 2203+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' 2204 lt_cv_file_magic_cmd='$OBJDUMP -f' 2205 fi 2206 ;; 2207@@ -5845,6 +5931,21 @@ esac 2208 fi 2209 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 2210 $as_echo "$lt_cv_deplibs_check_method" >&6; } 2211+ 2212+file_magic_glob= 2213+want_nocaseglob=no 2214+if test "$build" = "$host"; then 2215+ case $host_os in 2216+ mingw* | pw32*) 2217+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then 2218+ want_nocaseglob=yes 2219+ else 2220+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` 2221+ fi 2222+ ;; 2223+ esac 2224+fi 2225+ 2226 file_magic_cmd=$lt_cv_file_magic_cmd 2227 deplibs_check_method=$lt_cv_deplibs_check_method 2228 test -z "$deplibs_check_method" && deplibs_check_method=unknown 2229@@ -5860,6 +5961,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 2230 2231 2232 2233+ 2234+ 2235+ 2236+ 2237+ 2238+ 2239+ 2240+ 2241+ 2242+ 2243+if test -n "$ac_tool_prefix"; then 2244+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. 2245+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 2246+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2247+$as_echo_n "checking for $ac_word... " >&6; } 2248+if ${ac_cv_prog_DLLTOOL+:} false; then : 2249+ $as_echo_n "(cached) " >&6 2250+else 2251+ if test -n "$DLLTOOL"; then 2252+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. 2253+else 2254+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 2255+for as_dir in $PATH 2256+do 2257+ IFS=$as_save_IFS 2258+ test -z "$as_dir" && as_dir=. 2259+ for ac_exec_ext in '' $ac_executable_extensions; do 2260+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 2261+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" 2262+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2263+ break 2 2264+ fi 2265+done 2266+ done 2267+IFS=$as_save_IFS 2268+ 2269+fi 2270+fi 2271+DLLTOOL=$ac_cv_prog_DLLTOOL 2272+if test -n "$DLLTOOL"; then 2273+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 2274+$as_echo "$DLLTOOL" >&6; } 2275+else 2276+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 2277+$as_echo "no" >&6; } 2278+fi 2279+ 2280+ 2281+fi 2282+if test -z "$ac_cv_prog_DLLTOOL"; then 2283+ ac_ct_DLLTOOL=$DLLTOOL 2284+ # Extract the first word of "dlltool", so it can be a program name with args. 2285+set dummy dlltool; ac_word=$2 2286+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2287+$as_echo_n "checking for $ac_word... " >&6; } 2288+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : 2289+ $as_echo_n "(cached) " >&6 2290+else 2291+ if test -n "$ac_ct_DLLTOOL"; then 2292+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. 2293+else 2294+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 2295+for as_dir in $PATH 2296+do 2297+ IFS=$as_save_IFS 2298+ test -z "$as_dir" && as_dir=. 2299+ for ac_exec_ext in '' $ac_executable_extensions; do 2300+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 2301+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" 2302+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2303+ break 2 2304+ fi 2305+done 2306+ done 2307+IFS=$as_save_IFS 2308+ 2309+fi 2310+fi 2311+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL 2312+if test -n "$ac_ct_DLLTOOL"; then 2313+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 2314+$as_echo "$ac_ct_DLLTOOL" >&6; } 2315+else 2316+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 2317+$as_echo "no" >&6; } 2318+fi 2319+ 2320+ if test "x$ac_ct_DLLTOOL" = x; then 2321+ DLLTOOL="false" 2322+ else 2323+ case $cross_compiling:$ac_tool_warned in 2324+yes:) 2325+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 2326+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 2327+ac_tool_warned=yes ;; 2328+esac 2329+ DLLTOOL=$ac_ct_DLLTOOL 2330+ fi 2331+else 2332+ DLLTOOL="$ac_cv_prog_DLLTOOL" 2333+fi 2334+ 2335+test -z "$DLLTOOL" && DLLTOOL=dlltool 2336+ 2337+ 2338+ 2339+ 2340+ 2341+ 2342+ 2343+ 2344+ 2345+ 2346+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 2347+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } 2348+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : 2349+ $as_echo_n "(cached) " >&6 2350+else 2351+ lt_cv_sharedlib_from_linklib_cmd='unknown' 2352+ 2353+case $host_os in 2354+cygwin* | mingw* | pw32* | cegcc*) 2355+ # two different shell functions defined in ltmain.sh 2356+ # decide which to use based on capabilities of $DLLTOOL 2357+ case `$DLLTOOL --help 2>&1` in 2358+ *--identify-strict*) 2359+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib 2360+ ;; 2361+ *) 2362+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback 2363+ ;; 2364+ esac 2365+ ;; 2366+*) 2367+ # fallback: assume linklib IS sharedlib 2368+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" 2369+ ;; 2370+esac 2371+ 2372+fi 2373+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 2374+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } 2375+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd 2376+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO 2377+ 2378+ 2379+ 2380+ 2381+ 2382+ 2383+ 2384 plugin_option= 2385 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 2386 for plugin in $plugin_names; do 2387@@ -5874,8 +6126,10 @@ for plugin in $plugin_names; do 2388 done 2389 2390 if test -n "$ac_tool_prefix"; then 2391- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 2392-set dummy ${ac_tool_prefix}ar; ac_word=$2 2393+ for ac_prog in ar 2394+ do 2395+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 2396+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 2397 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2398 $as_echo_n "checking for $ac_word... " >&6; } 2399 if ${ac_cv_prog_AR+:} false; then : 2400@@ -5891,7 +6145,7 @@ do 2401 test -z "$as_dir" && as_dir=. 2402 for ac_exec_ext in '' $ac_executable_extensions; do 2403 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 2404- ac_cv_prog_AR="${ac_tool_prefix}ar" 2405+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" 2406 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2407 break 2 2408 fi 2409@@ -5911,11 +6165,15 @@ $as_echo "no" >&6; } 2410 fi 2411 2412 2413+ test -n "$AR" && break 2414+ done 2415 fi 2416-if test -z "$ac_cv_prog_AR"; then 2417+if test -z "$AR"; then 2418 ac_ct_AR=$AR 2419- # Extract the first word of "ar", so it can be a program name with args. 2420-set dummy ar; ac_word=$2 2421+ for ac_prog in ar 2422+do 2423+ # Extract the first word of "$ac_prog", so it can be a program name with args. 2424+set dummy $ac_prog; ac_word=$2 2425 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2426 $as_echo_n "checking for $ac_word... " >&6; } 2427 if ${ac_cv_prog_ac_ct_AR+:} false; then : 2428@@ -5931,7 +6189,7 @@ do 2429 test -z "$as_dir" && as_dir=. 2430 for ac_exec_ext in '' $ac_executable_extensions; do 2431 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 2432- ac_cv_prog_ac_ct_AR="ar" 2433+ ac_cv_prog_ac_ct_AR="$ac_prog" 2434 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2435 break 2 2436 fi 2437@@ -5950,6 +6208,10 @@ else 2438 $as_echo "no" >&6; } 2439 fi 2440 2441+ 2442+ test -n "$ac_ct_AR" && break 2443+done 2444+ 2445 if test "x$ac_ct_AR" = x; then 2446 AR="false" 2447 else 2448@@ -5961,29 +6223,81 @@ ac_tool_warned=yes ;; 2449 esac 2450 AR=$ac_ct_AR 2451 fi 2452-else 2453- AR="$ac_cv_prog_AR" 2454 fi 2455 2456-test -z "$AR" && AR=ar 2457-if test -n "$plugin_option"; then 2458- if $AR --help 2>&1 | grep -q "\--plugin"; then 2459- touch conftest.c 2460- $AR $plugin_option rc conftest.a conftest.c 2461- if test "$?" != 0; then 2462- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 2463+ touch conftest.c 2464+ $AR $plugin_option rc conftest.a conftest.c 2465+ if test "$?" != 0; then 2466+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 2467 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} 2468- else 2469- AR="$AR $plugin_option" 2470- fi 2471- rm -f conftest.* 2472+ else 2473+ AR="$AR $plugin_option" 2474 fi 2475-fi 2476-test -z "$AR_FLAGS" && AR_FLAGS=cru 2477+ rm -f conftest.* 2478+: ${AR=ar} 2479+: ${AR_FLAGS=cru} 2480+ 2481+ 2482+ 2483+ 2484+ 2485+ 2486+ 2487+ 2488+ 2489+ 2490+ 2491+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 2492+$as_echo_n "checking for archiver @FILE support... " >&6; } 2493+if ${lt_cv_ar_at_file+:} false; then : 2494+ $as_echo_n "(cached) " >&6 2495+else 2496+ lt_cv_ar_at_file=no 2497+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2498+/* end confdefs.h. */ 2499+ 2500+int 2501+main () 2502+{ 2503 2504+ ; 2505+ return 0; 2506+} 2507+_ACEOF 2508+if ac_fn_c_try_compile "$LINENO"; then : 2509+ echo conftest.$ac_objext > conftest.lst 2510+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' 2511+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 2512+ (eval $lt_ar_try) 2>&5 2513+ ac_status=$? 2514+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 2515+ test $ac_status = 0; } 2516+ if test "$ac_status" -eq 0; then 2517+ # Ensure the archiver fails upon bogus file names. 2518+ rm -f conftest.$ac_objext libconftest.a 2519+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 2520+ (eval $lt_ar_try) 2>&5 2521+ ac_status=$? 2522+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 2523+ test $ac_status = 0; } 2524+ if test "$ac_status" -ne 0; then 2525+ lt_cv_ar_at_file=@ 2526+ fi 2527+ fi 2528+ rm -f conftest.* libconftest.a 2529 2530+fi 2531+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 2532 2533+fi 2534+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 2535+$as_echo "$lt_cv_ar_at_file" >&6; } 2536 2537+if test "x$lt_cv_ar_at_file" = xno; then 2538+ archiver_list_spec= 2539+else 2540+ archiver_list_spec=$lt_cv_ar_at_file 2541+fi 2542 2543 2544 2545@@ -6330,8 +6644,8 @@ esac 2546 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 2547 2548 # Transform an extracted symbol line into symbol name and symbol address 2549-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 2550-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" 2551+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 2552+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'" 2553 2554 # Handle CRLF in mingw tool chain 2555 opt_cr= 2556@@ -6367,6 +6681,7 @@ for ac_symprfx in "" "_"; do 2557 else 2558 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 2559 fi 2560+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" 2561 2562 # Check to see that the pipe works correctly. 2563 pipe_works=no 2564@@ -6408,6 +6723,18 @@ _LT_EOF 2565 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 2566 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 2567 cat <<_LT_EOF > conftest.$ac_ext 2568+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ 2569+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) 2570+/* DATA imports from DLLs on WIN32 con't be const, because runtime 2571+ relocations are performed -- see ld's documentation on pseudo-relocs. */ 2572+# define LT_DLSYM_CONST 2573+#elif defined(__osf__) 2574+/* This system does not cope well with relocations in const data. */ 2575+# define LT_DLSYM_CONST 2576+#else 2577+# define LT_DLSYM_CONST const 2578+#endif 2579+ 2580 #ifdef __cplusplus 2581 extern "C" { 2582 #endif 2583@@ -6419,7 +6746,7 @@ _LT_EOF 2584 cat <<_LT_EOF >> conftest.$ac_ext 2585 2586 /* The mapping between symbol names and symbols. */ 2587-const struct { 2588+LT_DLSYM_CONST struct { 2589 const char *name; 2590 void *address; 2591 } 2592@@ -6445,8 +6772,8 @@ static const void *lt_preloaded_setup() { 2593 _LT_EOF 2594 # Now try linking the two files. 2595 mv conftest.$ac_objext conftstm.$ac_objext 2596- lt_save_LIBS="$LIBS" 2597- lt_save_CFLAGS="$CFLAGS" 2598+ lt_globsym_save_LIBS=$LIBS 2599+ lt_globsym_save_CFLAGS=$CFLAGS 2600 LIBS="conftstm.$ac_objext" 2601 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 2602 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 2603@@ -6456,8 +6783,8 @@ _LT_EOF 2604 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 2605 pipe_works=yes 2606 fi 2607- LIBS="$lt_save_LIBS" 2608- CFLAGS="$lt_save_CFLAGS" 2609+ LIBS=$lt_globsym_save_LIBS 2610+ CFLAGS=$lt_globsym_save_CFLAGS 2611 else 2612 echo "cannot find nm_test_func in $nlist" >&5 2613 fi 2614@@ -6494,6 +6821,19 @@ else 2615 $as_echo "ok" >&6; } 2616 fi 2617 2618+# Response file support. 2619+if test "$lt_cv_nm_interface" = "MS dumpbin"; then 2620+ nm_file_list_spec='@' 2621+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then 2622+ nm_file_list_spec='@' 2623+fi 2624+ 2625+ 2626+ 2627+ 2628+ 2629+ 2630+ 2631 2632 2633 2634@@ -6510,6 +6850,42 @@ fi 2635 2636 2637 2638+ 2639+ 2640+ 2641+ 2642+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 2643+$as_echo_n "checking for sysroot... " >&6; } 2644+ 2645+# Check whether --with-libtool-sysroot was given. 2646+if test "${with_libtool_sysroot+set}" = set; then : 2647+ withval=$with_libtool_sysroot; 2648+else 2649+ with_libtool_sysroot=no 2650+fi 2651+ 2652+ 2653+lt_sysroot= 2654+case ${with_libtool_sysroot} in #( 2655+ yes) 2656+ if test "$GCC" = yes; then 2657+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` 2658+ fi 2659+ ;; #( 2660+ /*) 2661+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` 2662+ ;; #( 2663+ no|'') 2664+ ;; #( 2665+ *) 2666+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 2667+$as_echo "${with_libtool_sysroot}" >&6; } 2668+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 2669+ ;; 2670+esac 2671+ 2672+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 2673+$as_echo "${lt_sysroot:-no}" >&6; } 2674 2675 2676 2677@@ -6721,6 +7097,123 @@ esac 2678 2679 need_locks="$enable_libtool_lock" 2680 2681+if test -n "$ac_tool_prefix"; then 2682+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. 2683+set dummy ${ac_tool_prefix}mt; ac_word=$2 2684+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2685+$as_echo_n "checking for $ac_word... " >&6; } 2686+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : 2687+ $as_echo_n "(cached) " >&6 2688+else 2689+ if test -n "$MANIFEST_TOOL"; then 2690+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. 2691+else 2692+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 2693+for as_dir in $PATH 2694+do 2695+ IFS=$as_save_IFS 2696+ test -z "$as_dir" && as_dir=. 2697+ for ac_exec_ext in '' $ac_executable_extensions; do 2698+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 2699+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" 2700+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2701+ break 2 2702+ fi 2703+done 2704+ done 2705+IFS=$as_save_IFS 2706+ 2707+fi 2708+fi 2709+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL 2710+if test -n "$MANIFEST_TOOL"; then 2711+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 2712+$as_echo "$MANIFEST_TOOL" >&6; } 2713+else 2714+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 2715+$as_echo "no" >&6; } 2716+fi 2717+ 2718+ 2719+fi 2720+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then 2721+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL 2722+ # Extract the first word of "mt", so it can be a program name with args. 2723+set dummy mt; ac_word=$2 2724+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2725+$as_echo_n "checking for $ac_word... " >&6; } 2726+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : 2727+ $as_echo_n "(cached) " >&6 2728+else 2729+ if test -n "$ac_ct_MANIFEST_TOOL"; then 2730+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. 2731+else 2732+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 2733+for as_dir in $PATH 2734+do 2735+ IFS=$as_save_IFS 2736+ test -z "$as_dir" && as_dir=. 2737+ for ac_exec_ext in '' $ac_executable_extensions; do 2738+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 2739+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" 2740+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2741+ break 2 2742+ fi 2743+done 2744+ done 2745+IFS=$as_save_IFS 2746+ 2747+fi 2748+fi 2749+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL 2750+if test -n "$ac_ct_MANIFEST_TOOL"; then 2751+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 2752+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } 2753+else 2754+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 2755+$as_echo "no" >&6; } 2756+fi 2757+ 2758+ if test "x$ac_ct_MANIFEST_TOOL" = x; then 2759+ MANIFEST_TOOL=":" 2760+ else 2761+ case $cross_compiling:$ac_tool_warned in 2762+yes:) 2763+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 2764+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 2765+ac_tool_warned=yes ;; 2766+esac 2767+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL 2768+ fi 2769+else 2770+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" 2771+fi 2772+ 2773+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt 2774+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 2775+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } 2776+if ${lt_cv_path_mainfest_tool+:} false; then : 2777+ $as_echo_n "(cached) " >&6 2778+else 2779+ lt_cv_path_mainfest_tool=no 2780+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 2781+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out 2782+ cat conftest.err >&5 2783+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then 2784+ lt_cv_path_mainfest_tool=yes 2785+ fi 2786+ rm -f conftest* 2787+fi 2788+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 2789+$as_echo "$lt_cv_path_mainfest_tool" >&6; } 2790+if test "x$lt_cv_path_mainfest_tool" != xyes; then 2791+ MANIFEST_TOOL=: 2792+fi 2793+ 2794+ 2795+ 2796+ 2797+ 2798 2799 case $host_os in 2800 rhapsody* | darwin*) 2801@@ -7284,6 +7777,8 @@ _LT_EOF 2802 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 2803 echo "$AR cru libconftest.a conftest.o" >&5 2804 $AR cru libconftest.a conftest.o 2>&5 2805+ echo "$RANLIB libconftest.a" >&5 2806+ $RANLIB libconftest.a 2>&5 2807 cat > conftest.c << _LT_EOF 2808 int main() { return 0;} 2809 _LT_EOF 2810@@ -7866,8 +8361,6 @@ fi 2811 lt_prog_compiler_pic= 2812 lt_prog_compiler_static= 2813 2814-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 2815-$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 2816 2817 if test "$GCC" = yes; then 2818 lt_prog_compiler_wl='-Wl,' 2819@@ -8033,6 +8526,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 2820 lt_prog_compiler_pic='--shared' 2821 lt_prog_compiler_static='--static' 2822 ;; 2823+ nagfor*) 2824+ # NAG Fortran compiler 2825+ lt_prog_compiler_wl='-Wl,-Wl,,' 2826+ lt_prog_compiler_pic='-PIC' 2827+ lt_prog_compiler_static='-Bstatic' 2828+ ;; 2829 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 2830 # Portland Group compilers (*not* the Pentium gcc compiler, 2831 # which looks to be a dead project) 2832@@ -8095,7 +8594,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 2833 lt_prog_compiler_pic='-KPIC' 2834 lt_prog_compiler_static='-Bstatic' 2835 case $cc_basename in 2836- f77* | f90* | f95*) 2837+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) 2838 lt_prog_compiler_wl='-Qoption ld ';; 2839 *) 2840 lt_prog_compiler_wl='-Wl,';; 2841@@ -8152,13 +8651,17 @@ case $host_os in 2842 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 2843 ;; 2844 esac 2845-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 2846-$as_echo "$lt_prog_compiler_pic" >&6; } 2847- 2848- 2849- 2850- 2851 2852+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 2853+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 2854+if ${lt_cv_prog_compiler_pic+:} false; then : 2855+ $as_echo_n "(cached) " >&6 2856+else 2857+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic 2858+fi 2859+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 2860+$as_echo "$lt_cv_prog_compiler_pic" >&6; } 2861+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic 2862 2863 # 2864 # Check to make sure the PIC flag actually works. 2865@@ -8219,6 +8722,11 @@ fi 2866 2867 2868 2869+ 2870+ 2871+ 2872+ 2873+ 2874 # 2875 # Check to make sure the static flag actually works. 2876 # 2877@@ -8569,7 +9077,8 @@ _LT_EOF 2878 allow_undefined_flag=unsupported 2879 always_export_symbols=no 2880 enable_shared_with_static_runtimes=yes 2881- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 2882+ 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' 2883+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' 2884 2885 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 2886 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 2887@@ -8668,12 +9177,12 @@ _LT_EOF 2888 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 2889 hardcode_libdir_flag_spec= 2890 hardcode_libdir_flag_spec_ld='-rpath $libdir' 2891- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' 2892+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' 2893 if test "x$supports_anon_versioning" = xyes; then 2894 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ 2895 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ 2896 echo "local: *; };" >> $output_objdir/$libname.ver~ 2897- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 2898+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 2899 fi 2900 ;; 2901 esac 2902@@ -8687,8 +9196,8 @@ _LT_EOF 2903 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 2904 wlarc= 2905 else 2906- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 2907- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 2908+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 2909+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 2910 fi 2911 ;; 2912 2913@@ -8706,8 +9215,8 @@ _LT_EOF 2914 2915 _LT_EOF 2916 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 2917- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 2918- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 2919+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 2920+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 2921 else 2922 ld_shlibs=no 2923 fi 2924@@ -8753,8 +9262,8 @@ _LT_EOF 2925 2926 *) 2927 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 2928- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 2929- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 2930+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 2931+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 2932 else 2933 ld_shlibs=no 2934 fi 2935@@ -8884,7 +9393,13 @@ _LT_EOF 2936 allow_undefined_flag='-berok' 2937 # Determine the default libpath from the value encoded in an 2938 # empty executable. 2939- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2940+ if test "${lt_cv_aix_libpath+set}" = set; then 2941+ aix_libpath=$lt_cv_aix_libpath 2942+else 2943+ if ${lt_cv_aix_libpath_+:} false; then : 2944+ $as_echo_n "(cached) " >&6 2945+else 2946+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2947 /* end confdefs.h. */ 2948 2949 int 2950@@ -8897,22 +9412,29 @@ main () 2951 _ACEOF 2952 if ac_fn_c_try_link "$LINENO"; then : 2953 2954-lt_aix_libpath_sed=' 2955- /Import File Strings/,/^$/ { 2956- /^0/ { 2957- s/^0 *\(.*\)$/\1/ 2958- p 2959- } 2960- }' 2961-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 2962-# Check for a 64-bit object if we didn't find anything. 2963-if test -z "$aix_libpath"; then 2964- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 2965-fi 2966+ lt_aix_libpath_sed=' 2967+ /Import File Strings/,/^$/ { 2968+ /^0/ { 2969+ s/^0 *\([^ ]*\) *$/\1/ 2970+ p 2971+ } 2972+ }' 2973+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 2974+ # Check for a 64-bit object if we didn't find anything. 2975+ if test -z "$lt_cv_aix_libpath_"; then 2976+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 2977+ fi 2978 fi 2979 rm -f core conftest.err conftest.$ac_objext \ 2980 conftest$ac_exeext conftest.$ac_ext 2981-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 2982+ if test -z "$lt_cv_aix_libpath_"; then 2983+ lt_cv_aix_libpath_="/usr/lib:/lib" 2984+ fi 2985+ 2986+fi 2987+ 2988+ aix_libpath=$lt_cv_aix_libpath_ 2989+fi 2990 2991 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 2992 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" 2993@@ -8924,7 +9446,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 2994 else 2995 # Determine the default libpath from the value encoded in an 2996 # empty executable. 2997- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2998+ if test "${lt_cv_aix_libpath+set}" = set; then 2999+ aix_libpath=$lt_cv_aix_libpath 3000+else 3001+ if ${lt_cv_aix_libpath_+:} false; then : 3002+ $as_echo_n "(cached) " >&6 3003+else 3004+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 3005 /* end confdefs.h. */ 3006 3007 int 3008@@ -8937,22 +9465,29 @@ main () 3009 _ACEOF 3010 if ac_fn_c_try_link "$LINENO"; then : 3011 3012-lt_aix_libpath_sed=' 3013- /Import File Strings/,/^$/ { 3014- /^0/ { 3015- s/^0 *\(.*\)$/\1/ 3016- p 3017- } 3018- }' 3019-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 3020-# Check for a 64-bit object if we didn't find anything. 3021-if test -z "$aix_libpath"; then 3022- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 3023-fi 3024+ lt_aix_libpath_sed=' 3025+ /Import File Strings/,/^$/ { 3026+ /^0/ { 3027+ s/^0 *\([^ ]*\) *$/\1/ 3028+ p 3029+ } 3030+ }' 3031+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 3032+ # Check for a 64-bit object if we didn't find anything. 3033+ if test -z "$lt_cv_aix_libpath_"; then 3034+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 3035+ fi 3036 fi 3037 rm -f core conftest.err conftest.$ac_objext \ 3038 conftest$ac_exeext conftest.$ac_ext 3039-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3040+ if test -z "$lt_cv_aix_libpath_"; then 3041+ lt_cv_aix_libpath_="/usr/lib:/lib" 3042+ fi 3043+ 3044+fi 3045+ 3046+ aix_libpath=$lt_cv_aix_libpath_ 3047+fi 3048 3049 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 3050 # Warning - without using the other run time loading flags, 3051@@ -8997,20 +9532,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3052 # Microsoft Visual C++. 3053 # hardcode_libdir_flag_spec is actually meaningless, as there is 3054 # no search path for DLLs. 3055- hardcode_libdir_flag_spec=' ' 3056- allow_undefined_flag=unsupported 3057- # Tell ltmain to make .lib files, not .a files. 3058- libext=lib 3059- # Tell ltmain to make .dll files, not .so files. 3060- shrext_cmds=".dll" 3061- # FIXME: Setting linknames here is a bad hack. 3062- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 3063- # The linker will automatically build a .lib file if we build a DLL. 3064- old_archive_from_new_cmds='true' 3065- # FIXME: Should let the user specify the lib program. 3066- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 3067- fix_srcfile_path='`cygpath -w "$srcfile"`' 3068- enable_shared_with_static_runtimes=yes 3069+ case $cc_basename in 3070+ cl*) 3071+ # Native MSVC 3072+ hardcode_libdir_flag_spec=' ' 3073+ allow_undefined_flag=unsupported 3074+ always_export_symbols=yes 3075+ file_list_spec='@' 3076+ # Tell ltmain to make .lib files, not .a files. 3077+ libext=lib 3078+ # Tell ltmain to make .dll files, not .so files. 3079+ shrext_cmds=".dll" 3080+ # FIXME: Setting linknames here is a bad hack. 3081+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' 3082+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 3083+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; 3084+ else 3085+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; 3086+ fi~ 3087+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ 3088+ linknames=' 3089+ # The linker will not automatically build a static lib if we build a DLL. 3090+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' 3091+ enable_shared_with_static_runtimes=yes 3092+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 3093+ # Don't use ranlib 3094+ old_postinstall_cmds='chmod 644 $oldlib' 3095+ postlink_cmds='lt_outputfile="@OUTPUT@"~ 3096+ lt_tool_outputfile="@TOOL_OUTPUT@"~ 3097+ case $lt_outputfile in 3098+ *.exe|*.EXE) ;; 3099+ *) 3100+ lt_outputfile="$lt_outputfile.exe" 3101+ lt_tool_outputfile="$lt_tool_outputfile.exe" 3102+ ;; 3103+ esac~ 3104+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then 3105+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; 3106+ $RM "$lt_outputfile.manifest"; 3107+ fi' 3108+ ;; 3109+ *) 3110+ # Assume MSVC wrapper 3111+ hardcode_libdir_flag_spec=' ' 3112+ allow_undefined_flag=unsupported 3113+ # Tell ltmain to make .lib files, not .a files. 3114+ libext=lib 3115+ # Tell ltmain to make .dll files, not .so files. 3116+ shrext_cmds=".dll" 3117+ # FIXME: Setting linknames here is a bad hack. 3118+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 3119+ # The linker will automatically build a .lib file if we build a DLL. 3120+ old_archive_from_new_cmds='true' 3121+ # FIXME: Should let the user specify the lib program. 3122+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 3123+ enable_shared_with_static_runtimes=yes 3124+ ;; 3125+ esac 3126 ;; 3127 3128 darwin* | rhapsody*) 3129@@ -9071,7 +9649,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3130 3131 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 3132 freebsd* | dragonfly*) 3133- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' 3134+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' 3135 hardcode_libdir_flag_spec='-R$libdir' 3136 hardcode_direct=yes 3137 hardcode_shlibpath_var=no 3138@@ -9079,7 +9657,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3139 3140 hpux9*) 3141 if test "$GCC" = yes; then 3142- 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' 3143+ 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' 3144 else 3145 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' 3146 fi 3147@@ -9095,7 +9673,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3148 3149 hpux10*) 3150 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 3151- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 3152+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 3153 else 3154 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 3155 fi 3156@@ -9119,10 +9697,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3157 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 3158 ;; 3159 ia64*) 3160- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 3161+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 3162 ;; 3163 *) 3164- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 3165+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 3166 ;; 3167 esac 3168 else 3169@@ -9201,23 +9779,36 @@ fi 3170 3171 irix5* | irix6* | nonstopux*) 3172 if test "$GCC" = yes; then 3173- 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' 3174+ 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' 3175 # Try to use the -exported_symbol ld option, if it does not 3176 # work, assume that -exports_file does not work either and 3177 # implicitly export all symbols. 3178- save_LDFLAGS="$LDFLAGS" 3179- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 3180- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 3181+ # This should be the same for all languages, so no per-tag cache variable. 3182+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 3183+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } 3184+if ${lt_cv_irix_exported_symbol+:} false; then : 3185+ $as_echo_n "(cached) " >&6 3186+else 3187+ save_LDFLAGS="$LDFLAGS" 3188+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 3189+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 3190 /* end confdefs.h. */ 3191-int foo(void) {} 3192+int foo (void) { return 0; } 3193 _ACEOF 3194 if ac_fn_c_try_link "$LINENO"; then : 3195- 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' 3196- 3197+ lt_cv_irix_exported_symbol=yes 3198+else 3199+ lt_cv_irix_exported_symbol=no 3200 fi 3201 rm -f core conftest.err conftest.$ac_objext \ 3202 conftest$ac_exeext conftest.$ac_ext 3203- LDFLAGS="$save_LDFLAGS" 3204+ LDFLAGS="$save_LDFLAGS" 3205+fi 3206+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 3207+$as_echo "$lt_cv_irix_exported_symbol" >&6; } 3208+ if test "$lt_cv_irix_exported_symbol" = yes; then 3209+ 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' 3210+ fi 3211 else 3212 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' 3213 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' 3214@@ -9302,7 +9893,7 @@ rm -f core conftest.err conftest.$ac_objext \ 3215 osf4* | osf5*) # as osf3* with the addition of -msym flag 3216 if test "$GCC" = yes; then 3217 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 3218- 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' 3219+ 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' 3220 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 3221 else 3222 allow_undefined_flag=' -expect_unresolved \*' 3223@@ -9321,9 +9912,9 @@ rm -f core conftest.err conftest.$ac_objext \ 3224 no_undefined_flag=' -z defs' 3225 if test "$GCC" = yes; then 3226 wlarc='${wl}' 3227- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 3228+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 3229 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ 3230- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' 3231+ $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' 3232 else 3233 case `$CC -V 2>&1` in 3234 *"Compilers 5.0"*) 3235@@ -9899,8 +10490,9 @@ cygwin* | mingw* | pw32* | cegcc*) 3236 need_version=no 3237 need_lib_prefix=no 3238 3239- case $GCC,$host_os in 3240- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) 3241+ case $GCC,$cc_basename in 3242+ yes,*) 3243+ # gcc 3244 library_names_spec='$libname.dll.a' 3245 # DLL is installed to $(libdir)/../bin by postinstall_cmds 3246 postinstall_cmds='base_file=`basename \${file}`~ 3247@@ -9933,13 +10525,71 @@ cygwin* | mingw* | pw32* | cegcc*) 3248 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 3249 ;; 3250 esac 3251+ dynamic_linker='Win32 ld.exe' 3252+ ;; 3253+ 3254+ *,cl*) 3255+ # Native MSVC 3256+ libname_spec='$name' 3257+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 3258+ library_names_spec='${libname}.dll.lib' 3259+ 3260+ case $build_os in 3261+ mingw*) 3262+ sys_lib_search_path_spec= 3263+ lt_save_ifs=$IFS 3264+ IFS=';' 3265+ for lt_path in $LIB 3266+ do 3267+ IFS=$lt_save_ifs 3268+ # Let DOS variable expansion print the short 8.3 style file name. 3269+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` 3270+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" 3271+ done 3272+ IFS=$lt_save_ifs 3273+ # Convert to MSYS style. 3274+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` 3275+ ;; 3276+ cygwin*) 3277+ # Convert to unix form, then to dos form, then back to unix form 3278+ # but this time dos style (no spaces!) so that the unix form looks 3279+ # like /cygdrive/c/PROGRA~1:/cygdr... 3280+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` 3281+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` 3282+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 3283+ ;; 3284+ *) 3285+ sys_lib_search_path_spec="$LIB" 3286+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then 3287+ # It is most probably a Windows format PATH. 3288+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` 3289+ else 3290+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 3291+ fi 3292+ # FIXME: find the short name or the path components, as spaces are 3293+ # common. (e.g. "Program Files" -> "PROGRA~1") 3294+ ;; 3295+ esac 3296+ 3297+ # DLL is installed to $(libdir)/../bin by postinstall_cmds 3298+ postinstall_cmds='base_file=`basename \${file}`~ 3299+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ 3300+ dldir=$destdir/`dirname \$dlpath`~ 3301+ test -d \$dldir || mkdir -p \$dldir~ 3302+ $install_prog $dir/$dlname \$dldir/$dlname' 3303+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ 3304+ dlpath=$dir/\$dldll~ 3305+ $RM \$dlpath' 3306+ shlibpath_overrides_runpath=yes 3307+ dynamic_linker='Win32 link.exe' 3308 ;; 3309 3310 *) 3311+ # Assume MSVC wrapper 3312 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' 3313+ dynamic_linker='Win32 ld.exe' 3314 ;; 3315 esac 3316- dynamic_linker='Win32 ld.exe' 3317 # FIXME: first we should search . and the directory the executable is in 3318 shlibpath_var=PATH 3319 ;; 3320@@ -10817,7 +11467,7 @@ else 3321 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 3322 lt_status=$lt_dlunknown 3323 cat > conftest.$ac_ext <<_LT_EOF 3324-#line 10820 "configure" 3325+#line $LINENO "configure" 3326 #include "confdefs.h" 3327 3328 #if HAVE_DLFCN_H 3329@@ -10861,10 +11511,10 @@ else 3330 /* When -fvisbility=hidden is used, assume the code has been annotated 3331 correspondingly for the symbols needed. */ 3332 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 3333-void fnord () __attribute__((visibility("default"))); 3334+int fnord () __attribute__((visibility("default"))); 3335 #endif 3336 3337-void fnord () { int i=42; } 3338+int fnord () { return 42; } 3339 int main () 3340 { 3341 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 3342@@ -10923,7 +11573,7 @@ else 3343 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 3344 lt_status=$lt_dlunknown 3345 cat > conftest.$ac_ext <<_LT_EOF 3346-#line 10926 "configure" 3347+#line $LINENO "configure" 3348 #include "confdefs.h" 3349 3350 #if HAVE_DLFCN_H 3351@@ -10967,10 +11617,10 @@ else 3352 /* When -fvisbility=hidden is used, assume the code has been annotated 3353 correspondingly for the symbols needed. */ 3354 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 3355-void fnord () __attribute__((visibility("default"))); 3356+int fnord () __attribute__((visibility("default"))); 3357 #endif 3358 3359-void fnord () { int i=42; } 3360+int fnord () { return 42; } 3361 int main () 3362 { 3363 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 3364@@ -15549,13 +16199,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 3365 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 3366 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 3367 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 3368+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' 3369+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' 3370 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' 3371 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' 3372 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' 3373 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' 3374 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' 3375+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' 3376+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' 3377+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' 3378+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' 3379 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' 3380 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' 3381+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' 3382 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 3383 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 3384 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 3385@@ -15570,14 +16227,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 3386 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 3387 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 3388 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"`' 3389+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' 3390+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' 3391 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' 3392 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' 3393 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' 3394-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 3395 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' 3396+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 3397 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' 3398 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' 3399 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' 3400+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' 3401 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 3402 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 3403 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 3404@@ -15610,12 +16270,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 3405 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 3406 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 3407 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 3408-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' 3409 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' 3410 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' 3411 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' 3412 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' 3413 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' 3414+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' 3415 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 3416 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 3417 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 3418@@ -15670,8 +16330,13 @@ reload_flag \ 3419 OBJDUMP \ 3420 deplibs_check_method \ 3421 file_magic_cmd \ 3422+file_magic_glob \ 3423+want_nocaseglob \ 3424+DLLTOOL \ 3425+sharedlib_from_linklib_cmd \ 3426 AR \ 3427 AR_FLAGS \ 3428+archiver_list_spec \ 3429 STRIP \ 3430 RANLIB \ 3431 CC \ 3432@@ -15681,12 +16346,14 @@ lt_cv_sys_global_symbol_pipe \ 3433 lt_cv_sys_global_symbol_to_cdecl \ 3434 lt_cv_sys_global_symbol_to_c_name_address \ 3435 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 3436+nm_file_list_spec \ 3437 lt_prog_compiler_no_builtin_flag \ 3438-lt_prog_compiler_wl \ 3439 lt_prog_compiler_pic \ 3440+lt_prog_compiler_wl \ 3441 lt_prog_compiler_static \ 3442 lt_cv_prog_compiler_c_o \ 3443 need_locks \ 3444+MANIFEST_TOOL \ 3445 DSYMUTIL \ 3446 NMEDIT \ 3447 LIPO \ 3448@@ -15702,7 +16369,6 @@ no_undefined_flag \ 3449 hardcode_libdir_flag_spec \ 3450 hardcode_libdir_flag_spec_ld \ 3451 hardcode_libdir_separator \ 3452-fix_srcfile_path \ 3453 exclude_expsyms \ 3454 include_expsyms \ 3455 file_list_spec \ 3456@@ -15738,6 +16404,7 @@ module_cmds \ 3457 module_expsym_cmds \ 3458 export_symbols_cmds \ 3459 prelink_cmds \ 3460+postlink_cmds \ 3461 postinstall_cmds \ 3462 postuninstall_cmds \ 3463 finish_cmds \ 3464@@ -16503,7 +17170,8 @@ $as_echo X"$file" | 3465 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 3466 # 3467 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 3468-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. 3469+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, 3470+# Inc. 3471 # Written by Gordon Matzigkeit, 1996 3472 # 3473 # This file is part of GNU Libtool. 3474@@ -16606,19 +17274,42 @@ SP2NL=$lt_lt_SP2NL 3475 # turn newlines into spaces. 3476 NL2SP=$lt_lt_NL2SP 3477 3478+# convert \$build file names to \$host format. 3479+to_host_file_cmd=$lt_cv_to_host_file_cmd 3480+ 3481+# convert \$build files to toolchain format. 3482+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 3483+ 3484 # An object symbol dumper. 3485 OBJDUMP=$lt_OBJDUMP 3486 3487 # Method to check whether dependent libraries are shared objects. 3488 deplibs_check_method=$lt_deplibs_check_method 3489 3490-# Command to use when deplibs_check_method == "file_magic". 3491+# Command to use when deplibs_check_method = "file_magic". 3492 file_magic_cmd=$lt_file_magic_cmd 3493 3494+# How to find potential files when deplibs_check_method = "file_magic". 3495+file_magic_glob=$lt_file_magic_glob 3496+ 3497+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". 3498+want_nocaseglob=$lt_want_nocaseglob 3499+ 3500+# DLL creation program. 3501+DLLTOOL=$lt_DLLTOOL 3502+ 3503+# Command to associate shared and link libraries. 3504+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd 3505+ 3506 # The archiver. 3507 AR=$lt_AR 3508+ 3509+# Flags to create an archive. 3510 AR_FLAGS=$lt_AR_FLAGS 3511 3512+# How to feed a file listing to the archiver. 3513+archiver_list_spec=$lt_archiver_list_spec 3514+ 3515 # A symbol stripping program. 3516 STRIP=$lt_STRIP 3517 3518@@ -16648,6 +17339,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 3519 # Transform the output of nm in a C name address pair when lib prefix is needed. 3520 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 3521 3522+# Specify filename containing input files for \$NM. 3523+nm_file_list_spec=$lt_nm_file_list_spec 3524+ 3525+# The root where to search for dependent libraries,and in which our libraries should be installed. 3526+lt_sysroot=$lt_sysroot 3527+ 3528 # The name of the directory that contains temporary libtool files. 3529 objdir=$objdir 3530 3531@@ -16657,6 +17354,9 @@ MAGIC_CMD=$MAGIC_CMD 3532 # Must we lock files when doing compilation? 3533 need_locks=$lt_need_locks 3534 3535+# Manifest tool. 3536+MANIFEST_TOOL=$lt_MANIFEST_TOOL 3537+ 3538 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 3539 DSYMUTIL=$lt_DSYMUTIL 3540 3541@@ -16771,12 +17471,12 @@ with_gcc=$GCC 3542 # Compiler flag to turn off builtin functions. 3543 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 3544 3545-# How to pass a linker flag through the compiler. 3546-wl=$lt_lt_prog_compiler_wl 3547- 3548 # Additional compiler flags for building library objects. 3549 pic_flag=$lt_lt_prog_compiler_pic 3550 3551+# How to pass a linker flag through the compiler. 3552+wl=$lt_lt_prog_compiler_wl 3553+ 3554 # Compiler flag to prevent dynamic linking. 3555 link_static_flag=$lt_lt_prog_compiler_static 3556 3557@@ -16863,9 +17563,6 @@ inherit_rpath=$inherit_rpath 3558 # Whether libtool must link a program against all its dependency libraries. 3559 link_all_deplibs=$link_all_deplibs 3560 3561-# Fix the shell variable \$srcfile for the compiler. 3562-fix_srcfile_path=$lt_fix_srcfile_path 3563- 3564 # Set to "yes" if exported symbols are required. 3565 always_export_symbols=$always_export_symbols 3566 3567@@ -16881,6 +17578,9 @@ include_expsyms=$lt_include_expsyms 3568 # Commands necessary for linking programs (against libraries) with templates. 3569 prelink_cmds=$lt_prelink_cmds 3570 3571+# Commands necessary for finishing linking programs. 3572+postlink_cmds=$lt_postlink_cmds 3573+ 3574 # Specify filename containing input files. 3575 file_list_spec=$lt_file_list_spec 3576 3577@@ -16913,210 +17613,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 3578 # if finds mixed CR/LF and LF-only lines. Since sed operates in 3579 # text mode, it properly converts lines to CR/LF. This bash problem 3580 # is reportedly fixed, but why not run on old versions too? 3581- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ 3582- || (rm -f "$cfgfile"; exit 1) 3583- 3584- case $xsi_shell in 3585- yes) 3586- cat << \_LT_EOF >> "$cfgfile" 3587- 3588-# func_dirname file append nondir_replacement 3589-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 3590-# otherwise set result to NONDIR_REPLACEMENT. 3591-func_dirname () 3592-{ 3593- case ${1} in 3594- */*) func_dirname_result="${1%/*}${2}" ;; 3595- * ) func_dirname_result="${3}" ;; 3596- esac 3597-} 3598- 3599-# func_basename file 3600-func_basename () 3601-{ 3602- func_basename_result="${1##*/}" 3603-} 3604- 3605-# func_dirname_and_basename file append nondir_replacement 3606-# perform func_basename and func_dirname in a single function 3607-# call: 3608-# dirname: Compute the dirname of FILE. If nonempty, 3609-# add APPEND to the result, otherwise set result 3610-# to NONDIR_REPLACEMENT. 3611-# value returned in "$func_dirname_result" 3612-# basename: Compute filename of FILE. 3613-# value retuned in "$func_basename_result" 3614-# Implementation must be kept synchronized with func_dirname 3615-# and func_basename. For efficiency, we do not delegate to 3616-# those functions but instead duplicate the functionality here. 3617-func_dirname_and_basename () 3618-{ 3619- case ${1} in 3620- */*) func_dirname_result="${1%/*}${2}" ;; 3621- * ) func_dirname_result="${3}" ;; 3622- esac 3623- func_basename_result="${1##*/}" 3624-} 3625- 3626-# func_stripname prefix suffix name 3627-# strip PREFIX and SUFFIX off of NAME. 3628-# PREFIX and SUFFIX must not contain globbing or regex special 3629-# characters, hashes, percent signs, but SUFFIX may contain a leading 3630-# dot (in which case that matches only a dot). 3631-func_stripname () 3632-{ 3633- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are 3634- # positional parameters, so assign one to ordinary parameter first. 3635- func_stripname_result=${3} 3636- func_stripname_result=${func_stripname_result#"${1}"} 3637- func_stripname_result=${func_stripname_result%"${2}"} 3638-} 3639- 3640-# func_opt_split 3641-func_opt_split () 3642-{ 3643- func_opt_split_opt=${1%%=*} 3644- func_opt_split_arg=${1#*=} 3645-} 3646- 3647-# func_lo2o object 3648-func_lo2o () 3649-{ 3650- case ${1} in 3651- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; 3652- *) func_lo2o_result=${1} ;; 3653- esac 3654-} 3655- 3656-# func_xform libobj-or-source 3657-func_xform () 3658-{ 3659- func_xform_result=${1%.*}.lo 3660-} 3661- 3662-# func_arith arithmetic-term... 3663-func_arith () 3664-{ 3665- func_arith_result=$(( $* )) 3666-} 3667- 3668-# func_len string 3669-# STRING may not start with a hyphen. 3670-func_len () 3671-{ 3672- func_len_result=${#1} 3673-} 3674- 3675-_LT_EOF 3676- ;; 3677- *) # Bourne compatible functions. 3678- cat << \_LT_EOF >> "$cfgfile" 3679- 3680-# func_dirname file append nondir_replacement 3681-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 3682-# otherwise set result to NONDIR_REPLACEMENT. 3683-func_dirname () 3684-{ 3685- # Extract subdirectory from the argument. 3686- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` 3687- if test "X$func_dirname_result" = "X${1}"; then 3688- func_dirname_result="${3}" 3689- else 3690- func_dirname_result="$func_dirname_result${2}" 3691- fi 3692-} 3693- 3694-# func_basename file 3695-func_basename () 3696-{ 3697- func_basename_result=`$ECHO "${1}" | $SED "$basename"` 3698-} 3699- 3700- 3701-# func_stripname prefix suffix name 3702-# strip PREFIX and SUFFIX off of NAME. 3703-# PREFIX and SUFFIX must not contain globbing or regex special 3704-# characters, hashes, percent signs, but SUFFIX may contain a leading 3705-# dot (in which case that matches only a dot). 3706-# func_strip_suffix prefix name 3707-func_stripname () 3708-{ 3709- case ${2} in 3710- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; 3711- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; 3712- esac 3713-} 3714- 3715-# sed scripts: 3716-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' 3717-my_sed_long_arg='1s/^-[^=]*=//' 3718- 3719-# func_opt_split 3720-func_opt_split () 3721-{ 3722- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` 3723- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` 3724-} 3725- 3726-# func_lo2o object 3727-func_lo2o () 3728-{ 3729- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` 3730-} 3731- 3732-# func_xform libobj-or-source 3733-func_xform () 3734-{ 3735- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` 3736-} 3737- 3738-# func_arith arithmetic-term... 3739-func_arith () 3740-{ 3741- func_arith_result=`expr "$@"` 3742-} 3743- 3744-# func_len string 3745-# STRING may not start with a hyphen. 3746-func_len () 3747-{ 3748- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` 3749-} 3750- 3751-_LT_EOF 3752-esac 3753- 3754-case $lt_shell_append in 3755- yes) 3756- cat << \_LT_EOF >> "$cfgfile" 3757- 3758-# func_append var value 3759-# Append VALUE to the end of shell variable VAR. 3760-func_append () 3761-{ 3762- eval "$1+=\$2" 3763-} 3764-_LT_EOF 3765- ;; 3766- *) 3767- cat << \_LT_EOF >> "$cfgfile" 3768- 3769-# func_append var value 3770-# Append VALUE to the end of shell variable VAR. 3771-func_append () 3772-{ 3773- eval "$1=\$$1\$2" 3774-} 3775- 3776-_LT_EOF 3777- ;; 3778- esac 3779- 3780- 3781- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ 3782- || (rm -f "$cfgfile"; exit 1) 3783- 3784- mv -f "$cfgfile" "$ofile" || 3785+ sed '$q' "$ltmain" >> "$cfgfile" \ 3786+ || (rm -f "$cfgfile"; exit 1) 3787+ 3788+ if test x"$xsi_shell" = xyes; then 3789+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ 3790+func_dirname ()\ 3791+{\ 3792+\ case ${1} in\ 3793+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 3794+\ * ) func_dirname_result="${3}" ;;\ 3795+\ esac\ 3796+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ 3797+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 3798+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 3799+test 0 -eq $? || _lt_function_replace_fail=: 3800+ 3801+ 3802+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ 3803+func_basename ()\ 3804+{\ 3805+\ func_basename_result="${1##*/}"\ 3806+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ 3807+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 3808+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 3809+test 0 -eq $? || _lt_function_replace_fail=: 3810+ 3811+ 3812+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ 3813+func_dirname_and_basename ()\ 3814+{\ 3815+\ case ${1} in\ 3816+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 3817+\ * ) func_dirname_result="${3}" ;;\ 3818+\ esac\ 3819+\ func_basename_result="${1##*/}"\ 3820+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ 3821+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 3822+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 3823+test 0 -eq $? || _lt_function_replace_fail=: 3824+ 3825+ 3826+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ 3827+func_stripname ()\ 3828+{\ 3829+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ 3830+\ # positional parameters, so assign one to ordinary parameter first.\ 3831+\ func_stripname_result=${3}\ 3832+\ func_stripname_result=${func_stripname_result#"${1}"}\ 3833+\ func_stripname_result=${func_stripname_result%"${2}"}\ 3834+} # Extended-shell func_stripname 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_split_long_opt ()$/,/^} # func_split_long_opt /c\ 3841+func_split_long_opt ()\ 3842+{\ 3843+\ func_split_long_opt_name=${1%%=*}\ 3844+\ func_split_long_opt_arg=${1#*=}\ 3845+} # Extended-shell func_split_long_opt 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+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ 3852+func_split_short_opt ()\ 3853+{\ 3854+\ func_split_short_opt_arg=${1#??}\ 3855+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ 3856+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ 3857+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 3858+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 3859+test 0 -eq $? || _lt_function_replace_fail=: 3860+ 3861+ 3862+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ 3863+func_lo2o ()\ 3864+{\ 3865+\ case ${1} in\ 3866+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ 3867+\ *) func_lo2o_result=${1} ;;\ 3868+\ esac\ 3869+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ 3870+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 3871+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 3872+test 0 -eq $? || _lt_function_replace_fail=: 3873+ 3874+ 3875+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ 3876+func_xform ()\ 3877+{\ 3878+ func_xform_result=${1%.*}.lo\ 3879+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ 3880+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 3881+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 3882+test 0 -eq $? || _lt_function_replace_fail=: 3883+ 3884+ 3885+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ 3886+func_arith ()\ 3887+{\ 3888+ func_arith_result=$(( $* ))\ 3889+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ 3890+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 3891+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 3892+test 0 -eq $? || _lt_function_replace_fail=: 3893+ 3894+ 3895+ sed -e '/^func_len ()$/,/^} # func_len /c\ 3896+func_len ()\ 3897+{\ 3898+ func_len_result=${#1}\ 3899+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ 3900+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 3901+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 3902+test 0 -eq $? || _lt_function_replace_fail=: 3903+ 3904+fi 3905+ 3906+if test x"$lt_shell_append" = xyes; then 3907+ sed -e '/^func_append ()$/,/^} # func_append /c\ 3908+func_append ()\ 3909+{\ 3910+ eval "${1}+=\\${2}"\ 3911+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ 3912+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 3913+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 3914+test 0 -eq $? || _lt_function_replace_fail=: 3915+ 3916+ 3917+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ 3918+func_append_quoted ()\ 3919+{\ 3920+\ func_quote_for_eval "${2}"\ 3921+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ 3922+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ 3923+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 3924+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 3925+test 0 -eq $? || _lt_function_replace_fail=: 3926+ 3927+ 3928+ # Save a `func_append' function call where possible by direct use of '+=' 3929+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ 3930+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 3931+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 3932+ test 0 -eq $? || _lt_function_replace_fail=: 3933+else 3934+ # Save a `func_append' function call even when '+=' is not available 3935+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ 3936+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 3937+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 3938+ test 0 -eq $? || _lt_function_replace_fail=: 3939+fi 3940+ 3941+if test x"$_lt_function_replace_fail" = x":"; then 3942+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 3943+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} 3944+fi 3945+ 3946+ 3947+ mv -f "$cfgfile" "$ofile" || 3948 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 3949 chmod +x "$ofile" 3950 3951diff --git a/gas/Makefile.in b/gas/Makefile.in 3952index 8319181b472..3425e414c1c 100644 3953--- a/gas/Makefile.in 3954+++ b/gas/Makefile.in 3955@@ -377,6 +377,7 @@ CYGPATH_W = @CYGPATH_W@ 3956 DATADIRNAME = @DATADIRNAME@ 3957 DEFS = @DEFS@ 3958 DEPDIR = @DEPDIR@ 3959+DLLTOOL = @DLLTOOL@ 3960 DSYMUTIL = @DSYMUTIL@ 3961 DUMPBIN = @DUMPBIN@ 3962 ECHO_C = @ECHO_C@ 3963@@ -413,6 +414,7 @@ LN_S = @LN_S@ 3964 LTLIBOBJS = @LTLIBOBJS@ 3965 MAINT = @MAINT@ 3966 MAKEINFO = @MAKEINFO@ 3967+MANIFEST_TOOL = @MANIFEST_TOOL@ 3968 MKDIR_P = @MKDIR_P@ 3969 MKINSTALLDIRS = @MKINSTALLDIRS@ 3970 MSGFMT = @MSGFMT@ 3971@@ -456,6 +458,7 @@ abs_builddir = @abs_builddir@ 3972 abs_srcdir = @abs_srcdir@ 3973 abs_top_builddir = @abs_top_builddir@ 3974 abs_top_srcdir = @abs_top_srcdir@ 3975+ac_ct_AR = @ac_ct_AR@ 3976 ac_ct_CC = @ac_ct_CC@ 3977 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ 3978 am__include = @am__include@ 3979diff --git a/gas/configure b/gas/configure 3980index 3c0c3e27d3b..11baafb9db6 100755 3981--- a/gas/configure 3982+++ b/gas/configure 3983@@ -686,8 +686,11 @@ OTOOL 3984 LIPO 3985 NMEDIT 3986 DSYMUTIL 3987+MANIFEST_TOOL 3988 RANLIB 3989+ac_ct_AR 3990 AR 3991+DLLTOOL 3992 OBJDUMP 3993 LN_S 3994 NM 3995@@ -804,6 +807,7 @@ enable_static 3996 with_pic 3997 enable_fast_install 3998 with_gnu_ld 3999+with_libtool_sysroot 4000 enable_libtool_lock 4001 enable_plugins 4002 enable_largefile 4003@@ -1505,6 +1509,8 @@ Optional Packages: 4004 --with-pic try to use only PIC/non-PIC objects [default=use 4005 both] 4006 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 4007+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR 4008+ (or the compiler's sysroot if not specified). 4009 --with-cpu=CPU default cpu variant is CPU (currently only supported 4010 on ARC) 4011 --with-system-zlib use installed libz 4012@@ -4632,8 +4638,8 @@ esac 4013 4014 4015 4016-macro_version='2.2.7a' 4017-macro_revision='1.3134' 4018+macro_version='2.4' 4019+macro_revision='1.3293' 4020 4021 4022 4023@@ -4673,7 +4679,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 4024 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 4025 $as_echo_n "checking how to print strings... " >&6; } 4026 # Test print first, because it will be a builtin if present. 4027-if test "X`print -r -- -n 2>/dev/null`" = X-n && \ 4028+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ 4029 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 4030 ECHO='print -r --' 4031 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 4032@@ -5366,8 +5372,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 4033 # Try some XSI features 4034 xsi_shell=no 4035 ( _lt_dummy="a/b/c" 4036- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ 4037- = c,a/b,, \ 4038+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ 4039+ = c,a/b,b/c, \ 4040 && eval 'test $(( 1 + 1 )) -eq 2 \ 4041 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 4042 && xsi_shell=yes 4043@@ -5416,6 +5422,80 @@ esac 4044 4045 4046 4047+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 4048+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } 4049+if ${lt_cv_to_host_file_cmd+:} false; then : 4050+ $as_echo_n "(cached) " >&6 4051+else 4052+ case $host in 4053+ *-*-mingw* ) 4054+ case $build in 4055+ *-*-mingw* ) # actually msys 4056+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 4057+ ;; 4058+ *-*-cygwin* ) 4059+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 4060+ ;; 4061+ * ) # otherwise, assume *nix 4062+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 4063+ ;; 4064+ esac 4065+ ;; 4066+ *-*-cygwin* ) 4067+ case $build in 4068+ *-*-mingw* ) # actually msys 4069+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin 4070+ ;; 4071+ *-*-cygwin* ) 4072+ lt_cv_to_host_file_cmd=func_convert_file_noop 4073+ ;; 4074+ * ) # otherwise, assume *nix 4075+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin 4076+ ;; 4077+ esac 4078+ ;; 4079+ * ) # unhandled hosts (and "normal" native builds) 4080+ lt_cv_to_host_file_cmd=func_convert_file_noop 4081+ ;; 4082+esac 4083+ 4084+fi 4085+ 4086+to_host_file_cmd=$lt_cv_to_host_file_cmd 4087+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 4088+$as_echo "$lt_cv_to_host_file_cmd" >&6; } 4089+ 4090+ 4091+ 4092+ 4093+ 4094+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 4095+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } 4096+if ${lt_cv_to_tool_file_cmd+:} false; then : 4097+ $as_echo_n "(cached) " >&6 4098+else 4099+ #assume ordinary cross tools, or native build. 4100+lt_cv_to_tool_file_cmd=func_convert_file_noop 4101+case $host in 4102+ *-*-mingw* ) 4103+ case $build in 4104+ *-*-mingw* ) # actually msys 4105+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 4106+ ;; 4107+ esac 4108+ ;; 4109+esac 4110+ 4111+fi 4112+ 4113+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 4114+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 4115+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } 4116+ 4117+ 4118+ 4119+ 4120+ 4121 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 4122 $as_echo_n "checking for $LD option to reload object files... " >&6; } 4123 if ${lt_cv_ld_reload_flag+:} false; then : 4124@@ -5432,6 +5512,11 @@ case $reload_flag in 4125 esac 4126 reload_cmds='$LD$reload_flag -o $output$reload_objs' 4127 case $host_os in 4128+ cygwin* | mingw* | pw32* | cegcc*) 4129+ if test "$GCC" != yes; then 4130+ reload_cmds=false 4131+ fi 4132+ ;; 4133 darwin*) 4134 if test "$GCC" = yes; then 4135 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 4136@@ -5600,7 +5685,8 @@ mingw* | pw32*) 4137 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 4138 lt_cv_file_magic_cmd='func_win32_libid' 4139 else 4140- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' 4141+ # Keep this pattern in sync with the one in func_win32_libid. 4142+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' 4143 lt_cv_file_magic_cmd='$OBJDUMP -f' 4144 fi 4145 ;; 4146@@ -5754,6 +5840,21 @@ esac 4147 fi 4148 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 4149 $as_echo "$lt_cv_deplibs_check_method" >&6; } 4150+ 4151+file_magic_glob= 4152+want_nocaseglob=no 4153+if test "$build" = "$host"; then 4154+ case $host_os in 4155+ mingw* | pw32*) 4156+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then 4157+ want_nocaseglob=yes 4158+ else 4159+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` 4160+ fi 4161+ ;; 4162+ esac 4163+fi 4164+ 4165 file_magic_cmd=$lt_cv_file_magic_cmd 4166 deplibs_check_method=$lt_cv_deplibs_check_method 4167 test -z "$deplibs_check_method" && deplibs_check_method=unknown 4168@@ -5769,6 +5870,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 4169 4170 4171 4172+ 4173+ 4174+ 4175+ 4176+ 4177+ 4178+ 4179+ 4180+ 4181+ 4182+if test -n "$ac_tool_prefix"; then 4183+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. 4184+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 4185+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4186+$as_echo_n "checking for $ac_word... " >&6; } 4187+if ${ac_cv_prog_DLLTOOL+:} false; then : 4188+ $as_echo_n "(cached) " >&6 4189+else 4190+ if test -n "$DLLTOOL"; then 4191+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. 4192+else 4193+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 4194+for as_dir in $PATH 4195+do 4196+ IFS=$as_save_IFS 4197+ test -z "$as_dir" && as_dir=. 4198+ for ac_exec_ext in '' $ac_executable_extensions; do 4199+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 4200+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" 4201+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4202+ break 2 4203+ fi 4204+done 4205+ done 4206+IFS=$as_save_IFS 4207+ 4208+fi 4209+fi 4210+DLLTOOL=$ac_cv_prog_DLLTOOL 4211+if test -n "$DLLTOOL"; then 4212+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 4213+$as_echo "$DLLTOOL" >&6; } 4214+else 4215+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 4216+$as_echo "no" >&6; } 4217+fi 4218+ 4219+ 4220+fi 4221+if test -z "$ac_cv_prog_DLLTOOL"; then 4222+ ac_ct_DLLTOOL=$DLLTOOL 4223+ # Extract the first word of "dlltool", so it can be a program name with args. 4224+set dummy dlltool; ac_word=$2 4225+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4226+$as_echo_n "checking for $ac_word... " >&6; } 4227+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : 4228+ $as_echo_n "(cached) " >&6 4229+else 4230+ if test -n "$ac_ct_DLLTOOL"; then 4231+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. 4232+else 4233+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 4234+for as_dir in $PATH 4235+do 4236+ IFS=$as_save_IFS 4237+ test -z "$as_dir" && as_dir=. 4238+ for ac_exec_ext in '' $ac_executable_extensions; do 4239+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 4240+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" 4241+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4242+ break 2 4243+ fi 4244+done 4245+ done 4246+IFS=$as_save_IFS 4247+ 4248+fi 4249+fi 4250+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL 4251+if test -n "$ac_ct_DLLTOOL"; then 4252+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 4253+$as_echo "$ac_ct_DLLTOOL" >&6; } 4254+else 4255+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 4256+$as_echo "no" >&6; } 4257+fi 4258+ 4259+ if test "x$ac_ct_DLLTOOL" = x; then 4260+ DLLTOOL="false" 4261+ else 4262+ case $cross_compiling:$ac_tool_warned in 4263+yes:) 4264+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 4265+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 4266+ac_tool_warned=yes ;; 4267+esac 4268+ DLLTOOL=$ac_ct_DLLTOOL 4269+ fi 4270+else 4271+ DLLTOOL="$ac_cv_prog_DLLTOOL" 4272+fi 4273+ 4274+test -z "$DLLTOOL" && DLLTOOL=dlltool 4275+ 4276+ 4277+ 4278+ 4279+ 4280+ 4281+ 4282+ 4283+ 4284+ 4285+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 4286+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } 4287+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : 4288+ $as_echo_n "(cached) " >&6 4289+else 4290+ lt_cv_sharedlib_from_linklib_cmd='unknown' 4291+ 4292+case $host_os in 4293+cygwin* | mingw* | pw32* | cegcc*) 4294+ # two different shell functions defined in ltmain.sh 4295+ # decide which to use based on capabilities of $DLLTOOL 4296+ case `$DLLTOOL --help 2>&1` in 4297+ *--identify-strict*) 4298+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib 4299+ ;; 4300+ *) 4301+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback 4302+ ;; 4303+ esac 4304+ ;; 4305+*) 4306+ # fallback: assume linklib IS sharedlib 4307+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" 4308+ ;; 4309+esac 4310+ 4311+fi 4312+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 4313+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } 4314+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd 4315+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO 4316+ 4317+ 4318+ 4319+ 4320+ 4321+ 4322+ 4323 plugin_option= 4324 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 4325 for plugin in $plugin_names; do 4326@@ -5783,8 +6035,10 @@ for plugin in $plugin_names; do 4327 done 4328 4329 if test -n "$ac_tool_prefix"; then 4330- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 4331-set dummy ${ac_tool_prefix}ar; ac_word=$2 4332+ for ac_prog in ar 4333+ do 4334+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 4335+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 4336 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4337 $as_echo_n "checking for $ac_word... " >&6; } 4338 if ${ac_cv_prog_AR+:} false; then : 4339@@ -5800,7 +6054,7 @@ do 4340 test -z "$as_dir" && as_dir=. 4341 for ac_exec_ext in '' $ac_executable_extensions; do 4342 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 4343- ac_cv_prog_AR="${ac_tool_prefix}ar" 4344+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" 4345 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4346 break 2 4347 fi 4348@@ -5820,11 +6074,15 @@ $as_echo "no" >&6; } 4349 fi 4350 4351 4352+ test -n "$AR" && break 4353+ done 4354 fi 4355-if test -z "$ac_cv_prog_AR"; then 4356+if test -z "$AR"; then 4357 ac_ct_AR=$AR 4358- # Extract the first word of "ar", so it can be a program name with args. 4359-set dummy ar; ac_word=$2 4360+ for ac_prog in ar 4361+do 4362+ # Extract the first word of "$ac_prog", so it can be a program name with args. 4363+set dummy $ac_prog; ac_word=$2 4364 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4365 $as_echo_n "checking for $ac_word... " >&6; } 4366 if ${ac_cv_prog_ac_ct_AR+:} false; then : 4367@@ -5840,7 +6098,7 @@ do 4368 test -z "$as_dir" && as_dir=. 4369 for ac_exec_ext in '' $ac_executable_extensions; do 4370 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 4371- ac_cv_prog_ac_ct_AR="ar" 4372+ ac_cv_prog_ac_ct_AR="$ac_prog" 4373 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4374 break 2 4375 fi 4376@@ -5859,6 +6117,10 @@ else 4377 $as_echo "no" >&6; } 4378 fi 4379 4380+ 4381+ test -n "$ac_ct_AR" && break 4382+done 4383+ 4384 if test "x$ac_ct_AR" = x; then 4385 AR="false" 4386 else 4387@@ -5870,29 +6132,81 @@ ac_tool_warned=yes ;; 4388 esac 4389 AR=$ac_ct_AR 4390 fi 4391-else 4392- AR="$ac_cv_prog_AR" 4393 fi 4394 4395-test -z "$AR" && AR=ar 4396-if test -n "$plugin_option"; then 4397- if $AR --help 2>&1 | grep -q "\--plugin"; then 4398- touch conftest.c 4399- $AR $plugin_option rc conftest.a conftest.c 4400- if test "$?" != 0; then 4401- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 4402+ touch conftest.c 4403+ $AR $plugin_option rc conftest.a conftest.c 4404+ if test "$?" != 0; then 4405+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 4406 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} 4407- else 4408- AR="$AR $plugin_option" 4409- fi 4410- rm -f conftest.* 4411+ else 4412+ AR="$AR $plugin_option" 4413 fi 4414-fi 4415-test -z "$AR_FLAGS" && AR_FLAGS=cru 4416+ rm -f conftest.* 4417+: ${AR=ar} 4418+: ${AR_FLAGS=cru} 4419+ 4420+ 4421+ 4422+ 4423+ 4424+ 4425+ 4426+ 4427+ 4428+ 4429+ 4430+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 4431+$as_echo_n "checking for archiver @FILE support... " >&6; } 4432+if ${lt_cv_ar_at_file+:} false; then : 4433+ $as_echo_n "(cached) " >&6 4434+else 4435+ lt_cv_ar_at_file=no 4436+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 4437+/* end confdefs.h. */ 4438+ 4439+int 4440+main () 4441+{ 4442 4443+ ; 4444+ return 0; 4445+} 4446+_ACEOF 4447+if ac_fn_c_try_compile "$LINENO"; then : 4448+ echo conftest.$ac_objext > conftest.lst 4449+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' 4450+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 4451+ (eval $lt_ar_try) 2>&5 4452+ ac_status=$? 4453+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 4454+ test $ac_status = 0; } 4455+ if test "$ac_status" -eq 0; then 4456+ # Ensure the archiver fails upon bogus file names. 4457+ rm -f conftest.$ac_objext libconftest.a 4458+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 4459+ (eval $lt_ar_try) 2>&5 4460+ ac_status=$? 4461+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 4462+ test $ac_status = 0; } 4463+ if test "$ac_status" -ne 0; then 4464+ lt_cv_ar_at_file=@ 4465+ fi 4466+ fi 4467+ rm -f conftest.* libconftest.a 4468 4469+fi 4470+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 4471 4472+fi 4473+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 4474+$as_echo "$lt_cv_ar_at_file" >&6; } 4475 4476+if test "x$lt_cv_ar_at_file" = xno; then 4477+ archiver_list_spec= 4478+else 4479+ archiver_list_spec=$lt_cv_ar_at_file 4480+fi 4481 4482 4483 4484@@ -6239,8 +6553,8 @@ esac 4485 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 4486 4487 # Transform an extracted symbol line into symbol name and symbol address 4488-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 4489-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" 4490+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 4491+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'" 4492 4493 # Handle CRLF in mingw tool chain 4494 opt_cr= 4495@@ -6276,6 +6590,7 @@ for ac_symprfx in "" "_"; do 4496 else 4497 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 4498 fi 4499+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" 4500 4501 # Check to see that the pipe works correctly. 4502 pipe_works=no 4503@@ -6317,6 +6632,18 @@ _LT_EOF 4504 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 4505 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 4506 cat <<_LT_EOF > conftest.$ac_ext 4507+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ 4508+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) 4509+/* DATA imports from DLLs on WIN32 con't be const, because runtime 4510+ relocations are performed -- see ld's documentation on pseudo-relocs. */ 4511+# define LT_DLSYM_CONST 4512+#elif defined(__osf__) 4513+/* This system does not cope well with relocations in const data. */ 4514+# define LT_DLSYM_CONST 4515+#else 4516+# define LT_DLSYM_CONST const 4517+#endif 4518+ 4519 #ifdef __cplusplus 4520 extern "C" { 4521 #endif 4522@@ -6328,7 +6655,7 @@ _LT_EOF 4523 cat <<_LT_EOF >> conftest.$ac_ext 4524 4525 /* The mapping between symbol names and symbols. */ 4526-const struct { 4527+LT_DLSYM_CONST struct { 4528 const char *name; 4529 void *address; 4530 } 4531@@ -6354,8 +6681,8 @@ static const void *lt_preloaded_setup() { 4532 _LT_EOF 4533 # Now try linking the two files. 4534 mv conftest.$ac_objext conftstm.$ac_objext 4535- lt_save_LIBS="$LIBS" 4536- lt_save_CFLAGS="$CFLAGS" 4537+ lt_globsym_save_LIBS=$LIBS 4538+ lt_globsym_save_CFLAGS=$CFLAGS 4539 LIBS="conftstm.$ac_objext" 4540 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 4541 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 4542@@ -6365,8 +6692,8 @@ _LT_EOF 4543 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 4544 pipe_works=yes 4545 fi 4546- LIBS="$lt_save_LIBS" 4547- CFLAGS="$lt_save_CFLAGS" 4548+ LIBS=$lt_globsym_save_LIBS 4549+ CFLAGS=$lt_globsym_save_CFLAGS 4550 else 4551 echo "cannot find nm_test_func in $nlist" >&5 4552 fi 4553@@ -6403,6 +6730,19 @@ else 4554 $as_echo "ok" >&6; } 4555 fi 4556 4557+# Response file support. 4558+if test "$lt_cv_nm_interface" = "MS dumpbin"; then 4559+ nm_file_list_spec='@' 4560+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then 4561+ nm_file_list_spec='@' 4562+fi 4563+ 4564+ 4565+ 4566+ 4567+ 4568+ 4569+ 4570 4571 4572 4573@@ -6419,6 +6759,42 @@ fi 4574 4575 4576 4577+ 4578+ 4579+ 4580+ 4581+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 4582+$as_echo_n "checking for sysroot... " >&6; } 4583+ 4584+# Check whether --with-libtool-sysroot was given. 4585+if test "${with_libtool_sysroot+set}" = set; then : 4586+ withval=$with_libtool_sysroot; 4587+else 4588+ with_libtool_sysroot=no 4589+fi 4590+ 4591+ 4592+lt_sysroot= 4593+case ${with_libtool_sysroot} in #( 4594+ yes) 4595+ if test "$GCC" = yes; then 4596+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` 4597+ fi 4598+ ;; #( 4599+ /*) 4600+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` 4601+ ;; #( 4602+ no|'') 4603+ ;; #( 4604+ *) 4605+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 4606+$as_echo "${with_libtool_sysroot}" >&6; } 4607+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 4608+ ;; 4609+esac 4610+ 4611+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 4612+$as_echo "${lt_sysroot:-no}" >&6; } 4613 4614 4615 4616@@ -6630,6 +7006,123 @@ esac 4617 4618 need_locks="$enable_libtool_lock" 4619 4620+if test -n "$ac_tool_prefix"; then 4621+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. 4622+set dummy ${ac_tool_prefix}mt; ac_word=$2 4623+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4624+$as_echo_n "checking for $ac_word... " >&6; } 4625+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : 4626+ $as_echo_n "(cached) " >&6 4627+else 4628+ if test -n "$MANIFEST_TOOL"; then 4629+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. 4630+else 4631+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 4632+for as_dir in $PATH 4633+do 4634+ IFS=$as_save_IFS 4635+ test -z "$as_dir" && as_dir=. 4636+ for ac_exec_ext in '' $ac_executable_extensions; do 4637+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 4638+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" 4639+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4640+ break 2 4641+ fi 4642+done 4643+ done 4644+IFS=$as_save_IFS 4645+ 4646+fi 4647+fi 4648+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL 4649+if test -n "$MANIFEST_TOOL"; then 4650+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 4651+$as_echo "$MANIFEST_TOOL" >&6; } 4652+else 4653+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 4654+$as_echo "no" >&6; } 4655+fi 4656+ 4657+ 4658+fi 4659+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then 4660+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL 4661+ # Extract the first word of "mt", so it can be a program name with args. 4662+set dummy mt; ac_word=$2 4663+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4664+$as_echo_n "checking for $ac_word... " >&6; } 4665+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : 4666+ $as_echo_n "(cached) " >&6 4667+else 4668+ if test -n "$ac_ct_MANIFEST_TOOL"; then 4669+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. 4670+else 4671+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 4672+for as_dir in $PATH 4673+do 4674+ IFS=$as_save_IFS 4675+ test -z "$as_dir" && as_dir=. 4676+ for ac_exec_ext in '' $ac_executable_extensions; do 4677+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 4678+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" 4679+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4680+ break 2 4681+ fi 4682+done 4683+ done 4684+IFS=$as_save_IFS 4685+ 4686+fi 4687+fi 4688+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL 4689+if test -n "$ac_ct_MANIFEST_TOOL"; then 4690+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 4691+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } 4692+else 4693+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 4694+$as_echo "no" >&6; } 4695+fi 4696+ 4697+ if test "x$ac_ct_MANIFEST_TOOL" = x; then 4698+ MANIFEST_TOOL=":" 4699+ else 4700+ case $cross_compiling:$ac_tool_warned in 4701+yes:) 4702+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 4703+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 4704+ac_tool_warned=yes ;; 4705+esac 4706+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL 4707+ fi 4708+else 4709+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" 4710+fi 4711+ 4712+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt 4713+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 4714+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } 4715+if ${lt_cv_path_mainfest_tool+:} false; then : 4716+ $as_echo_n "(cached) " >&6 4717+else 4718+ lt_cv_path_mainfest_tool=no 4719+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 4720+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out 4721+ cat conftest.err >&5 4722+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then 4723+ lt_cv_path_mainfest_tool=yes 4724+ fi 4725+ rm -f conftest* 4726+fi 4727+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 4728+$as_echo "$lt_cv_path_mainfest_tool" >&6; } 4729+if test "x$lt_cv_path_mainfest_tool" != xyes; then 4730+ MANIFEST_TOOL=: 4731+fi 4732+ 4733+ 4734+ 4735+ 4736+ 4737 4738 case $host_os in 4739 rhapsody* | darwin*) 4740@@ -7193,6 +7686,8 @@ _LT_EOF 4741 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 4742 echo "$AR cru libconftest.a conftest.o" >&5 4743 $AR cru libconftest.a conftest.o 2>&5 4744+ echo "$RANLIB libconftest.a" >&5 4745+ $RANLIB libconftest.a 2>&5 4746 cat > conftest.c << _LT_EOF 4747 int main() { return 0;} 4748 _LT_EOF 4749@@ -7775,8 +8270,6 @@ fi 4750 lt_prog_compiler_pic= 4751 lt_prog_compiler_static= 4752 4753-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 4754-$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 4755 4756 if test "$GCC" = yes; then 4757 lt_prog_compiler_wl='-Wl,' 4758@@ -7942,6 +8435,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 4759 lt_prog_compiler_pic='--shared' 4760 lt_prog_compiler_static='--static' 4761 ;; 4762+ nagfor*) 4763+ # NAG Fortran compiler 4764+ lt_prog_compiler_wl='-Wl,-Wl,,' 4765+ lt_prog_compiler_pic='-PIC' 4766+ lt_prog_compiler_static='-Bstatic' 4767+ ;; 4768 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 4769 # Portland Group compilers (*not* the Pentium gcc compiler, 4770 # which looks to be a dead project) 4771@@ -8004,7 +8503,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 4772 lt_prog_compiler_pic='-KPIC' 4773 lt_prog_compiler_static='-Bstatic' 4774 case $cc_basename in 4775- f77* | f90* | f95*) 4776+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) 4777 lt_prog_compiler_wl='-Qoption ld ';; 4778 *) 4779 lt_prog_compiler_wl='-Wl,';; 4780@@ -8061,13 +8560,17 @@ case $host_os in 4781 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 4782 ;; 4783 esac 4784-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 4785-$as_echo "$lt_prog_compiler_pic" >&6; } 4786- 4787- 4788- 4789- 4790 4791+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 4792+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 4793+if ${lt_cv_prog_compiler_pic+:} false; then : 4794+ $as_echo_n "(cached) " >&6 4795+else 4796+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic 4797+fi 4798+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 4799+$as_echo "$lt_cv_prog_compiler_pic" >&6; } 4800+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic 4801 4802 # 4803 # Check to make sure the PIC flag actually works. 4804@@ -8128,6 +8631,11 @@ fi 4805 4806 4807 4808+ 4809+ 4810+ 4811+ 4812+ 4813 # 4814 # Check to make sure the static flag actually works. 4815 # 4816@@ -8478,7 +8986,8 @@ _LT_EOF 4817 allow_undefined_flag=unsupported 4818 always_export_symbols=no 4819 enable_shared_with_static_runtimes=yes 4820- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 4821+ 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' 4822+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' 4823 4824 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 4825 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 4826@@ -8577,12 +9086,12 @@ _LT_EOF 4827 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 4828 hardcode_libdir_flag_spec= 4829 hardcode_libdir_flag_spec_ld='-rpath $libdir' 4830- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' 4831+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' 4832 if test "x$supports_anon_versioning" = xyes; then 4833 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ 4834 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ 4835 echo "local: *; };" >> $output_objdir/$libname.ver~ 4836- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 4837+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 4838 fi 4839 ;; 4840 esac 4841@@ -8596,8 +9105,8 @@ _LT_EOF 4842 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 4843 wlarc= 4844 else 4845- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 4846- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 4847+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 4848+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 4849 fi 4850 ;; 4851 4852@@ -8615,8 +9124,8 @@ _LT_EOF 4853 4854 _LT_EOF 4855 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 4856- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 4857- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 4858+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 4859+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 4860 else 4861 ld_shlibs=no 4862 fi 4863@@ -8662,8 +9171,8 @@ _LT_EOF 4864 4865 *) 4866 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 4867- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 4868- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 4869+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 4870+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 4871 else 4872 ld_shlibs=no 4873 fi 4874@@ -8793,7 +9302,13 @@ _LT_EOF 4875 allow_undefined_flag='-berok' 4876 # Determine the default libpath from the value encoded in an 4877 # empty executable. 4878- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 4879+ if test "${lt_cv_aix_libpath+set}" = set; then 4880+ aix_libpath=$lt_cv_aix_libpath 4881+else 4882+ if ${lt_cv_aix_libpath_+:} false; then : 4883+ $as_echo_n "(cached) " >&6 4884+else 4885+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 4886 /* end confdefs.h. */ 4887 4888 int 4889@@ -8806,22 +9321,29 @@ main () 4890 _ACEOF 4891 if ac_fn_c_try_link "$LINENO"; then : 4892 4893-lt_aix_libpath_sed=' 4894- /Import File Strings/,/^$/ { 4895- /^0/ { 4896- s/^0 *\(.*\)$/\1/ 4897- p 4898- } 4899- }' 4900-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 4901-# Check for a 64-bit object if we didn't find anything. 4902-if test -z "$aix_libpath"; then 4903- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 4904-fi 4905+ lt_aix_libpath_sed=' 4906+ /Import File Strings/,/^$/ { 4907+ /^0/ { 4908+ s/^0 *\([^ ]*\) *$/\1/ 4909+ p 4910+ } 4911+ }' 4912+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 4913+ # Check for a 64-bit object if we didn't find anything. 4914+ if test -z "$lt_cv_aix_libpath_"; then 4915+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 4916+ fi 4917 fi 4918 rm -f core conftest.err conftest.$ac_objext \ 4919 conftest$ac_exeext conftest.$ac_ext 4920-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4921+ if test -z "$lt_cv_aix_libpath_"; then 4922+ lt_cv_aix_libpath_="/usr/lib:/lib" 4923+ fi 4924+ 4925+fi 4926+ 4927+ aix_libpath=$lt_cv_aix_libpath_ 4928+fi 4929 4930 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 4931 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" 4932@@ -8833,7 +9355,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4933 else 4934 # Determine the default libpath from the value encoded in an 4935 # empty executable. 4936- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 4937+ if test "${lt_cv_aix_libpath+set}" = set; then 4938+ aix_libpath=$lt_cv_aix_libpath 4939+else 4940+ if ${lt_cv_aix_libpath_+:} false; then : 4941+ $as_echo_n "(cached) " >&6 4942+else 4943+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 4944 /* end confdefs.h. */ 4945 4946 int 4947@@ -8846,22 +9374,29 @@ main () 4948 _ACEOF 4949 if ac_fn_c_try_link "$LINENO"; then : 4950 4951-lt_aix_libpath_sed=' 4952- /Import File Strings/,/^$/ { 4953- /^0/ { 4954- s/^0 *\(.*\)$/\1/ 4955- p 4956- } 4957- }' 4958-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 4959-# Check for a 64-bit object if we didn't find anything. 4960-if test -z "$aix_libpath"; then 4961- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 4962-fi 4963+ lt_aix_libpath_sed=' 4964+ /Import File Strings/,/^$/ { 4965+ /^0/ { 4966+ s/^0 *\([^ ]*\) *$/\1/ 4967+ p 4968+ } 4969+ }' 4970+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 4971+ # Check for a 64-bit object if we didn't find anything. 4972+ if test -z "$lt_cv_aix_libpath_"; then 4973+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 4974+ fi 4975 fi 4976 rm -f core conftest.err conftest.$ac_objext \ 4977 conftest$ac_exeext conftest.$ac_ext 4978-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4979+ if test -z "$lt_cv_aix_libpath_"; then 4980+ lt_cv_aix_libpath_="/usr/lib:/lib" 4981+ fi 4982+ 4983+fi 4984+ 4985+ aix_libpath=$lt_cv_aix_libpath_ 4986+fi 4987 4988 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 4989 # Warning - without using the other run time loading flags, 4990@@ -8906,20 +9441,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4991 # Microsoft Visual C++. 4992 # hardcode_libdir_flag_spec is actually meaningless, as there is 4993 # no search path for DLLs. 4994- hardcode_libdir_flag_spec=' ' 4995- allow_undefined_flag=unsupported 4996- # Tell ltmain to make .lib files, not .a files. 4997- libext=lib 4998- # Tell ltmain to make .dll files, not .so files. 4999- shrext_cmds=".dll" 5000- # FIXME: Setting linknames here is a bad hack. 5001- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 5002- # The linker will automatically build a .lib file if we build a DLL. 5003- old_archive_from_new_cmds='true' 5004- # FIXME: Should let the user specify the lib program. 5005- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 5006- fix_srcfile_path='`cygpath -w "$srcfile"`' 5007- enable_shared_with_static_runtimes=yes 5008+ case $cc_basename in 5009+ cl*) 5010+ # Native MSVC 5011+ hardcode_libdir_flag_spec=' ' 5012+ allow_undefined_flag=unsupported 5013+ always_export_symbols=yes 5014+ file_list_spec='@' 5015+ # Tell ltmain to make .lib files, not .a files. 5016+ libext=lib 5017+ # Tell ltmain to make .dll files, not .so files. 5018+ shrext_cmds=".dll" 5019+ # FIXME: Setting linknames here is a bad hack. 5020+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' 5021+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 5022+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; 5023+ else 5024+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; 5025+ fi~ 5026+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ 5027+ linknames=' 5028+ # The linker will not automatically build a static lib if we build a DLL. 5029+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' 5030+ enable_shared_with_static_runtimes=yes 5031+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 5032+ # Don't use ranlib 5033+ old_postinstall_cmds='chmod 644 $oldlib' 5034+ postlink_cmds='lt_outputfile="@OUTPUT@"~ 5035+ lt_tool_outputfile="@TOOL_OUTPUT@"~ 5036+ case $lt_outputfile in 5037+ *.exe|*.EXE) ;; 5038+ *) 5039+ lt_outputfile="$lt_outputfile.exe" 5040+ lt_tool_outputfile="$lt_tool_outputfile.exe" 5041+ ;; 5042+ esac~ 5043+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then 5044+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; 5045+ $RM "$lt_outputfile.manifest"; 5046+ fi' 5047+ ;; 5048+ *) 5049+ # Assume MSVC wrapper 5050+ hardcode_libdir_flag_spec=' ' 5051+ allow_undefined_flag=unsupported 5052+ # Tell ltmain to make .lib files, not .a files. 5053+ libext=lib 5054+ # Tell ltmain to make .dll files, not .so files. 5055+ shrext_cmds=".dll" 5056+ # FIXME: Setting linknames here is a bad hack. 5057+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 5058+ # The linker will automatically build a .lib file if we build a DLL. 5059+ old_archive_from_new_cmds='true' 5060+ # FIXME: Should let the user specify the lib program. 5061+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 5062+ enable_shared_with_static_runtimes=yes 5063+ ;; 5064+ esac 5065 ;; 5066 5067 darwin* | rhapsody*) 5068@@ -8980,7 +9558,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 5069 5070 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 5071 freebsd* | dragonfly*) 5072- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' 5073+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' 5074 hardcode_libdir_flag_spec='-R$libdir' 5075 hardcode_direct=yes 5076 hardcode_shlibpath_var=no 5077@@ -8988,7 +9566,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 5078 5079 hpux9*) 5080 if test "$GCC" = yes; then 5081- 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' 5082+ 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' 5083 else 5084 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' 5085 fi 5086@@ -9004,7 +9582,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 5087 5088 hpux10*) 5089 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 5090- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 5091+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 5092 else 5093 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 5094 fi 5095@@ -9028,10 +9606,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 5096 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 5097 ;; 5098 ia64*) 5099- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 5100+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 5101 ;; 5102 *) 5103- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 5104+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 5105 ;; 5106 esac 5107 else 5108@@ -9110,23 +9688,36 @@ fi 5109 5110 irix5* | irix6* | nonstopux*) 5111 if test "$GCC" = yes; then 5112- 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' 5113+ 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' 5114 # Try to use the -exported_symbol ld option, if it does not 5115 # work, assume that -exports_file does not work either and 5116 # implicitly export all symbols. 5117- save_LDFLAGS="$LDFLAGS" 5118- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 5119- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 5120+ # This should be the same for all languages, so no per-tag cache variable. 5121+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 5122+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } 5123+if ${lt_cv_irix_exported_symbol+:} false; then : 5124+ $as_echo_n "(cached) " >&6 5125+else 5126+ save_LDFLAGS="$LDFLAGS" 5127+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 5128+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 5129 /* end confdefs.h. */ 5130-int foo(void) {} 5131+int foo (void) { return 0; } 5132 _ACEOF 5133 if ac_fn_c_try_link "$LINENO"; then : 5134- 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' 5135- 5136+ lt_cv_irix_exported_symbol=yes 5137+else 5138+ lt_cv_irix_exported_symbol=no 5139 fi 5140 rm -f core conftest.err conftest.$ac_objext \ 5141 conftest$ac_exeext conftest.$ac_ext 5142- LDFLAGS="$save_LDFLAGS" 5143+ LDFLAGS="$save_LDFLAGS" 5144+fi 5145+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 5146+$as_echo "$lt_cv_irix_exported_symbol" >&6; } 5147+ if test "$lt_cv_irix_exported_symbol" = yes; then 5148+ 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' 5149+ fi 5150 else 5151 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' 5152 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' 5153@@ -9211,7 +9802,7 @@ rm -f core conftest.err conftest.$ac_objext \ 5154 osf4* | osf5*) # as osf3* with the addition of -msym flag 5155 if test "$GCC" = yes; then 5156 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 5157- 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' 5158+ 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' 5159 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 5160 else 5161 allow_undefined_flag=' -expect_unresolved \*' 5162@@ -9230,9 +9821,9 @@ rm -f core conftest.err conftest.$ac_objext \ 5163 no_undefined_flag=' -z defs' 5164 if test "$GCC" = yes; then 5165 wlarc='${wl}' 5166- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 5167+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 5168 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ 5169- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' 5170+ $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' 5171 else 5172 case `$CC -V 2>&1` in 5173 *"Compilers 5.0"*) 5174@@ -9808,8 +10399,9 @@ cygwin* | mingw* | pw32* | cegcc*) 5175 need_version=no 5176 need_lib_prefix=no 5177 5178- case $GCC,$host_os in 5179- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) 5180+ case $GCC,$cc_basename in 5181+ yes,*) 5182+ # gcc 5183 library_names_spec='$libname.dll.a' 5184 # DLL is installed to $(libdir)/../bin by postinstall_cmds 5185 postinstall_cmds='base_file=`basename \${file}`~ 5186@@ -9842,13 +10434,71 @@ cygwin* | mingw* | pw32* | cegcc*) 5187 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 5188 ;; 5189 esac 5190+ dynamic_linker='Win32 ld.exe' 5191+ ;; 5192+ 5193+ *,cl*) 5194+ # Native MSVC 5195+ libname_spec='$name' 5196+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 5197+ library_names_spec='${libname}.dll.lib' 5198+ 5199+ case $build_os in 5200+ mingw*) 5201+ sys_lib_search_path_spec= 5202+ lt_save_ifs=$IFS 5203+ IFS=';' 5204+ for lt_path in $LIB 5205+ do 5206+ IFS=$lt_save_ifs 5207+ # Let DOS variable expansion print the short 8.3 style file name. 5208+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` 5209+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" 5210+ done 5211+ IFS=$lt_save_ifs 5212+ # Convert to MSYS style. 5213+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` 5214+ ;; 5215+ cygwin*) 5216+ # Convert to unix form, then to dos form, then back to unix form 5217+ # but this time dos style (no spaces!) so that the unix form looks 5218+ # like /cygdrive/c/PROGRA~1:/cygdr... 5219+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` 5220+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` 5221+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 5222+ ;; 5223+ *) 5224+ sys_lib_search_path_spec="$LIB" 5225+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then 5226+ # It is most probably a Windows format PATH. 5227+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` 5228+ else 5229+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 5230+ fi 5231+ # FIXME: find the short name or the path components, as spaces are 5232+ # common. (e.g. "Program Files" -> "PROGRA~1") 5233+ ;; 5234+ esac 5235+ 5236+ # DLL is installed to $(libdir)/../bin by postinstall_cmds 5237+ postinstall_cmds='base_file=`basename \${file}`~ 5238+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ 5239+ dldir=$destdir/`dirname \$dlpath`~ 5240+ test -d \$dldir || mkdir -p \$dldir~ 5241+ $install_prog $dir/$dlname \$dldir/$dlname' 5242+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ 5243+ dlpath=$dir/\$dldll~ 5244+ $RM \$dlpath' 5245+ shlibpath_overrides_runpath=yes 5246+ dynamic_linker='Win32 link.exe' 5247 ;; 5248 5249 *) 5250+ # Assume MSVC wrapper 5251 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' 5252+ dynamic_linker='Win32 ld.exe' 5253 ;; 5254 esac 5255- dynamic_linker='Win32 ld.exe' 5256 # FIXME: first we should search . and the directory the executable is in 5257 shlibpath_var=PATH 5258 ;; 5259@@ -10726,7 +11376,7 @@ else 5260 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 5261 lt_status=$lt_dlunknown 5262 cat > conftest.$ac_ext <<_LT_EOF 5263-#line 10729 "configure" 5264+#line $LINENO "configure" 5265 #include "confdefs.h" 5266 5267 #if HAVE_DLFCN_H 5268@@ -10770,10 +11420,10 @@ else 5269 /* When -fvisbility=hidden is used, assume the code has been annotated 5270 correspondingly for the symbols needed. */ 5271 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 5272-void fnord () __attribute__((visibility("default"))); 5273+int fnord () __attribute__((visibility("default"))); 5274 #endif 5275 5276-void fnord () { int i=42; } 5277+int fnord () { return 42; } 5278 int main () 5279 { 5280 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 5281@@ -10832,7 +11482,7 @@ else 5282 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 5283 lt_status=$lt_dlunknown 5284 cat > conftest.$ac_ext <<_LT_EOF 5285-#line 10835 "configure" 5286+#line $LINENO "configure" 5287 #include "confdefs.h" 5288 5289 #if HAVE_DLFCN_H 5290@@ -10876,10 +11526,10 @@ else 5291 /* When -fvisbility=hidden is used, assume the code has been annotated 5292 correspondingly for the symbols needed. */ 5293 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 5294-void fnord () __attribute__((visibility("default"))); 5295+int fnord () __attribute__((visibility("default"))); 5296 #endif 5297 5298-void fnord () { int i=42; } 5299+int fnord () { return 42; } 5300 int main () 5301 { 5302 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 5303@@ -15133,13 +15783,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 5304 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 5305 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 5306 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 5307+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' 5308+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' 5309 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' 5310 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' 5311 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' 5312 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' 5313 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' 5314+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' 5315+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' 5316+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' 5317+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' 5318 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' 5319 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' 5320+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' 5321 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 5322 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 5323 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 5324@@ -15154,14 +15811,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 5325 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 5326 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 5327 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"`' 5328+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' 5329+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' 5330 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' 5331 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' 5332 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' 5333-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 5334 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' 5335+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 5336 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' 5337 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' 5338 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' 5339+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' 5340 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 5341 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 5342 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 5343@@ -15194,12 +15854,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 5344 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 5345 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 5346 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 5347-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' 5348 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' 5349 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' 5350 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' 5351 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' 5352 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' 5353+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' 5354 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 5355 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 5356 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 5357@@ -15254,8 +15914,13 @@ reload_flag \ 5358 OBJDUMP \ 5359 deplibs_check_method \ 5360 file_magic_cmd \ 5361+file_magic_glob \ 5362+want_nocaseglob \ 5363+DLLTOOL \ 5364+sharedlib_from_linklib_cmd \ 5365 AR \ 5366 AR_FLAGS \ 5367+archiver_list_spec \ 5368 STRIP \ 5369 RANLIB \ 5370 CC \ 5371@@ -15265,12 +15930,14 @@ lt_cv_sys_global_symbol_pipe \ 5372 lt_cv_sys_global_symbol_to_cdecl \ 5373 lt_cv_sys_global_symbol_to_c_name_address \ 5374 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 5375+nm_file_list_spec \ 5376 lt_prog_compiler_no_builtin_flag \ 5377-lt_prog_compiler_wl \ 5378 lt_prog_compiler_pic \ 5379+lt_prog_compiler_wl \ 5380 lt_prog_compiler_static \ 5381 lt_cv_prog_compiler_c_o \ 5382 need_locks \ 5383+MANIFEST_TOOL \ 5384 DSYMUTIL \ 5385 NMEDIT \ 5386 LIPO \ 5387@@ -15286,7 +15953,6 @@ no_undefined_flag \ 5388 hardcode_libdir_flag_spec \ 5389 hardcode_libdir_flag_spec_ld \ 5390 hardcode_libdir_separator \ 5391-fix_srcfile_path \ 5392 exclude_expsyms \ 5393 include_expsyms \ 5394 file_list_spec \ 5395@@ -15322,6 +15988,7 @@ module_cmds \ 5396 module_expsym_cmds \ 5397 export_symbols_cmds \ 5398 prelink_cmds \ 5399+postlink_cmds \ 5400 postinstall_cmds \ 5401 postuninstall_cmds \ 5402 finish_cmds \ 5403@@ -16094,7 +16761,8 @@ $as_echo X"$file" | 5404 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 5405 # 5406 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 5407-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. 5408+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, 5409+# Inc. 5410 # Written by Gordon Matzigkeit, 1996 5411 # 5412 # This file is part of GNU Libtool. 5413@@ -16197,19 +16865,42 @@ SP2NL=$lt_lt_SP2NL 5414 # turn newlines into spaces. 5415 NL2SP=$lt_lt_NL2SP 5416 5417+# convert \$build file names to \$host format. 5418+to_host_file_cmd=$lt_cv_to_host_file_cmd 5419+ 5420+# convert \$build files to toolchain format. 5421+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 5422+ 5423 # An object symbol dumper. 5424 OBJDUMP=$lt_OBJDUMP 5425 5426 # Method to check whether dependent libraries are shared objects. 5427 deplibs_check_method=$lt_deplibs_check_method 5428 5429-# Command to use when deplibs_check_method == "file_magic". 5430+# Command to use when deplibs_check_method = "file_magic". 5431 file_magic_cmd=$lt_file_magic_cmd 5432 5433+# How to find potential files when deplibs_check_method = "file_magic". 5434+file_magic_glob=$lt_file_magic_glob 5435+ 5436+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". 5437+want_nocaseglob=$lt_want_nocaseglob 5438+ 5439+# DLL creation program. 5440+DLLTOOL=$lt_DLLTOOL 5441+ 5442+# Command to associate shared and link libraries. 5443+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd 5444+ 5445 # The archiver. 5446 AR=$lt_AR 5447+ 5448+# Flags to create an archive. 5449 AR_FLAGS=$lt_AR_FLAGS 5450 5451+# How to feed a file listing to the archiver. 5452+archiver_list_spec=$lt_archiver_list_spec 5453+ 5454 # A symbol stripping program. 5455 STRIP=$lt_STRIP 5456 5457@@ -16239,6 +16930,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 5458 # Transform the output of nm in a C name address pair when lib prefix is needed. 5459 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 5460 5461+# Specify filename containing input files for \$NM. 5462+nm_file_list_spec=$lt_nm_file_list_spec 5463+ 5464+# The root where to search for dependent libraries,and in which our libraries should be installed. 5465+lt_sysroot=$lt_sysroot 5466+ 5467 # The name of the directory that contains temporary libtool files. 5468 objdir=$objdir 5469 5470@@ -16248,6 +16945,9 @@ MAGIC_CMD=$MAGIC_CMD 5471 # Must we lock files when doing compilation? 5472 need_locks=$lt_need_locks 5473 5474+# Manifest tool. 5475+MANIFEST_TOOL=$lt_MANIFEST_TOOL 5476+ 5477 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 5478 DSYMUTIL=$lt_DSYMUTIL 5479 5480@@ -16362,12 +17062,12 @@ with_gcc=$GCC 5481 # Compiler flag to turn off builtin functions. 5482 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 5483 5484-# How to pass a linker flag through the compiler. 5485-wl=$lt_lt_prog_compiler_wl 5486- 5487 # Additional compiler flags for building library objects. 5488 pic_flag=$lt_lt_prog_compiler_pic 5489 5490+# How to pass a linker flag through the compiler. 5491+wl=$lt_lt_prog_compiler_wl 5492+ 5493 # Compiler flag to prevent dynamic linking. 5494 link_static_flag=$lt_lt_prog_compiler_static 5495 5496@@ -16454,9 +17154,6 @@ inherit_rpath=$inherit_rpath 5497 # Whether libtool must link a program against all its dependency libraries. 5498 link_all_deplibs=$link_all_deplibs 5499 5500-# Fix the shell variable \$srcfile for the compiler. 5501-fix_srcfile_path=$lt_fix_srcfile_path 5502- 5503 # Set to "yes" if exported symbols are required. 5504 always_export_symbols=$always_export_symbols 5505 5506@@ -16472,6 +17169,9 @@ include_expsyms=$lt_include_expsyms 5507 # Commands necessary for linking programs (against libraries) with templates. 5508 prelink_cmds=$lt_prelink_cmds 5509 5510+# Commands necessary for finishing linking programs. 5511+postlink_cmds=$lt_postlink_cmds 5512+ 5513 # Specify filename containing input files. 5514 file_list_spec=$lt_file_list_spec 5515 5516@@ -16504,210 +17204,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 5517 # if finds mixed CR/LF and LF-only lines. Since sed operates in 5518 # text mode, it properly converts lines to CR/LF. This bash problem 5519 # is reportedly fixed, but why not run on old versions too? 5520- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ 5521- || (rm -f "$cfgfile"; exit 1) 5522- 5523- case $xsi_shell in 5524- yes) 5525- cat << \_LT_EOF >> "$cfgfile" 5526- 5527-# func_dirname file append nondir_replacement 5528-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 5529-# otherwise set result to NONDIR_REPLACEMENT. 5530-func_dirname () 5531-{ 5532- case ${1} in 5533- */*) func_dirname_result="${1%/*}${2}" ;; 5534- * ) func_dirname_result="${3}" ;; 5535- esac 5536-} 5537- 5538-# func_basename file 5539-func_basename () 5540-{ 5541- func_basename_result="${1##*/}" 5542-} 5543- 5544-# func_dirname_and_basename file append nondir_replacement 5545-# perform func_basename and func_dirname in a single function 5546-# call: 5547-# dirname: Compute the dirname of FILE. If nonempty, 5548-# add APPEND to the result, otherwise set result 5549-# to NONDIR_REPLACEMENT. 5550-# value returned in "$func_dirname_result" 5551-# basename: Compute filename of FILE. 5552-# value retuned in "$func_basename_result" 5553-# Implementation must be kept synchronized with func_dirname 5554-# and func_basename. For efficiency, we do not delegate to 5555-# those functions but instead duplicate the functionality here. 5556-func_dirname_and_basename () 5557-{ 5558- case ${1} in 5559- */*) func_dirname_result="${1%/*}${2}" ;; 5560- * ) func_dirname_result="${3}" ;; 5561- esac 5562- func_basename_result="${1##*/}" 5563-} 5564- 5565-# func_stripname prefix suffix name 5566-# strip PREFIX and SUFFIX off of NAME. 5567-# PREFIX and SUFFIX must not contain globbing or regex special 5568-# characters, hashes, percent signs, but SUFFIX may contain a leading 5569-# dot (in which case that matches only a dot). 5570-func_stripname () 5571-{ 5572- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are 5573- # positional parameters, so assign one to ordinary parameter first. 5574- func_stripname_result=${3} 5575- func_stripname_result=${func_stripname_result#"${1}"} 5576- func_stripname_result=${func_stripname_result%"${2}"} 5577-} 5578- 5579-# func_opt_split 5580-func_opt_split () 5581-{ 5582- func_opt_split_opt=${1%%=*} 5583- func_opt_split_arg=${1#*=} 5584-} 5585- 5586-# func_lo2o object 5587-func_lo2o () 5588-{ 5589- case ${1} in 5590- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; 5591- *) func_lo2o_result=${1} ;; 5592- esac 5593-} 5594- 5595-# func_xform libobj-or-source 5596-func_xform () 5597-{ 5598- func_xform_result=${1%.*}.lo 5599-} 5600- 5601-# func_arith arithmetic-term... 5602-func_arith () 5603-{ 5604- func_arith_result=$(( $* )) 5605-} 5606- 5607-# func_len string 5608-# STRING may not start with a hyphen. 5609-func_len () 5610-{ 5611- func_len_result=${#1} 5612-} 5613- 5614-_LT_EOF 5615- ;; 5616- *) # Bourne compatible functions. 5617- cat << \_LT_EOF >> "$cfgfile" 5618- 5619-# func_dirname file append nondir_replacement 5620-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 5621-# otherwise set result to NONDIR_REPLACEMENT. 5622-func_dirname () 5623-{ 5624- # Extract subdirectory from the argument. 5625- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` 5626- if test "X$func_dirname_result" = "X${1}"; then 5627- func_dirname_result="${3}" 5628- else 5629- func_dirname_result="$func_dirname_result${2}" 5630- fi 5631-} 5632- 5633-# func_basename file 5634-func_basename () 5635-{ 5636- func_basename_result=`$ECHO "${1}" | $SED "$basename"` 5637-} 5638- 5639- 5640-# func_stripname prefix suffix name 5641-# strip PREFIX and SUFFIX off of NAME. 5642-# PREFIX and SUFFIX must not contain globbing or regex special 5643-# characters, hashes, percent signs, but SUFFIX may contain a leading 5644-# dot (in which case that matches only a dot). 5645-# func_strip_suffix prefix name 5646-func_stripname () 5647-{ 5648- case ${2} in 5649- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; 5650- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; 5651- esac 5652-} 5653- 5654-# sed scripts: 5655-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' 5656-my_sed_long_arg='1s/^-[^=]*=//' 5657- 5658-# func_opt_split 5659-func_opt_split () 5660-{ 5661- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` 5662- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` 5663-} 5664- 5665-# func_lo2o object 5666-func_lo2o () 5667-{ 5668- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` 5669-} 5670- 5671-# func_xform libobj-or-source 5672-func_xform () 5673-{ 5674- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` 5675-} 5676- 5677-# func_arith arithmetic-term... 5678-func_arith () 5679-{ 5680- func_arith_result=`expr "$@"` 5681-} 5682- 5683-# func_len string 5684-# STRING may not start with a hyphen. 5685-func_len () 5686-{ 5687- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` 5688-} 5689- 5690-_LT_EOF 5691-esac 5692- 5693-case $lt_shell_append in 5694- yes) 5695- cat << \_LT_EOF >> "$cfgfile" 5696- 5697-# func_append var value 5698-# Append VALUE to the end of shell variable VAR. 5699-func_append () 5700-{ 5701- eval "$1+=\$2" 5702-} 5703-_LT_EOF 5704- ;; 5705- *) 5706- cat << \_LT_EOF >> "$cfgfile" 5707- 5708-# func_append var value 5709-# Append VALUE to the end of shell variable VAR. 5710-func_append () 5711-{ 5712- eval "$1=\$$1\$2" 5713-} 5714- 5715-_LT_EOF 5716- ;; 5717- esac 5718- 5719- 5720- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ 5721- || (rm -f "$cfgfile"; exit 1) 5722- 5723- mv -f "$cfgfile" "$ofile" || 5724+ sed '$q' "$ltmain" >> "$cfgfile" \ 5725+ || (rm -f "$cfgfile"; exit 1) 5726+ 5727+ if test x"$xsi_shell" = xyes; then 5728+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ 5729+func_dirname ()\ 5730+{\ 5731+\ case ${1} in\ 5732+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 5733+\ * ) func_dirname_result="${3}" ;;\ 5734+\ esac\ 5735+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ 5736+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 5737+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 5738+test 0 -eq $? || _lt_function_replace_fail=: 5739+ 5740+ 5741+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ 5742+func_basename ()\ 5743+{\ 5744+\ func_basename_result="${1##*/}"\ 5745+} # Extended-shell func_basename 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_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ 5752+func_dirname_and_basename ()\ 5753+{\ 5754+\ case ${1} in\ 5755+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 5756+\ * ) func_dirname_result="${3}" ;;\ 5757+\ esac\ 5758+\ func_basename_result="${1##*/}"\ 5759+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ 5760+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 5761+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 5762+test 0 -eq $? || _lt_function_replace_fail=: 5763+ 5764+ 5765+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ 5766+func_stripname ()\ 5767+{\ 5768+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ 5769+\ # positional parameters, so assign one to ordinary parameter first.\ 5770+\ func_stripname_result=${3}\ 5771+\ func_stripname_result=${func_stripname_result#"${1}"}\ 5772+\ func_stripname_result=${func_stripname_result%"${2}"}\ 5773+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ 5774+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 5775+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 5776+test 0 -eq $? || _lt_function_replace_fail=: 5777+ 5778+ 5779+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ 5780+func_split_long_opt ()\ 5781+{\ 5782+\ func_split_long_opt_name=${1%%=*}\ 5783+\ func_split_long_opt_arg=${1#*=}\ 5784+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ 5785+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 5786+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 5787+test 0 -eq $? || _lt_function_replace_fail=: 5788+ 5789+ 5790+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ 5791+func_split_short_opt ()\ 5792+{\ 5793+\ func_split_short_opt_arg=${1#??}\ 5794+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ 5795+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ 5796+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 5797+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 5798+test 0 -eq $? || _lt_function_replace_fail=: 5799+ 5800+ 5801+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ 5802+func_lo2o ()\ 5803+{\ 5804+\ case ${1} in\ 5805+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ 5806+\ *) func_lo2o_result=${1} ;;\ 5807+\ esac\ 5808+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ 5809+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 5810+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 5811+test 0 -eq $? || _lt_function_replace_fail=: 5812+ 5813+ 5814+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ 5815+func_xform ()\ 5816+{\ 5817+ func_xform_result=${1%.*}.lo\ 5818+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ 5819+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 5820+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 5821+test 0 -eq $? || _lt_function_replace_fail=: 5822+ 5823+ 5824+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ 5825+func_arith ()\ 5826+{\ 5827+ func_arith_result=$(( $* ))\ 5828+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ 5829+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 5830+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 5831+test 0 -eq $? || _lt_function_replace_fail=: 5832+ 5833+ 5834+ sed -e '/^func_len ()$/,/^} # func_len /c\ 5835+func_len ()\ 5836+{\ 5837+ func_len_result=${#1}\ 5838+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ 5839+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 5840+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 5841+test 0 -eq $? || _lt_function_replace_fail=: 5842+ 5843+fi 5844+ 5845+if test x"$lt_shell_append" = xyes; then 5846+ sed -e '/^func_append ()$/,/^} # func_append /c\ 5847+func_append ()\ 5848+{\ 5849+ eval "${1}+=\\${2}"\ 5850+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ 5851+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 5852+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 5853+test 0 -eq $? || _lt_function_replace_fail=: 5854+ 5855+ 5856+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ 5857+func_append_quoted ()\ 5858+{\ 5859+\ func_quote_for_eval "${2}"\ 5860+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ 5861+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ 5862+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 5863+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 5864+test 0 -eq $? || _lt_function_replace_fail=: 5865+ 5866+ 5867+ # Save a `func_append' function call where possible by direct use of '+=' 5868+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ 5869+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 5870+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 5871+ test 0 -eq $? || _lt_function_replace_fail=: 5872+else 5873+ # Save a `func_append' function call even when '+=' is not available 5874+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ 5875+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 5876+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 5877+ test 0 -eq $? || _lt_function_replace_fail=: 5878+fi 5879+ 5880+if test x"$_lt_function_replace_fail" = x":"; then 5881+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 5882+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} 5883+fi 5884+ 5885+ 5886+ mv -f "$cfgfile" "$ofile" || 5887 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 5888 chmod +x "$ofile" 5889 5890diff --git a/gprof/Makefile.in b/gprof/Makefile.in 5891index c9914e46d7d..1857eb8b5a8 100644 5892--- a/gprof/Makefile.in 5893+++ b/gprof/Makefile.in 5894@@ -321,6 +321,7 @@ CYGPATH_W = @CYGPATH_W@ 5895 DATADIRNAME = @DATADIRNAME@ 5896 DEFS = @DEFS@ 5897 DEPDIR = @DEPDIR@ 5898+DLLTOOL = @DLLTOOL@ 5899 DSYMUTIL = @DSYMUTIL@ 5900 DUMPBIN = @DUMPBIN@ 5901 ECHO_C = @ECHO_C@ 5902@@ -352,6 +353,7 @@ LN_S = @LN_S@ 5903 LTLIBOBJS = @LTLIBOBJS@ 5904 MAINT = @MAINT@ 5905 MAKEINFO = @MAKEINFO@ 5906+MANIFEST_TOOL = @MANIFEST_TOOL@ 5907 MKDIR_P = @MKDIR_P@ 5908 MKINSTALLDIRS = @MKINSTALLDIRS@ 5909 MSGFMT = @MSGFMT@ 5910@@ -387,6 +389,7 @@ abs_builddir = @abs_builddir@ 5911 abs_srcdir = @abs_srcdir@ 5912 abs_top_builddir = @abs_top_builddir@ 5913 abs_top_srcdir = @abs_top_srcdir@ 5914+ac_ct_AR = @ac_ct_AR@ 5915 ac_ct_CC = @ac_ct_CC@ 5916 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ 5917 am__include = @am__include@ 5918diff --git a/gprof/configure b/gprof/configure 5919index c5a081c88aa..a1b06379df4 100755 5920--- a/gprof/configure 5921+++ b/gprof/configure 5922@@ -663,8 +663,11 @@ OTOOL 5923 LIPO 5924 NMEDIT 5925 DSYMUTIL 5926+MANIFEST_TOOL 5927 RANLIB 5928+ac_ct_AR 5929 AR 5930+DLLTOOL 5931 OBJDUMP 5932 LN_S 5933 NM 5934@@ -781,6 +784,7 @@ enable_static 5935 with_pic 5936 enable_fast_install 5937 with_gnu_ld 5938+with_libtool_sysroot 5939 enable_libtool_lock 5940 enable_plugins 5941 enable_largefile 5942@@ -1443,6 +1447,8 @@ Optional Packages: 5943 --with-pic try to use only PIC/non-PIC objects [default=use 5944 both] 5945 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 5946+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR 5947+ (or the compiler's sysroot if not specified). 5948 5949 Some influential environment variables: 5950 CC C compiler command 5951@@ -4510,8 +4516,8 @@ esac 5952 5953 5954 5955-macro_version='2.2.7a' 5956-macro_revision='1.3134' 5957+macro_version='2.4' 5958+macro_revision='1.3293' 5959 5960 5961 5962@@ -4551,7 +4557,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 5963 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 5964 $as_echo_n "checking how to print strings... " >&6; } 5965 # Test print first, because it will be a builtin if present. 5966-if test "X`print -r -- -n 2>/dev/null`" = X-n && \ 5967+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ 5968 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 5969 ECHO='print -r --' 5970 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 5971@@ -5244,8 +5250,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 5972 # Try some XSI features 5973 xsi_shell=no 5974 ( _lt_dummy="a/b/c" 5975- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ 5976- = c,a/b,, \ 5977+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ 5978+ = c,a/b,b/c, \ 5979 && eval 'test $(( 1 + 1 )) -eq 2 \ 5980 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 5981 && xsi_shell=yes 5982@@ -5294,6 +5300,80 @@ esac 5983 5984 5985 5986+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 5987+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } 5988+if ${lt_cv_to_host_file_cmd+:} false; then : 5989+ $as_echo_n "(cached) " >&6 5990+else 5991+ case $host in 5992+ *-*-mingw* ) 5993+ case $build in 5994+ *-*-mingw* ) # actually msys 5995+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 5996+ ;; 5997+ *-*-cygwin* ) 5998+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 5999+ ;; 6000+ * ) # otherwise, assume *nix 6001+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 6002+ ;; 6003+ esac 6004+ ;; 6005+ *-*-cygwin* ) 6006+ case $build in 6007+ *-*-mingw* ) # actually msys 6008+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin 6009+ ;; 6010+ *-*-cygwin* ) 6011+ lt_cv_to_host_file_cmd=func_convert_file_noop 6012+ ;; 6013+ * ) # otherwise, assume *nix 6014+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin 6015+ ;; 6016+ esac 6017+ ;; 6018+ * ) # unhandled hosts (and "normal" native builds) 6019+ lt_cv_to_host_file_cmd=func_convert_file_noop 6020+ ;; 6021+esac 6022+ 6023+fi 6024+ 6025+to_host_file_cmd=$lt_cv_to_host_file_cmd 6026+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 6027+$as_echo "$lt_cv_to_host_file_cmd" >&6; } 6028+ 6029+ 6030+ 6031+ 6032+ 6033+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 6034+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } 6035+if ${lt_cv_to_tool_file_cmd+:} false; then : 6036+ $as_echo_n "(cached) " >&6 6037+else 6038+ #assume ordinary cross tools, or native build. 6039+lt_cv_to_tool_file_cmd=func_convert_file_noop 6040+case $host in 6041+ *-*-mingw* ) 6042+ case $build in 6043+ *-*-mingw* ) # actually msys 6044+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 6045+ ;; 6046+ esac 6047+ ;; 6048+esac 6049+ 6050+fi 6051+ 6052+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 6053+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 6054+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } 6055+ 6056+ 6057+ 6058+ 6059+ 6060 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 6061 $as_echo_n "checking for $LD option to reload object files... " >&6; } 6062 if ${lt_cv_ld_reload_flag+:} false; then : 6063@@ -5310,6 +5390,11 @@ case $reload_flag in 6064 esac 6065 reload_cmds='$LD$reload_flag -o $output$reload_objs' 6066 case $host_os in 6067+ cygwin* | mingw* | pw32* | cegcc*) 6068+ if test "$GCC" != yes; then 6069+ reload_cmds=false 6070+ fi 6071+ ;; 6072 darwin*) 6073 if test "$GCC" = yes; then 6074 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 6075@@ -5478,7 +5563,8 @@ mingw* | pw32*) 6076 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 6077 lt_cv_file_magic_cmd='func_win32_libid' 6078 else 6079- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' 6080+ # Keep this pattern in sync with the one in func_win32_libid. 6081+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' 6082 lt_cv_file_magic_cmd='$OBJDUMP -f' 6083 fi 6084 ;; 6085@@ -5632,6 +5718,21 @@ esac 6086 fi 6087 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 6088 $as_echo "$lt_cv_deplibs_check_method" >&6; } 6089+ 6090+file_magic_glob= 6091+want_nocaseglob=no 6092+if test "$build" = "$host"; then 6093+ case $host_os in 6094+ mingw* | pw32*) 6095+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then 6096+ want_nocaseglob=yes 6097+ else 6098+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` 6099+ fi 6100+ ;; 6101+ esac 6102+fi 6103+ 6104 file_magic_cmd=$lt_cv_file_magic_cmd 6105 deplibs_check_method=$lt_cv_deplibs_check_method 6106 test -z "$deplibs_check_method" && deplibs_check_method=unknown 6107@@ -5647,6 +5748,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 6108 6109 6110 6111+ 6112+ 6113+ 6114+ 6115+ 6116+ 6117+ 6118+ 6119+ 6120+ 6121+if test -n "$ac_tool_prefix"; then 6122+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. 6123+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 6124+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6125+$as_echo_n "checking for $ac_word... " >&6; } 6126+if ${ac_cv_prog_DLLTOOL+:} false; then : 6127+ $as_echo_n "(cached) " >&6 6128+else 6129+ if test -n "$DLLTOOL"; then 6130+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. 6131+else 6132+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 6133+for as_dir in $PATH 6134+do 6135+ IFS=$as_save_IFS 6136+ test -z "$as_dir" && as_dir=. 6137+ for ac_exec_ext in '' $ac_executable_extensions; do 6138+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6139+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" 6140+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6141+ break 2 6142+ fi 6143+done 6144+ done 6145+IFS=$as_save_IFS 6146+ 6147+fi 6148+fi 6149+DLLTOOL=$ac_cv_prog_DLLTOOL 6150+if test -n "$DLLTOOL"; then 6151+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 6152+$as_echo "$DLLTOOL" >&6; } 6153+else 6154+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 6155+$as_echo "no" >&6; } 6156+fi 6157+ 6158+ 6159+fi 6160+if test -z "$ac_cv_prog_DLLTOOL"; then 6161+ ac_ct_DLLTOOL=$DLLTOOL 6162+ # Extract the first word of "dlltool", so it can be a program name with args. 6163+set dummy dlltool; ac_word=$2 6164+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6165+$as_echo_n "checking for $ac_word... " >&6; } 6166+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : 6167+ $as_echo_n "(cached) " >&6 6168+else 6169+ if test -n "$ac_ct_DLLTOOL"; then 6170+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. 6171+else 6172+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 6173+for as_dir in $PATH 6174+do 6175+ IFS=$as_save_IFS 6176+ test -z "$as_dir" && as_dir=. 6177+ for ac_exec_ext in '' $ac_executable_extensions; do 6178+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6179+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" 6180+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6181+ break 2 6182+ fi 6183+done 6184+ done 6185+IFS=$as_save_IFS 6186+ 6187+fi 6188+fi 6189+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL 6190+if test -n "$ac_ct_DLLTOOL"; then 6191+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 6192+$as_echo "$ac_ct_DLLTOOL" >&6; } 6193+else 6194+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 6195+$as_echo "no" >&6; } 6196+fi 6197+ 6198+ if test "x$ac_ct_DLLTOOL" = x; then 6199+ DLLTOOL="false" 6200+ else 6201+ case $cross_compiling:$ac_tool_warned in 6202+yes:) 6203+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 6204+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 6205+ac_tool_warned=yes ;; 6206+esac 6207+ DLLTOOL=$ac_ct_DLLTOOL 6208+ fi 6209+else 6210+ DLLTOOL="$ac_cv_prog_DLLTOOL" 6211+fi 6212+ 6213+test -z "$DLLTOOL" && DLLTOOL=dlltool 6214+ 6215+ 6216+ 6217+ 6218+ 6219+ 6220+ 6221+ 6222+ 6223+ 6224+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 6225+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } 6226+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : 6227+ $as_echo_n "(cached) " >&6 6228+else 6229+ lt_cv_sharedlib_from_linklib_cmd='unknown' 6230+ 6231+case $host_os in 6232+cygwin* | mingw* | pw32* | cegcc*) 6233+ # two different shell functions defined in ltmain.sh 6234+ # decide which to use based on capabilities of $DLLTOOL 6235+ case `$DLLTOOL --help 2>&1` in 6236+ *--identify-strict*) 6237+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib 6238+ ;; 6239+ *) 6240+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback 6241+ ;; 6242+ esac 6243+ ;; 6244+*) 6245+ # fallback: assume linklib IS sharedlib 6246+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" 6247+ ;; 6248+esac 6249+ 6250+fi 6251+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 6252+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } 6253+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd 6254+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO 6255+ 6256+ 6257+ 6258+ 6259+ 6260+ 6261+ 6262 plugin_option= 6263 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 6264 for plugin in $plugin_names; do 6265@@ -5661,8 +5913,10 @@ for plugin in $plugin_names; do 6266 done 6267 6268 if test -n "$ac_tool_prefix"; then 6269- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 6270-set dummy ${ac_tool_prefix}ar; ac_word=$2 6271+ for ac_prog in ar 6272+ do 6273+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 6274+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 6275 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6276 $as_echo_n "checking for $ac_word... " >&6; } 6277 if ${ac_cv_prog_AR+:} false; then : 6278@@ -5678,7 +5932,7 @@ do 6279 test -z "$as_dir" && as_dir=. 6280 for ac_exec_ext in '' $ac_executable_extensions; do 6281 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6282- ac_cv_prog_AR="${ac_tool_prefix}ar" 6283+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" 6284 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6285 break 2 6286 fi 6287@@ -5698,11 +5952,15 @@ $as_echo "no" >&6; } 6288 fi 6289 6290 6291+ test -n "$AR" && break 6292+ done 6293 fi 6294-if test -z "$ac_cv_prog_AR"; then 6295+if test -z "$AR"; then 6296 ac_ct_AR=$AR 6297- # Extract the first word of "ar", so it can be a program name with args. 6298-set dummy ar; ac_word=$2 6299+ for ac_prog in ar 6300+do 6301+ # Extract the first word of "$ac_prog", so it can be a program name with args. 6302+set dummy $ac_prog; ac_word=$2 6303 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6304 $as_echo_n "checking for $ac_word... " >&6; } 6305 if ${ac_cv_prog_ac_ct_AR+:} false; then : 6306@@ -5718,7 +5976,7 @@ do 6307 test -z "$as_dir" && as_dir=. 6308 for ac_exec_ext in '' $ac_executable_extensions; do 6309 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6310- ac_cv_prog_ac_ct_AR="ar" 6311+ ac_cv_prog_ac_ct_AR="$ac_prog" 6312 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6313 break 2 6314 fi 6315@@ -5737,6 +5995,10 @@ else 6316 $as_echo "no" >&6; } 6317 fi 6318 6319+ 6320+ test -n "$ac_ct_AR" && break 6321+done 6322+ 6323 if test "x$ac_ct_AR" = x; then 6324 AR="false" 6325 else 6326@@ -5748,25 +6010,19 @@ ac_tool_warned=yes ;; 6327 esac 6328 AR=$ac_ct_AR 6329 fi 6330-else 6331- AR="$ac_cv_prog_AR" 6332 fi 6333 6334-test -z "$AR" && AR=ar 6335-if test -n "$plugin_option"; then 6336- if $AR --help 2>&1 | grep -q "\--plugin"; then 6337- touch conftest.c 6338- $AR $plugin_option rc conftest.a conftest.c 6339- if test "$?" != 0; then 6340- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 6341+ touch conftest.c 6342+ $AR $plugin_option rc conftest.a conftest.c 6343+ if test "$?" != 0; then 6344+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 6345 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} 6346- else 6347- AR="$AR $plugin_option" 6348- fi 6349- rm -f conftest.* 6350+ else 6351+ AR="$AR $plugin_option" 6352 fi 6353-fi 6354-test -z "$AR_FLAGS" && AR_FLAGS=cru 6355+ rm -f conftest.* 6356+: ${AR=ar} 6357+: ${AR_FLAGS=cru} 6358 6359 6360 6361@@ -5778,6 +6034,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 6362 6363 6364 6365+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 6366+$as_echo_n "checking for archiver @FILE support... " >&6; } 6367+if ${lt_cv_ar_at_file+:} false; then : 6368+ $as_echo_n "(cached) " >&6 6369+else 6370+ lt_cv_ar_at_file=no 6371+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 6372+/* end confdefs.h. */ 6373+ 6374+int 6375+main () 6376+{ 6377+ 6378+ ; 6379+ return 0; 6380+} 6381+_ACEOF 6382+if ac_fn_c_try_compile "$LINENO"; then : 6383+ echo conftest.$ac_objext > conftest.lst 6384+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' 6385+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 6386+ (eval $lt_ar_try) 2>&5 6387+ ac_status=$? 6388+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 6389+ test $ac_status = 0; } 6390+ if test "$ac_status" -eq 0; then 6391+ # Ensure the archiver fails upon bogus file names. 6392+ rm -f conftest.$ac_objext libconftest.a 6393+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 6394+ (eval $lt_ar_try) 2>&5 6395+ ac_status=$? 6396+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 6397+ test $ac_status = 0; } 6398+ if test "$ac_status" -ne 0; then 6399+ lt_cv_ar_at_file=@ 6400+ fi 6401+ fi 6402+ rm -f conftest.* libconftest.a 6403+ 6404+fi 6405+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 6406+ 6407+fi 6408+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 6409+$as_echo "$lt_cv_ar_at_file" >&6; } 6410+ 6411+if test "x$lt_cv_ar_at_file" = xno; then 6412+ archiver_list_spec= 6413+else 6414+ archiver_list_spec=$lt_cv_ar_at_file 6415+fi 6416+ 6417+ 6418+ 6419+ 6420+ 6421+ 6422+ 6423 if test -n "$ac_tool_prefix"; then 6424 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 6425 set dummy ${ac_tool_prefix}strip; ac_word=$2 6426@@ -6117,8 +6431,8 @@ esac 6427 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 6428 6429 # Transform an extracted symbol line into symbol name and symbol address 6430-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 6431-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'" 6432+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 6433+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'" 6434 6435 # Handle CRLF in mingw tool chain 6436 opt_cr= 6437@@ -6154,6 +6468,7 @@ for ac_symprfx in "" "_"; do 6438 else 6439 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 6440 fi 6441+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" 6442 6443 # Check to see that the pipe works correctly. 6444 pipe_works=no 6445@@ -6195,6 +6510,18 @@ _LT_EOF 6446 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 6447 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 6448 cat <<_LT_EOF > conftest.$ac_ext 6449+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ 6450+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) 6451+/* DATA imports from DLLs on WIN32 con't be const, because runtime 6452+ relocations are performed -- see ld's documentation on pseudo-relocs. */ 6453+# define LT_DLSYM_CONST 6454+#elif defined(__osf__) 6455+/* This system does not cope well with relocations in const data. */ 6456+# define LT_DLSYM_CONST 6457+#else 6458+# define LT_DLSYM_CONST const 6459+#endif 6460+ 6461 #ifdef __cplusplus 6462 extern "C" { 6463 #endif 6464@@ -6206,7 +6533,7 @@ _LT_EOF 6465 cat <<_LT_EOF >> conftest.$ac_ext 6466 6467 /* The mapping between symbol names and symbols. */ 6468-const struct { 6469+LT_DLSYM_CONST struct { 6470 const char *name; 6471 void *address; 6472 } 6473@@ -6232,8 +6559,8 @@ static const void *lt_preloaded_setup() { 6474 _LT_EOF 6475 # Now try linking the two files. 6476 mv conftest.$ac_objext conftstm.$ac_objext 6477- lt_save_LIBS="$LIBS" 6478- lt_save_CFLAGS="$CFLAGS" 6479+ lt_globsym_save_LIBS=$LIBS 6480+ lt_globsym_save_CFLAGS=$CFLAGS 6481 LIBS="conftstm.$ac_objext" 6482 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 6483 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 6484@@ -6243,8 +6570,8 @@ _LT_EOF 6485 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 6486 pipe_works=yes 6487 fi 6488- LIBS="$lt_save_LIBS" 6489- CFLAGS="$lt_save_CFLAGS" 6490+ LIBS=$lt_globsym_save_LIBS 6491+ CFLAGS=$lt_globsym_save_CFLAGS 6492 else 6493 echo "cannot find nm_test_func in $nlist" >&5 6494 fi 6495@@ -6281,6 +6608,18 @@ else 6496 $as_echo "ok" >&6; } 6497 fi 6498 6499+# Response file support. 6500+if test "$lt_cv_nm_interface" = "MS dumpbin"; then 6501+ nm_file_list_spec='@' 6502+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then 6503+ nm_file_list_spec='@' 6504+fi 6505+ 6506+ 6507+ 6508+ 6509+ 6510+ 6511 6512 6513 6514@@ -6297,6 +6636,43 @@ fi 6515 6516 6517 6518+ 6519+ 6520+ 6521+ 6522+ 6523+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 6524+$as_echo_n "checking for sysroot... " >&6; } 6525+ 6526+# Check whether --with-libtool-sysroot was given. 6527+if test "${with_libtool_sysroot+set}" = set; then : 6528+ withval=$with_libtool_sysroot; 6529+else 6530+ with_libtool_sysroot=no 6531+fi 6532+ 6533+ 6534+lt_sysroot= 6535+case ${with_libtool_sysroot} in #( 6536+ yes) 6537+ if test "$GCC" = yes; then 6538+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` 6539+ fi 6540+ ;; #( 6541+ /*) 6542+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` 6543+ ;; #( 6544+ no|'') 6545+ ;; #( 6546+ *) 6547+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 6548+$as_echo "${with_libtool_sysroot}" >&6; } 6549+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 6550+ ;; 6551+esac 6552+ 6553+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 6554+$as_echo "${lt_sysroot:-no}" >&6; } 6555 6556 6557 6558@@ -6508,6 +6884,123 @@ esac 6559 6560 need_locks="$enable_libtool_lock" 6561 6562+if test -n "$ac_tool_prefix"; then 6563+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. 6564+set dummy ${ac_tool_prefix}mt; ac_word=$2 6565+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6566+$as_echo_n "checking for $ac_word... " >&6; } 6567+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : 6568+ $as_echo_n "(cached) " >&6 6569+else 6570+ if test -n "$MANIFEST_TOOL"; then 6571+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. 6572+else 6573+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 6574+for as_dir in $PATH 6575+do 6576+ IFS=$as_save_IFS 6577+ test -z "$as_dir" && as_dir=. 6578+ for ac_exec_ext in '' $ac_executable_extensions; do 6579+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6580+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" 6581+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6582+ break 2 6583+ fi 6584+done 6585+ done 6586+IFS=$as_save_IFS 6587+ 6588+fi 6589+fi 6590+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL 6591+if test -n "$MANIFEST_TOOL"; then 6592+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 6593+$as_echo "$MANIFEST_TOOL" >&6; } 6594+else 6595+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 6596+$as_echo "no" >&6; } 6597+fi 6598+ 6599+ 6600+fi 6601+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then 6602+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL 6603+ # Extract the first word of "mt", so it can be a program name with args. 6604+set dummy mt; ac_word=$2 6605+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6606+$as_echo_n "checking for $ac_word... " >&6; } 6607+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : 6608+ $as_echo_n "(cached) " >&6 6609+else 6610+ if test -n "$ac_ct_MANIFEST_TOOL"; then 6611+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. 6612+else 6613+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 6614+for as_dir in $PATH 6615+do 6616+ IFS=$as_save_IFS 6617+ test -z "$as_dir" && as_dir=. 6618+ for ac_exec_ext in '' $ac_executable_extensions; do 6619+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6620+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" 6621+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6622+ break 2 6623+ fi 6624+done 6625+ done 6626+IFS=$as_save_IFS 6627+ 6628+fi 6629+fi 6630+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL 6631+if test -n "$ac_ct_MANIFEST_TOOL"; then 6632+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 6633+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } 6634+else 6635+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 6636+$as_echo "no" >&6; } 6637+fi 6638+ 6639+ if test "x$ac_ct_MANIFEST_TOOL" = x; then 6640+ MANIFEST_TOOL=":" 6641+ else 6642+ case $cross_compiling:$ac_tool_warned in 6643+yes:) 6644+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 6645+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 6646+ac_tool_warned=yes ;; 6647+esac 6648+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL 6649+ fi 6650+else 6651+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" 6652+fi 6653+ 6654+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt 6655+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 6656+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } 6657+if ${lt_cv_path_mainfest_tool+:} false; then : 6658+ $as_echo_n "(cached) " >&6 6659+else 6660+ lt_cv_path_mainfest_tool=no 6661+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 6662+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out 6663+ cat conftest.err >&5 6664+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then 6665+ lt_cv_path_mainfest_tool=yes 6666+ fi 6667+ rm -f conftest* 6668+fi 6669+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 6670+$as_echo "$lt_cv_path_mainfest_tool" >&6; } 6671+if test "x$lt_cv_path_mainfest_tool" != xyes; then 6672+ MANIFEST_TOOL=: 6673+fi 6674+ 6675+ 6676+ 6677+ 6678+ 6679 6680 case $host_os in 6681 rhapsody* | darwin*) 6682@@ -7071,6 +7564,8 @@ _LT_EOF 6683 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 6684 echo "$AR cru libconftest.a conftest.o" >&5 6685 $AR cru libconftest.a conftest.o 2>&5 6686+ echo "$RANLIB libconftest.a" >&5 6687+ $RANLIB libconftest.a 2>&5 6688 cat > conftest.c << _LT_EOF 6689 int main() { return 0;} 6690 _LT_EOF 6691@@ -7653,8 +8148,6 @@ fi 6692 lt_prog_compiler_pic= 6693 lt_prog_compiler_static= 6694 6695-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 6696-$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 6697 6698 if test "$GCC" = yes; then 6699 lt_prog_compiler_wl='-Wl,' 6700@@ -7820,6 +8313,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 6701 lt_prog_compiler_pic='--shared' 6702 lt_prog_compiler_static='--static' 6703 ;; 6704+ nagfor*) 6705+ # NAG Fortran compiler 6706+ lt_prog_compiler_wl='-Wl,-Wl,,' 6707+ lt_prog_compiler_pic='-PIC' 6708+ lt_prog_compiler_static='-Bstatic' 6709+ ;; 6710 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 6711 # Portland Group compilers (*not* the Pentium gcc compiler, 6712 # which looks to be a dead project) 6713@@ -7882,7 +8381,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 6714 lt_prog_compiler_pic='-KPIC' 6715 lt_prog_compiler_static='-Bstatic' 6716 case $cc_basename in 6717- f77* | f90* | f95*) 6718+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) 6719 lt_prog_compiler_wl='-Qoption ld ';; 6720 *) 6721 lt_prog_compiler_wl='-Wl,';; 6722@@ -7939,13 +8438,17 @@ case $host_os in 6723 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 6724 ;; 6725 esac 6726-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 6727-$as_echo "$lt_prog_compiler_pic" >&6; } 6728- 6729- 6730- 6731- 6732 6733+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 6734+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 6735+if ${lt_cv_prog_compiler_pic+:} false; then : 6736+ $as_echo_n "(cached) " >&6 6737+else 6738+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic 6739+fi 6740+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 6741+$as_echo "$lt_cv_prog_compiler_pic" >&6; } 6742+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic 6743 6744 # 6745 # Check to make sure the PIC flag actually works. 6746@@ -8006,6 +8509,11 @@ fi 6747 6748 6749 6750+ 6751+ 6752+ 6753+ 6754+ 6755 # 6756 # Check to make sure the static flag actually works. 6757 # 6758@@ -8356,7 +8864,8 @@ _LT_EOF 6759 allow_undefined_flag=unsupported 6760 always_export_symbols=no 6761 enable_shared_with_static_runtimes=yes 6762- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 6763+ 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' 6764+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' 6765 6766 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 6767 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 6768@@ -8455,12 +8964,12 @@ _LT_EOF 6769 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 6770 hardcode_libdir_flag_spec= 6771 hardcode_libdir_flag_spec_ld='-rpath $libdir' 6772- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' 6773+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' 6774 if test "x$supports_anon_versioning" = xyes; then 6775 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ 6776 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ 6777 echo "local: *; };" >> $output_objdir/$libname.ver~ 6778- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 6779+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 6780 fi 6781 ;; 6782 esac 6783@@ -8474,8 +8983,8 @@ _LT_EOF 6784 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 6785 wlarc= 6786 else 6787- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 6788- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 6789+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 6790+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 6791 fi 6792 ;; 6793 6794@@ -8493,8 +9002,8 @@ _LT_EOF 6795 6796 _LT_EOF 6797 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 6798- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 6799- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 6800+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 6801+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 6802 else 6803 ld_shlibs=no 6804 fi 6805@@ -8540,8 +9049,8 @@ _LT_EOF 6806 6807 *) 6808 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 6809- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 6810- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 6811+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 6812+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 6813 else 6814 ld_shlibs=no 6815 fi 6816@@ -8671,7 +9180,13 @@ _LT_EOF 6817 allow_undefined_flag='-berok' 6818 # Determine the default libpath from the value encoded in an 6819 # empty executable. 6820- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 6821+ if test "${lt_cv_aix_libpath+set}" = set; then 6822+ aix_libpath=$lt_cv_aix_libpath 6823+else 6824+ if ${lt_cv_aix_libpath_+:} false; then : 6825+ $as_echo_n "(cached) " >&6 6826+else 6827+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 6828 /* end confdefs.h. */ 6829 6830 int 6831@@ -8684,22 +9199,29 @@ main () 6832 _ACEOF 6833 if ac_fn_c_try_link "$LINENO"; then : 6834 6835-lt_aix_libpath_sed=' 6836- /Import File Strings/,/^$/ { 6837- /^0/ { 6838- s/^0 *\(.*\)$/\1/ 6839- p 6840- } 6841- }' 6842-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 6843-# Check for a 64-bit object if we didn't find anything. 6844-if test -z "$aix_libpath"; then 6845- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 6846-fi 6847+ lt_aix_libpath_sed=' 6848+ /Import File Strings/,/^$/ { 6849+ /^0/ { 6850+ s/^0 *\([^ ]*\) *$/\1/ 6851+ p 6852+ } 6853+ }' 6854+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 6855+ # Check for a 64-bit object if we didn't find anything. 6856+ if test -z "$lt_cv_aix_libpath_"; then 6857+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 6858+ fi 6859 fi 6860 rm -f core conftest.err conftest.$ac_objext \ 6861 conftest$ac_exeext conftest.$ac_ext 6862-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6863+ if test -z "$lt_cv_aix_libpath_"; then 6864+ lt_cv_aix_libpath_="/usr/lib:/lib" 6865+ fi 6866+ 6867+fi 6868+ 6869+ aix_libpath=$lt_cv_aix_libpath_ 6870+fi 6871 6872 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 6873 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" 6874@@ -8711,7 +9233,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6875 else 6876 # Determine the default libpath from the value encoded in an 6877 # empty executable. 6878- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 6879+ if test "${lt_cv_aix_libpath+set}" = set; then 6880+ aix_libpath=$lt_cv_aix_libpath 6881+else 6882+ if ${lt_cv_aix_libpath_+:} false; then : 6883+ $as_echo_n "(cached) " >&6 6884+else 6885+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 6886 /* end confdefs.h. */ 6887 6888 int 6889@@ -8724,22 +9252,29 @@ main () 6890 _ACEOF 6891 if ac_fn_c_try_link "$LINENO"; then : 6892 6893-lt_aix_libpath_sed=' 6894- /Import File Strings/,/^$/ { 6895- /^0/ { 6896- s/^0 *\(.*\)$/\1/ 6897- p 6898- } 6899- }' 6900-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 6901-# Check for a 64-bit object if we didn't find anything. 6902-if test -z "$aix_libpath"; then 6903- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 6904-fi 6905+ lt_aix_libpath_sed=' 6906+ /Import File Strings/,/^$/ { 6907+ /^0/ { 6908+ s/^0 *\([^ ]*\) *$/\1/ 6909+ p 6910+ } 6911+ }' 6912+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 6913+ # Check for a 64-bit object if we didn't find anything. 6914+ if test -z "$lt_cv_aix_libpath_"; then 6915+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 6916+ fi 6917 fi 6918 rm -f core conftest.err conftest.$ac_objext \ 6919 conftest$ac_exeext conftest.$ac_ext 6920-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6921+ if test -z "$lt_cv_aix_libpath_"; then 6922+ lt_cv_aix_libpath_="/usr/lib:/lib" 6923+ fi 6924+ 6925+fi 6926+ 6927+ aix_libpath=$lt_cv_aix_libpath_ 6928+fi 6929 6930 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 6931 # Warning - without using the other run time loading flags, 6932@@ -8784,20 +9319,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6933 # Microsoft Visual C++. 6934 # hardcode_libdir_flag_spec is actually meaningless, as there is 6935 # no search path for DLLs. 6936- hardcode_libdir_flag_spec=' ' 6937- allow_undefined_flag=unsupported 6938- # Tell ltmain to make .lib files, not .a files. 6939- libext=lib 6940- # Tell ltmain to make .dll files, not .so files. 6941- shrext_cmds=".dll" 6942- # FIXME: Setting linknames here is a bad hack. 6943- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 6944- # The linker will automatically build a .lib file if we build a DLL. 6945- old_archive_from_new_cmds='true' 6946- # FIXME: Should let the user specify the lib program. 6947- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 6948- fix_srcfile_path='`cygpath -w "$srcfile"`' 6949- enable_shared_with_static_runtimes=yes 6950+ case $cc_basename in 6951+ cl*) 6952+ # Native MSVC 6953+ hardcode_libdir_flag_spec=' ' 6954+ allow_undefined_flag=unsupported 6955+ always_export_symbols=yes 6956+ file_list_spec='@' 6957+ # Tell ltmain to make .lib files, not .a files. 6958+ libext=lib 6959+ # Tell ltmain to make .dll files, not .so files. 6960+ shrext_cmds=".dll" 6961+ # FIXME: Setting linknames here is a bad hack. 6962+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' 6963+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 6964+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; 6965+ else 6966+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; 6967+ fi~ 6968+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ 6969+ linknames=' 6970+ # The linker will not automatically build a static lib if we build a DLL. 6971+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' 6972+ enable_shared_with_static_runtimes=yes 6973+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 6974+ # Don't use ranlib 6975+ old_postinstall_cmds='chmod 644 $oldlib' 6976+ postlink_cmds='lt_outputfile="@OUTPUT@"~ 6977+ lt_tool_outputfile="@TOOL_OUTPUT@"~ 6978+ case $lt_outputfile in 6979+ *.exe|*.EXE) ;; 6980+ *) 6981+ lt_outputfile="$lt_outputfile.exe" 6982+ lt_tool_outputfile="$lt_tool_outputfile.exe" 6983+ ;; 6984+ esac~ 6985+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then 6986+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; 6987+ $RM "$lt_outputfile.manifest"; 6988+ fi' 6989+ ;; 6990+ *) 6991+ # Assume MSVC wrapper 6992+ hardcode_libdir_flag_spec=' ' 6993+ allow_undefined_flag=unsupported 6994+ # Tell ltmain to make .lib files, not .a files. 6995+ libext=lib 6996+ # Tell ltmain to make .dll files, not .so files. 6997+ shrext_cmds=".dll" 6998+ # FIXME: Setting linknames here is a bad hack. 6999+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 7000+ # The linker will automatically build a .lib file if we build a DLL. 7001+ old_archive_from_new_cmds='true' 7002+ # FIXME: Should let the user specify the lib program. 7003+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 7004+ enable_shared_with_static_runtimes=yes 7005+ ;; 7006+ esac 7007 ;; 7008 7009 darwin* | rhapsody*) 7010@@ -8858,7 +9436,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 7011 7012 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 7013 freebsd* | dragonfly*) 7014- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' 7015+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' 7016 hardcode_libdir_flag_spec='-R$libdir' 7017 hardcode_direct=yes 7018 hardcode_shlibpath_var=no 7019@@ -8866,7 +9444,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 7020 7021 hpux9*) 7022 if test "$GCC" = yes; then 7023- 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' 7024+ 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' 7025 else 7026 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' 7027 fi 7028@@ -8882,7 +9460,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 7029 7030 hpux10*) 7031 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 7032- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 7033+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 7034 else 7035 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 7036 fi 7037@@ -8906,10 +9484,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 7038 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 7039 ;; 7040 ia64*) 7041- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 7042+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 7043 ;; 7044 *) 7045- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 7046+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 7047 ;; 7048 esac 7049 else 7050@@ -8988,23 +9566,36 @@ fi 7051 7052 irix5* | irix6* | nonstopux*) 7053 if test "$GCC" = yes; then 7054- 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' 7055+ 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' 7056 # Try to use the -exported_symbol ld option, if it does not 7057 # work, assume that -exports_file does not work either and 7058 # implicitly export all symbols. 7059- save_LDFLAGS="$LDFLAGS" 7060- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 7061- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 7062+ # This should be the same for all languages, so no per-tag cache variable. 7063+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 7064+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } 7065+if ${lt_cv_irix_exported_symbol+:} false; then : 7066+ $as_echo_n "(cached) " >&6 7067+else 7068+ save_LDFLAGS="$LDFLAGS" 7069+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 7070+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 7071 /* end confdefs.h. */ 7072-int foo(void) {} 7073+int foo (void) { return 0; } 7074 _ACEOF 7075 if ac_fn_c_try_link "$LINENO"; then : 7076- 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' 7077- 7078+ lt_cv_irix_exported_symbol=yes 7079+else 7080+ lt_cv_irix_exported_symbol=no 7081 fi 7082 rm -f core conftest.err conftest.$ac_objext \ 7083 conftest$ac_exeext conftest.$ac_ext 7084- LDFLAGS="$save_LDFLAGS" 7085+ LDFLAGS="$save_LDFLAGS" 7086+fi 7087+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 7088+$as_echo "$lt_cv_irix_exported_symbol" >&6; } 7089+ if test "$lt_cv_irix_exported_symbol" = yes; then 7090+ 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' 7091+ fi 7092 else 7093 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' 7094 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' 7095@@ -9089,7 +9680,7 @@ rm -f core conftest.err conftest.$ac_objext \ 7096 osf4* | osf5*) # as osf3* with the addition of -msym flag 7097 if test "$GCC" = yes; then 7098 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 7099- 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' 7100+ 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' 7101 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 7102 else 7103 allow_undefined_flag=' -expect_unresolved \*' 7104@@ -9108,9 +9699,9 @@ rm -f core conftest.err conftest.$ac_objext \ 7105 no_undefined_flag=' -z defs' 7106 if test "$GCC" = yes; then 7107 wlarc='${wl}' 7108- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 7109+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 7110 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ 7111- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' 7112+ $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' 7113 else 7114 case `$CC -V 2>&1` in 7115 *"Compilers 5.0"*) 7116@@ -9686,8 +10277,9 @@ cygwin* | mingw* | pw32* | cegcc*) 7117 need_version=no 7118 need_lib_prefix=no 7119 7120- case $GCC,$host_os in 7121- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) 7122+ case $GCC,$cc_basename in 7123+ yes,*) 7124+ # gcc 7125 library_names_spec='$libname.dll.a' 7126 # DLL is installed to $(libdir)/../bin by postinstall_cmds 7127 postinstall_cmds='base_file=`basename \${file}`~ 7128@@ -9720,13 +10312,71 @@ cygwin* | mingw* | pw32* | cegcc*) 7129 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 7130 ;; 7131 esac 7132+ dynamic_linker='Win32 ld.exe' 7133+ ;; 7134+ 7135+ *,cl*) 7136+ # Native MSVC 7137+ libname_spec='$name' 7138+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 7139+ library_names_spec='${libname}.dll.lib' 7140+ 7141+ case $build_os in 7142+ mingw*) 7143+ sys_lib_search_path_spec= 7144+ lt_save_ifs=$IFS 7145+ IFS=';' 7146+ for lt_path in $LIB 7147+ do 7148+ IFS=$lt_save_ifs 7149+ # Let DOS variable expansion print the short 8.3 style file name. 7150+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` 7151+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" 7152+ done 7153+ IFS=$lt_save_ifs 7154+ # Convert to MSYS style. 7155+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` 7156+ ;; 7157+ cygwin*) 7158+ # Convert to unix form, then to dos form, then back to unix form 7159+ # but this time dos style (no spaces!) so that the unix form looks 7160+ # like /cygdrive/c/PROGRA~1:/cygdr... 7161+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` 7162+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` 7163+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 7164+ ;; 7165+ *) 7166+ sys_lib_search_path_spec="$LIB" 7167+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then 7168+ # It is most probably a Windows format PATH. 7169+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` 7170+ else 7171+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 7172+ fi 7173+ # FIXME: find the short name or the path components, as spaces are 7174+ # common. (e.g. "Program Files" -> "PROGRA~1") 7175+ ;; 7176+ esac 7177+ 7178+ # DLL is installed to $(libdir)/../bin by postinstall_cmds 7179+ postinstall_cmds='base_file=`basename \${file}`~ 7180+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ 7181+ dldir=$destdir/`dirname \$dlpath`~ 7182+ test -d \$dldir || mkdir -p \$dldir~ 7183+ $install_prog $dir/$dlname \$dldir/$dlname' 7184+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ 7185+ dlpath=$dir/\$dldll~ 7186+ $RM \$dlpath' 7187+ shlibpath_overrides_runpath=yes 7188+ dynamic_linker='Win32 link.exe' 7189 ;; 7190 7191 *) 7192+ # Assume MSVC wrapper 7193 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' 7194+ dynamic_linker='Win32 ld.exe' 7195 ;; 7196 esac 7197- dynamic_linker='Win32 ld.exe' 7198 # FIXME: first we should search . and the directory the executable is in 7199 shlibpath_var=PATH 7200 ;; 7201@@ -10604,7 +11254,7 @@ else 7202 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 7203 lt_status=$lt_dlunknown 7204 cat > conftest.$ac_ext <<_LT_EOF 7205-#line 10607 "configure" 7206+#line $LINENO "configure" 7207 #include "confdefs.h" 7208 7209 #if HAVE_DLFCN_H 7210@@ -10648,10 +11298,10 @@ else 7211 /* When -fvisbility=hidden is used, assume the code has been annotated 7212 correspondingly for the symbols needed. */ 7213 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 7214-void fnord () __attribute__((visibility("default"))); 7215+int fnord () __attribute__((visibility("default"))); 7216 #endif 7217 7218-void fnord () { int i=42; } 7219+int fnord () { return 42; } 7220 int main () 7221 { 7222 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 7223@@ -10710,7 +11360,7 @@ else 7224 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 7225 lt_status=$lt_dlunknown 7226 cat > conftest.$ac_ext <<_LT_EOF 7227-#line 10713 "configure" 7228+#line $LINENO "configure" 7229 #include "confdefs.h" 7230 7231 #if HAVE_DLFCN_H 7232@@ -10754,10 +11404,10 @@ else 7233 /* When -fvisbility=hidden is used, assume the code has been annotated 7234 correspondingly for the symbols needed. */ 7235 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 7236-void fnord () __attribute__((visibility("default"))); 7237+int fnord () __attribute__((visibility("default"))); 7238 #endif 7239 7240-void fnord () { int i=42; } 7241+int fnord () { return 42; } 7242 int main () 7243 { 7244 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 7245@@ -12795,13 +13445,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 7246 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 7247 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 7248 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 7249+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' 7250+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' 7251 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' 7252 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' 7253 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' 7254 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' 7255 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' 7256+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' 7257+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' 7258+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' 7259+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' 7260 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' 7261 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' 7262+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' 7263 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 7264 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 7265 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 7266@@ -12816,14 +13473,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 7267 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 7268 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 7269 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"`' 7270+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' 7271+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' 7272 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' 7273 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' 7274 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' 7275-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 7276 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' 7277+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 7278 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' 7279 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' 7280 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' 7281+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' 7282 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 7283 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 7284 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 7285@@ -12856,12 +13516,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 7286 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 7287 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 7288 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 7289-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' 7290 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' 7291 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' 7292 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' 7293 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' 7294 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' 7295+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' 7296 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 7297 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 7298 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 7299@@ -12916,8 +13576,13 @@ reload_flag \ 7300 OBJDUMP \ 7301 deplibs_check_method \ 7302 file_magic_cmd \ 7303+file_magic_glob \ 7304+want_nocaseglob \ 7305+DLLTOOL \ 7306+sharedlib_from_linklib_cmd \ 7307 AR \ 7308 AR_FLAGS \ 7309+archiver_list_spec \ 7310 STRIP \ 7311 RANLIB \ 7312 CC \ 7313@@ -12927,12 +13592,14 @@ lt_cv_sys_global_symbol_pipe \ 7314 lt_cv_sys_global_symbol_to_cdecl \ 7315 lt_cv_sys_global_symbol_to_c_name_address \ 7316 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 7317+nm_file_list_spec \ 7318 lt_prog_compiler_no_builtin_flag \ 7319-lt_prog_compiler_wl \ 7320 lt_prog_compiler_pic \ 7321+lt_prog_compiler_wl \ 7322 lt_prog_compiler_static \ 7323 lt_cv_prog_compiler_c_o \ 7324 need_locks \ 7325+MANIFEST_TOOL \ 7326 DSYMUTIL \ 7327 NMEDIT \ 7328 LIPO \ 7329@@ -12948,7 +13615,6 @@ no_undefined_flag \ 7330 hardcode_libdir_flag_spec \ 7331 hardcode_libdir_flag_spec_ld \ 7332 hardcode_libdir_separator \ 7333-fix_srcfile_path \ 7334 exclude_expsyms \ 7335 include_expsyms \ 7336 file_list_spec \ 7337@@ -12984,6 +13650,7 @@ module_cmds \ 7338 module_expsym_cmds \ 7339 export_symbols_cmds \ 7340 prelink_cmds \ 7341+postlink_cmds \ 7342 postinstall_cmds \ 7343 postuninstall_cmds \ 7344 finish_cmds \ 7345@@ -13749,7 +14416,8 @@ $as_echo X"$file" | 7346 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 7347 # 7348 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 7349-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. 7350+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, 7351+# Inc. 7352 # Written by Gordon Matzigkeit, 1996 7353 # 7354 # This file is part of GNU Libtool. 7355@@ -13852,19 +14520,42 @@ SP2NL=$lt_lt_SP2NL 7356 # turn newlines into spaces. 7357 NL2SP=$lt_lt_NL2SP 7358 7359+# convert \$build file names to \$host format. 7360+to_host_file_cmd=$lt_cv_to_host_file_cmd 7361+ 7362+# convert \$build files to toolchain format. 7363+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 7364+ 7365 # An object symbol dumper. 7366 OBJDUMP=$lt_OBJDUMP 7367 7368 # Method to check whether dependent libraries are shared objects. 7369 deplibs_check_method=$lt_deplibs_check_method 7370 7371-# Command to use when deplibs_check_method == "file_magic". 7372+# Command to use when deplibs_check_method = "file_magic". 7373 file_magic_cmd=$lt_file_magic_cmd 7374 7375+# How to find potential files when deplibs_check_method = "file_magic". 7376+file_magic_glob=$lt_file_magic_glob 7377+ 7378+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". 7379+want_nocaseglob=$lt_want_nocaseglob 7380+ 7381+# DLL creation program. 7382+DLLTOOL=$lt_DLLTOOL 7383+ 7384+# Command to associate shared and link libraries. 7385+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd 7386+ 7387 # The archiver. 7388 AR=$lt_AR 7389+ 7390+# Flags to create an archive. 7391 AR_FLAGS=$lt_AR_FLAGS 7392 7393+# How to feed a file listing to the archiver. 7394+archiver_list_spec=$lt_archiver_list_spec 7395+ 7396 # A symbol stripping program. 7397 STRIP=$lt_STRIP 7398 7399@@ -13894,6 +14585,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 7400 # Transform the output of nm in a C name address pair when lib prefix is needed. 7401 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 7402 7403+# Specify filename containing input files for \$NM. 7404+nm_file_list_spec=$lt_nm_file_list_spec 7405+ 7406+# The root where to search for dependent libraries,and in which our libraries should be installed. 7407+lt_sysroot=$lt_sysroot 7408+ 7409 # The name of the directory that contains temporary libtool files. 7410 objdir=$objdir 7411 7412@@ -13903,6 +14600,9 @@ MAGIC_CMD=$MAGIC_CMD 7413 # Must we lock files when doing compilation? 7414 need_locks=$lt_need_locks 7415 7416+# Manifest tool. 7417+MANIFEST_TOOL=$lt_MANIFEST_TOOL 7418+ 7419 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 7420 DSYMUTIL=$lt_DSYMUTIL 7421 7422@@ -14017,12 +14717,12 @@ with_gcc=$GCC 7423 # Compiler flag to turn off builtin functions. 7424 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 7425 7426-# How to pass a linker flag through the compiler. 7427-wl=$lt_lt_prog_compiler_wl 7428- 7429 # Additional compiler flags for building library objects. 7430 pic_flag=$lt_lt_prog_compiler_pic 7431 7432+# How to pass a linker flag through the compiler. 7433+wl=$lt_lt_prog_compiler_wl 7434+ 7435 # Compiler flag to prevent dynamic linking. 7436 link_static_flag=$lt_lt_prog_compiler_static 7437 7438@@ -14109,9 +14809,6 @@ inherit_rpath=$inherit_rpath 7439 # Whether libtool must link a program against all its dependency libraries. 7440 link_all_deplibs=$link_all_deplibs 7441 7442-# Fix the shell variable \$srcfile for the compiler. 7443-fix_srcfile_path=$lt_fix_srcfile_path 7444- 7445 # Set to "yes" if exported symbols are required. 7446 always_export_symbols=$always_export_symbols 7447 7448@@ -14127,6 +14824,9 @@ include_expsyms=$lt_include_expsyms 7449 # Commands necessary for linking programs (against libraries) with templates. 7450 prelink_cmds=$lt_prelink_cmds 7451 7452+# Commands necessary for finishing linking programs. 7453+postlink_cmds=$lt_postlink_cmds 7454+ 7455 # Specify filename containing input files. 7456 file_list_spec=$lt_file_list_spec 7457 7458@@ -14159,210 +14859,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 7459 # if finds mixed CR/LF and LF-only lines. Since sed operates in 7460 # text mode, it properly converts lines to CR/LF. This bash problem 7461 # is reportedly fixed, but why not run on old versions too? 7462- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ 7463- || (rm -f "$cfgfile"; exit 1) 7464- 7465- case $xsi_shell in 7466- yes) 7467- cat << \_LT_EOF >> "$cfgfile" 7468- 7469-# func_dirname file append nondir_replacement 7470-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 7471-# otherwise set result to NONDIR_REPLACEMENT. 7472-func_dirname () 7473-{ 7474- case ${1} in 7475- */*) func_dirname_result="${1%/*}${2}" ;; 7476- * ) func_dirname_result="${3}" ;; 7477- esac 7478-} 7479- 7480-# func_basename file 7481-func_basename () 7482-{ 7483- func_basename_result="${1##*/}" 7484-} 7485- 7486-# func_dirname_and_basename file append nondir_replacement 7487-# perform func_basename and func_dirname in a single function 7488-# call: 7489-# dirname: Compute the dirname of FILE. If nonempty, 7490-# add APPEND to the result, otherwise set result 7491-# to NONDIR_REPLACEMENT. 7492-# value returned in "$func_dirname_result" 7493-# basename: Compute filename of FILE. 7494-# value retuned in "$func_basename_result" 7495-# Implementation must be kept synchronized with func_dirname 7496-# and func_basename. For efficiency, we do not delegate to 7497-# those functions but instead duplicate the functionality here. 7498-func_dirname_and_basename () 7499-{ 7500- case ${1} in 7501- */*) func_dirname_result="${1%/*}${2}" ;; 7502- * ) func_dirname_result="${3}" ;; 7503- esac 7504- func_basename_result="${1##*/}" 7505-} 7506- 7507-# func_stripname prefix suffix name 7508-# strip PREFIX and SUFFIX off of NAME. 7509-# PREFIX and SUFFIX must not contain globbing or regex special 7510-# characters, hashes, percent signs, but SUFFIX may contain a leading 7511-# dot (in which case that matches only a dot). 7512-func_stripname () 7513-{ 7514- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are 7515- # positional parameters, so assign one to ordinary parameter first. 7516- func_stripname_result=${3} 7517- func_stripname_result=${func_stripname_result#"${1}"} 7518- func_stripname_result=${func_stripname_result%"${2}"} 7519-} 7520- 7521-# func_opt_split 7522-func_opt_split () 7523-{ 7524- func_opt_split_opt=${1%%=*} 7525- func_opt_split_arg=${1#*=} 7526-} 7527- 7528-# func_lo2o object 7529-func_lo2o () 7530-{ 7531- case ${1} in 7532- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; 7533- *) func_lo2o_result=${1} ;; 7534- esac 7535-} 7536- 7537-# func_xform libobj-or-source 7538-func_xform () 7539-{ 7540- func_xform_result=${1%.*}.lo 7541-} 7542- 7543-# func_arith arithmetic-term... 7544-func_arith () 7545-{ 7546- func_arith_result=$(( $* )) 7547-} 7548- 7549-# func_len string 7550-# STRING may not start with a hyphen. 7551-func_len () 7552-{ 7553- func_len_result=${#1} 7554-} 7555- 7556-_LT_EOF 7557- ;; 7558- *) # Bourne compatible functions. 7559- cat << \_LT_EOF >> "$cfgfile" 7560- 7561-# func_dirname file append nondir_replacement 7562-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 7563-# otherwise set result to NONDIR_REPLACEMENT. 7564-func_dirname () 7565-{ 7566- # Extract subdirectory from the argument. 7567- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` 7568- if test "X$func_dirname_result" = "X${1}"; then 7569- func_dirname_result="${3}" 7570- else 7571- func_dirname_result="$func_dirname_result${2}" 7572- fi 7573-} 7574- 7575-# func_basename file 7576-func_basename () 7577-{ 7578- func_basename_result=`$ECHO "${1}" | $SED "$basename"` 7579-} 7580- 7581- 7582-# func_stripname prefix suffix name 7583-# strip PREFIX and SUFFIX off of NAME. 7584-# PREFIX and SUFFIX must not contain globbing or regex special 7585-# characters, hashes, percent signs, but SUFFIX may contain a leading 7586-# dot (in which case that matches only a dot). 7587-# func_strip_suffix prefix name 7588-func_stripname () 7589-{ 7590- case ${2} in 7591- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; 7592- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; 7593- esac 7594-} 7595- 7596-# sed scripts: 7597-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' 7598-my_sed_long_arg='1s/^-[^=]*=//' 7599- 7600-# func_opt_split 7601-func_opt_split () 7602-{ 7603- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` 7604- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` 7605-} 7606- 7607-# func_lo2o object 7608-func_lo2o () 7609-{ 7610- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` 7611-} 7612- 7613-# func_xform libobj-or-source 7614-func_xform () 7615-{ 7616- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` 7617-} 7618- 7619-# func_arith arithmetic-term... 7620-func_arith () 7621-{ 7622- func_arith_result=`expr "$@"` 7623-} 7624- 7625-# func_len string 7626-# STRING may not start with a hyphen. 7627-func_len () 7628-{ 7629- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` 7630-} 7631- 7632-_LT_EOF 7633-esac 7634- 7635-case $lt_shell_append in 7636- yes) 7637- cat << \_LT_EOF >> "$cfgfile" 7638- 7639-# func_append var value 7640-# Append VALUE to the end of shell variable VAR. 7641-func_append () 7642-{ 7643- eval "$1+=\$2" 7644-} 7645-_LT_EOF 7646- ;; 7647- *) 7648- cat << \_LT_EOF >> "$cfgfile" 7649- 7650-# func_append var value 7651-# Append VALUE to the end of shell variable VAR. 7652-func_append () 7653-{ 7654- eval "$1=\$$1\$2" 7655-} 7656- 7657-_LT_EOF 7658- ;; 7659- esac 7660- 7661- 7662- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ 7663- || (rm -f "$cfgfile"; exit 1) 7664- 7665- mv -f "$cfgfile" "$ofile" || 7666+ sed '$q' "$ltmain" >> "$cfgfile" \ 7667+ || (rm -f "$cfgfile"; exit 1) 7668+ 7669+ if test x"$xsi_shell" = xyes; then 7670+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ 7671+func_dirname ()\ 7672+{\ 7673+\ case ${1} in\ 7674+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 7675+\ * ) func_dirname_result="${3}" ;;\ 7676+\ esac\ 7677+} # Extended-shell func_dirname implementation' "$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+ 7682+ 7683+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ 7684+func_basename ()\ 7685+{\ 7686+\ func_basename_result="${1##*/}"\ 7687+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ 7688+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 7689+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 7690+test 0 -eq $? || _lt_function_replace_fail=: 7691+ 7692+ 7693+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ 7694+func_dirname_and_basename ()\ 7695+{\ 7696+\ case ${1} in\ 7697+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 7698+\ * ) func_dirname_result="${3}" ;;\ 7699+\ esac\ 7700+\ func_basename_result="${1##*/}"\ 7701+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ 7702+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 7703+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 7704+test 0 -eq $? || _lt_function_replace_fail=: 7705+ 7706+ 7707+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ 7708+func_stripname ()\ 7709+{\ 7710+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ 7711+\ # positional parameters, so assign one to ordinary parameter first.\ 7712+\ func_stripname_result=${3}\ 7713+\ func_stripname_result=${func_stripname_result#"${1}"}\ 7714+\ func_stripname_result=${func_stripname_result%"${2}"}\ 7715+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ 7716+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 7717+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 7718+test 0 -eq $? || _lt_function_replace_fail=: 7719+ 7720+ 7721+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ 7722+func_split_long_opt ()\ 7723+{\ 7724+\ func_split_long_opt_name=${1%%=*}\ 7725+\ func_split_long_opt_arg=${1#*=}\ 7726+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ 7727+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 7728+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 7729+test 0 -eq $? || _lt_function_replace_fail=: 7730+ 7731+ 7732+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ 7733+func_split_short_opt ()\ 7734+{\ 7735+\ func_split_short_opt_arg=${1#??}\ 7736+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ 7737+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ 7738+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 7739+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 7740+test 0 -eq $? || _lt_function_replace_fail=: 7741+ 7742+ 7743+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ 7744+func_lo2o ()\ 7745+{\ 7746+\ case ${1} in\ 7747+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ 7748+\ *) func_lo2o_result=${1} ;;\ 7749+\ esac\ 7750+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ 7751+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 7752+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 7753+test 0 -eq $? || _lt_function_replace_fail=: 7754+ 7755+ 7756+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ 7757+func_xform ()\ 7758+{\ 7759+ func_xform_result=${1%.*}.lo\ 7760+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ 7761+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 7762+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 7763+test 0 -eq $? || _lt_function_replace_fail=: 7764+ 7765+ 7766+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ 7767+func_arith ()\ 7768+{\ 7769+ func_arith_result=$(( $* ))\ 7770+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ 7771+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 7772+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 7773+test 0 -eq $? || _lt_function_replace_fail=: 7774+ 7775+ 7776+ sed -e '/^func_len ()$/,/^} # func_len /c\ 7777+func_len ()\ 7778+{\ 7779+ func_len_result=${#1}\ 7780+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ 7781+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 7782+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 7783+test 0 -eq $? || _lt_function_replace_fail=: 7784+ 7785+fi 7786+ 7787+if test x"$lt_shell_append" = xyes; then 7788+ sed -e '/^func_append ()$/,/^} # func_append /c\ 7789+func_append ()\ 7790+{\ 7791+ eval "${1}+=\\${2}"\ 7792+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ 7793+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 7794+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 7795+test 0 -eq $? || _lt_function_replace_fail=: 7796+ 7797+ 7798+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ 7799+func_append_quoted ()\ 7800+{\ 7801+\ func_quote_for_eval "${2}"\ 7802+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ 7803+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ 7804+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 7805+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 7806+test 0 -eq $? || _lt_function_replace_fail=: 7807+ 7808+ 7809+ # Save a `func_append' function call where possible by direct use of '+=' 7810+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ 7811+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 7812+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 7813+ test 0 -eq $? || _lt_function_replace_fail=: 7814+else 7815+ # Save a `func_append' function call even when '+=' is not available 7816+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ 7817+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 7818+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 7819+ test 0 -eq $? || _lt_function_replace_fail=: 7820+fi 7821+ 7822+if test x"$_lt_function_replace_fail" = x":"; then 7823+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 7824+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} 7825+fi 7826+ 7827+ 7828+ mv -f "$cfgfile" "$ofile" || 7829 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 7830 chmod +x "$ofile" 7831 7832diff --git a/gprofng/Makefile.in b/gprofng/Makefile.in 7833index a2854950e34..4d307543d81 100644 7834--- a/gprofng/Makefile.in 7835+++ b/gprofng/Makefile.in 7836@@ -253,6 +253,7 @@ CXXFLAGS = @CXXFLAGS@ 7837 CYGPATH_W = @CYGPATH_W@ 7838 DEFS = @DEFS@ 7839 DEPDIR = @DEPDIR@ 7840+DLLTOOL = @DLLTOOL@ 7841 DSYMUTIL = @DSYMUTIL@ 7842 DUMPBIN = @DUMPBIN@ 7843 ECHO_C = @ECHO_C@ 7844@@ -290,6 +291,7 @@ LN_S = @LN_S@ 7845 LTLIBOBJS = @LTLIBOBJS@ 7846 MAINT = @MAINT@ 7847 MAKEINFO = @MAKEINFO@ 7848+MANIFEST_TOOL = @MANIFEST_TOOL@ 7849 MKDIR_P = @MKDIR_P@ 7850 NM = @NM@ 7851 NMEDIT = @NMEDIT@ 7852diff --git a/gprofng/configure b/gprofng/configure 7853index 3ad87139280..e4593cbb838 100755 7854--- a/gprofng/configure 7855+++ b/gprofng/configure 7856@@ -674,6 +674,8 @@ OTOOL 7857 LIPO 7858 NMEDIT 7859 DSYMUTIL 7860+MANIFEST_TOOL 7861+DLLTOOL 7862 OBJDUMP 7863 LN_S 7864 NM 7865@@ -804,6 +806,7 @@ enable_static 7866 with_pic 7867 enable_fast_install 7868 with_gnu_ld 7869+with_libtool_sysroot 7870 enable_libtool_lock 7871 enable_werror_always 7872 enable_gprofng_tools 7873@@ -1467,6 +1470,8 @@ Optional Packages: 7874 --with-pic try to use only PIC/non-PIC objects [default=use 7875 both] 7876 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 7877+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR 7878+ (or the compiler's sysroot if not specified). 7879 --with-jdk=PATH specify prefix directory for installed JDK. 7880 --with-system-zlib use installed libz 7881 7882@@ -6158,8 +6163,8 @@ esac 7883 7884 7885 7886-macro_version='2.2.7a' 7887-macro_revision='1.3134' 7888+macro_version='2.4' 7889+macro_revision='1.3293' 7890 7891 7892 7893@@ -6199,7 +6204,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 7894 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 7895 $as_echo_n "checking how to print strings... " >&6; } 7896 # Test print first, because it will be a builtin if present. 7897-if test "X`print -r -- -n 2>/dev/null`" = X-n && \ 7898+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ 7899 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 7900 ECHO='print -r --' 7901 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 7902@@ -6892,8 +6897,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 7903 # Try some XSI features 7904 xsi_shell=no 7905 ( _lt_dummy="a/b/c" 7906- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ 7907- = c,a/b,, \ 7908+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ 7909+ = c,a/b,b/c, \ 7910 && eval 'test $(( 1 + 1 )) -eq 2 \ 7911 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 7912 && xsi_shell=yes 7913@@ -6942,6 +6947,80 @@ esac 7914 7915 7916 7917+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 7918+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } 7919+if ${lt_cv_to_host_file_cmd+:} false; then : 7920+ $as_echo_n "(cached) " >&6 7921+else 7922+ case $host in 7923+ *-*-mingw* ) 7924+ case $build in 7925+ *-*-mingw* ) # actually msys 7926+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 7927+ ;; 7928+ *-*-cygwin* ) 7929+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 7930+ ;; 7931+ * ) # otherwise, assume *nix 7932+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 7933+ ;; 7934+ esac 7935+ ;; 7936+ *-*-cygwin* ) 7937+ case $build in 7938+ *-*-mingw* ) # actually msys 7939+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin 7940+ ;; 7941+ *-*-cygwin* ) 7942+ lt_cv_to_host_file_cmd=func_convert_file_noop 7943+ ;; 7944+ * ) # otherwise, assume *nix 7945+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin 7946+ ;; 7947+ esac 7948+ ;; 7949+ * ) # unhandled hosts (and "normal" native builds) 7950+ lt_cv_to_host_file_cmd=func_convert_file_noop 7951+ ;; 7952+esac 7953+ 7954+fi 7955+ 7956+to_host_file_cmd=$lt_cv_to_host_file_cmd 7957+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 7958+$as_echo "$lt_cv_to_host_file_cmd" >&6; } 7959+ 7960+ 7961+ 7962+ 7963+ 7964+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 7965+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } 7966+if ${lt_cv_to_tool_file_cmd+:} false; then : 7967+ $as_echo_n "(cached) " >&6 7968+else 7969+ #assume ordinary cross tools, or native build. 7970+lt_cv_to_tool_file_cmd=func_convert_file_noop 7971+case $host in 7972+ *-*-mingw* ) 7973+ case $build in 7974+ *-*-mingw* ) # actually msys 7975+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 7976+ ;; 7977+ esac 7978+ ;; 7979+esac 7980+ 7981+fi 7982+ 7983+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 7984+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 7985+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } 7986+ 7987+ 7988+ 7989+ 7990+ 7991 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 7992 $as_echo_n "checking for $LD option to reload object files... " >&6; } 7993 if ${lt_cv_ld_reload_flag+:} false; then : 7994@@ -6958,6 +7037,11 @@ case $reload_flag in 7995 esac 7996 reload_cmds='$LD$reload_flag -o $output$reload_objs' 7997 case $host_os in 7998+ cygwin* | mingw* | pw32* | cegcc*) 7999+ if test "$GCC" != yes; then 8000+ reload_cmds=false 8001+ fi 8002+ ;; 8003 darwin*) 8004 if test "$GCC" = yes; then 8005 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 8006@@ -7126,7 +7210,8 @@ mingw* | pw32*) 8007 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 8008 lt_cv_file_magic_cmd='func_win32_libid' 8009 else 8010- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' 8011+ # Keep this pattern in sync with the one in func_win32_libid. 8012+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' 8013 lt_cv_file_magic_cmd='$OBJDUMP -f' 8014 fi 8015 ;; 8016@@ -7280,6 +7365,21 @@ esac 8017 fi 8018 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 8019 $as_echo "$lt_cv_deplibs_check_method" >&6; } 8020+ 8021+file_magic_glob= 8022+want_nocaseglob=no 8023+if test "$build" = "$host"; then 8024+ case $host_os in 8025+ mingw* | pw32*) 8026+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then 8027+ want_nocaseglob=yes 8028+ else 8029+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` 8030+ fi 8031+ ;; 8032+ esac 8033+fi 8034+ 8035 file_magic_cmd=$lt_cv_file_magic_cmd 8036 deplibs_check_method=$lt_cv_deplibs_check_method 8037 test -z "$deplibs_check_method" && deplibs_check_method=unknown 8038@@ -7295,6 +7395,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 8039 8040 8041 8042+ 8043+ 8044+ 8045+ 8046+ 8047+ 8048+ 8049+ 8050+ 8051+ 8052+if test -n "$ac_tool_prefix"; then 8053+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. 8054+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 8055+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8056+$as_echo_n "checking for $ac_word... " >&6; } 8057+if ${ac_cv_prog_DLLTOOL+:} false; then : 8058+ $as_echo_n "(cached) " >&6 8059+else 8060+ if test -n "$DLLTOOL"; then 8061+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. 8062+else 8063+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 8064+for as_dir in $PATH 8065+do 8066+ IFS=$as_save_IFS 8067+ test -z "$as_dir" && as_dir=. 8068+ for ac_exec_ext in '' $ac_executable_extensions; do 8069+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 8070+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" 8071+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 8072+ break 2 8073+ fi 8074+done 8075+ done 8076+IFS=$as_save_IFS 8077+ 8078+fi 8079+fi 8080+DLLTOOL=$ac_cv_prog_DLLTOOL 8081+if test -n "$DLLTOOL"; then 8082+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 8083+$as_echo "$DLLTOOL" >&6; } 8084+else 8085+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 8086+$as_echo "no" >&6; } 8087+fi 8088+ 8089+ 8090+fi 8091+if test -z "$ac_cv_prog_DLLTOOL"; then 8092+ ac_ct_DLLTOOL=$DLLTOOL 8093+ # Extract the first word of "dlltool", so it can be a program name with args. 8094+set dummy dlltool; ac_word=$2 8095+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8096+$as_echo_n "checking for $ac_word... " >&6; } 8097+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : 8098+ $as_echo_n "(cached) " >&6 8099+else 8100+ if test -n "$ac_ct_DLLTOOL"; then 8101+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. 8102+else 8103+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 8104+for as_dir in $PATH 8105+do 8106+ IFS=$as_save_IFS 8107+ test -z "$as_dir" && as_dir=. 8108+ for ac_exec_ext in '' $ac_executable_extensions; do 8109+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 8110+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" 8111+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 8112+ break 2 8113+ fi 8114+done 8115+ done 8116+IFS=$as_save_IFS 8117+ 8118+fi 8119+fi 8120+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL 8121+if test -n "$ac_ct_DLLTOOL"; then 8122+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 8123+$as_echo "$ac_ct_DLLTOOL" >&6; } 8124+else 8125+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 8126+$as_echo "no" >&6; } 8127+fi 8128+ 8129+ if test "x$ac_ct_DLLTOOL" = x; then 8130+ DLLTOOL="false" 8131+ else 8132+ case $cross_compiling:$ac_tool_warned in 8133+yes:) 8134+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 8135+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 8136+ac_tool_warned=yes ;; 8137+esac 8138+ DLLTOOL=$ac_ct_DLLTOOL 8139+ fi 8140+else 8141+ DLLTOOL="$ac_cv_prog_DLLTOOL" 8142+fi 8143+ 8144+test -z "$DLLTOOL" && DLLTOOL=dlltool 8145+ 8146+ 8147+ 8148+ 8149+ 8150+ 8151+ 8152+ 8153+ 8154+ 8155+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 8156+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } 8157+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : 8158+ $as_echo_n "(cached) " >&6 8159+else 8160+ lt_cv_sharedlib_from_linklib_cmd='unknown' 8161+ 8162+case $host_os in 8163+cygwin* | mingw* | pw32* | cegcc*) 8164+ # two different shell functions defined in ltmain.sh 8165+ # decide which to use based on capabilities of $DLLTOOL 8166+ case `$DLLTOOL --help 2>&1` in 8167+ *--identify-strict*) 8168+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib 8169+ ;; 8170+ *) 8171+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback 8172+ ;; 8173+ esac 8174+ ;; 8175+*) 8176+ # fallback: assume linklib IS sharedlib 8177+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" 8178+ ;; 8179+esac 8180+ 8181+fi 8182+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 8183+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } 8184+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd 8185+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO 8186+ 8187+ 8188+ 8189+ 8190+ 8191+ 8192+ 8193 plugin_option= 8194 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 8195 for plugin in $plugin_names; do 8196@@ -7309,8 +7560,10 @@ for plugin in $plugin_names; do 8197 done 8198 8199 if test -n "$ac_tool_prefix"; then 8200- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 8201-set dummy ${ac_tool_prefix}ar; ac_word=$2 8202+ for ac_prog in ar 8203+ do 8204+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 8205+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 8206 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8207 $as_echo_n "checking for $ac_word... " >&6; } 8208 if ${ac_cv_prog_AR+:} false; then : 8209@@ -7326,7 +7579,7 @@ do 8210 test -z "$as_dir" && as_dir=. 8211 for ac_exec_ext in '' $ac_executable_extensions; do 8212 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 8213- ac_cv_prog_AR="${ac_tool_prefix}ar" 8214+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" 8215 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 8216 break 2 8217 fi 8218@@ -7346,11 +7599,15 @@ $as_echo "no" >&6; } 8219 fi 8220 8221 8222+ test -n "$AR" && break 8223+ done 8224 fi 8225-if test -z "$ac_cv_prog_AR"; then 8226+if test -z "$AR"; then 8227 ac_ct_AR=$AR 8228- # Extract the first word of "ar", so it can be a program name with args. 8229-set dummy ar; ac_word=$2 8230+ for ac_prog in ar 8231+do 8232+ # Extract the first word of "$ac_prog", so it can be a program name with args. 8233+set dummy $ac_prog; ac_word=$2 8234 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8235 $as_echo_n "checking for $ac_word... " >&6; } 8236 if ${ac_cv_prog_ac_ct_AR+:} false; then : 8237@@ -7366,7 +7623,7 @@ do 8238 test -z "$as_dir" && as_dir=. 8239 for ac_exec_ext in '' $ac_executable_extensions; do 8240 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 8241- ac_cv_prog_ac_ct_AR="ar" 8242+ ac_cv_prog_ac_ct_AR="$ac_prog" 8243 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 8244 break 2 8245 fi 8246@@ -7385,6 +7642,10 @@ else 8247 $as_echo "no" >&6; } 8248 fi 8249 8250+ 8251+ test -n "$ac_ct_AR" && break 8252+done 8253+ 8254 if test "x$ac_ct_AR" = x; then 8255 AR="false" 8256 else 8257@@ -7396,29 +7657,81 @@ ac_tool_warned=yes ;; 8258 esac 8259 AR=$ac_ct_AR 8260 fi 8261-else 8262- AR="$ac_cv_prog_AR" 8263 fi 8264 8265-test -z "$AR" && AR=ar 8266-if test -n "$plugin_option"; then 8267- if $AR --help 2>&1 | grep -q "\--plugin"; then 8268- touch conftest.c 8269- $AR $plugin_option rc conftest.a conftest.c 8270- if test "$?" != 0; then 8271- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 8272+ touch conftest.c 8273+ $AR $plugin_option rc conftest.a conftest.c 8274+ if test "$?" != 0; then 8275+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 8276 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} 8277- else 8278- AR="$AR $plugin_option" 8279- fi 8280- rm -f conftest.* 8281+ else 8282+ AR="$AR $plugin_option" 8283 fi 8284-fi 8285-test -z "$AR_FLAGS" && AR_FLAGS=cru 8286+ rm -f conftest.* 8287+: ${AR=ar} 8288+: ${AR_FLAGS=cru} 8289+ 8290+ 8291+ 8292+ 8293+ 8294+ 8295+ 8296 8297 8298 8299 8300+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 8301+$as_echo_n "checking for archiver @FILE support... " >&6; } 8302+if ${lt_cv_ar_at_file+:} false; then : 8303+ $as_echo_n "(cached) " >&6 8304+else 8305+ lt_cv_ar_at_file=no 8306+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 8307+/* end confdefs.h. */ 8308+ 8309+int 8310+main () 8311+{ 8312+ 8313+ ; 8314+ return 0; 8315+} 8316+_ACEOF 8317+if ac_fn_c_try_compile "$LINENO"; then : 8318+ echo conftest.$ac_objext > conftest.lst 8319+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' 8320+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 8321+ (eval $lt_ar_try) 2>&5 8322+ ac_status=$? 8323+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 8324+ test $ac_status = 0; } 8325+ if test "$ac_status" -eq 0; then 8326+ # Ensure the archiver fails upon bogus file names. 8327+ rm -f conftest.$ac_objext libconftest.a 8328+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 8329+ (eval $lt_ar_try) 2>&5 8330+ ac_status=$? 8331+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 8332+ test $ac_status = 0; } 8333+ if test "$ac_status" -ne 0; then 8334+ lt_cv_ar_at_file=@ 8335+ fi 8336+ fi 8337+ rm -f conftest.* libconftest.a 8338+ 8339+fi 8340+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 8341+ 8342+fi 8343+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 8344+$as_echo "$lt_cv_ar_at_file" >&6; } 8345+ 8346+if test "x$lt_cv_ar_at_file" = xno; then 8347+ archiver_list_spec= 8348+else 8349+ archiver_list_spec=$lt_cv_ar_at_file 8350+fi 8351 8352 8353 8354@@ -7765,8 +8078,8 @@ esac 8355 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 8356 8357 # Transform an extracted symbol line into symbol name and symbol address 8358-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 8359-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'" 8360+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 8361+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'" 8362 8363 # Handle CRLF in mingw tool chain 8364 opt_cr= 8365@@ -7802,6 +8115,7 @@ for ac_symprfx in "" "_"; do 8366 else 8367 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 8368 fi 8369+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" 8370 8371 # Check to see that the pipe works correctly. 8372 pipe_works=no 8373@@ -7843,6 +8157,18 @@ _LT_EOF 8374 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 8375 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 8376 cat <<_LT_EOF > conftest.$ac_ext 8377+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ 8378+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) 8379+/* DATA imports from DLLs on WIN32 con't be const, because runtime 8380+ relocations are performed -- see ld's documentation on pseudo-relocs. */ 8381+# define LT_DLSYM_CONST 8382+#elif defined(__osf__) 8383+/* This system does not cope well with relocations in const data. */ 8384+# define LT_DLSYM_CONST 8385+#else 8386+# define LT_DLSYM_CONST const 8387+#endif 8388+ 8389 #ifdef __cplusplus 8390 extern "C" { 8391 #endif 8392@@ -7854,7 +8180,7 @@ _LT_EOF 8393 cat <<_LT_EOF >> conftest.$ac_ext 8394 8395 /* The mapping between symbol names and symbols. */ 8396-const struct { 8397+LT_DLSYM_CONST struct { 8398 const char *name; 8399 void *address; 8400 } 8401@@ -7880,8 +8206,8 @@ static const void *lt_preloaded_setup() { 8402 _LT_EOF 8403 # Now try linking the two files. 8404 mv conftest.$ac_objext conftstm.$ac_objext 8405- lt_save_LIBS="$LIBS" 8406- lt_save_CFLAGS="$CFLAGS" 8407+ lt_globsym_save_LIBS=$LIBS 8408+ lt_globsym_save_CFLAGS=$CFLAGS 8409 LIBS="conftstm.$ac_objext" 8410 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 8411 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 8412@@ -7891,8 +8217,8 @@ _LT_EOF 8413 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 8414 pipe_works=yes 8415 fi 8416- LIBS="$lt_save_LIBS" 8417- CFLAGS="$lt_save_CFLAGS" 8418+ LIBS=$lt_globsym_save_LIBS 8419+ CFLAGS=$lt_globsym_save_CFLAGS 8420 else 8421 echo "cannot find nm_test_func in $nlist" >&5 8422 fi 8423@@ -7929,6 +8255,13 @@ else 8424 $as_echo "ok" >&6; } 8425 fi 8426 8427+# Response file support. 8428+if test "$lt_cv_nm_interface" = "MS dumpbin"; then 8429+ nm_file_list_spec='@' 8430+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then 8431+ nm_file_list_spec='@' 8432+fi 8433+ 8434 8435 8436 8437@@ -7948,6 +8281,48 @@ fi 8438 8439 8440 8441+ 8442+ 8443+ 8444+ 8445+ 8446+ 8447+ 8448+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 8449+$as_echo_n "checking for sysroot... " >&6; } 8450+ 8451+# Check whether --with-libtool-sysroot was given. 8452+if test "${with_libtool_sysroot+set}" = set; then : 8453+ withval=$with_libtool_sysroot; 8454+else 8455+ with_libtool_sysroot=no 8456+fi 8457+ 8458+ 8459+lt_sysroot= 8460+case ${with_libtool_sysroot} in #( 8461+ yes) 8462+ if test "$GCC" = yes; then 8463+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` 8464+ fi 8465+ ;; #( 8466+ /*) 8467+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` 8468+ ;; #( 8469+ no|'') 8470+ ;; #( 8471+ *) 8472+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 8473+$as_echo "${with_libtool_sysroot}" >&6; } 8474+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 8475+ ;; 8476+esac 8477+ 8478+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 8479+$as_echo "${lt_sysroot:-no}" >&6; } 8480+ 8481+ 8482+ 8483 8484 8485 # Check whether --enable-libtool-lock was given. 8486@@ -8156,6 +8531,123 @@ esac 8487 8488 need_locks="$enable_libtool_lock" 8489 8490+if test -n "$ac_tool_prefix"; then 8491+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. 8492+set dummy ${ac_tool_prefix}mt; ac_word=$2 8493+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8494+$as_echo_n "checking for $ac_word... " >&6; } 8495+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : 8496+ $as_echo_n "(cached) " >&6 8497+else 8498+ if test -n "$MANIFEST_TOOL"; then 8499+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. 8500+else 8501+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 8502+for as_dir in $PATH 8503+do 8504+ IFS=$as_save_IFS 8505+ test -z "$as_dir" && as_dir=. 8506+ for ac_exec_ext in '' $ac_executable_extensions; do 8507+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 8508+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" 8509+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 8510+ break 2 8511+ fi 8512+done 8513+ done 8514+IFS=$as_save_IFS 8515+ 8516+fi 8517+fi 8518+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL 8519+if test -n "$MANIFEST_TOOL"; then 8520+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 8521+$as_echo "$MANIFEST_TOOL" >&6; } 8522+else 8523+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 8524+$as_echo "no" >&6; } 8525+fi 8526+ 8527+ 8528+fi 8529+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then 8530+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL 8531+ # Extract the first word of "mt", so it can be a program name with args. 8532+set dummy mt; ac_word=$2 8533+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8534+$as_echo_n "checking for $ac_word... " >&6; } 8535+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : 8536+ $as_echo_n "(cached) " >&6 8537+else 8538+ if test -n "$ac_ct_MANIFEST_TOOL"; then 8539+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. 8540+else 8541+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 8542+for as_dir in $PATH 8543+do 8544+ IFS=$as_save_IFS 8545+ test -z "$as_dir" && as_dir=. 8546+ for ac_exec_ext in '' $ac_executable_extensions; do 8547+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 8548+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" 8549+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 8550+ break 2 8551+ fi 8552+done 8553+ done 8554+IFS=$as_save_IFS 8555+ 8556+fi 8557+fi 8558+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL 8559+if test -n "$ac_ct_MANIFEST_TOOL"; then 8560+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 8561+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } 8562+else 8563+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 8564+$as_echo "no" >&6; } 8565+fi 8566+ 8567+ if test "x$ac_ct_MANIFEST_TOOL" = x; then 8568+ MANIFEST_TOOL=":" 8569+ else 8570+ case $cross_compiling:$ac_tool_warned in 8571+yes:) 8572+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 8573+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 8574+ac_tool_warned=yes ;; 8575+esac 8576+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL 8577+ fi 8578+else 8579+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" 8580+fi 8581+ 8582+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt 8583+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 8584+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } 8585+if ${lt_cv_path_mainfest_tool+:} false; then : 8586+ $as_echo_n "(cached) " >&6 8587+else 8588+ lt_cv_path_mainfest_tool=no 8589+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 8590+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out 8591+ cat conftest.err >&5 8592+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then 8593+ lt_cv_path_mainfest_tool=yes 8594+ fi 8595+ rm -f conftest* 8596+fi 8597+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 8598+$as_echo "$lt_cv_path_mainfest_tool" >&6; } 8599+if test "x$lt_cv_path_mainfest_tool" != xyes; then 8600+ MANIFEST_TOOL=: 8601+fi 8602+ 8603+ 8604+ 8605+ 8606+ 8607 8608 case $host_os in 8609 rhapsody* | darwin*) 8610@@ -8719,6 +9211,8 @@ _LT_EOF 8611 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 8612 echo "$AR cru libconftest.a conftest.o" >&5 8613 $AR cru libconftest.a conftest.o 2>&5 8614+ echo "$RANLIB libconftest.a" >&5 8615+ $RANLIB libconftest.a 2>&5 8616 cat > conftest.c << _LT_EOF 8617 int main() { return 0;} 8618 _LT_EOF 8619@@ -8787,6 +9281,16 @@ done 8620 8621 8622 8623+func_stripname_cnf () 8624+{ 8625+ case ${2} in 8626+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; 8627+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; 8628+ esac 8629+} # func_stripname_cnf 8630+ 8631+ 8632+ 8633 8634 8635 # Set options 8636@@ -9272,8 +9776,6 @@ fi 8637 lt_prog_compiler_pic= 8638 lt_prog_compiler_static= 8639 8640-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 8641-$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 8642 8643 if test "$GCC" = yes; then 8644 lt_prog_compiler_wl='-Wl,' 8645@@ -9439,6 +9941,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 8646 lt_prog_compiler_pic='--shared' 8647 lt_prog_compiler_static='--static' 8648 ;; 8649+ nagfor*) 8650+ # NAG Fortran compiler 8651+ lt_prog_compiler_wl='-Wl,-Wl,,' 8652+ lt_prog_compiler_pic='-PIC' 8653+ lt_prog_compiler_static='-Bstatic' 8654+ ;; 8655 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 8656 # Portland Group compilers (*not* the Pentium gcc compiler, 8657 # which looks to be a dead project) 8658@@ -9501,7 +10009,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 8659 lt_prog_compiler_pic='-KPIC' 8660 lt_prog_compiler_static='-Bstatic' 8661 case $cc_basename in 8662- f77* | f90* | f95*) 8663+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) 8664 lt_prog_compiler_wl='-Qoption ld ';; 8665 *) 8666 lt_prog_compiler_wl='-Wl,';; 8667@@ -9558,13 +10066,17 @@ case $host_os in 8668 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 8669 ;; 8670 esac 8671-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 8672-$as_echo "$lt_prog_compiler_pic" >&6; } 8673- 8674- 8675- 8676- 8677 8678+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 8679+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 8680+if ${lt_cv_prog_compiler_pic+:} false; then : 8681+ $as_echo_n "(cached) " >&6 8682+else 8683+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic 8684+fi 8685+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 8686+$as_echo "$lt_cv_prog_compiler_pic" >&6; } 8687+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic 8688 8689 # 8690 # Check to make sure the PIC flag actually works. 8691@@ -9625,6 +10137,11 @@ fi 8692 8693 8694 8695+ 8696+ 8697+ 8698+ 8699+ 8700 # 8701 # Check to make sure the static flag actually works. 8702 # 8703@@ -9975,7 +10492,8 @@ _LT_EOF 8704 allow_undefined_flag=unsupported 8705 always_export_symbols=no 8706 enable_shared_with_static_runtimes=yes 8707- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 8708+ 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' 8709+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' 8710 8711 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 8712 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 8713@@ -10074,12 +10592,12 @@ _LT_EOF 8714 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 8715 hardcode_libdir_flag_spec= 8716 hardcode_libdir_flag_spec_ld='-rpath $libdir' 8717- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' 8718+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' 8719 if test "x$supports_anon_versioning" = xyes; then 8720 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ 8721 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ 8722 echo "local: *; };" >> $output_objdir/$libname.ver~ 8723- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 8724+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 8725 fi 8726 ;; 8727 esac 8728@@ -10093,8 +10611,8 @@ _LT_EOF 8729 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 8730 wlarc= 8731 else 8732- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 8733- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 8734+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 8735+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 8736 fi 8737 ;; 8738 8739@@ -10112,8 +10630,8 @@ _LT_EOF 8740 8741 _LT_EOF 8742 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 8743- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 8744- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 8745+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 8746+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 8747 else 8748 ld_shlibs=no 8749 fi 8750@@ -10159,8 +10677,8 @@ _LT_EOF 8751 8752 *) 8753 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 8754- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 8755- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 8756+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 8757+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 8758 else 8759 ld_shlibs=no 8760 fi 8761@@ -10290,7 +10808,13 @@ _LT_EOF 8762 allow_undefined_flag='-berok' 8763 # Determine the default libpath from the value encoded in an 8764 # empty executable. 8765- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 8766+ if test "${lt_cv_aix_libpath+set}" = set; then 8767+ aix_libpath=$lt_cv_aix_libpath 8768+else 8769+ if ${lt_cv_aix_libpath_+:} false; then : 8770+ $as_echo_n "(cached) " >&6 8771+else 8772+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 8773 /* end confdefs.h. */ 8774 8775 int 8776@@ -10303,22 +10827,29 @@ main () 8777 _ACEOF 8778 if ac_fn_c_try_link "$LINENO"; then : 8779 8780-lt_aix_libpath_sed=' 8781- /Import File Strings/,/^$/ { 8782- /^0/ { 8783- s/^0 *\(.*\)$/\1/ 8784- p 8785- } 8786- }' 8787-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 8788-# Check for a 64-bit object if we didn't find anything. 8789-if test -z "$aix_libpath"; then 8790- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 8791-fi 8792+ lt_aix_libpath_sed=' 8793+ /Import File Strings/,/^$/ { 8794+ /^0/ { 8795+ s/^0 *\([^ ]*\) *$/\1/ 8796+ p 8797+ } 8798+ }' 8799+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 8800+ # Check for a 64-bit object if we didn't find anything. 8801+ if test -z "$lt_cv_aix_libpath_"; then 8802+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 8803+ fi 8804 fi 8805 rm -f core conftest.err conftest.$ac_objext \ 8806 conftest$ac_exeext conftest.$ac_ext 8807-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8808+ if test -z "$lt_cv_aix_libpath_"; then 8809+ lt_cv_aix_libpath_="/usr/lib:/lib" 8810+ fi 8811+ 8812+fi 8813+ 8814+ aix_libpath=$lt_cv_aix_libpath_ 8815+fi 8816 8817 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 8818 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" 8819@@ -10330,7 +10861,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8820 else 8821 # Determine the default libpath from the value encoded in an 8822 # empty executable. 8823- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 8824+ if test "${lt_cv_aix_libpath+set}" = set; then 8825+ aix_libpath=$lt_cv_aix_libpath 8826+else 8827+ if ${lt_cv_aix_libpath_+:} false; then : 8828+ $as_echo_n "(cached) " >&6 8829+else 8830+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 8831 /* end confdefs.h. */ 8832 8833 int 8834@@ -10343,22 +10880,29 @@ main () 8835 _ACEOF 8836 if ac_fn_c_try_link "$LINENO"; then : 8837 8838-lt_aix_libpath_sed=' 8839- /Import File Strings/,/^$/ { 8840- /^0/ { 8841- s/^0 *\(.*\)$/\1/ 8842- p 8843- } 8844- }' 8845-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 8846-# Check for a 64-bit object if we didn't find anything. 8847-if test -z "$aix_libpath"; then 8848- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 8849-fi 8850+ lt_aix_libpath_sed=' 8851+ /Import File Strings/,/^$/ { 8852+ /^0/ { 8853+ s/^0 *\([^ ]*\) *$/\1/ 8854+ p 8855+ } 8856+ }' 8857+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 8858+ # Check for a 64-bit object if we didn't find anything. 8859+ if test -z "$lt_cv_aix_libpath_"; then 8860+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 8861+ fi 8862 fi 8863 rm -f core conftest.err conftest.$ac_objext \ 8864 conftest$ac_exeext conftest.$ac_ext 8865-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8866+ if test -z "$lt_cv_aix_libpath_"; then 8867+ lt_cv_aix_libpath_="/usr/lib:/lib" 8868+ fi 8869+ 8870+fi 8871+ 8872+ aix_libpath=$lt_cv_aix_libpath_ 8873+fi 8874 8875 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 8876 # Warning - without using the other run time loading flags, 8877@@ -10403,20 +10947,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8878 # Microsoft Visual C++. 8879 # hardcode_libdir_flag_spec is actually meaningless, as there is 8880 # no search path for DLLs. 8881- hardcode_libdir_flag_spec=' ' 8882- allow_undefined_flag=unsupported 8883- # Tell ltmain to make .lib files, not .a files. 8884- libext=lib 8885- # Tell ltmain to make .dll files, not .so files. 8886- shrext_cmds=".dll" 8887- # FIXME: Setting linknames here is a bad hack. 8888- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 8889- # The linker will automatically build a .lib file if we build a DLL. 8890- old_archive_from_new_cmds='true' 8891- # FIXME: Should let the user specify the lib program. 8892- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 8893- fix_srcfile_path='`cygpath -w "$srcfile"`' 8894- enable_shared_with_static_runtimes=yes 8895+ case $cc_basename in 8896+ cl*) 8897+ # Native MSVC 8898+ hardcode_libdir_flag_spec=' ' 8899+ allow_undefined_flag=unsupported 8900+ always_export_symbols=yes 8901+ file_list_spec='@' 8902+ # Tell ltmain to make .lib files, not .a files. 8903+ libext=lib 8904+ # Tell ltmain to make .dll files, not .so files. 8905+ shrext_cmds=".dll" 8906+ # FIXME: Setting linknames here is a bad hack. 8907+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' 8908+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 8909+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; 8910+ else 8911+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; 8912+ fi~ 8913+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ 8914+ linknames=' 8915+ # The linker will not automatically build a static lib if we build a DLL. 8916+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' 8917+ enable_shared_with_static_runtimes=yes 8918+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 8919+ # Don't use ranlib 8920+ old_postinstall_cmds='chmod 644 $oldlib' 8921+ postlink_cmds='lt_outputfile="@OUTPUT@"~ 8922+ lt_tool_outputfile="@TOOL_OUTPUT@"~ 8923+ case $lt_outputfile in 8924+ *.exe|*.EXE) ;; 8925+ *) 8926+ lt_outputfile="$lt_outputfile.exe" 8927+ lt_tool_outputfile="$lt_tool_outputfile.exe" 8928+ ;; 8929+ esac~ 8930+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then 8931+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; 8932+ $RM "$lt_outputfile.manifest"; 8933+ fi' 8934+ ;; 8935+ *) 8936+ # Assume MSVC wrapper 8937+ hardcode_libdir_flag_spec=' ' 8938+ allow_undefined_flag=unsupported 8939+ # Tell ltmain to make .lib files, not .a files. 8940+ libext=lib 8941+ # Tell ltmain to make .dll files, not .so files. 8942+ shrext_cmds=".dll" 8943+ # FIXME: Setting linknames here is a bad hack. 8944+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 8945+ # The linker will automatically build a .lib file if we build a DLL. 8946+ old_archive_from_new_cmds='true' 8947+ # FIXME: Should let the user specify the lib program. 8948+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 8949+ enable_shared_with_static_runtimes=yes 8950+ ;; 8951+ esac 8952 ;; 8953 8954 darwin* | rhapsody*) 8955@@ -10477,7 +11064,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8956 8957 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 8958 freebsd* | dragonfly*) 8959- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' 8960+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' 8961 hardcode_libdir_flag_spec='-R$libdir' 8962 hardcode_direct=yes 8963 hardcode_shlibpath_var=no 8964@@ -10485,7 +11072,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8965 8966 hpux9*) 8967 if test "$GCC" = yes; then 8968- 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' 8969+ 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' 8970 else 8971 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' 8972 fi 8973@@ -10501,7 +11088,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8974 8975 hpux10*) 8976 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 8977- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 8978+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 8979 else 8980 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 8981 fi 8982@@ -10525,10 +11112,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8983 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 8984 ;; 8985 ia64*) 8986- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 8987+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 8988 ;; 8989 *) 8990- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 8991+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 8992 ;; 8993 esac 8994 else 8995@@ -10607,23 +11194,36 @@ fi 8996 8997 irix5* | irix6* | nonstopux*) 8998 if test "$GCC" = yes; then 8999- 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' 9000+ 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' 9001 # Try to use the -exported_symbol ld option, if it does not 9002 # work, assume that -exports_file does not work either and 9003 # implicitly export all symbols. 9004- save_LDFLAGS="$LDFLAGS" 9005- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 9006- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 9007+ # This should be the same for all languages, so no per-tag cache variable. 9008+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 9009+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } 9010+if ${lt_cv_irix_exported_symbol+:} false; then : 9011+ $as_echo_n "(cached) " >&6 9012+else 9013+ save_LDFLAGS="$LDFLAGS" 9014+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 9015+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 9016 /* end confdefs.h. */ 9017-int foo(void) {} 9018+int foo (void) { return 0; } 9019 _ACEOF 9020 if ac_fn_c_try_link "$LINENO"; then : 9021- 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' 9022- 9023+ lt_cv_irix_exported_symbol=yes 9024+else 9025+ lt_cv_irix_exported_symbol=no 9026 fi 9027 rm -f core conftest.err conftest.$ac_objext \ 9028 conftest$ac_exeext conftest.$ac_ext 9029- LDFLAGS="$save_LDFLAGS" 9030+ LDFLAGS="$save_LDFLAGS" 9031+fi 9032+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 9033+$as_echo "$lt_cv_irix_exported_symbol" >&6; } 9034+ if test "$lt_cv_irix_exported_symbol" = yes; then 9035+ 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' 9036+ fi 9037 else 9038 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' 9039 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' 9040@@ -10708,7 +11308,7 @@ rm -f core conftest.err conftest.$ac_objext \ 9041 osf4* | osf5*) # as osf3* with the addition of -msym flag 9042 if test "$GCC" = yes; then 9043 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 9044- 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' 9045+ 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' 9046 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 9047 else 9048 allow_undefined_flag=' -expect_unresolved \*' 9049@@ -10727,9 +11327,9 @@ rm -f core conftest.err conftest.$ac_objext \ 9050 no_undefined_flag=' -z defs' 9051 if test "$GCC" = yes; then 9052 wlarc='${wl}' 9053- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 9054+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 9055 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ 9056- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' 9057+ $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' 9058 else 9059 case `$CC -V 2>&1` in 9060 *"Compilers 5.0"*) 9061@@ -11305,8 +11905,9 @@ cygwin* | mingw* | pw32* | cegcc*) 9062 need_version=no 9063 need_lib_prefix=no 9064 9065- case $GCC,$host_os in 9066- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) 9067+ case $GCC,$cc_basename in 9068+ yes,*) 9069+ # gcc 9070 library_names_spec='$libname.dll.a' 9071 # DLL is installed to $(libdir)/../bin by postinstall_cmds 9072 postinstall_cmds='base_file=`basename \${file}`~ 9073@@ -11339,13 +11940,71 @@ cygwin* | mingw* | pw32* | cegcc*) 9074 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 9075 ;; 9076 esac 9077+ dynamic_linker='Win32 ld.exe' 9078+ ;; 9079+ 9080+ *,cl*) 9081+ # Native MSVC 9082+ libname_spec='$name' 9083+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 9084+ library_names_spec='${libname}.dll.lib' 9085+ 9086+ case $build_os in 9087+ mingw*) 9088+ sys_lib_search_path_spec= 9089+ lt_save_ifs=$IFS 9090+ IFS=';' 9091+ for lt_path in $LIB 9092+ do 9093+ IFS=$lt_save_ifs 9094+ # Let DOS variable expansion print the short 8.3 style file name. 9095+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` 9096+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" 9097+ done 9098+ IFS=$lt_save_ifs 9099+ # Convert to MSYS style. 9100+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` 9101+ ;; 9102+ cygwin*) 9103+ # Convert to unix form, then to dos form, then back to unix form 9104+ # but this time dos style (no spaces!) so that the unix form looks 9105+ # like /cygdrive/c/PROGRA~1:/cygdr... 9106+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` 9107+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` 9108+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 9109+ ;; 9110+ *) 9111+ sys_lib_search_path_spec="$LIB" 9112+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then 9113+ # It is most probably a Windows format PATH. 9114+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` 9115+ else 9116+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 9117+ fi 9118+ # FIXME: find the short name or the path components, as spaces are 9119+ # common. (e.g. "Program Files" -> "PROGRA~1") 9120+ ;; 9121+ esac 9122+ 9123+ # DLL is installed to $(libdir)/../bin by postinstall_cmds 9124+ postinstall_cmds='base_file=`basename \${file}`~ 9125+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ 9126+ dldir=$destdir/`dirname \$dlpath`~ 9127+ test -d \$dldir || mkdir -p \$dldir~ 9128+ $install_prog $dir/$dlname \$dldir/$dlname' 9129+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ 9130+ dlpath=$dir/\$dldll~ 9131+ $RM \$dlpath' 9132+ shlibpath_overrides_runpath=yes 9133+ dynamic_linker='Win32 link.exe' 9134 ;; 9135 9136 *) 9137+ # Assume MSVC wrapper 9138 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' 9139+ dynamic_linker='Win32 ld.exe' 9140 ;; 9141 esac 9142- dynamic_linker='Win32 ld.exe' 9143 # FIXME: first we should search . and the directory the executable is in 9144 shlibpath_var=PATH 9145 ;; 9146@@ -12223,7 +12882,7 @@ else 9147 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 9148 lt_status=$lt_dlunknown 9149 cat > conftest.$ac_ext <<_LT_EOF 9150-#line 12226 "configure" 9151+#line $LINENO "configure" 9152 #include "confdefs.h" 9153 9154 #if HAVE_DLFCN_H 9155@@ -12267,10 +12926,10 @@ else 9156 /* When -fvisbility=hidden is used, assume the code has been annotated 9157 correspondingly for the symbols needed. */ 9158 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 9159-void fnord () __attribute__((visibility("default"))); 9160+int fnord () __attribute__((visibility("default"))); 9161 #endif 9162 9163-void fnord () { int i=42; } 9164+int fnord () { return 42; } 9165 int main () 9166 { 9167 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 9168@@ -12329,7 +12988,7 @@ else 9169 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 9170 lt_status=$lt_dlunknown 9171 cat > conftest.$ac_ext <<_LT_EOF 9172-#line 12332 "configure" 9173+#line $LINENO "configure" 9174 #include "confdefs.h" 9175 9176 #if HAVE_DLFCN_H 9177@@ -12373,10 +13032,10 @@ else 9178 /* When -fvisbility=hidden is used, assume the code has been annotated 9179 correspondingly for the symbols needed. */ 9180 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 9181-void fnord () __attribute__((visibility("default"))); 9182+int fnord () __attribute__((visibility("default"))); 9183 #endif 9184 9185-void fnord () { int i=42; } 9186+int fnord () { return 42; } 9187 int main () 9188 { 9189 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 9190@@ -12768,6 +13427,7 @@ $RM -r conftest* 9191 9192 # Allow CC to be a program name with arguments. 9193 lt_save_CC=$CC 9194+ lt_save_CFLAGS=$CFLAGS 9195 lt_save_LD=$LD 9196 lt_save_GCC=$GCC 9197 GCC=$GXX 9198@@ -12785,6 +13445,7 @@ $RM -r conftest* 9199 fi 9200 test -z "${LDCXX+set}" || LD=$LDCXX 9201 CC=${CXX-"c++"} 9202+ CFLAGS=$CXXFLAGS 9203 compiler=$CC 9204 compiler_CXX=$CC 9205 for cc_temp in $compiler""; do 9206@@ -13067,7 +13728,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie 9207 allow_undefined_flag_CXX='-berok' 9208 # Determine the default libpath from the value encoded in an empty 9209 # executable. 9210- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 9211+ if test "${lt_cv_aix_libpath+set}" = set; then 9212+ aix_libpath=$lt_cv_aix_libpath 9213+else 9214+ if ${lt_cv_aix_libpath__CXX+:} false; then : 9215+ $as_echo_n "(cached) " >&6 9216+else 9217+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 9218 /* end confdefs.h. */ 9219 9220 int 9221@@ -13080,22 +13747,29 @@ main () 9222 _ACEOF 9223 if ac_fn_cxx_try_link "$LINENO"; then : 9224 9225-lt_aix_libpath_sed=' 9226- /Import File Strings/,/^$/ { 9227- /^0/ { 9228- s/^0 *\(.*\)$/\1/ 9229- p 9230- } 9231- }' 9232-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 9233-# Check for a 64-bit object if we didn't find anything. 9234-if test -z "$aix_libpath"; then 9235- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 9236-fi 9237+ lt_aix_libpath_sed=' 9238+ /Import File Strings/,/^$/ { 9239+ /^0/ { 9240+ s/^0 *\([^ ]*\) *$/\1/ 9241+ p 9242+ } 9243+ }' 9244+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 9245+ # Check for a 64-bit object if we didn't find anything. 9246+ if test -z "$lt_cv_aix_libpath__CXX"; then 9247+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 9248+ fi 9249 fi 9250 rm -f core conftest.err conftest.$ac_objext \ 9251 conftest$ac_exeext conftest.$ac_ext 9252-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9253+ if test -z "$lt_cv_aix_libpath__CXX"; then 9254+ lt_cv_aix_libpath__CXX="/usr/lib:/lib" 9255+ fi 9256+ 9257+fi 9258+ 9259+ aix_libpath=$lt_cv_aix_libpath__CXX 9260+fi 9261 9262 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" 9263 9264@@ -13108,7 +13782,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9265 else 9266 # Determine the default libpath from the value encoded in an 9267 # empty executable. 9268- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 9269+ if test "${lt_cv_aix_libpath+set}" = set; then 9270+ aix_libpath=$lt_cv_aix_libpath 9271+else 9272+ if ${lt_cv_aix_libpath__CXX+:} false; then : 9273+ $as_echo_n "(cached) " >&6 9274+else 9275+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 9276 /* end confdefs.h. */ 9277 9278 int 9279@@ -13121,22 +13801,29 @@ main () 9280 _ACEOF 9281 if ac_fn_cxx_try_link "$LINENO"; then : 9282 9283-lt_aix_libpath_sed=' 9284- /Import File Strings/,/^$/ { 9285- /^0/ { 9286- s/^0 *\(.*\)$/\1/ 9287- p 9288- } 9289- }' 9290-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 9291-# Check for a 64-bit object if we didn't find anything. 9292-if test -z "$aix_libpath"; then 9293- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 9294-fi 9295+ lt_aix_libpath_sed=' 9296+ /Import File Strings/,/^$/ { 9297+ /^0/ { 9298+ s/^0 *\([^ ]*\) *$/\1/ 9299+ p 9300+ } 9301+ }' 9302+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 9303+ # Check for a 64-bit object if we didn't find anything. 9304+ if test -z "$lt_cv_aix_libpath__CXX"; then 9305+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 9306+ fi 9307 fi 9308 rm -f core conftest.err conftest.$ac_objext \ 9309 conftest$ac_exeext conftest.$ac_ext 9310-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9311+ if test -z "$lt_cv_aix_libpath__CXX"; then 9312+ lt_cv_aix_libpath__CXX="/usr/lib:/lib" 9313+ fi 9314+ 9315+fi 9316+ 9317+ aix_libpath=$lt_cv_aix_libpath__CXX 9318+fi 9319 9320 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" 9321 # Warning - without using the other run time loading flags, 9322@@ -13179,29 +13866,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9323 ;; 9324 9325 cygwin* | mingw* | pw32* | cegcc*) 9326- # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, 9327- # as there is no search path for DLLs. 9328- hardcode_libdir_flag_spec_CXX='-L$libdir' 9329- export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' 9330- allow_undefined_flag_CXX=unsupported 9331- always_export_symbols_CXX=no 9332- enable_shared_with_static_runtimes_CXX=yes 9333- 9334- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 9335- 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' 9336- # If the export-symbols file already is a .def file (1st line 9337- # is EXPORTS), use it as is; otherwise, prepend... 9338- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 9339- cp $export_symbols $output_objdir/$soname.def; 9340- else 9341- echo EXPORTS > $output_objdir/$soname.def; 9342- cat $export_symbols >> $output_objdir/$soname.def; 9343- fi~ 9344- $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' 9345- else 9346- ld_shlibs_CXX=no 9347- fi 9348- ;; 9349+ case $GXX,$cc_basename in 9350+ ,cl* | no,cl*) 9351+ # Native MSVC 9352+ # hardcode_libdir_flag_spec is actually meaningless, as there is 9353+ # no search path for DLLs. 9354+ hardcode_libdir_flag_spec_CXX=' ' 9355+ allow_undefined_flag_CXX=unsupported 9356+ always_export_symbols_CXX=yes 9357+ file_list_spec_CXX='@' 9358+ # Tell ltmain to make .lib files, not .a files. 9359+ libext=lib 9360+ # Tell ltmain to make .dll files, not .so files. 9361+ shrext_cmds=".dll" 9362+ # FIXME: Setting linknames here is a bad hack. 9363+ archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' 9364+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 9365+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; 9366+ else 9367+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; 9368+ fi~ 9369+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ 9370+ linknames=' 9371+ # The linker will not automatically build a static lib if we build a DLL. 9372+ # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true' 9373+ enable_shared_with_static_runtimes_CXX=yes 9374+ # Don't use ranlib 9375+ old_postinstall_cmds_CXX='chmod 644 $oldlib' 9376+ postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~ 9377+ lt_tool_outputfile="@TOOL_OUTPUT@"~ 9378+ case $lt_outputfile in 9379+ *.exe|*.EXE) ;; 9380+ *) 9381+ lt_outputfile="$lt_outputfile.exe" 9382+ lt_tool_outputfile="$lt_tool_outputfile.exe" 9383+ ;; 9384+ esac~ 9385+ func_to_tool_file "$lt_outputfile"~ 9386+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then 9387+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; 9388+ $RM "$lt_outputfile.manifest"; 9389+ fi' 9390+ ;; 9391+ *) 9392+ # g++ 9393+ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, 9394+ # as there is no search path for DLLs. 9395+ hardcode_libdir_flag_spec_CXX='-L$libdir' 9396+ export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' 9397+ allow_undefined_flag_CXX=unsupported 9398+ always_export_symbols_CXX=no 9399+ enable_shared_with_static_runtimes_CXX=yes 9400+ 9401+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 9402+ 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' 9403+ # If the export-symbols file already is a .def file (1st line 9404+ # is EXPORTS), use it as is; otherwise, prepend... 9405+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 9406+ cp $export_symbols $output_objdir/$soname.def; 9407+ else 9408+ echo EXPORTS > $output_objdir/$soname.def; 9409+ cat $export_symbols >> $output_objdir/$soname.def; 9410+ fi~ 9411+ $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' 9412+ else 9413+ ld_shlibs_CXX=no 9414+ fi 9415+ ;; 9416+ esac 9417+ ;; 9418 darwin* | rhapsody*) 9419 9420 9421@@ -13307,7 +14040,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9422 ;; 9423 *) 9424 if test "$GXX" = yes; then 9425- 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' 9426+ 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' 9427 else 9428 # FIXME: insert proper C++ library support 9429 ld_shlibs_CXX=no 9430@@ -13378,10 +14111,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9431 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 9432 ;; 9433 ia64*) 9434- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 9435+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 9436 ;; 9437 *) 9438- 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' 9439+ 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' 9440 ;; 9441 esac 9442 fi 9443@@ -13422,9 +14155,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9444 *) 9445 if test "$GXX" = yes; then 9446 if test "$with_gnu_ld" = no; then 9447- 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' 9448+ 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' 9449 else 9450- 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' 9451+ 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' 9452 fi 9453 fi 9454 link_all_deplibs_CXX=yes 9455@@ -13494,20 +14227,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9456 prelink_cmds_CXX='tpldir=Template.dir~ 9457 rm -rf $tpldir~ 9458 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ 9459- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' 9460+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' 9461 old_archive_cmds_CXX='tpldir=Template.dir~ 9462 rm -rf $tpldir~ 9463 $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ 9464- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ 9465+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ 9466 $RANLIB $oldlib' 9467 archive_cmds_CXX='tpldir=Template.dir~ 9468 rm -rf $tpldir~ 9469 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ 9470- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' 9471+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' 9472 archive_expsym_cmds_CXX='tpldir=Template.dir~ 9473 rm -rf $tpldir~ 9474 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ 9475- $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' 9476+ $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' 9477 ;; 9478 *) # Version 6 and above use weak symbols 9479 archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' 9480@@ -13702,7 +14435,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9481 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' 9482 ;; 9483 *) 9484- 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' 9485+ 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' 9486 ;; 9487 esac 9488 9489@@ -13748,7 +14481,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9490 9491 solaris*) 9492 case $cc_basename in 9493- CC*) 9494+ CC* | sunCC*) 9495 # Sun C++ 4.2, 5.x and Centerline C++ 9496 archive_cmds_need_lc_CXX=yes 9497 no_undefined_flag_CXX=' -zdefs' 9498@@ -13789,9 +14522,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9499 if test "$GXX" = yes && test "$with_gnu_ld" = no; then 9500 no_undefined_flag_CXX=' ${wl}-z ${wl}defs' 9501 if $CC --version | $GREP -v '^2\.7' > /dev/null; then 9502- archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' 9503+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' 9504 archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ 9505- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' 9506+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' 9507 9508 # Commands to make compiler produce verbose output that lists 9509 # what "hidden" libraries, object files and flags are used when 9510@@ -13926,6 +14659,13 @@ private: 9511 }; 9512 _LT_EOF 9513 9514+ 9515+_lt_libdeps_save_CFLAGS=$CFLAGS 9516+case "$CC $CFLAGS " in #( 9517+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; 9518+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; 9519+esac 9520+ 9521 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9522 (eval $ac_compile) 2>&5 9523 ac_status=$? 9524@@ -13939,7 +14679,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9525 pre_test_object_deps_done=no 9526 9527 for p in `eval "$output_verbose_link_cmd"`; do 9528- case $p in 9529+ case ${prev}${p} in 9530 9531 -L* | -R* | -l*) 9532 # Some compilers place space between "-{L,R}" and the path. 9533@@ -13948,13 +14688,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9534 test $p = "-R"; then 9535 prev=$p 9536 continue 9537- else 9538- prev= 9539 fi 9540 9541+ # Expand the sysroot to ease extracting the directories later. 9542+ if test -z "$prev"; then 9543+ case $p in 9544+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; 9545+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; 9546+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; 9547+ esac 9548+ fi 9549+ case $p in 9550+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; 9551+ esac 9552 if test "$pre_test_object_deps_done" = no; then 9553- case $p in 9554- -L* | -R*) 9555+ case ${prev} in 9556+ -L | -R) 9557 # Internal compiler library paths should come after those 9558 # provided the user. The postdeps already come after the 9559 # user supplied libs so there is no need to process them. 9560@@ -13974,8 +14723,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9561 postdeps_CXX="${postdeps_CXX} ${prev}${p}" 9562 fi 9563 fi 9564+ prev= 9565 ;; 9566 9567+ *.lto.$objext) ;; # Ignore GCC LTO objects 9568 *.$objext) 9569 # This assumes that the test object file only shows up 9570 # once in the compiler output. 9571@@ -14011,6 +14762,7 @@ else 9572 fi 9573 9574 $RM -f confest.$objext 9575+CFLAGS=$_lt_libdeps_save_CFLAGS 9576 9577 # PORTME: override above test on systems where it is broken 9578 case $host_os in 9579@@ -14046,7 +14798,7 @@ linux*) 9580 9581 solaris*) 9582 case $cc_basename in 9583- CC*) 9584+ CC* | sunCC*) 9585 # The more standards-conforming stlport4 library is 9586 # incompatible with the Cstd library. Avoid specifying 9587 # it if it's in CXXFLAGS. Ignore libCrun as 9588@@ -14111,8 +14863,6 @@ fi 9589 lt_prog_compiler_pic_CXX= 9590 lt_prog_compiler_static_CXX= 9591 9592-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 9593-$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 9594 9595 # C++ specific cases for pic, static, wl, etc. 9596 if test "$GXX" = yes; then 9597@@ -14217,6 +14967,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 9598 ;; 9599 esac 9600 ;; 9601+ mingw* | cygwin* | os2* | pw32* | cegcc*) 9602+ # This hack is so that the source file can tell whether it is being 9603+ # built for inclusion in a dll (and should export symbols for example). 9604+ lt_prog_compiler_pic_CXX='-DDLL_EXPORT' 9605+ ;; 9606 dgux*) 9607 case $cc_basename in 9608 ec++*) 9609@@ -14369,7 +15124,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 9610 ;; 9611 solaris*) 9612 case $cc_basename in 9613- CC*) 9614+ CC* | sunCC*) 9615 # Sun C++ 4.2, 5.x and Centerline C++ 9616 lt_prog_compiler_pic_CXX='-KPIC' 9617 lt_prog_compiler_static_CXX='-Bstatic' 9618@@ -14434,10 +15189,17 @@ case $host_os in 9619 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" 9620 ;; 9621 esac 9622-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5 9623-$as_echo "$lt_prog_compiler_pic_CXX" >&6; } 9624- 9625 9626+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 9627+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 9628+if ${lt_cv_prog_compiler_pic_CXX+:} false; then : 9629+ $as_echo_n "(cached) " >&6 9630+else 9631+ lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX 9632+fi 9633+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 9634+$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; } 9635+lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX 9636 9637 # 9638 # Check to make sure the PIC flag actually works. 9639@@ -14495,6 +15257,8 @@ fi 9640 9641 9642 9643+ 9644+ 9645 # 9646 # Check to make sure the static flag actually works. 9647 # 9648@@ -14672,6 +15436,7 @@ fi 9649 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } 9650 9651 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 9652+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' 9653 case $host_os in 9654 aix[4-9]*) 9655 # If we're using GNU nm, then we don't want the "-C" option. 9656@@ -14686,15 +15451,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie 9657 ;; 9658 pw32*) 9659 export_symbols_cmds_CXX="$ltdll_cmds" 9660- ;; 9661+ ;; 9662 cygwin* | mingw* | cegcc*) 9663- 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' 9664- ;; 9665+ case $cc_basename in 9666+ cl*) ;; 9667+ *) 9668+ 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' 9669+ exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' 9670+ ;; 9671+ esac 9672+ ;; 9673 *) 9674 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 9675- ;; 9676+ ;; 9677 esac 9678- exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' 9679 9680 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 9681 $as_echo "$ld_shlibs_CXX" >&6; } 9682@@ -14957,8 +15727,9 @@ cygwin* | mingw* | pw32* | cegcc*) 9683 need_version=no 9684 need_lib_prefix=no 9685 9686- case $GCC,$host_os in 9687- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) 9688+ case $GCC,$cc_basename in 9689+ yes,*) 9690+ # gcc 9691 library_names_spec='$libname.dll.a' 9692 # DLL is installed to $(libdir)/../bin by postinstall_cmds 9693 postinstall_cmds='base_file=`basename \${file}`~ 9694@@ -14990,13 +15761,71 @@ cygwin* | mingw* | pw32* | cegcc*) 9695 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 9696 ;; 9697 esac 9698+ dynamic_linker='Win32 ld.exe' 9699+ ;; 9700+ 9701+ *,cl*) 9702+ # Native MSVC 9703+ libname_spec='$name' 9704+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 9705+ library_names_spec='${libname}.dll.lib' 9706+ 9707+ case $build_os in 9708+ mingw*) 9709+ sys_lib_search_path_spec= 9710+ lt_save_ifs=$IFS 9711+ IFS=';' 9712+ for lt_path in $LIB 9713+ do 9714+ IFS=$lt_save_ifs 9715+ # Let DOS variable expansion print the short 8.3 style file name. 9716+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` 9717+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" 9718+ done 9719+ IFS=$lt_save_ifs 9720+ # Convert to MSYS style. 9721+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` 9722+ ;; 9723+ cygwin*) 9724+ # Convert to unix form, then to dos form, then back to unix form 9725+ # but this time dos style (no spaces!) so that the unix form looks 9726+ # like /cygdrive/c/PROGRA~1:/cygdr... 9727+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` 9728+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` 9729+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 9730+ ;; 9731+ *) 9732+ sys_lib_search_path_spec="$LIB" 9733+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then 9734+ # It is most probably a Windows format PATH. 9735+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` 9736+ else 9737+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 9738+ fi 9739+ # FIXME: find the short name or the path components, as spaces are 9740+ # common. (e.g. "Program Files" -> "PROGRA~1") 9741+ ;; 9742+ esac 9743+ 9744+ # DLL is installed to $(libdir)/../bin by postinstall_cmds 9745+ postinstall_cmds='base_file=`basename \${file}`~ 9746+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ 9747+ dldir=$destdir/`dirname \$dlpath`~ 9748+ test -d \$dldir || mkdir -p \$dldir~ 9749+ $install_prog $dir/$dlname \$dldir/$dlname' 9750+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ 9751+ dlpath=$dir/\$dldll~ 9752+ $RM \$dlpath' 9753+ shlibpath_overrides_runpath=yes 9754+ dynamic_linker='Win32 link.exe' 9755 ;; 9756 9757 *) 9758+ # Assume MSVC wrapper 9759 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' 9760+ dynamic_linker='Win32 ld.exe' 9761 ;; 9762 esac 9763- dynamic_linker='Win32 ld.exe' 9764 # FIXME: first we should search . and the directory the executable is in 9765 shlibpath_var=PATH 9766 ;; 9767@@ -15536,6 +16365,7 @@ fi 9768 fi # test -n "$compiler" 9769 9770 CC=$lt_save_CC 9771+ CFLAGS=$lt_save_CFLAGS 9772 LDCXX=$LD 9773 LD=$lt_save_LD 9774 GCC=$lt_save_GCC 9775@@ -17751,13 +18581,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 9776 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 9777 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 9778 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 9779+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' 9780+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' 9781 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' 9782 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' 9783 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' 9784 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' 9785 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' 9786+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' 9787+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' 9788+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' 9789+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' 9790 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' 9791 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' 9792+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' 9793 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 9794 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 9795 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 9796@@ -17772,14 +18609,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 9797 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 9798 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 9799 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"`' 9800+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' 9801+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' 9802 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' 9803 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' 9804 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' 9805-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 9806 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' 9807+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 9808 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' 9809 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' 9810 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' 9811+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' 9812 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 9813 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 9814 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 9815@@ -17812,12 +18652,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 9816 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 9817 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 9818 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 9819-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' 9820 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' 9821 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' 9822 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' 9823 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' 9824 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' 9825+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' 9826 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 9827 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 9828 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 9829@@ -17856,8 +18696,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote 9830 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' 9831 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' 9832 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' 9833-lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' 9834 lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`' 9835+lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' 9836 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' 9837 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' 9838 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' 9839@@ -17884,12 +18724,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ 9840 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' 9841 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' 9842 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' 9843-fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`' 9844 always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`' 9845 export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`' 9846 exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`' 9847 include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`' 9848 prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`' 9849+postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`' 9850 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' 9851 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' 9852 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' 9853@@ -17927,8 +18767,13 @@ reload_flag \ 9854 OBJDUMP \ 9855 deplibs_check_method \ 9856 file_magic_cmd \ 9857+file_magic_glob \ 9858+want_nocaseglob \ 9859+DLLTOOL \ 9860+sharedlib_from_linklib_cmd \ 9861 AR \ 9862 AR_FLAGS \ 9863+archiver_list_spec \ 9864 STRIP \ 9865 RANLIB \ 9866 CC \ 9867@@ -17938,12 +18783,14 @@ lt_cv_sys_global_symbol_pipe \ 9868 lt_cv_sys_global_symbol_to_cdecl \ 9869 lt_cv_sys_global_symbol_to_c_name_address \ 9870 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 9871+nm_file_list_spec \ 9872 lt_prog_compiler_no_builtin_flag \ 9873-lt_prog_compiler_wl \ 9874 lt_prog_compiler_pic \ 9875+lt_prog_compiler_wl \ 9876 lt_prog_compiler_static \ 9877 lt_cv_prog_compiler_c_o \ 9878 need_locks \ 9879+MANIFEST_TOOL \ 9880 DSYMUTIL \ 9881 NMEDIT \ 9882 LIPO \ 9883@@ -17959,7 +18806,6 @@ no_undefined_flag \ 9884 hardcode_libdir_flag_spec \ 9885 hardcode_libdir_flag_spec_ld \ 9886 hardcode_libdir_separator \ 9887-fix_srcfile_path \ 9888 exclude_expsyms \ 9889 include_expsyms \ 9890 file_list_spec \ 9891@@ -17981,8 +18827,8 @@ LD_CXX \ 9892 reload_flag_CXX \ 9893 compiler_CXX \ 9894 lt_prog_compiler_no_builtin_flag_CXX \ 9895-lt_prog_compiler_wl_CXX \ 9896 lt_prog_compiler_pic_CXX \ 9897+lt_prog_compiler_wl_CXX \ 9898 lt_prog_compiler_static_CXX \ 9899 lt_cv_prog_compiler_c_o_CXX \ 9900 export_dynamic_flag_spec_CXX \ 9901@@ -17994,7 +18840,6 @@ no_undefined_flag_CXX \ 9902 hardcode_libdir_flag_spec_CXX \ 9903 hardcode_libdir_flag_spec_ld_CXX \ 9904 hardcode_libdir_separator_CXX \ 9905-fix_srcfile_path_CXX \ 9906 exclude_expsyms_CXX \ 9907 include_expsyms_CXX \ 9908 file_list_spec_CXX \ 9909@@ -18028,6 +18873,7 @@ module_cmds \ 9910 module_expsym_cmds \ 9911 export_symbols_cmds \ 9912 prelink_cmds \ 9913+postlink_cmds \ 9914 postinstall_cmds \ 9915 postuninstall_cmds \ 9916 finish_cmds \ 9917@@ -18042,7 +18888,8 @@ archive_expsym_cmds_CXX \ 9918 module_cmds_CXX \ 9919 module_expsym_cmds_CXX \ 9920 export_symbols_cmds_CXX \ 9921-prelink_cmds_CXX; do 9922+prelink_cmds_CXX \ 9923+postlink_cmds_CXX; do 9924 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in 9925 *[\\\\\\\`\\"\\\$]*) 9926 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" 9927@@ -18799,7 +19646,8 @@ $as_echo X"$file" | 9928 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 9929 # 9930 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 9931-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. 9932+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, 9933+# Inc. 9934 # Written by Gordon Matzigkeit, 1996 9935 # 9936 # This file is part of GNU Libtool. 9937@@ -18902,19 +19750,42 @@ SP2NL=$lt_lt_SP2NL 9938 # turn newlines into spaces. 9939 NL2SP=$lt_lt_NL2SP 9940 9941+# convert \$build file names to \$host format. 9942+to_host_file_cmd=$lt_cv_to_host_file_cmd 9943+ 9944+# convert \$build files to toolchain format. 9945+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 9946+ 9947 # An object symbol dumper. 9948 OBJDUMP=$lt_OBJDUMP 9949 9950 # Method to check whether dependent libraries are shared objects. 9951 deplibs_check_method=$lt_deplibs_check_method 9952 9953-# Command to use when deplibs_check_method == "file_magic". 9954+# Command to use when deplibs_check_method = "file_magic". 9955 file_magic_cmd=$lt_file_magic_cmd 9956 9957+# How to find potential files when deplibs_check_method = "file_magic". 9958+file_magic_glob=$lt_file_magic_glob 9959+ 9960+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". 9961+want_nocaseglob=$lt_want_nocaseglob 9962+ 9963+# DLL creation program. 9964+DLLTOOL=$lt_DLLTOOL 9965+ 9966+# Command to associate shared and link libraries. 9967+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd 9968+ 9969 # The archiver. 9970 AR=$lt_AR 9971+ 9972+# Flags to create an archive. 9973 AR_FLAGS=$lt_AR_FLAGS 9974 9975+# How to feed a file listing to the archiver. 9976+archiver_list_spec=$lt_archiver_list_spec 9977+ 9978 # A symbol stripping program. 9979 STRIP=$lt_STRIP 9980 9981@@ -18944,6 +19815,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 9982 # Transform the output of nm in a C name address pair when lib prefix is needed. 9983 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 9984 9985+# Specify filename containing input files for \$NM. 9986+nm_file_list_spec=$lt_nm_file_list_spec 9987+ 9988+# The root where to search for dependent libraries,and in which our libraries should be installed. 9989+lt_sysroot=$lt_sysroot 9990+ 9991 # The name of the directory that contains temporary libtool files. 9992 objdir=$objdir 9993 9994@@ -18953,6 +19830,9 @@ MAGIC_CMD=$MAGIC_CMD 9995 # Must we lock files when doing compilation? 9996 need_locks=$lt_need_locks 9997 9998+# Manifest tool. 9999+MANIFEST_TOOL=$lt_MANIFEST_TOOL 10000+ 10001 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 10002 DSYMUTIL=$lt_DSYMUTIL 10003 10004@@ -19067,12 +19947,12 @@ with_gcc=$GCC 10005 # Compiler flag to turn off builtin functions. 10006 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 10007 10008-# How to pass a linker flag through the compiler. 10009-wl=$lt_lt_prog_compiler_wl 10010- 10011 # Additional compiler flags for building library objects. 10012 pic_flag=$lt_lt_prog_compiler_pic 10013 10014+# How to pass a linker flag through the compiler. 10015+wl=$lt_lt_prog_compiler_wl 10016+ 10017 # Compiler flag to prevent dynamic linking. 10018 link_static_flag=$lt_lt_prog_compiler_static 10019 10020@@ -19159,9 +20039,6 @@ inherit_rpath=$inherit_rpath 10021 # Whether libtool must link a program against all its dependency libraries. 10022 link_all_deplibs=$link_all_deplibs 10023 10024-# Fix the shell variable \$srcfile for the compiler. 10025-fix_srcfile_path=$lt_fix_srcfile_path 10026- 10027 # Set to "yes" if exported symbols are required. 10028 always_export_symbols=$always_export_symbols 10029 10030@@ -19177,6 +20054,9 @@ include_expsyms=$lt_include_expsyms 10031 # Commands necessary for linking programs (against libraries) with templates. 10032 prelink_cmds=$lt_prelink_cmds 10033 10034+# Commands necessary for finishing linking programs. 10035+postlink_cmds=$lt_postlink_cmds 10036+ 10037 # Specify filename containing input files. 10038 file_list_spec=$lt_file_list_spec 10039 10040@@ -19223,210 +20103,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 10041 # if finds mixed CR/LF and LF-only lines. Since sed operates in 10042 # text mode, it properly converts lines to CR/LF. This bash problem 10043 # is reportedly fixed, but why not run on old versions too? 10044- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ 10045- || (rm -f "$cfgfile"; exit 1) 10046- 10047- case $xsi_shell in 10048- yes) 10049- cat << \_LT_EOF >> "$cfgfile" 10050- 10051-# func_dirname file append nondir_replacement 10052-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 10053-# otherwise set result to NONDIR_REPLACEMENT. 10054-func_dirname () 10055-{ 10056- case ${1} in 10057- */*) func_dirname_result="${1%/*}${2}" ;; 10058- * ) func_dirname_result="${3}" ;; 10059- esac 10060-} 10061- 10062-# func_basename file 10063-func_basename () 10064-{ 10065- func_basename_result="${1##*/}" 10066-} 10067- 10068-# func_dirname_and_basename file append nondir_replacement 10069-# perform func_basename and func_dirname in a single function 10070-# call: 10071-# dirname: Compute the dirname of FILE. If nonempty, 10072-# add APPEND to the result, otherwise set result 10073-# to NONDIR_REPLACEMENT. 10074-# value returned in "$func_dirname_result" 10075-# basename: Compute filename of FILE. 10076-# value retuned in "$func_basename_result" 10077-# Implementation must be kept synchronized with func_dirname 10078-# and func_basename. For efficiency, we do not delegate to 10079-# those functions but instead duplicate the functionality here. 10080-func_dirname_and_basename () 10081-{ 10082- case ${1} in 10083- */*) func_dirname_result="${1%/*}${2}" ;; 10084- * ) func_dirname_result="${3}" ;; 10085- esac 10086- func_basename_result="${1##*/}" 10087-} 10088- 10089-# func_stripname prefix suffix name 10090-# strip PREFIX and SUFFIX off of NAME. 10091-# PREFIX and SUFFIX must not contain globbing or regex special 10092-# characters, hashes, percent signs, but SUFFIX may contain a leading 10093-# dot (in which case that matches only a dot). 10094-func_stripname () 10095-{ 10096- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are 10097- # positional parameters, so assign one to ordinary parameter first. 10098- func_stripname_result=${3} 10099- func_stripname_result=${func_stripname_result#"${1}"} 10100- func_stripname_result=${func_stripname_result%"${2}"} 10101-} 10102- 10103-# func_opt_split 10104-func_opt_split () 10105-{ 10106- func_opt_split_opt=${1%%=*} 10107- func_opt_split_arg=${1#*=} 10108-} 10109- 10110-# func_lo2o object 10111-func_lo2o () 10112-{ 10113- case ${1} in 10114- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; 10115- *) func_lo2o_result=${1} ;; 10116- esac 10117-} 10118- 10119-# func_xform libobj-or-source 10120-func_xform () 10121-{ 10122- func_xform_result=${1%.*}.lo 10123-} 10124- 10125-# func_arith arithmetic-term... 10126-func_arith () 10127-{ 10128- func_arith_result=$(( $* )) 10129-} 10130- 10131-# func_len string 10132-# STRING may not start with a hyphen. 10133-func_len () 10134-{ 10135- func_len_result=${#1} 10136-} 10137- 10138-_LT_EOF 10139- ;; 10140- *) # Bourne compatible functions. 10141- cat << \_LT_EOF >> "$cfgfile" 10142- 10143-# func_dirname file append nondir_replacement 10144-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 10145-# otherwise set result to NONDIR_REPLACEMENT. 10146-func_dirname () 10147-{ 10148- # Extract subdirectory from the argument. 10149- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` 10150- if test "X$func_dirname_result" = "X${1}"; then 10151- func_dirname_result="${3}" 10152- else 10153- func_dirname_result="$func_dirname_result${2}" 10154- fi 10155-} 10156- 10157-# func_basename file 10158-func_basename () 10159-{ 10160- func_basename_result=`$ECHO "${1}" | $SED "$basename"` 10161-} 10162- 10163- 10164-# func_stripname prefix suffix name 10165-# strip PREFIX and SUFFIX off of NAME. 10166-# PREFIX and SUFFIX must not contain globbing or regex special 10167-# characters, hashes, percent signs, but SUFFIX may contain a leading 10168-# dot (in which case that matches only a dot). 10169-# func_strip_suffix prefix name 10170-func_stripname () 10171-{ 10172- case ${2} in 10173- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; 10174- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; 10175- esac 10176-} 10177- 10178-# sed scripts: 10179-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' 10180-my_sed_long_arg='1s/^-[^=]*=//' 10181- 10182-# func_opt_split 10183-func_opt_split () 10184-{ 10185- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` 10186- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` 10187-} 10188- 10189-# func_lo2o object 10190-func_lo2o () 10191-{ 10192- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` 10193-} 10194- 10195-# func_xform libobj-or-source 10196-func_xform () 10197-{ 10198- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` 10199-} 10200- 10201-# func_arith arithmetic-term... 10202-func_arith () 10203-{ 10204- func_arith_result=`expr "$@"` 10205-} 10206- 10207-# func_len string 10208-# STRING may not start with a hyphen. 10209-func_len () 10210-{ 10211- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` 10212-} 10213- 10214-_LT_EOF 10215-esac 10216- 10217-case $lt_shell_append in 10218- yes) 10219- cat << \_LT_EOF >> "$cfgfile" 10220- 10221-# func_append var value 10222-# Append VALUE to the end of shell variable VAR. 10223-func_append () 10224-{ 10225- eval "$1+=\$2" 10226-} 10227-_LT_EOF 10228- ;; 10229- *) 10230- cat << \_LT_EOF >> "$cfgfile" 10231- 10232-# func_append var value 10233-# Append VALUE to the end of shell variable VAR. 10234-func_append () 10235-{ 10236- eval "$1=\$$1\$2" 10237-} 10238- 10239-_LT_EOF 10240- ;; 10241- esac 10242- 10243- 10244- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ 10245- || (rm -f "$cfgfile"; exit 1) 10246- 10247- mv -f "$cfgfile" "$ofile" || 10248+ sed '$q' "$ltmain" >> "$cfgfile" \ 10249+ || (rm -f "$cfgfile"; exit 1) 10250+ 10251+ if test x"$xsi_shell" = xyes; then 10252+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ 10253+func_dirname ()\ 10254+{\ 10255+\ case ${1} in\ 10256+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 10257+\ * ) func_dirname_result="${3}" ;;\ 10258+\ esac\ 10259+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ 10260+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 10261+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 10262+test 0 -eq $? || _lt_function_replace_fail=: 10263+ 10264+ 10265+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ 10266+func_basename ()\ 10267+{\ 10268+\ func_basename_result="${1##*/}"\ 10269+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ 10270+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 10271+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 10272+test 0 -eq $? || _lt_function_replace_fail=: 10273+ 10274+ 10275+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ 10276+func_dirname_and_basename ()\ 10277+{\ 10278+\ case ${1} in\ 10279+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 10280+\ * ) func_dirname_result="${3}" ;;\ 10281+\ esac\ 10282+\ func_basename_result="${1##*/}"\ 10283+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ 10284+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 10285+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 10286+test 0 -eq $? || _lt_function_replace_fail=: 10287+ 10288+ 10289+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ 10290+func_stripname ()\ 10291+{\ 10292+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ 10293+\ # positional parameters, so assign one to ordinary parameter first.\ 10294+\ func_stripname_result=${3}\ 10295+\ func_stripname_result=${func_stripname_result#"${1}"}\ 10296+\ func_stripname_result=${func_stripname_result%"${2}"}\ 10297+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ 10298+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 10299+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 10300+test 0 -eq $? || _lt_function_replace_fail=: 10301+ 10302+ 10303+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ 10304+func_split_long_opt ()\ 10305+{\ 10306+\ func_split_long_opt_name=${1%%=*}\ 10307+\ func_split_long_opt_arg=${1#*=}\ 10308+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ 10309+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 10310+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 10311+test 0 -eq $? || _lt_function_replace_fail=: 10312+ 10313+ 10314+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ 10315+func_split_short_opt ()\ 10316+{\ 10317+\ func_split_short_opt_arg=${1#??}\ 10318+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ 10319+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ 10320+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 10321+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 10322+test 0 -eq $? || _lt_function_replace_fail=: 10323+ 10324+ 10325+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ 10326+func_lo2o ()\ 10327+{\ 10328+\ case ${1} in\ 10329+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ 10330+\ *) func_lo2o_result=${1} ;;\ 10331+\ esac\ 10332+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ 10333+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 10334+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 10335+test 0 -eq $? || _lt_function_replace_fail=: 10336+ 10337+ 10338+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ 10339+func_xform ()\ 10340+{\ 10341+ func_xform_result=${1%.*}.lo\ 10342+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ 10343+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 10344+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 10345+test 0 -eq $? || _lt_function_replace_fail=: 10346+ 10347+ 10348+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ 10349+func_arith ()\ 10350+{\ 10351+ func_arith_result=$(( $* ))\ 10352+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ 10353+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 10354+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 10355+test 0 -eq $? || _lt_function_replace_fail=: 10356+ 10357+ 10358+ sed -e '/^func_len ()$/,/^} # func_len /c\ 10359+func_len ()\ 10360+{\ 10361+ func_len_result=${#1}\ 10362+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ 10363+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 10364+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 10365+test 0 -eq $? || _lt_function_replace_fail=: 10366+ 10367+fi 10368+ 10369+if test x"$lt_shell_append" = xyes; then 10370+ sed -e '/^func_append ()$/,/^} # func_append /c\ 10371+func_append ()\ 10372+{\ 10373+ eval "${1}+=\\${2}"\ 10374+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ 10375+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 10376+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 10377+test 0 -eq $? || _lt_function_replace_fail=: 10378+ 10379+ 10380+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ 10381+func_append_quoted ()\ 10382+{\ 10383+\ func_quote_for_eval "${2}"\ 10384+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ 10385+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ 10386+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 10387+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 10388+test 0 -eq $? || _lt_function_replace_fail=: 10389+ 10390+ 10391+ # Save a `func_append' function call where possible by direct use of '+=' 10392+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ 10393+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 10394+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 10395+ test 0 -eq $? || _lt_function_replace_fail=: 10396+else 10397+ # Save a `func_append' function call even when '+=' is not available 10398+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ 10399+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 10400+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 10401+ test 0 -eq $? || _lt_function_replace_fail=: 10402+fi 10403+ 10404+if test x"$_lt_function_replace_fail" = x":"; then 10405+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 10406+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} 10407+fi 10408+ 10409+ 10410+ mv -f "$cfgfile" "$ofile" || 10411 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 10412 chmod +x "$ofile" 10413 10414@@ -19454,12 +20293,12 @@ with_gcc=$GCC_CXX 10415 # Compiler flag to turn off builtin functions. 10416 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX 10417 10418-# How to pass a linker flag through the compiler. 10419-wl=$lt_lt_prog_compiler_wl_CXX 10420- 10421 # Additional compiler flags for building library objects. 10422 pic_flag=$lt_lt_prog_compiler_pic_CXX 10423 10424+# How to pass a linker flag through the compiler. 10425+wl=$lt_lt_prog_compiler_wl_CXX 10426+ 10427 # Compiler flag to prevent dynamic linking. 10428 link_static_flag=$lt_lt_prog_compiler_static_CXX 10429 10430@@ -19546,9 +20385,6 @@ inherit_rpath=$inherit_rpath_CXX 10431 # Whether libtool must link a program against all its dependency libraries. 10432 link_all_deplibs=$link_all_deplibs_CXX 10433 10434-# Fix the shell variable \$srcfile for the compiler. 10435-fix_srcfile_path=$lt_fix_srcfile_path_CXX 10436- 10437 # Set to "yes" if exported symbols are required. 10438 always_export_symbols=$always_export_symbols_CXX 10439 10440@@ -19564,6 +20400,9 @@ include_expsyms=$lt_include_expsyms_CXX 10441 # Commands necessary for linking programs (against libraries) with templates. 10442 prelink_cmds=$lt_prelink_cmds_CXX 10443 10444+# Commands necessary for finishing linking programs. 10445+postlink_cmds=$lt_postlink_cmds_CXX 10446+ 10447 # Specify filename containing input files. 10448 file_list_spec=$lt_file_list_spec_CXX 10449 10450diff --git a/gprofng/doc/Makefile.in b/gprofng/doc/Makefile.in 10451index 3cd2068cbf6..c5d431236aa 100644 10452--- a/gprofng/doc/Makefile.in 10453+++ b/gprofng/doc/Makefile.in 10454@@ -240,6 +240,7 @@ CXXFLAGS = @CXXFLAGS@ 10455 CYGPATH_W = @CYGPATH_W@ 10456 DEFS = @DEFS@ 10457 DEPDIR = @DEPDIR@ 10458+DLLTOOL = @DLLTOOL@ 10459 DSYMUTIL = @DSYMUTIL@ 10460 DUMPBIN = @DUMPBIN@ 10461 ECHO_C = @ECHO_C@ 10462@@ -275,6 +276,7 @@ LN_S = @LN_S@ 10463 LTLIBOBJS = @LTLIBOBJS@ 10464 MAINT = @MAINT@ 10465 MAKEINFO = @MAKEINFO@ 10466+MANIFEST_TOOL = @MANIFEST_TOOL@ 10467 MKDIR_P = @MKDIR_P@ 10468 NM = @NM@ 10469 NMEDIT = @NMEDIT@ 10470diff --git a/gprofng/gp-display-html/Makefile.in b/gprofng/gp-display-html/Makefile.in 10471index 42886f7c645..b7e31ded46a 100644 10472--- a/gprofng/gp-display-html/Makefile.in 10473+++ b/gprofng/gp-display-html/Makefile.in 10474@@ -200,6 +200,7 @@ CXXFLAGS = @CXXFLAGS@ 10475 CYGPATH_W = @CYGPATH_W@ 10476 DEFS = @DEFS@ 10477 DEPDIR = @DEPDIR@ 10478+DLLTOOL = @DLLTOOL@ 10479 DSYMUTIL = @DSYMUTIL@ 10480 DUMPBIN = @DUMPBIN@ 10481 ECHO_C = @ECHO_C@ 10482@@ -235,6 +236,7 @@ LN_S = @LN_S@ 10483 LTLIBOBJS = @LTLIBOBJS@ 10484 MAINT = @MAINT@ 10485 MAKEINFO = @MAKEINFO@ 10486+MANIFEST_TOOL = @MANIFEST_TOOL@ 10487 MKDIR_P = @MKDIR_P@ 10488 NM = @NM@ 10489 NMEDIT = @NMEDIT@ 10490diff --git a/gprofng/libcollector/Makefile.in b/gprofng/libcollector/Makefile.in 10491index eef61ba85f7..0eb1521b704 100644 10492--- a/gprofng/libcollector/Makefile.in 10493+++ b/gprofng/libcollector/Makefile.in 10494@@ -316,6 +316,7 @@ CXXFLAGS = @CXXFLAGS@ 10495 CYGPATH_W = @CYGPATH_W@ 10496 DEFS = @DEFS@ 10497 DEPDIR = @DEPDIR@ 10498+DLLTOOL = @DLLTOOL@ 10499 DSYMUTIL = @DSYMUTIL@ 10500 DUMPBIN = @DUMPBIN@ 10501 ECHO_C = @ECHO_C@ 10502@@ -342,6 +343,7 @@ LN_S = @LN_S@ 10503 LTLIBOBJS = @LTLIBOBJS@ 10504 MAINT = @MAINT@ 10505 MAKEINFO = @MAKEINFO@ 10506+MANIFEST_TOOL = @MANIFEST_TOOL@ 10507 MKDIR_P = @MKDIR_P@ 10508 NM = @NM@ 10509 NMEDIT = @NMEDIT@ 10510diff --git a/gprofng/libcollector/configure b/gprofng/libcollector/configure 10511index 079a0b71ec3..a28289cfe9d 100755 10512--- a/gprofng/libcollector/configure 10513+++ b/gprofng/libcollector/configure 10514@@ -641,6 +641,8 @@ OTOOL 10515 LIPO 10516 NMEDIT 10517 DSYMUTIL 10518+MANIFEST_TOOL 10519+DLLTOOL 10520 OBJDUMP 10521 LN_S 10522 NM 10523@@ -770,6 +772,7 @@ enable_static 10524 with_pic 10525 enable_fast_install 10526 with_gnu_ld 10527+with_libtool_sysroot 10528 enable_libtool_lock 10529 ' 10530 ac_precious_vars='build_alias 10531@@ -1425,6 +1428,8 @@ Optional Packages: 10532 --with-pic try to use only PIC/non-PIC objects [default=use 10533 both] 10534 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 10535+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR 10536+ (or the compiler's sysroot if not specified). 10537 10538 Some influential environment variables: 10539 CC C compiler command 10540@@ -5969,8 +5974,8 @@ esac 10541 10542 10543 10544-macro_version='2.2.7a' 10545-macro_revision='1.3134' 10546+macro_version='2.4' 10547+macro_revision='1.3293' 10548 10549 10550 10551@@ -6010,7 +6015,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 10552 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 10553 $as_echo_n "checking how to print strings... " >&6; } 10554 # Test print first, because it will be a builtin if present. 10555-if test "X`print -r -- -n 2>/dev/null`" = X-n && \ 10556+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ 10557 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 10558 ECHO='print -r --' 10559 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 10560@@ -6703,8 +6708,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 10561 # Try some XSI features 10562 xsi_shell=no 10563 ( _lt_dummy="a/b/c" 10564- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ 10565- = c,a/b,, \ 10566+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ 10567+ = c,a/b,b/c, \ 10568 && eval 'test $(( 1 + 1 )) -eq 2 \ 10569 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 10570 && xsi_shell=yes 10571@@ -6753,6 +6758,80 @@ esac 10572 10573 10574 10575+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 10576+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } 10577+if ${lt_cv_to_host_file_cmd+:} false; then : 10578+ $as_echo_n "(cached) " >&6 10579+else 10580+ case $host in 10581+ *-*-mingw* ) 10582+ case $build in 10583+ *-*-mingw* ) # actually msys 10584+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 10585+ ;; 10586+ *-*-cygwin* ) 10587+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 10588+ ;; 10589+ * ) # otherwise, assume *nix 10590+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 10591+ ;; 10592+ esac 10593+ ;; 10594+ *-*-cygwin* ) 10595+ case $build in 10596+ *-*-mingw* ) # actually msys 10597+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin 10598+ ;; 10599+ *-*-cygwin* ) 10600+ lt_cv_to_host_file_cmd=func_convert_file_noop 10601+ ;; 10602+ * ) # otherwise, assume *nix 10603+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin 10604+ ;; 10605+ esac 10606+ ;; 10607+ * ) # unhandled hosts (and "normal" native builds) 10608+ lt_cv_to_host_file_cmd=func_convert_file_noop 10609+ ;; 10610+esac 10611+ 10612+fi 10613+ 10614+to_host_file_cmd=$lt_cv_to_host_file_cmd 10615+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 10616+$as_echo "$lt_cv_to_host_file_cmd" >&6; } 10617+ 10618+ 10619+ 10620+ 10621+ 10622+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 10623+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } 10624+if ${lt_cv_to_tool_file_cmd+:} false; then : 10625+ $as_echo_n "(cached) " >&6 10626+else 10627+ #assume ordinary cross tools, or native build. 10628+lt_cv_to_tool_file_cmd=func_convert_file_noop 10629+case $host in 10630+ *-*-mingw* ) 10631+ case $build in 10632+ *-*-mingw* ) # actually msys 10633+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 10634+ ;; 10635+ esac 10636+ ;; 10637+esac 10638+ 10639+fi 10640+ 10641+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 10642+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 10643+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } 10644+ 10645+ 10646+ 10647+ 10648+ 10649 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 10650 $as_echo_n "checking for $LD option to reload object files... " >&6; } 10651 if ${lt_cv_ld_reload_flag+:} false; then : 10652@@ -6769,6 +6848,11 @@ case $reload_flag in 10653 esac 10654 reload_cmds='$LD$reload_flag -o $output$reload_objs' 10655 case $host_os in 10656+ cygwin* | mingw* | pw32* | cegcc*) 10657+ if test "$GCC" != yes; then 10658+ reload_cmds=false 10659+ fi 10660+ ;; 10661 darwin*) 10662 if test "$GCC" = yes; then 10663 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 10664@@ -6937,7 +7021,8 @@ mingw* | pw32*) 10665 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 10666 lt_cv_file_magic_cmd='func_win32_libid' 10667 else 10668- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' 10669+ # Keep this pattern in sync with the one in func_win32_libid. 10670+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' 10671 lt_cv_file_magic_cmd='$OBJDUMP -f' 10672 fi 10673 ;; 10674@@ -7091,6 +7176,21 @@ esac 10675 fi 10676 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 10677 $as_echo "$lt_cv_deplibs_check_method" >&6; } 10678+ 10679+file_magic_glob= 10680+want_nocaseglob=no 10681+if test "$build" = "$host"; then 10682+ case $host_os in 10683+ mingw* | pw32*) 10684+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then 10685+ want_nocaseglob=yes 10686+ else 10687+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` 10688+ fi 10689+ ;; 10690+ esac 10691+fi 10692+ 10693 file_magic_cmd=$lt_cv_file_magic_cmd 10694 deplibs_check_method=$lt_cv_deplibs_check_method 10695 test -z "$deplibs_check_method" && deplibs_check_method=unknown 10696@@ -7106,6 +7206,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 10697 10698 10699 10700+ 10701+ 10702+ 10703+ 10704+ 10705+ 10706+ 10707+ 10708+ 10709+ 10710+if test -n "$ac_tool_prefix"; then 10711+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. 10712+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 10713+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 10714+$as_echo_n "checking for $ac_word... " >&6; } 10715+if ${ac_cv_prog_DLLTOOL+:} false; then : 10716+ $as_echo_n "(cached) " >&6 10717+else 10718+ if test -n "$DLLTOOL"; then 10719+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. 10720+else 10721+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 10722+for as_dir in $PATH 10723+do 10724+ IFS=$as_save_IFS 10725+ test -z "$as_dir" && as_dir=. 10726+ for ac_exec_ext in '' $ac_executable_extensions; do 10727+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 10728+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" 10729+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 10730+ break 2 10731+ fi 10732+done 10733+ done 10734+IFS=$as_save_IFS 10735+ 10736+fi 10737+fi 10738+DLLTOOL=$ac_cv_prog_DLLTOOL 10739+if test -n "$DLLTOOL"; then 10740+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 10741+$as_echo "$DLLTOOL" >&6; } 10742+else 10743+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 10744+$as_echo "no" >&6; } 10745+fi 10746+ 10747+ 10748+fi 10749+if test -z "$ac_cv_prog_DLLTOOL"; then 10750+ ac_ct_DLLTOOL=$DLLTOOL 10751+ # Extract the first word of "dlltool", so it can be a program name with args. 10752+set dummy dlltool; ac_word=$2 10753+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 10754+$as_echo_n "checking for $ac_word... " >&6; } 10755+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : 10756+ $as_echo_n "(cached) " >&6 10757+else 10758+ if test -n "$ac_ct_DLLTOOL"; then 10759+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. 10760+else 10761+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 10762+for as_dir in $PATH 10763+do 10764+ IFS=$as_save_IFS 10765+ test -z "$as_dir" && as_dir=. 10766+ for ac_exec_ext in '' $ac_executable_extensions; do 10767+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 10768+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" 10769+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 10770+ break 2 10771+ fi 10772+done 10773+ done 10774+IFS=$as_save_IFS 10775+ 10776+fi 10777+fi 10778+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL 10779+if test -n "$ac_ct_DLLTOOL"; then 10780+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 10781+$as_echo "$ac_ct_DLLTOOL" >&6; } 10782+else 10783+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 10784+$as_echo "no" >&6; } 10785+fi 10786+ 10787+ if test "x$ac_ct_DLLTOOL" = x; then 10788+ DLLTOOL="false" 10789+ else 10790+ case $cross_compiling:$ac_tool_warned in 10791+yes:) 10792+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 10793+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 10794+ac_tool_warned=yes ;; 10795+esac 10796+ DLLTOOL=$ac_ct_DLLTOOL 10797+ fi 10798+else 10799+ DLLTOOL="$ac_cv_prog_DLLTOOL" 10800+fi 10801+ 10802+test -z "$DLLTOOL" && DLLTOOL=dlltool 10803+ 10804+ 10805+ 10806+ 10807+ 10808+ 10809+ 10810+ 10811+ 10812+ 10813+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 10814+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } 10815+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : 10816+ $as_echo_n "(cached) " >&6 10817+else 10818+ lt_cv_sharedlib_from_linklib_cmd='unknown' 10819+ 10820+case $host_os in 10821+cygwin* | mingw* | pw32* | cegcc*) 10822+ # two different shell functions defined in ltmain.sh 10823+ # decide which to use based on capabilities of $DLLTOOL 10824+ case `$DLLTOOL --help 2>&1` in 10825+ *--identify-strict*) 10826+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib 10827+ ;; 10828+ *) 10829+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback 10830+ ;; 10831+ esac 10832+ ;; 10833+*) 10834+ # fallback: assume linklib IS sharedlib 10835+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" 10836+ ;; 10837+esac 10838+ 10839+fi 10840+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 10841+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } 10842+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd 10843+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO 10844+ 10845+ 10846+ 10847+ 10848+ 10849+ 10850+ 10851 plugin_option= 10852 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 10853 for plugin in $plugin_names; do 10854@@ -7120,8 +7371,10 @@ for plugin in $plugin_names; do 10855 done 10856 10857 if test -n "$ac_tool_prefix"; then 10858- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 10859-set dummy ${ac_tool_prefix}ar; ac_word=$2 10860+ for ac_prog in ar 10861+ do 10862+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 10863+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 10864 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 10865 $as_echo_n "checking for $ac_word... " >&6; } 10866 if ${ac_cv_prog_AR+:} false; then : 10867@@ -7137,7 +7390,7 @@ do 10868 test -z "$as_dir" && as_dir=. 10869 for ac_exec_ext in '' $ac_executable_extensions; do 10870 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 10871- ac_cv_prog_AR="${ac_tool_prefix}ar" 10872+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" 10873 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 10874 break 2 10875 fi 10876@@ -7157,11 +7410,15 @@ $as_echo "no" >&6; } 10877 fi 10878 10879 10880+ test -n "$AR" && break 10881+ done 10882 fi 10883-if test -z "$ac_cv_prog_AR"; then 10884+if test -z "$AR"; then 10885 ac_ct_AR=$AR 10886- # Extract the first word of "ar", so it can be a program name with args. 10887-set dummy ar; ac_word=$2 10888+ for ac_prog in ar 10889+do 10890+ # Extract the first word of "$ac_prog", so it can be a program name with args. 10891+set dummy $ac_prog; ac_word=$2 10892 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 10893 $as_echo_n "checking for $ac_word... " >&6; } 10894 if ${ac_cv_prog_ac_ct_AR+:} false; then : 10895@@ -7177,7 +7434,7 @@ do 10896 test -z "$as_dir" && as_dir=. 10897 for ac_exec_ext in '' $ac_executable_extensions; do 10898 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 10899- ac_cv_prog_ac_ct_AR="ar" 10900+ ac_cv_prog_ac_ct_AR="$ac_prog" 10901 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 10902 break 2 10903 fi 10904@@ -7196,6 +7453,10 @@ else 10905 $as_echo "no" >&6; } 10906 fi 10907 10908+ 10909+ test -n "$ac_ct_AR" && break 10910+done 10911+ 10912 if test "x$ac_ct_AR" = x; then 10913 AR="false" 10914 else 10915@@ -7207,29 +7468,81 @@ ac_tool_warned=yes ;; 10916 esac 10917 AR=$ac_ct_AR 10918 fi 10919-else 10920- AR="$ac_cv_prog_AR" 10921 fi 10922 10923-test -z "$AR" && AR=ar 10924-if test -n "$plugin_option"; then 10925- if $AR --help 2>&1 | grep -q "\--plugin"; then 10926- touch conftest.c 10927- $AR $plugin_option rc conftest.a conftest.c 10928- if test "$?" != 0; then 10929- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 10930+ touch conftest.c 10931+ $AR $plugin_option rc conftest.a conftest.c 10932+ if test "$?" != 0; then 10933+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 10934 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} 10935- else 10936- AR="$AR $plugin_option" 10937- fi 10938- rm -f conftest.* 10939+ else 10940+ AR="$AR $plugin_option" 10941 fi 10942-fi 10943-test -z "$AR_FLAGS" && AR_FLAGS=cru 10944+ rm -f conftest.* 10945+: ${AR=ar} 10946+: ${AR_FLAGS=cru} 10947+ 10948+ 10949+ 10950+ 10951+ 10952+ 10953+ 10954 10955 10956 10957 10958+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 10959+$as_echo_n "checking for archiver @FILE support... " >&6; } 10960+if ${lt_cv_ar_at_file+:} false; then : 10961+ $as_echo_n "(cached) " >&6 10962+else 10963+ lt_cv_ar_at_file=no 10964+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 10965+/* end confdefs.h. */ 10966+ 10967+int 10968+main () 10969+{ 10970+ 10971+ ; 10972+ return 0; 10973+} 10974+_ACEOF 10975+if ac_fn_c_try_compile "$LINENO"; then : 10976+ echo conftest.$ac_objext > conftest.lst 10977+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' 10978+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 10979+ (eval $lt_ar_try) 2>&5 10980+ ac_status=$? 10981+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 10982+ test $ac_status = 0; } 10983+ if test "$ac_status" -eq 0; then 10984+ # Ensure the archiver fails upon bogus file names. 10985+ rm -f conftest.$ac_objext libconftest.a 10986+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 10987+ (eval $lt_ar_try) 2>&5 10988+ ac_status=$? 10989+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 10990+ test $ac_status = 0; } 10991+ if test "$ac_status" -ne 0; then 10992+ lt_cv_ar_at_file=@ 10993+ fi 10994+ fi 10995+ rm -f conftest.* libconftest.a 10996+ 10997+fi 10998+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 10999+ 11000+fi 11001+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 11002+$as_echo "$lt_cv_ar_at_file" >&6; } 11003+ 11004+if test "x$lt_cv_ar_at_file" = xno; then 11005+ archiver_list_spec= 11006+else 11007+ archiver_list_spec=$lt_cv_ar_at_file 11008+fi 11009 11010 11011 11012@@ -7576,8 +7889,8 @@ esac 11013 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 11014 11015 # Transform an extracted symbol line into symbol name and symbol address 11016-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 11017-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'" 11018+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 11019+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'" 11020 11021 # Handle CRLF in mingw tool chain 11022 opt_cr= 11023@@ -7613,6 +7926,7 @@ for ac_symprfx in "" "_"; do 11024 else 11025 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 11026 fi 11027+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" 11028 11029 # Check to see that the pipe works correctly. 11030 pipe_works=no 11031@@ -7654,6 +7968,18 @@ _LT_EOF 11032 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 11033 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 11034 cat <<_LT_EOF > conftest.$ac_ext 11035+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ 11036+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) 11037+/* DATA imports from DLLs on WIN32 con't be const, because runtime 11038+ relocations are performed -- see ld's documentation on pseudo-relocs. */ 11039+# define LT_DLSYM_CONST 11040+#elif defined(__osf__) 11041+/* This system does not cope well with relocations in const data. */ 11042+# define LT_DLSYM_CONST 11043+#else 11044+# define LT_DLSYM_CONST const 11045+#endif 11046+ 11047 #ifdef __cplusplus 11048 extern "C" { 11049 #endif 11050@@ -7665,7 +7991,7 @@ _LT_EOF 11051 cat <<_LT_EOF >> conftest.$ac_ext 11052 11053 /* The mapping between symbol names and symbols. */ 11054-const struct { 11055+LT_DLSYM_CONST struct { 11056 const char *name; 11057 void *address; 11058 } 11059@@ -7691,8 +8017,8 @@ static const void *lt_preloaded_setup() { 11060 _LT_EOF 11061 # Now try linking the two files. 11062 mv conftest.$ac_objext conftstm.$ac_objext 11063- lt_save_LIBS="$LIBS" 11064- lt_save_CFLAGS="$CFLAGS" 11065+ lt_globsym_save_LIBS=$LIBS 11066+ lt_globsym_save_CFLAGS=$CFLAGS 11067 LIBS="conftstm.$ac_objext" 11068 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 11069 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 11070@@ -7702,8 +8028,8 @@ _LT_EOF 11071 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 11072 pipe_works=yes 11073 fi 11074- LIBS="$lt_save_LIBS" 11075- CFLAGS="$lt_save_CFLAGS" 11076+ LIBS=$lt_globsym_save_LIBS 11077+ CFLAGS=$lt_globsym_save_CFLAGS 11078 else 11079 echo "cannot find nm_test_func in $nlist" >&5 11080 fi 11081@@ -7740,6 +8066,13 @@ else 11082 $as_echo "ok" >&6; } 11083 fi 11084 11085+# Response file support. 11086+if test "$lt_cv_nm_interface" = "MS dumpbin"; then 11087+ nm_file_list_spec='@' 11088+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then 11089+ nm_file_list_spec='@' 11090+fi 11091+ 11092 11093 11094 11095@@ -7759,6 +8092,48 @@ fi 11096 11097 11098 11099+ 11100+ 11101+ 11102+ 11103+ 11104+ 11105+ 11106+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 11107+$as_echo_n "checking for sysroot... " >&6; } 11108+ 11109+# Check whether --with-libtool-sysroot was given. 11110+if test "${with_libtool_sysroot+set}" = set; then : 11111+ withval=$with_libtool_sysroot; 11112+else 11113+ with_libtool_sysroot=no 11114+fi 11115+ 11116+ 11117+lt_sysroot= 11118+case ${with_libtool_sysroot} in #( 11119+ yes) 11120+ if test "$GCC" = yes; then 11121+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` 11122+ fi 11123+ ;; #( 11124+ /*) 11125+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` 11126+ ;; #( 11127+ no|'') 11128+ ;; #( 11129+ *) 11130+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 11131+$as_echo "${with_libtool_sysroot}" >&6; } 11132+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 11133+ ;; 11134+esac 11135+ 11136+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 11137+$as_echo "${lt_sysroot:-no}" >&6; } 11138+ 11139+ 11140+ 11141 11142 11143 # Check whether --enable-libtool-lock was given. 11144@@ -7967,6 +8342,123 @@ esac 11145 11146 need_locks="$enable_libtool_lock" 11147 11148+if test -n "$ac_tool_prefix"; then 11149+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. 11150+set dummy ${ac_tool_prefix}mt; ac_word=$2 11151+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 11152+$as_echo_n "checking for $ac_word... " >&6; } 11153+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : 11154+ $as_echo_n "(cached) " >&6 11155+else 11156+ if test -n "$MANIFEST_TOOL"; then 11157+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. 11158+else 11159+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 11160+for as_dir in $PATH 11161+do 11162+ IFS=$as_save_IFS 11163+ test -z "$as_dir" && as_dir=. 11164+ for ac_exec_ext in '' $ac_executable_extensions; do 11165+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 11166+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" 11167+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 11168+ break 2 11169+ fi 11170+done 11171+ done 11172+IFS=$as_save_IFS 11173+ 11174+fi 11175+fi 11176+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL 11177+if test -n "$MANIFEST_TOOL"; then 11178+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 11179+$as_echo "$MANIFEST_TOOL" >&6; } 11180+else 11181+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 11182+$as_echo "no" >&6; } 11183+fi 11184+ 11185+ 11186+fi 11187+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then 11188+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL 11189+ # Extract the first word of "mt", so it can be a program name with args. 11190+set dummy mt; ac_word=$2 11191+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 11192+$as_echo_n "checking for $ac_word... " >&6; } 11193+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : 11194+ $as_echo_n "(cached) " >&6 11195+else 11196+ if test -n "$ac_ct_MANIFEST_TOOL"; then 11197+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. 11198+else 11199+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 11200+for as_dir in $PATH 11201+do 11202+ IFS=$as_save_IFS 11203+ test -z "$as_dir" && as_dir=. 11204+ for ac_exec_ext in '' $ac_executable_extensions; do 11205+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 11206+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" 11207+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 11208+ break 2 11209+ fi 11210+done 11211+ done 11212+IFS=$as_save_IFS 11213+ 11214+fi 11215+fi 11216+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL 11217+if test -n "$ac_ct_MANIFEST_TOOL"; then 11218+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 11219+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } 11220+else 11221+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 11222+$as_echo "no" >&6; } 11223+fi 11224+ 11225+ if test "x$ac_ct_MANIFEST_TOOL" = x; then 11226+ MANIFEST_TOOL=":" 11227+ else 11228+ case $cross_compiling:$ac_tool_warned in 11229+yes:) 11230+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 11231+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 11232+ac_tool_warned=yes ;; 11233+esac 11234+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL 11235+ fi 11236+else 11237+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" 11238+fi 11239+ 11240+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt 11241+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 11242+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } 11243+if ${lt_cv_path_mainfest_tool+:} false; then : 11244+ $as_echo_n "(cached) " >&6 11245+else 11246+ lt_cv_path_mainfest_tool=no 11247+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 11248+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out 11249+ cat conftest.err >&5 11250+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then 11251+ lt_cv_path_mainfest_tool=yes 11252+ fi 11253+ rm -f conftest* 11254+fi 11255+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 11256+$as_echo "$lt_cv_path_mainfest_tool" >&6; } 11257+if test "x$lt_cv_path_mainfest_tool" != xyes; then 11258+ MANIFEST_TOOL=: 11259+fi 11260+ 11261+ 11262+ 11263+ 11264+ 11265 11266 case $host_os in 11267 rhapsody* | darwin*) 11268@@ -8530,6 +9022,8 @@ _LT_EOF 11269 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 11270 echo "$AR cru libconftest.a conftest.o" >&5 11271 $AR cru libconftest.a conftest.o 2>&5 11272+ echo "$RANLIB libconftest.a" >&5 11273+ $RANLIB libconftest.a 2>&5 11274 cat > conftest.c << _LT_EOF 11275 int main() { return 0;} 11276 _LT_EOF 11277@@ -8598,6 +9092,16 @@ done 11278 11279 11280 11281+func_stripname_cnf () 11282+{ 11283+ case ${2} in 11284+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; 11285+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; 11286+ esac 11287+} # func_stripname_cnf 11288+ 11289+ 11290+ 11291 11292 11293 # Set options 11294@@ -9113,8 +9617,6 @@ fi 11295 lt_prog_compiler_pic= 11296 lt_prog_compiler_static= 11297 11298-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 11299-$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 11300 11301 if test "$GCC" = yes; then 11302 lt_prog_compiler_wl='-Wl,' 11303@@ -9280,6 +9782,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 11304 lt_prog_compiler_pic='--shared' 11305 lt_prog_compiler_static='--static' 11306 ;; 11307+ nagfor*) 11308+ # NAG Fortran compiler 11309+ lt_prog_compiler_wl='-Wl,-Wl,,' 11310+ lt_prog_compiler_pic='-PIC' 11311+ lt_prog_compiler_static='-Bstatic' 11312+ ;; 11313 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 11314 # Portland Group compilers (*not* the Pentium gcc compiler, 11315 # which looks to be a dead project) 11316@@ -9342,7 +9850,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 11317 lt_prog_compiler_pic='-KPIC' 11318 lt_prog_compiler_static='-Bstatic' 11319 case $cc_basename in 11320- f77* | f90* | f95*) 11321+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) 11322 lt_prog_compiler_wl='-Qoption ld ';; 11323 *) 11324 lt_prog_compiler_wl='-Wl,';; 11325@@ -9399,13 +9907,17 @@ case $host_os in 11326 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 11327 ;; 11328 esac 11329-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 11330-$as_echo "$lt_prog_compiler_pic" >&6; } 11331- 11332- 11333- 11334- 11335 11336+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 11337+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 11338+if ${lt_cv_prog_compiler_pic+:} false; then : 11339+ $as_echo_n "(cached) " >&6 11340+else 11341+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic 11342+fi 11343+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 11344+$as_echo "$lt_cv_prog_compiler_pic" >&6; } 11345+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic 11346 11347 # 11348 # Check to make sure the PIC flag actually works. 11349@@ -9466,6 +9978,11 @@ fi 11350 11351 11352 11353+ 11354+ 11355+ 11356+ 11357+ 11358 # 11359 # Check to make sure the static flag actually works. 11360 # 11361@@ -9816,7 +10333,8 @@ _LT_EOF 11362 allow_undefined_flag=unsupported 11363 always_export_symbols=no 11364 enable_shared_with_static_runtimes=yes 11365- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 11366+ 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' 11367+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' 11368 11369 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 11370 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 11371@@ -9915,12 +10433,12 @@ _LT_EOF 11372 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 11373 hardcode_libdir_flag_spec= 11374 hardcode_libdir_flag_spec_ld='-rpath $libdir' 11375- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' 11376+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' 11377 if test "x$supports_anon_versioning" = xyes; then 11378 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ 11379 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ 11380 echo "local: *; };" >> $output_objdir/$libname.ver~ 11381- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 11382+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 11383 fi 11384 ;; 11385 esac 11386@@ -9934,8 +10452,8 @@ _LT_EOF 11387 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 11388 wlarc= 11389 else 11390- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 11391- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 11392+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 11393+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 11394 fi 11395 ;; 11396 11397@@ -9953,8 +10471,8 @@ _LT_EOF 11398 11399 _LT_EOF 11400 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 11401- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 11402- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 11403+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 11404+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 11405 else 11406 ld_shlibs=no 11407 fi 11408@@ -10000,8 +10518,8 @@ _LT_EOF 11409 11410 *) 11411 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 11412- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 11413- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 11414+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 11415+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 11416 else 11417 ld_shlibs=no 11418 fi 11419@@ -10131,7 +10649,13 @@ _LT_EOF 11420 allow_undefined_flag='-berok' 11421 # Determine the default libpath from the value encoded in an 11422 # empty executable. 11423- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 11424+ if test "${lt_cv_aix_libpath+set}" = set; then 11425+ aix_libpath=$lt_cv_aix_libpath 11426+else 11427+ if ${lt_cv_aix_libpath_+:} false; then : 11428+ $as_echo_n "(cached) " >&6 11429+else 11430+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 11431 /* end confdefs.h. */ 11432 11433 int 11434@@ -10144,22 +10668,29 @@ main () 11435 _ACEOF 11436 if ac_fn_c_try_link "$LINENO"; then : 11437 11438-lt_aix_libpath_sed=' 11439- /Import File Strings/,/^$/ { 11440- /^0/ { 11441- s/^0 *\(.*\)$/\1/ 11442- p 11443- } 11444- }' 11445-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 11446-# Check for a 64-bit object if we didn't find anything. 11447-if test -z "$aix_libpath"; then 11448- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 11449-fi 11450+ lt_aix_libpath_sed=' 11451+ /Import File Strings/,/^$/ { 11452+ /^0/ { 11453+ s/^0 *\([^ ]*\) *$/\1/ 11454+ p 11455+ } 11456+ }' 11457+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 11458+ # Check for a 64-bit object if we didn't find anything. 11459+ if test -z "$lt_cv_aix_libpath_"; then 11460+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 11461+ fi 11462 fi 11463 rm -f core conftest.err conftest.$ac_objext \ 11464 conftest$ac_exeext conftest.$ac_ext 11465-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11466+ if test -z "$lt_cv_aix_libpath_"; then 11467+ lt_cv_aix_libpath_="/usr/lib:/lib" 11468+ fi 11469+ 11470+fi 11471+ 11472+ aix_libpath=$lt_cv_aix_libpath_ 11473+fi 11474 11475 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 11476 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" 11477@@ -10171,7 +10702,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11478 else 11479 # Determine the default libpath from the value encoded in an 11480 # empty executable. 11481- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 11482+ if test "${lt_cv_aix_libpath+set}" = set; then 11483+ aix_libpath=$lt_cv_aix_libpath 11484+else 11485+ if ${lt_cv_aix_libpath_+:} false; then : 11486+ $as_echo_n "(cached) " >&6 11487+else 11488+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 11489 /* end confdefs.h. */ 11490 11491 int 11492@@ -10184,22 +10721,29 @@ main () 11493 _ACEOF 11494 if ac_fn_c_try_link "$LINENO"; then : 11495 11496-lt_aix_libpath_sed=' 11497- /Import File Strings/,/^$/ { 11498- /^0/ { 11499- s/^0 *\(.*\)$/\1/ 11500- p 11501- } 11502- }' 11503-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 11504-# Check for a 64-bit object if we didn't find anything. 11505-if test -z "$aix_libpath"; then 11506- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 11507-fi 11508+ lt_aix_libpath_sed=' 11509+ /Import File Strings/,/^$/ { 11510+ /^0/ { 11511+ s/^0 *\([^ ]*\) *$/\1/ 11512+ p 11513+ } 11514+ }' 11515+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 11516+ # Check for a 64-bit object if we didn't find anything. 11517+ if test -z "$lt_cv_aix_libpath_"; then 11518+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 11519+ fi 11520 fi 11521 rm -f core conftest.err conftest.$ac_objext \ 11522 conftest$ac_exeext conftest.$ac_ext 11523-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11524+ if test -z "$lt_cv_aix_libpath_"; then 11525+ lt_cv_aix_libpath_="/usr/lib:/lib" 11526+ fi 11527+ 11528+fi 11529+ 11530+ aix_libpath=$lt_cv_aix_libpath_ 11531+fi 11532 11533 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 11534 # Warning - without using the other run time loading flags, 11535@@ -10243,21 +10787,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11536 # When not using gcc, we currently assume that we are using 11537 # Microsoft Visual C++. 11538 # hardcode_libdir_flag_spec is actually meaningless, as there is 11539- # no search path for DLLs. 11540- hardcode_libdir_flag_spec=' ' 11541- allow_undefined_flag=unsupported 11542- # Tell ltmain to make .lib files, not .a files. 11543- libext=lib 11544- # Tell ltmain to make .dll files, not .so files. 11545- shrext_cmds=".dll" 11546- # FIXME: Setting linknames here is a bad hack. 11547- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 11548- # The linker will automatically build a .lib file if we build a DLL. 11549- old_archive_from_new_cmds='true' 11550- # FIXME: Should let the user specify the lib program. 11551- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 11552- fix_srcfile_path='`cygpath -w "$srcfile"`' 11553- enable_shared_with_static_runtimes=yes 11554+ # no search path for DLLs. 11555+ case $cc_basename in 11556+ cl*) 11557+ # Native MSVC 11558+ hardcode_libdir_flag_spec=' ' 11559+ allow_undefined_flag=unsupported 11560+ always_export_symbols=yes 11561+ file_list_spec='@' 11562+ # Tell ltmain to make .lib files, not .a files. 11563+ libext=lib 11564+ # Tell ltmain to make .dll files, not .so files. 11565+ shrext_cmds=".dll" 11566+ # FIXME: Setting linknames here is a bad hack. 11567+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' 11568+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 11569+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; 11570+ else 11571+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; 11572+ fi~ 11573+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ 11574+ linknames=' 11575+ # The linker will not automatically build a static lib if we build a DLL. 11576+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' 11577+ enable_shared_with_static_runtimes=yes 11578+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 11579+ # Don't use ranlib 11580+ old_postinstall_cmds='chmod 644 $oldlib' 11581+ postlink_cmds='lt_outputfile="@OUTPUT@"~ 11582+ lt_tool_outputfile="@TOOL_OUTPUT@"~ 11583+ case $lt_outputfile in 11584+ *.exe|*.EXE) ;; 11585+ *) 11586+ lt_outputfile="$lt_outputfile.exe" 11587+ lt_tool_outputfile="$lt_tool_outputfile.exe" 11588+ ;; 11589+ esac~ 11590+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then 11591+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; 11592+ $RM "$lt_outputfile.manifest"; 11593+ fi' 11594+ ;; 11595+ *) 11596+ # Assume MSVC wrapper 11597+ hardcode_libdir_flag_spec=' ' 11598+ allow_undefined_flag=unsupported 11599+ # Tell ltmain to make .lib files, not .a files. 11600+ libext=lib 11601+ # Tell ltmain to make .dll files, not .so files. 11602+ shrext_cmds=".dll" 11603+ # FIXME: Setting linknames here is a bad hack. 11604+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 11605+ # The linker will automatically build a .lib file if we build a DLL. 11606+ old_archive_from_new_cmds='true' 11607+ # FIXME: Should let the user specify the lib program. 11608+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 11609+ enable_shared_with_static_runtimes=yes 11610+ ;; 11611+ esac 11612 ;; 11613 11614 darwin* | rhapsody*) 11615@@ -10318,7 +10905,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11616 11617 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 11618 freebsd* | dragonfly*) 11619- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' 11620+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' 11621 hardcode_libdir_flag_spec='-R$libdir' 11622 hardcode_direct=yes 11623 hardcode_shlibpath_var=no 11624@@ -10326,7 +10913,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11625 11626 hpux9*) 11627 if test "$GCC" = yes; then 11628- 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' 11629+ 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' 11630 else 11631 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' 11632 fi 11633@@ -10342,7 +10929,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11634 11635 hpux10*) 11636 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 11637- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 11638+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 11639 else 11640 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 11641 fi 11642@@ -10366,10 +10953,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11643 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 11644 ;; 11645 ia64*) 11646- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 11647+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 11648 ;; 11649 *) 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 ;; 11653 esac 11654 else 11655@@ -10448,23 +11035,36 @@ fi 11656 11657 irix5* | irix6* | nonstopux*) 11658 if test "$GCC" = yes; then 11659- 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' 11660+ 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' 11661 # Try to use the -exported_symbol ld option, if it does not 11662 # work, assume that -exports_file does not work either and 11663 # implicitly export all symbols. 11664- save_LDFLAGS="$LDFLAGS" 11665- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 11666- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 11667+ # This should be the same for all languages, so no per-tag cache variable. 11668+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 11669+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } 11670+if ${lt_cv_irix_exported_symbol+:} false; then : 11671+ $as_echo_n "(cached) " >&6 11672+else 11673+ save_LDFLAGS="$LDFLAGS" 11674+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 11675+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 11676 /* end confdefs.h. */ 11677-int foo(void) {} 11678+int foo (void) { return 0; } 11679 _ACEOF 11680 if ac_fn_c_try_link "$LINENO"; then : 11681- 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' 11682- 11683+ lt_cv_irix_exported_symbol=yes 11684+else 11685+ lt_cv_irix_exported_symbol=no 11686 fi 11687 rm -f core conftest.err conftest.$ac_objext \ 11688 conftest$ac_exeext conftest.$ac_ext 11689- LDFLAGS="$save_LDFLAGS" 11690+ LDFLAGS="$save_LDFLAGS" 11691+fi 11692+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 11693+$as_echo "$lt_cv_irix_exported_symbol" >&6; } 11694+ if test "$lt_cv_irix_exported_symbol" = yes; then 11695+ 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' 11696+ fi 11697 else 11698 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' 11699 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' 11700@@ -10549,7 +11149,7 @@ rm -f core conftest.err conftest.$ac_objext \ 11701 osf4* | osf5*) # as osf3* with the addition of -msym flag 11702 if test "$GCC" = yes; then 11703 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 11704- 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' 11705+ 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' 11706 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 11707 else 11708 allow_undefined_flag=' -expect_unresolved \*' 11709@@ -10568,9 +11168,9 @@ rm -f core conftest.err conftest.$ac_objext \ 11710 no_undefined_flag=' -z defs' 11711 if test "$GCC" = yes; then 11712 wlarc='${wl}' 11713- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 11714+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 11715 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ 11716- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' 11717+ $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' 11718 else 11719 case `$CC -V 2>&1` in 11720 *"Compilers 5.0"*) 11721@@ -11146,8 +11746,9 @@ cygwin* | mingw* | pw32* | cegcc*) 11722 need_version=no 11723 need_lib_prefix=no 11724 11725- case $GCC,$host_os in 11726- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) 11727+ case $GCC,$cc_basename in 11728+ yes,*) 11729+ # gcc 11730 library_names_spec='$libname.dll.a' 11731 # DLL is installed to $(libdir)/../bin by postinstall_cmds 11732 postinstall_cmds='base_file=`basename \${file}`~ 11733@@ -11180,13 +11781,71 @@ cygwin* | mingw* | pw32* | cegcc*) 11734 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 11735 ;; 11736 esac 11737+ dynamic_linker='Win32 ld.exe' 11738+ ;; 11739+ 11740+ *,cl*) 11741+ # Native MSVC 11742+ libname_spec='$name' 11743+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 11744+ library_names_spec='${libname}.dll.lib' 11745+ 11746+ case $build_os in 11747+ mingw*) 11748+ sys_lib_search_path_spec= 11749+ lt_save_ifs=$IFS 11750+ IFS=';' 11751+ for lt_path in $LIB 11752+ do 11753+ IFS=$lt_save_ifs 11754+ # Let DOS variable expansion print the short 8.3 style file name. 11755+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` 11756+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" 11757+ done 11758+ IFS=$lt_save_ifs 11759+ # Convert to MSYS style. 11760+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` 11761+ ;; 11762+ cygwin*) 11763+ # Convert to unix form, then to dos form, then back to unix form 11764+ # but this time dos style (no spaces!) so that the unix form looks 11765+ # like /cygdrive/c/PROGRA~1:/cygdr... 11766+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` 11767+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` 11768+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 11769+ ;; 11770+ *) 11771+ sys_lib_search_path_spec="$LIB" 11772+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then 11773+ # It is most probably a Windows format PATH. 11774+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` 11775+ else 11776+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 11777+ fi 11778+ # FIXME: find the short name or the path components, as spaces are 11779+ # common. (e.g. "Program Files" -> "PROGRA~1") 11780+ ;; 11781+ esac 11782+ 11783+ # DLL is installed to $(libdir)/../bin by postinstall_cmds 11784+ postinstall_cmds='base_file=`basename \${file}`~ 11785+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ 11786+ dldir=$destdir/`dirname \$dlpath`~ 11787+ test -d \$dldir || mkdir -p \$dldir~ 11788+ $install_prog $dir/$dlname \$dldir/$dlname' 11789+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ 11790+ dlpath=$dir/\$dldll~ 11791+ $RM \$dlpath' 11792+ shlibpath_overrides_runpath=yes 11793+ dynamic_linker='Win32 link.exe' 11794 ;; 11795 11796 *) 11797+ # Assume MSVC wrapper 11798 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' 11799+ dynamic_linker='Win32 ld.exe' 11800 ;; 11801 esac 11802- dynamic_linker='Win32 ld.exe' 11803 # FIXME: first we should search . and the directory the executable is in 11804 shlibpath_var=PATH 11805 ;; 11806@@ -12064,7 +12723,7 @@ else 11807 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 11808 lt_status=$lt_dlunknown 11809 cat > conftest.$ac_ext <<_LT_EOF 11810-#line 12067 "configure" 11811+#line $LINENO "configure" 11812 #include "confdefs.h" 11813 11814 #if HAVE_DLFCN_H 11815@@ -12108,10 +12767,10 @@ else 11816 /* When -fvisbility=hidden is used, assume the code has been annotated 11817 correspondingly for the symbols needed. */ 11818 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 11819-void fnord () __attribute__((visibility("default"))); 11820+int fnord () __attribute__((visibility("default"))); 11821 #endif 11822 11823-void fnord () { int i=42; } 11824+int fnord () { return 42; } 11825 int main () 11826 { 11827 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 11828@@ -12170,7 +12829,7 @@ else 11829 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 11830 lt_status=$lt_dlunknown 11831 cat > conftest.$ac_ext <<_LT_EOF 11832-#line 12173 "configure" 11833+#line $LINENO "configure" 11834 #include "confdefs.h" 11835 11836 #if HAVE_DLFCN_H 11837@@ -12214,10 +12873,10 @@ else 11838 /* When -fvisbility=hidden is used, assume the code has been annotated 11839 correspondingly for the symbols needed. */ 11840 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 11841-void fnord () __attribute__((visibility("default"))); 11842+int fnord () __attribute__((visibility("default"))); 11843 #endif 11844 11845-void fnord () { int i=42; } 11846+int fnord () { return 42; } 11847 int main () 11848 { 11849 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 11850@@ -12609,6 +13268,7 @@ $RM -r conftest* 11851 11852 # Allow CC to be a program name with arguments. 11853 lt_save_CC=$CC 11854+ lt_save_CFLAGS=$CFLAGS 11855 lt_save_LD=$LD 11856 lt_save_GCC=$GCC 11857 GCC=$GXX 11858@@ -12626,6 +13286,7 @@ $RM -r conftest* 11859 fi 11860 test -z "${LDCXX+set}" || LD=$LDCXX 11861 CC=${CXX-"c++"} 11862+ CFLAGS=$CXXFLAGS 11863 compiler=$CC 11864 compiler_CXX=$CC 11865 for cc_temp in $compiler""; do 11866@@ -12908,7 +13569,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie 11867 allow_undefined_flag_CXX='-berok' 11868 # Determine the default libpath from the value encoded in an empty 11869 # executable. 11870- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 11871+ if test "${lt_cv_aix_libpath+set}" = set; then 11872+ aix_libpath=$lt_cv_aix_libpath 11873+else 11874+ if ${lt_cv_aix_libpath__CXX+:} false; then : 11875+ $as_echo_n "(cached) " >&6 11876+else 11877+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 11878 /* end confdefs.h. */ 11879 11880 int 11881@@ -12921,22 +13588,29 @@ main () 11882 _ACEOF 11883 if ac_fn_cxx_try_link "$LINENO"; then : 11884 11885-lt_aix_libpath_sed=' 11886- /Import File Strings/,/^$/ { 11887- /^0/ { 11888- s/^0 *\(.*\)$/\1/ 11889- p 11890- } 11891- }' 11892-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 11893-# Check for a 64-bit object if we didn't find anything. 11894-if test -z "$aix_libpath"; then 11895- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 11896-fi 11897+ lt_aix_libpath_sed=' 11898+ /Import File Strings/,/^$/ { 11899+ /^0/ { 11900+ s/^0 *\([^ ]*\) *$/\1/ 11901+ p 11902+ } 11903+ }' 11904+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 11905+ # Check for a 64-bit object if we didn't find anything. 11906+ if test -z "$lt_cv_aix_libpath__CXX"; then 11907+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 11908+ fi 11909 fi 11910 rm -f core conftest.err conftest.$ac_objext \ 11911 conftest$ac_exeext conftest.$ac_ext 11912-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11913+ if test -z "$lt_cv_aix_libpath__CXX"; then 11914+ lt_cv_aix_libpath__CXX="/usr/lib:/lib" 11915+ fi 11916+ 11917+fi 11918+ 11919+ aix_libpath=$lt_cv_aix_libpath__CXX 11920+fi 11921 11922 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" 11923 11924@@ -12949,7 +13623,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11925 else 11926 # Determine the default libpath from the value encoded in an 11927 # empty executable. 11928- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 11929+ if test "${lt_cv_aix_libpath+set}" = set; then 11930+ aix_libpath=$lt_cv_aix_libpath 11931+else 11932+ if ${lt_cv_aix_libpath__CXX+:} false; then : 11933+ $as_echo_n "(cached) " >&6 11934+else 11935+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 11936 /* end confdefs.h. */ 11937 11938 int 11939@@ -12962,22 +13642,29 @@ main () 11940 _ACEOF 11941 if ac_fn_cxx_try_link "$LINENO"; then : 11942 11943-lt_aix_libpath_sed=' 11944- /Import File Strings/,/^$/ { 11945- /^0/ { 11946- s/^0 *\(.*\)$/\1/ 11947- p 11948- } 11949- }' 11950-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 11951-# Check for a 64-bit object if we didn't find anything. 11952-if test -z "$aix_libpath"; then 11953- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 11954-fi 11955+ lt_aix_libpath_sed=' 11956+ /Import File Strings/,/^$/ { 11957+ /^0/ { 11958+ s/^0 *\([^ ]*\) *$/\1/ 11959+ p 11960+ } 11961+ }' 11962+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 11963+ # Check for a 64-bit object if we didn't find anything. 11964+ if test -z "$lt_cv_aix_libpath__CXX"; then 11965+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 11966+ fi 11967 fi 11968 rm -f core conftest.err conftest.$ac_objext \ 11969 conftest$ac_exeext conftest.$ac_ext 11970-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11971+ if test -z "$lt_cv_aix_libpath__CXX"; then 11972+ lt_cv_aix_libpath__CXX="/usr/lib:/lib" 11973+ fi 11974+ 11975+fi 11976+ 11977+ aix_libpath=$lt_cv_aix_libpath__CXX 11978+fi 11979 11980 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" 11981 # Warning - without using the other run time loading flags, 11982@@ -13020,29 +13707,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11983 ;; 11984 11985 cygwin* | mingw* | pw32* | cegcc*) 11986- # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, 11987- # as there is no search path for DLLs. 11988- hardcode_libdir_flag_spec_CXX='-L$libdir' 11989- export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' 11990- allow_undefined_flag_CXX=unsupported 11991- always_export_symbols_CXX=no 11992- enable_shared_with_static_runtimes_CXX=yes 11993- 11994- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 11995- 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' 11996- # If the export-symbols file already is a .def file (1st line 11997- # is EXPORTS), use it as is; otherwise, prepend... 11998- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 11999- cp $export_symbols $output_objdir/$soname.def; 12000- else 12001- echo EXPORTS > $output_objdir/$soname.def; 12002- cat $export_symbols >> $output_objdir/$soname.def; 12003- fi~ 12004- $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' 12005- else 12006- ld_shlibs_CXX=no 12007- fi 12008- ;; 12009+ case $GXX,$cc_basename in 12010+ ,cl* | no,cl*) 12011+ # Native MSVC 12012+ # hardcode_libdir_flag_spec is actually meaningless, as there is 12013+ # no search path for DLLs. 12014+ hardcode_libdir_flag_spec_CXX=' ' 12015+ allow_undefined_flag_CXX=unsupported 12016+ always_export_symbols_CXX=yes 12017+ file_list_spec_CXX='@' 12018+ # Tell ltmain to make .lib files, not .a files. 12019+ libext=lib 12020+ # Tell ltmain to make .dll files, not .so files. 12021+ shrext_cmds=".dll" 12022+ # FIXME: Setting linknames here is a bad hack. 12023+ archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' 12024+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 12025+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; 12026+ else 12027+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; 12028+ fi~ 12029+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ 12030+ linknames=' 12031+ # The linker will not automatically build a static lib if we build a DLL. 12032+ # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true' 12033+ enable_shared_with_static_runtimes_CXX=yes 12034+ # Don't use ranlib 12035+ old_postinstall_cmds_CXX='chmod 644 $oldlib' 12036+ postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~ 12037+ lt_tool_outputfile="@TOOL_OUTPUT@"~ 12038+ case $lt_outputfile in 12039+ *.exe|*.EXE) ;; 12040+ *) 12041+ lt_outputfile="$lt_outputfile.exe" 12042+ lt_tool_outputfile="$lt_tool_outputfile.exe" 12043+ ;; 12044+ esac~ 12045+ func_to_tool_file "$lt_outputfile"~ 12046+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then 12047+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; 12048+ $RM "$lt_outputfile.manifest"; 12049+ fi' 12050+ ;; 12051+ *) 12052+ # g++ 12053+ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, 12054+ # as there is no search path for DLLs. 12055+ hardcode_libdir_flag_spec_CXX='-L$libdir' 12056+ export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' 12057+ allow_undefined_flag_CXX=unsupported 12058+ always_export_symbols_CXX=no 12059+ enable_shared_with_static_runtimes_CXX=yes 12060+ 12061+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 12062+ 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' 12063+ # If the export-symbols file already is a .def file (1st line 12064+ # is EXPORTS), use it as is; otherwise, prepend... 12065+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 12066+ cp $export_symbols $output_objdir/$soname.def; 12067+ else 12068+ echo EXPORTS > $output_objdir/$soname.def; 12069+ cat $export_symbols >> $output_objdir/$soname.def; 12070+ fi~ 12071+ $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' 12072+ else 12073+ ld_shlibs_CXX=no 12074+ fi 12075+ ;; 12076+ esac 12077+ ;; 12078 darwin* | rhapsody*) 12079 12080 12081@@ -13148,7 +13881,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 12082 ;; 12083 *) 12084 if test "$GXX" = yes; then 12085- 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' 12086+ 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' 12087 else 12088 # FIXME: insert proper C++ library support 12089 ld_shlibs_CXX=no 12090@@ -13219,10 +13952,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 12091 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 12092 ;; 12093 ia64*) 12094- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 12095+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 12096 ;; 12097 *) 12098- 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' 12099+ 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' 12100 ;; 12101 esac 12102 fi 12103@@ -13263,9 +13996,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 12104 *) 12105 if test "$GXX" = yes; then 12106 if test "$with_gnu_ld" = no; then 12107- 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' 12108+ 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' 12109 else 12110- 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' 12111+ 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' 12112 fi 12113 fi 12114 link_all_deplibs_CXX=yes 12115@@ -13335,20 +14068,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 12116 prelink_cmds_CXX='tpldir=Template.dir~ 12117 rm -rf $tpldir~ 12118 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ 12119- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' 12120+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' 12121 old_archive_cmds_CXX='tpldir=Template.dir~ 12122 rm -rf $tpldir~ 12123 $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ 12124- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ 12125+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ 12126 $RANLIB $oldlib' 12127 archive_cmds_CXX='tpldir=Template.dir~ 12128 rm -rf $tpldir~ 12129 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ 12130- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' 12131+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' 12132 archive_expsym_cmds_CXX='tpldir=Template.dir~ 12133 rm -rf $tpldir~ 12134 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ 12135- $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' 12136+ $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' 12137 ;; 12138 *) # Version 6 and above use weak symbols 12139 archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' 12140@@ -13543,7 +14276,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 12141 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' 12142 ;; 12143 *) 12144- 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' 12145+ 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' 12146 ;; 12147 esac 12148 12149@@ -13589,7 +14322,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 12150 12151 solaris*) 12152 case $cc_basename in 12153- CC*) 12154+ CC* | sunCC*) 12155 # Sun C++ 4.2, 5.x and Centerline C++ 12156 archive_cmds_need_lc_CXX=yes 12157 no_undefined_flag_CXX=' -zdefs' 12158@@ -13630,9 +14363,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 12159 if test "$GXX" = yes && test "$with_gnu_ld" = no; then 12160 no_undefined_flag_CXX=' ${wl}-z ${wl}defs' 12161 if $CC --version | $GREP -v '^2\.7' > /dev/null; then 12162- archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' 12163+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' 12164 archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ 12165- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' 12166+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' 12167 12168 # Commands to make compiler produce verbose output that lists 12169 # what "hidden" libraries, object files and flags are used when 12170@@ -13767,6 +14500,13 @@ private: 12171 }; 12172 _LT_EOF 12173 12174+ 12175+_lt_libdeps_save_CFLAGS=$CFLAGS 12176+case "$CC $CFLAGS " in #( 12177+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; 12178+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; 12179+esac 12180+ 12181 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 12182 (eval $ac_compile) 2>&5 12183 ac_status=$? 12184@@ -13780,7 +14520,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 12185 pre_test_object_deps_done=no 12186 12187 for p in `eval "$output_verbose_link_cmd"`; do 12188- case $p in 12189+ case ${prev}${p} in 12190 12191 -L* | -R* | -l*) 12192 # Some compilers place space between "-{L,R}" and the path. 12193@@ -13789,13 +14529,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 12194 test $p = "-R"; then 12195 prev=$p 12196 continue 12197- else 12198- prev= 12199 fi 12200 12201+ # Expand the sysroot to ease extracting the directories later. 12202+ if test -z "$prev"; then 12203+ case $p in 12204+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; 12205+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; 12206+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; 12207+ esac 12208+ fi 12209+ case $p in 12210+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; 12211+ esac 12212 if test "$pre_test_object_deps_done" = no; then 12213- case $p in 12214- -L* | -R*) 12215+ case ${prev} in 12216+ -L | -R) 12217 # Internal compiler library paths should come after those 12218 # provided the user. The postdeps already come after the 12219 # user supplied libs so there is no need to process them. 12220@@ -13815,8 +14564,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 12221 postdeps_CXX="${postdeps_CXX} ${prev}${p}" 12222 fi 12223 fi 12224+ prev= 12225 ;; 12226 12227+ *.lto.$objext) ;; # Ignore GCC LTO objects 12228 *.$objext) 12229 # This assumes that the test object file only shows up 12230 # once in the compiler output. 12231@@ -13852,6 +14603,7 @@ else 12232 fi 12233 12234 $RM -f confest.$objext 12235+CFLAGS=$_lt_libdeps_save_CFLAGS 12236 12237 # PORTME: override above test on systems where it is broken 12238 case $host_os in 12239@@ -13887,7 +14639,7 @@ linux*) 12240 12241 solaris*) 12242 case $cc_basename in 12243- CC*) 12244+ CC* | sunCC*) 12245 # The more standards-conforming stlport4 library is 12246 # incompatible with the Cstd library. Avoid specifying 12247 # it if it's in CXXFLAGS. Ignore libCrun as 12248@@ -13952,8 +14704,6 @@ fi 12249 lt_prog_compiler_pic_CXX= 12250 lt_prog_compiler_static_CXX= 12251 12252-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 12253-$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 12254 12255 # C++ specific cases for pic, static, wl, etc. 12256 if test "$GXX" = yes; then 12257@@ -14058,6 +14808,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 12258 ;; 12259 esac 12260 ;; 12261+ mingw* | cygwin* | os2* | pw32* | cegcc*) 12262+ # This hack is so that the source file can tell whether it is being 12263+ # built for inclusion in a dll (and should export symbols for example). 12264+ lt_prog_compiler_pic_CXX='-DDLL_EXPORT' 12265+ ;; 12266 dgux*) 12267 case $cc_basename in 12268 ec++*) 12269@@ -14210,7 +14965,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 12270 ;; 12271 solaris*) 12272 case $cc_basename in 12273- CC*) 12274+ CC* | sunCC*) 12275 # Sun C++ 4.2, 5.x and Centerline C++ 12276 lt_prog_compiler_pic_CXX='-KPIC' 12277 lt_prog_compiler_static_CXX='-Bstatic' 12278@@ -14275,10 +15030,17 @@ case $host_os in 12279 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" 12280 ;; 12281 esac 12282-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5 12283-$as_echo "$lt_prog_compiler_pic_CXX" >&6; } 12284- 12285 12286+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 12287+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 12288+if ${lt_cv_prog_compiler_pic_CXX+:} false; then : 12289+ $as_echo_n "(cached) " >&6 12290+else 12291+ lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX 12292+fi 12293+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 12294+$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; } 12295+lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX 12296 12297 # 12298 # Check to make sure the PIC flag actually works. 12299@@ -14336,6 +15098,8 @@ fi 12300 12301 12302 12303+ 12304+ 12305 # 12306 # Check to make sure the static flag actually works. 12307 # 12308@@ -14513,6 +15277,7 @@ fi 12309 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } 12310 12311 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 12312+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' 12313 case $host_os in 12314 aix[4-9]*) 12315 # If we're using GNU nm, then we don't want the "-C" option. 12316@@ -14527,15 +15292,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie 12317 ;; 12318 pw32*) 12319 export_symbols_cmds_CXX="$ltdll_cmds" 12320- ;; 12321+ ;; 12322 cygwin* | mingw* | cegcc*) 12323- 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' 12324- ;; 12325+ case $cc_basename in 12326+ cl*) ;; 12327+ *) 12328+ 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' 12329+ exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' 12330+ ;; 12331+ esac 12332+ ;; 12333 *) 12334 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 12335- ;; 12336+ ;; 12337 esac 12338- exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' 12339 12340 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 12341 $as_echo "$ld_shlibs_CXX" >&6; } 12342@@ -14798,8 +15568,9 @@ cygwin* | mingw* | pw32* | cegcc*) 12343 need_version=no 12344 need_lib_prefix=no 12345 12346- case $GCC,$host_os in 12347- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) 12348+ case $GCC,$cc_basename in 12349+ yes,*) 12350+ # gcc 12351 library_names_spec='$libname.dll.a' 12352 # DLL is installed to $(libdir)/../bin by postinstall_cmds 12353 postinstall_cmds='base_file=`basename \${file}`~ 12354@@ -14831,13 +15602,71 @@ cygwin* | mingw* | pw32* | cegcc*) 12355 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 12356 ;; 12357 esac 12358+ dynamic_linker='Win32 ld.exe' 12359+ ;; 12360+ 12361+ *,cl*) 12362+ # Native MSVC 12363+ libname_spec='$name' 12364+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 12365+ library_names_spec='${libname}.dll.lib' 12366+ 12367+ case $build_os in 12368+ mingw*) 12369+ sys_lib_search_path_spec= 12370+ lt_save_ifs=$IFS 12371+ IFS=';' 12372+ for lt_path in $LIB 12373+ do 12374+ IFS=$lt_save_ifs 12375+ # Let DOS variable expansion print the short 8.3 style file name. 12376+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` 12377+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" 12378+ done 12379+ IFS=$lt_save_ifs 12380+ # Convert to MSYS style. 12381+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` 12382+ ;; 12383+ cygwin*) 12384+ # Convert to unix form, then to dos form, then back to unix form 12385+ # but this time dos style (no spaces!) so that the unix form looks 12386+ # like /cygdrive/c/PROGRA~1:/cygdr... 12387+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` 12388+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` 12389+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 12390+ ;; 12391+ *) 12392+ sys_lib_search_path_spec="$LIB" 12393+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then 12394+ # It is most probably a Windows format PATH. 12395+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` 12396+ else 12397+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 12398+ fi 12399+ # FIXME: find the short name or the path components, as spaces are 12400+ # common. (e.g. "Program Files" -> "PROGRA~1") 12401+ ;; 12402+ esac 12403+ 12404+ # DLL is installed to $(libdir)/../bin by postinstall_cmds 12405+ postinstall_cmds='base_file=`basename \${file}`~ 12406+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ 12407+ dldir=$destdir/`dirname \$dlpath`~ 12408+ test -d \$dldir || mkdir -p \$dldir~ 12409+ $install_prog $dir/$dlname \$dldir/$dlname' 12410+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ 12411+ dlpath=$dir/\$dldll~ 12412+ $RM \$dlpath' 12413+ shlibpath_overrides_runpath=yes 12414+ dynamic_linker='Win32 link.exe' 12415 ;; 12416 12417 *) 12418+ # Assume MSVC wrapper 12419 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' 12420+ dynamic_linker='Win32 ld.exe' 12421 ;; 12422 esac 12423- dynamic_linker='Win32 ld.exe' 12424 # FIXME: first we should search . and the directory the executable is in 12425 shlibpath_var=PATH 12426 ;; 12427@@ -15377,6 +16206,7 @@ fi 12428 fi # test -n "$compiler" 12429 12430 CC=$lt_save_CC 12431+ CFLAGS=$lt_save_CFLAGS 12432 LDCXX=$LD 12433 LD=$lt_save_LD 12434 GCC=$lt_save_GCC 12435@@ -16321,13 +17151,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 12436 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 12437 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 12438 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 12439+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' 12440+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' 12441 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' 12442 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' 12443 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' 12444 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' 12445 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' 12446+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' 12447+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' 12448+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' 12449+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' 12450 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' 12451 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' 12452+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' 12453 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 12454 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 12455 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 12456@@ -16342,14 +17179,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 12457 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 12458 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 12459 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"`' 12460+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' 12461+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' 12462 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' 12463 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' 12464 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' 12465-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 12466 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' 12467+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 12468 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' 12469 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' 12470 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' 12471+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' 12472 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 12473 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 12474 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 12475@@ -16382,12 +17222,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 12476 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 12477 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 12478 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 12479-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' 12480 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' 12481 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' 12482 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' 12483 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' 12484 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' 12485+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' 12486 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 12487 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 12488 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 12489@@ -16426,8 +17266,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote 12490 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' 12491 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' 12492 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' 12493-lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' 12494 lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`' 12495+lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' 12496 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' 12497 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' 12498 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' 12499@@ -16454,12 +17294,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ 12500 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' 12501 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' 12502 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' 12503-fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`' 12504 always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`' 12505 export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`' 12506 exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`' 12507 include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`' 12508 prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`' 12509+postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`' 12510 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' 12511 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' 12512 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' 12513@@ -16497,8 +17337,13 @@ reload_flag \ 12514 OBJDUMP \ 12515 deplibs_check_method \ 12516 file_magic_cmd \ 12517+file_magic_glob \ 12518+want_nocaseglob \ 12519+DLLTOOL \ 12520+sharedlib_from_linklib_cmd \ 12521 AR \ 12522 AR_FLAGS \ 12523+archiver_list_spec \ 12524 STRIP \ 12525 RANLIB \ 12526 CC \ 12527@@ -16508,12 +17353,14 @@ lt_cv_sys_global_symbol_pipe \ 12528 lt_cv_sys_global_symbol_to_cdecl \ 12529 lt_cv_sys_global_symbol_to_c_name_address \ 12530 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 12531+nm_file_list_spec \ 12532 lt_prog_compiler_no_builtin_flag \ 12533-lt_prog_compiler_wl \ 12534 lt_prog_compiler_pic \ 12535+lt_prog_compiler_wl \ 12536 lt_prog_compiler_static \ 12537 lt_cv_prog_compiler_c_o \ 12538 need_locks \ 12539+MANIFEST_TOOL \ 12540 DSYMUTIL \ 12541 NMEDIT \ 12542 LIPO \ 12543@@ -16529,7 +17376,6 @@ no_undefined_flag \ 12544 hardcode_libdir_flag_spec \ 12545 hardcode_libdir_flag_spec_ld \ 12546 hardcode_libdir_separator \ 12547-fix_srcfile_path \ 12548 exclude_expsyms \ 12549 include_expsyms \ 12550 file_list_spec \ 12551@@ -16551,8 +17397,8 @@ LD_CXX \ 12552 reload_flag_CXX \ 12553 compiler_CXX \ 12554 lt_prog_compiler_no_builtin_flag_CXX \ 12555-lt_prog_compiler_wl_CXX \ 12556 lt_prog_compiler_pic_CXX \ 12557+lt_prog_compiler_wl_CXX \ 12558 lt_prog_compiler_static_CXX \ 12559 lt_cv_prog_compiler_c_o_CXX \ 12560 export_dynamic_flag_spec_CXX \ 12561@@ -16564,7 +17410,6 @@ no_undefined_flag_CXX \ 12562 hardcode_libdir_flag_spec_CXX \ 12563 hardcode_libdir_flag_spec_ld_CXX \ 12564 hardcode_libdir_separator_CXX \ 12565-fix_srcfile_path_CXX \ 12566 exclude_expsyms_CXX \ 12567 include_expsyms_CXX \ 12568 file_list_spec_CXX \ 12569@@ -16598,6 +17443,7 @@ module_cmds \ 12570 module_expsym_cmds \ 12571 export_symbols_cmds \ 12572 prelink_cmds \ 12573+postlink_cmds \ 12574 postinstall_cmds \ 12575 postuninstall_cmds \ 12576 finish_cmds \ 12577@@ -16612,7 +17458,8 @@ archive_expsym_cmds_CXX \ 12578 module_cmds_CXX \ 12579 module_expsym_cmds_CXX \ 12580 export_symbols_cmds_CXX \ 12581-prelink_cmds_CXX; do 12582+prelink_cmds_CXX \ 12583+postlink_cmds_CXX; do 12584 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in 12585 *[\\\\\\\`\\"\\\$]*) 12586 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" 12587@@ -17366,7 +18213,8 @@ $as_echo X"$file" | 12588 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 12589 # 12590 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 12591-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. 12592+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, 12593+# Inc. 12594 # Written by Gordon Matzigkeit, 1996 12595 # 12596 # This file is part of GNU Libtool. 12597@@ -17469,19 +18317,42 @@ SP2NL=$lt_lt_SP2NL 12598 # turn newlines into spaces. 12599 NL2SP=$lt_lt_NL2SP 12600 12601+# convert \$build file names to \$host format. 12602+to_host_file_cmd=$lt_cv_to_host_file_cmd 12603+ 12604+# convert \$build files to toolchain format. 12605+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 12606+ 12607 # An object symbol dumper. 12608 OBJDUMP=$lt_OBJDUMP 12609 12610 # Method to check whether dependent libraries are shared objects. 12611 deplibs_check_method=$lt_deplibs_check_method 12612 12613-# Command to use when deplibs_check_method == "file_magic". 12614+# Command to use when deplibs_check_method = "file_magic". 12615 file_magic_cmd=$lt_file_magic_cmd 12616 12617+# How to find potential files when deplibs_check_method = "file_magic". 12618+file_magic_glob=$lt_file_magic_glob 12619+ 12620+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". 12621+want_nocaseglob=$lt_want_nocaseglob 12622+ 12623+# DLL creation program. 12624+DLLTOOL=$lt_DLLTOOL 12625+ 12626+# Command to associate shared and link libraries. 12627+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd 12628+ 12629 # The archiver. 12630 AR=$lt_AR 12631+ 12632+# Flags to create an archive. 12633 AR_FLAGS=$lt_AR_FLAGS 12634 12635+# How to feed a file listing to the archiver. 12636+archiver_list_spec=$lt_archiver_list_spec 12637+ 12638 # A symbol stripping program. 12639 STRIP=$lt_STRIP 12640 12641@@ -17511,6 +18382,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 12642 # Transform the output of nm in a C name address pair when lib prefix is needed. 12643 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 12644 12645+# Specify filename containing input files for \$NM. 12646+nm_file_list_spec=$lt_nm_file_list_spec 12647+ 12648+# The root where to search for dependent libraries,and in which our libraries should be installed. 12649+lt_sysroot=$lt_sysroot 12650+ 12651 # The name of the directory that contains temporary libtool files. 12652 objdir=$objdir 12653 12654@@ -17520,6 +18397,9 @@ MAGIC_CMD=$MAGIC_CMD 12655 # Must we lock files when doing compilation? 12656 need_locks=$lt_need_locks 12657 12658+# Manifest tool. 12659+MANIFEST_TOOL=$lt_MANIFEST_TOOL 12660+ 12661 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 12662 DSYMUTIL=$lt_DSYMUTIL 12663 12664@@ -17634,12 +18514,12 @@ with_gcc=$GCC 12665 # Compiler flag to turn off builtin functions. 12666 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 12667 12668-# How to pass a linker flag through the compiler. 12669-wl=$lt_lt_prog_compiler_wl 12670- 12671 # Additional compiler flags for building library objects. 12672 pic_flag=$lt_lt_prog_compiler_pic 12673 12674+# How to pass a linker flag through the compiler. 12675+wl=$lt_lt_prog_compiler_wl 12676+ 12677 # Compiler flag to prevent dynamic linking. 12678 link_static_flag=$lt_lt_prog_compiler_static 12679 12680@@ -17726,9 +18606,6 @@ inherit_rpath=$inherit_rpath 12681 # Whether libtool must link a program against all its dependency libraries. 12682 link_all_deplibs=$link_all_deplibs 12683 12684-# Fix the shell variable \$srcfile for the compiler. 12685-fix_srcfile_path=$lt_fix_srcfile_path 12686- 12687 # Set to "yes" if exported symbols are required. 12688 always_export_symbols=$always_export_symbols 12689 12690@@ -17744,6 +18621,9 @@ include_expsyms=$lt_include_expsyms 12691 # Commands necessary for linking programs (against libraries) with templates. 12692 prelink_cmds=$lt_prelink_cmds 12693 12694+# Commands necessary for finishing linking programs. 12695+postlink_cmds=$lt_postlink_cmds 12696+ 12697 # Specify filename containing input files. 12698 file_list_spec=$lt_file_list_spec 12699 12700@@ -17790,210 +18670,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 12701 # if finds mixed CR/LF and LF-only lines. Since sed operates in 12702 # text mode, it properly converts lines to CR/LF. This bash problem 12703 # is reportedly fixed, but why not run on old versions too? 12704- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ 12705- || (rm -f "$cfgfile"; exit 1) 12706- 12707- case $xsi_shell in 12708- yes) 12709- cat << \_LT_EOF >> "$cfgfile" 12710- 12711-# func_dirname file append nondir_replacement 12712-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 12713-# otherwise set result to NONDIR_REPLACEMENT. 12714-func_dirname () 12715-{ 12716- case ${1} in 12717- */*) func_dirname_result="${1%/*}${2}" ;; 12718- * ) func_dirname_result="${3}" ;; 12719- esac 12720-} 12721- 12722-# func_basename file 12723-func_basename () 12724-{ 12725- func_basename_result="${1##*/}" 12726-} 12727- 12728-# func_dirname_and_basename file append nondir_replacement 12729-# perform func_basename and func_dirname in a single function 12730-# call: 12731-# dirname: Compute the dirname of FILE. If nonempty, 12732-# add APPEND to the result, otherwise set result 12733-# to NONDIR_REPLACEMENT. 12734-# value returned in "$func_dirname_result" 12735-# basename: Compute filename of FILE. 12736-# value retuned in "$func_basename_result" 12737-# Implementation must be kept synchronized with func_dirname 12738-# and func_basename. For efficiency, we do not delegate to 12739-# those functions but instead duplicate the functionality here. 12740-func_dirname_and_basename () 12741-{ 12742- case ${1} in 12743- */*) func_dirname_result="${1%/*}${2}" ;; 12744- * ) func_dirname_result="${3}" ;; 12745- esac 12746- func_basename_result="${1##*/}" 12747-} 12748- 12749-# func_stripname prefix suffix name 12750-# strip PREFIX and SUFFIX off of NAME. 12751-# PREFIX and SUFFIX must not contain globbing or regex special 12752-# characters, hashes, percent signs, but SUFFIX may contain a leading 12753-# dot (in which case that matches only a dot). 12754-func_stripname () 12755-{ 12756- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are 12757- # positional parameters, so assign one to ordinary parameter first. 12758- func_stripname_result=${3} 12759- func_stripname_result=${func_stripname_result#"${1}"} 12760- func_stripname_result=${func_stripname_result%"${2}"} 12761-} 12762- 12763-# func_opt_split 12764-func_opt_split () 12765-{ 12766- func_opt_split_opt=${1%%=*} 12767- func_opt_split_arg=${1#*=} 12768-} 12769- 12770-# func_lo2o object 12771-func_lo2o () 12772-{ 12773- case ${1} in 12774- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; 12775- *) func_lo2o_result=${1} ;; 12776- esac 12777-} 12778- 12779-# func_xform libobj-or-source 12780-func_xform () 12781-{ 12782- func_xform_result=${1%.*}.lo 12783-} 12784- 12785-# func_arith arithmetic-term... 12786-func_arith () 12787-{ 12788- func_arith_result=$(( $* )) 12789-} 12790- 12791-# func_len string 12792-# STRING may not start with a hyphen. 12793-func_len () 12794-{ 12795- func_len_result=${#1} 12796-} 12797- 12798-_LT_EOF 12799- ;; 12800- *) # Bourne compatible functions. 12801- cat << \_LT_EOF >> "$cfgfile" 12802- 12803-# func_dirname file append nondir_replacement 12804-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 12805-# otherwise set result to NONDIR_REPLACEMENT. 12806-func_dirname () 12807-{ 12808- # Extract subdirectory from the argument. 12809- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` 12810- if test "X$func_dirname_result" = "X${1}"; then 12811- func_dirname_result="${3}" 12812- else 12813- func_dirname_result="$func_dirname_result${2}" 12814- fi 12815-} 12816- 12817-# func_basename file 12818-func_basename () 12819-{ 12820- func_basename_result=`$ECHO "${1}" | $SED "$basename"` 12821-} 12822- 12823- 12824-# func_stripname prefix suffix name 12825-# strip PREFIX and SUFFIX off of NAME. 12826-# PREFIX and SUFFIX must not contain globbing or regex special 12827-# characters, hashes, percent signs, but SUFFIX may contain a leading 12828-# dot (in which case that matches only a dot). 12829-# func_strip_suffix prefix name 12830-func_stripname () 12831-{ 12832- case ${2} in 12833- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; 12834- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; 12835- esac 12836-} 12837- 12838-# sed scripts: 12839-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' 12840-my_sed_long_arg='1s/^-[^=]*=//' 12841- 12842-# func_opt_split 12843-func_opt_split () 12844-{ 12845- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` 12846- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` 12847-} 12848- 12849-# func_lo2o object 12850-func_lo2o () 12851-{ 12852- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` 12853-} 12854- 12855-# func_xform libobj-or-source 12856-func_xform () 12857-{ 12858- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` 12859-} 12860- 12861-# func_arith arithmetic-term... 12862-func_arith () 12863-{ 12864- func_arith_result=`expr "$@"` 12865-} 12866- 12867-# func_len string 12868-# STRING may not start with a hyphen. 12869-func_len () 12870-{ 12871- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` 12872-} 12873- 12874-_LT_EOF 12875-esac 12876- 12877-case $lt_shell_append in 12878- yes) 12879- cat << \_LT_EOF >> "$cfgfile" 12880- 12881-# func_append var value 12882-# Append VALUE to the end of shell variable VAR. 12883-func_append () 12884-{ 12885- eval "$1+=\$2" 12886-} 12887-_LT_EOF 12888- ;; 12889- *) 12890- cat << \_LT_EOF >> "$cfgfile" 12891- 12892-# func_append var value 12893-# Append VALUE to the end of shell variable VAR. 12894-func_append () 12895-{ 12896- eval "$1=\$$1\$2" 12897-} 12898- 12899-_LT_EOF 12900- ;; 12901- esac 12902- 12903- 12904- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ 12905- || (rm -f "$cfgfile"; exit 1) 12906- 12907- mv -f "$cfgfile" "$ofile" || 12908+ sed '$q' "$ltmain" >> "$cfgfile" \ 12909+ || (rm -f "$cfgfile"; exit 1) 12910+ 12911+ if test x"$xsi_shell" = xyes; then 12912+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ 12913+func_dirname ()\ 12914+{\ 12915+\ case ${1} in\ 12916+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 12917+\ * ) func_dirname_result="${3}" ;;\ 12918+\ esac\ 12919+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ 12920+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 12921+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 12922+test 0 -eq $? || _lt_function_replace_fail=: 12923+ 12924+ 12925+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ 12926+func_basename ()\ 12927+{\ 12928+\ func_basename_result="${1##*/}"\ 12929+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ 12930+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 12931+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 12932+test 0 -eq $? || _lt_function_replace_fail=: 12933+ 12934+ 12935+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ 12936+func_dirname_and_basename ()\ 12937+{\ 12938+\ case ${1} in\ 12939+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 12940+\ * ) func_dirname_result="${3}" ;;\ 12941+\ esac\ 12942+\ func_basename_result="${1##*/}"\ 12943+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ 12944+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 12945+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 12946+test 0 -eq $? || _lt_function_replace_fail=: 12947+ 12948+ 12949+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ 12950+func_stripname ()\ 12951+{\ 12952+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ 12953+\ # positional parameters, so assign one to ordinary parameter first.\ 12954+\ func_stripname_result=${3}\ 12955+\ func_stripname_result=${func_stripname_result#"${1}"}\ 12956+\ func_stripname_result=${func_stripname_result%"${2}"}\ 12957+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ 12958+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 12959+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 12960+test 0 -eq $? || _lt_function_replace_fail=: 12961+ 12962+ 12963+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ 12964+func_split_long_opt ()\ 12965+{\ 12966+\ func_split_long_opt_name=${1%%=*}\ 12967+\ func_split_long_opt_arg=${1#*=}\ 12968+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ 12969+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 12970+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 12971+test 0 -eq $? || _lt_function_replace_fail=: 12972+ 12973+ 12974+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ 12975+func_split_short_opt ()\ 12976+{\ 12977+\ func_split_short_opt_arg=${1#??}\ 12978+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ 12979+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ 12980+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 12981+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 12982+test 0 -eq $? || _lt_function_replace_fail=: 12983+ 12984+ 12985+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ 12986+func_lo2o ()\ 12987+{\ 12988+\ case ${1} in\ 12989+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ 12990+\ *) func_lo2o_result=${1} ;;\ 12991+\ esac\ 12992+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ 12993+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 12994+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 12995+test 0 -eq $? || _lt_function_replace_fail=: 12996+ 12997+ 12998+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ 12999+func_xform ()\ 13000+{\ 13001+ func_xform_result=${1%.*}.lo\ 13002+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ 13003+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 13004+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 13005+test 0 -eq $? || _lt_function_replace_fail=: 13006+ 13007+ 13008+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ 13009+func_arith ()\ 13010+{\ 13011+ func_arith_result=$(( $* ))\ 13012+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ 13013+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 13014+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 13015+test 0 -eq $? || _lt_function_replace_fail=: 13016+ 13017+ 13018+ sed -e '/^func_len ()$/,/^} # func_len /c\ 13019+func_len ()\ 13020+{\ 13021+ func_len_result=${#1}\ 13022+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ 13023+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 13024+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 13025+test 0 -eq $? || _lt_function_replace_fail=: 13026+ 13027+fi 13028+ 13029+if test x"$lt_shell_append" = xyes; then 13030+ sed -e '/^func_append ()$/,/^} # func_append /c\ 13031+func_append ()\ 13032+{\ 13033+ eval "${1}+=\\${2}"\ 13034+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ 13035+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 13036+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 13037+test 0 -eq $? || _lt_function_replace_fail=: 13038+ 13039+ 13040+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ 13041+func_append_quoted ()\ 13042+{\ 13043+\ func_quote_for_eval "${2}"\ 13044+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ 13045+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ 13046+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 13047+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 13048+test 0 -eq $? || _lt_function_replace_fail=: 13049+ 13050+ 13051+ # Save a `func_append' function call where possible by direct use of '+=' 13052+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ 13053+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 13054+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 13055+ test 0 -eq $? || _lt_function_replace_fail=: 13056+else 13057+ # Save a `func_append' function call even when '+=' is not available 13058+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ 13059+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 13060+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 13061+ test 0 -eq $? || _lt_function_replace_fail=: 13062+fi 13063+ 13064+if test x"$_lt_function_replace_fail" = x":"; then 13065+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 13066+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} 13067+fi 13068+ 13069+ 13070+ mv -f "$cfgfile" "$ofile" || 13071 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 13072 chmod +x "$ofile" 13073 13074@@ -18021,12 +18860,12 @@ with_gcc=$GCC_CXX 13075 # Compiler flag to turn off builtin functions. 13076 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX 13077 13078-# How to pass a linker flag through the compiler. 13079-wl=$lt_lt_prog_compiler_wl_CXX 13080- 13081 # Additional compiler flags for building library objects. 13082 pic_flag=$lt_lt_prog_compiler_pic_CXX 13083 13084+# How to pass a linker flag through the compiler. 13085+wl=$lt_lt_prog_compiler_wl_CXX 13086+ 13087 # Compiler flag to prevent dynamic linking. 13088 link_static_flag=$lt_lt_prog_compiler_static_CXX 13089 13090@@ -18113,9 +18952,6 @@ inherit_rpath=$inherit_rpath_CXX 13091 # Whether libtool must link a program against all its dependency libraries. 13092 link_all_deplibs=$link_all_deplibs_CXX 13093 13094-# Fix the shell variable \$srcfile for the compiler. 13095-fix_srcfile_path=$lt_fix_srcfile_path_CXX 13096- 13097 # Set to "yes" if exported symbols are required. 13098 always_export_symbols=$always_export_symbols_CXX 13099 13100@@ -18131,6 +18967,9 @@ include_expsyms=$lt_include_expsyms_CXX 13101 # Commands necessary for linking programs (against libraries) with templates. 13102 prelink_cmds=$lt_prelink_cmds_CXX 13103 13104+# Commands necessary for finishing linking programs. 13105+postlink_cmds=$lt_postlink_cmds_CXX 13106+ 13107 # Specify filename containing input files. 13108 file_list_spec=$lt_file_list_spec_CXX 13109 13110diff --git a/gprofng/src/Makefile.in b/gprofng/src/Makefile.in 13111index 605fa4f6fd4..313c4ceb4ca 100644 13112--- a/gprofng/src/Makefile.in 13113+++ b/gprofng/src/Makefile.in 13114@@ -324,6 +324,7 @@ CXXFLAGS = @CXXFLAGS@ 13115 CYGPATH_W = @CYGPATH_W@ 13116 DEFS = @DEFS@ 13117 DEPDIR = @DEPDIR@ 13118+DLLTOOL = @DLLTOOL@ 13119 DSYMUTIL = @DSYMUTIL@ 13120 DUMPBIN = @DUMPBIN@ 13121 ECHO_C = @ECHO_C@ 13122@@ -359,6 +360,7 @@ LN_S = @LN_S@ 13123 LTLIBOBJS = @LTLIBOBJS@ 13124 MAINT = @MAINT@ 13125 MAKEINFO = @MAKEINFO@ 13126+MANIFEST_TOOL = @MANIFEST_TOOL@ 13127 MKDIR_P = @MKDIR_P@ 13128 NM = @NM@ 13129 NMEDIT = @NMEDIT@ 13130diff --git a/ld/Makefile.in b/ld/Makefile.in 13131index 08dcd7b75fc..17c58dd2fd0 100644 13132--- a/ld/Makefile.in 13133+++ b/ld/Makefile.in 13134@@ -384,6 +384,7 @@ CYGPATH_W = @CYGPATH_W@ 13135 DATADIRNAME = @DATADIRNAME@ 13136 DEFS = @DEFS@ 13137 DEPDIR = @DEPDIR@ 13138+DLLTOOL = @DLLTOOL@ 13139 DSYMUTIL = @DSYMUTIL@ 13140 DUMPBIN = @DUMPBIN@ 13141 ECHO_C = @ECHO_C@ 13142@@ -434,6 +435,7 @@ LN_S = @LN_S@ 13143 LTLIBOBJS = @LTLIBOBJS@ 13144 MAINT = @MAINT@ 13145 MAKEINFO = @MAKEINFO@ 13146+MANIFEST_TOOL = @MANIFEST_TOOL@ 13147 MKDIR_P = @MKDIR_P@ 13148 MKINSTALLDIRS = @MKINSTALLDIRS@ 13149 MSGFMT = @MSGFMT@ 13150@@ -485,6 +487,7 @@ abs_builddir = @abs_builddir@ 13151 abs_srcdir = @abs_srcdir@ 13152 abs_top_builddir = @abs_top_builddir@ 13153 abs_top_srcdir = @abs_top_srcdir@ 13154+ac_ct_AR = @ac_ct_AR@ 13155 ac_ct_CC = @ac_ct_CC@ 13156 ac_ct_CXX = @ac_ct_CXX@ 13157 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ 13158diff --git a/ld/configure b/ld/configure 13159index 6406a42c442..21ab5b06709 100755 13160--- a/ld/configure 13161+++ b/ld/configure 13162@@ -700,8 +700,11 @@ OTOOL 13163 LIPO 13164 NMEDIT 13165 DSYMUTIL 13166+MANIFEST_TOOL 13167 RANLIB 13168+ac_ct_AR 13169 AR 13170+DLLTOOL 13171 OBJDUMP 13172 LN_S 13173 NM 13174@@ -831,6 +834,7 @@ enable_static 13175 with_pic 13176 enable_fast_install 13177 with_gnu_ld 13178+with_libtool_sysroot 13179 enable_libtool_lock 13180 enable_plugins 13181 enable_largefile 13182@@ -1562,6 +1566,8 @@ Optional Packages: 13183 --with-pic try to use only PIC/non-PIC objects [default=use 13184 both] 13185 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 13186+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR 13187+ (or the compiler's sysroot if not specified). 13188 --with-lib-path=dir1:dir2... set default LIB_PATH 13189 --with-sysroot=DIR Search for usr/lib et al within DIR. 13190 --with-system-zlib use installed libz 13191@@ -5533,8 +5539,8 @@ esac 13192 13193 13194 13195-macro_version='2.2.7a' 13196-macro_revision='1.3134' 13197+macro_version='2.4' 13198+macro_revision='1.3293' 13199 13200 13201 13202@@ -5574,7 +5580,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 13203 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 13204 $as_echo_n "checking how to print strings... " >&6; } 13205 # Test print first, because it will be a builtin if present. 13206-if test "X`print -r -- -n 2>/dev/null`" = X-n && \ 13207+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ 13208 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 13209 ECHO='print -r --' 13210 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 13211@@ -6267,8 +6273,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 13212 # Try some XSI features 13213 xsi_shell=no 13214 ( _lt_dummy="a/b/c" 13215- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ 13216- = c,a/b,, \ 13217+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ 13218+ = c,a/b,b/c, \ 13219 && eval 'test $(( 1 + 1 )) -eq 2 \ 13220 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 13221 && xsi_shell=yes 13222@@ -6317,6 +6323,80 @@ esac 13223 13224 13225 13226+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 13227+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } 13228+if ${lt_cv_to_host_file_cmd+:} false; then : 13229+ $as_echo_n "(cached) " >&6 13230+else 13231+ case $host in 13232+ *-*-mingw* ) 13233+ case $build in 13234+ *-*-mingw* ) # actually msys 13235+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 13236+ ;; 13237+ *-*-cygwin* ) 13238+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 13239+ ;; 13240+ * ) # otherwise, assume *nix 13241+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 13242+ ;; 13243+ esac 13244+ ;; 13245+ *-*-cygwin* ) 13246+ case $build in 13247+ *-*-mingw* ) # actually msys 13248+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin 13249+ ;; 13250+ *-*-cygwin* ) 13251+ lt_cv_to_host_file_cmd=func_convert_file_noop 13252+ ;; 13253+ * ) # otherwise, assume *nix 13254+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin 13255+ ;; 13256+ esac 13257+ ;; 13258+ * ) # unhandled hosts (and "normal" native builds) 13259+ lt_cv_to_host_file_cmd=func_convert_file_noop 13260+ ;; 13261+esac 13262+ 13263+fi 13264+ 13265+to_host_file_cmd=$lt_cv_to_host_file_cmd 13266+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 13267+$as_echo "$lt_cv_to_host_file_cmd" >&6; } 13268+ 13269+ 13270+ 13271+ 13272+ 13273+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 13274+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } 13275+if ${lt_cv_to_tool_file_cmd+:} false; then : 13276+ $as_echo_n "(cached) " >&6 13277+else 13278+ #assume ordinary cross tools, or native build. 13279+lt_cv_to_tool_file_cmd=func_convert_file_noop 13280+case $host in 13281+ *-*-mingw* ) 13282+ case $build in 13283+ *-*-mingw* ) # actually msys 13284+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 13285+ ;; 13286+ esac 13287+ ;; 13288+esac 13289+ 13290+fi 13291+ 13292+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 13293+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 13294+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } 13295+ 13296+ 13297+ 13298+ 13299+ 13300 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 13301 $as_echo_n "checking for $LD option to reload object files... " >&6; } 13302 if ${lt_cv_ld_reload_flag+:} false; then : 13303@@ -6333,6 +6413,11 @@ case $reload_flag in 13304 esac 13305 reload_cmds='$LD$reload_flag -o $output$reload_objs' 13306 case $host_os in 13307+ cygwin* | mingw* | pw32* | cegcc*) 13308+ if test "$GCC" != yes; then 13309+ reload_cmds=false 13310+ fi 13311+ ;; 13312 darwin*) 13313 if test "$GCC" = yes; then 13314 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 13315@@ -6501,7 +6586,8 @@ mingw* | pw32*) 13316 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 13317 lt_cv_file_magic_cmd='func_win32_libid' 13318 else 13319- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' 13320+ # Keep this pattern in sync with the one in func_win32_libid. 13321+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' 13322 lt_cv_file_magic_cmd='$OBJDUMP -f' 13323 fi 13324 ;; 13325@@ -6655,6 +6741,21 @@ esac 13326 fi 13327 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 13328 $as_echo "$lt_cv_deplibs_check_method" >&6; } 13329+ 13330+file_magic_glob= 13331+want_nocaseglob=no 13332+if test "$build" = "$host"; then 13333+ case $host_os in 13334+ mingw* | pw32*) 13335+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then 13336+ want_nocaseglob=yes 13337+ else 13338+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` 13339+ fi 13340+ ;; 13341+ esac 13342+fi 13343+ 13344 file_magic_cmd=$lt_cv_file_magic_cmd 13345 deplibs_check_method=$lt_cv_deplibs_check_method 13346 test -z "$deplibs_check_method" && deplibs_check_method=unknown 13347@@ -6670,6 +6771,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 13348 13349 13350 13351+ 13352+ 13353+ 13354+ 13355+ 13356+ 13357+ 13358+ 13359+ 13360+ 13361+if test -n "$ac_tool_prefix"; then 13362+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. 13363+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 13364+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13365+$as_echo_n "checking for $ac_word... " >&6; } 13366+if ${ac_cv_prog_DLLTOOL+:} false; then : 13367+ $as_echo_n "(cached) " >&6 13368+else 13369+ if test -n "$DLLTOOL"; then 13370+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. 13371+else 13372+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 13373+for as_dir in $PATH 13374+do 13375+ IFS=$as_save_IFS 13376+ test -z "$as_dir" && as_dir=. 13377+ for ac_exec_ext in '' $ac_executable_extensions; do 13378+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 13379+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" 13380+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 13381+ break 2 13382+ fi 13383+done 13384+ done 13385+IFS=$as_save_IFS 13386+ 13387+fi 13388+fi 13389+DLLTOOL=$ac_cv_prog_DLLTOOL 13390+if test -n "$DLLTOOL"; then 13391+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 13392+$as_echo "$DLLTOOL" >&6; } 13393+else 13394+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 13395+$as_echo "no" >&6; } 13396+fi 13397+ 13398+ 13399+fi 13400+if test -z "$ac_cv_prog_DLLTOOL"; then 13401+ ac_ct_DLLTOOL=$DLLTOOL 13402+ # Extract the first word of "dlltool", so it can be a program name with args. 13403+set dummy dlltool; ac_word=$2 13404+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13405+$as_echo_n "checking for $ac_word... " >&6; } 13406+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : 13407+ $as_echo_n "(cached) " >&6 13408+else 13409+ if test -n "$ac_ct_DLLTOOL"; then 13410+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. 13411+else 13412+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 13413+for as_dir in $PATH 13414+do 13415+ IFS=$as_save_IFS 13416+ test -z "$as_dir" && as_dir=. 13417+ for ac_exec_ext in '' $ac_executable_extensions; do 13418+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 13419+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" 13420+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 13421+ break 2 13422+ fi 13423+done 13424+ done 13425+IFS=$as_save_IFS 13426+ 13427+fi 13428+fi 13429+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL 13430+if test -n "$ac_ct_DLLTOOL"; then 13431+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 13432+$as_echo "$ac_ct_DLLTOOL" >&6; } 13433+else 13434+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 13435+$as_echo "no" >&6; } 13436+fi 13437+ 13438+ if test "x$ac_ct_DLLTOOL" = x; then 13439+ DLLTOOL="false" 13440+ else 13441+ case $cross_compiling:$ac_tool_warned in 13442+yes:) 13443+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 13444+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 13445+ac_tool_warned=yes ;; 13446+esac 13447+ DLLTOOL=$ac_ct_DLLTOOL 13448+ fi 13449+else 13450+ DLLTOOL="$ac_cv_prog_DLLTOOL" 13451+fi 13452+ 13453+test -z "$DLLTOOL" && DLLTOOL=dlltool 13454+ 13455+ 13456+ 13457+ 13458+ 13459+ 13460+ 13461+ 13462+ 13463+ 13464+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 13465+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } 13466+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : 13467+ $as_echo_n "(cached) " >&6 13468+else 13469+ lt_cv_sharedlib_from_linklib_cmd='unknown' 13470+ 13471+case $host_os in 13472+cygwin* | mingw* | pw32* | cegcc*) 13473+ # two different shell functions defined in ltmain.sh 13474+ # decide which to use based on capabilities of $DLLTOOL 13475+ case `$DLLTOOL --help 2>&1` in 13476+ *--identify-strict*) 13477+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib 13478+ ;; 13479+ *) 13480+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback 13481+ ;; 13482+ esac 13483+ ;; 13484+*) 13485+ # fallback: assume linklib IS sharedlib 13486+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" 13487+ ;; 13488+esac 13489+ 13490+fi 13491+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 13492+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } 13493+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd 13494+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO 13495+ 13496+ 13497+ 13498+ 13499+ 13500+ 13501+ 13502 plugin_option= 13503 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 13504 for plugin in $plugin_names; do 13505@@ -6684,8 +6936,10 @@ for plugin in $plugin_names; do 13506 done 13507 13508 if test -n "$ac_tool_prefix"; then 13509- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 13510-set dummy ${ac_tool_prefix}ar; ac_word=$2 13511+ for ac_prog in ar 13512+ do 13513+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 13514+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 13515 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13516 $as_echo_n "checking for $ac_word... " >&6; } 13517 if ${ac_cv_prog_AR+:} false; then : 13518@@ -6701,7 +6955,7 @@ do 13519 test -z "$as_dir" && as_dir=. 13520 for ac_exec_ext in '' $ac_executable_extensions; do 13521 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 13522- ac_cv_prog_AR="${ac_tool_prefix}ar" 13523+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" 13524 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 13525 break 2 13526 fi 13527@@ -6721,11 +6975,15 @@ $as_echo "no" >&6; } 13528 fi 13529 13530 13531+ test -n "$AR" && break 13532+ done 13533 fi 13534-if test -z "$ac_cv_prog_AR"; then 13535+if test -z "$AR"; then 13536 ac_ct_AR=$AR 13537- # Extract the first word of "ar", so it can be a program name with args. 13538-set dummy ar; ac_word=$2 13539+ for ac_prog in ar 13540+do 13541+ # Extract the first word of "$ac_prog", so it can be a program name with args. 13542+set dummy $ac_prog; ac_word=$2 13543 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13544 $as_echo_n "checking for $ac_word... " >&6; } 13545 if ${ac_cv_prog_ac_ct_AR+:} false; then : 13546@@ -6741,7 +6999,7 @@ do 13547 test -z "$as_dir" && as_dir=. 13548 for ac_exec_ext in '' $ac_executable_extensions; do 13549 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 13550- ac_cv_prog_ac_ct_AR="ar" 13551+ ac_cv_prog_ac_ct_AR="$ac_prog" 13552 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 13553 break 2 13554 fi 13555@@ -6760,6 +7018,10 @@ else 13556 $as_echo "no" >&6; } 13557 fi 13558 13559+ 13560+ test -n "$ac_ct_AR" && break 13561+done 13562+ 13563 if test "x$ac_ct_AR" = x; then 13564 AR="false" 13565 else 13566@@ -6771,25 +7033,19 @@ ac_tool_warned=yes ;; 13567 esac 13568 AR=$ac_ct_AR 13569 fi 13570-else 13571- AR="$ac_cv_prog_AR" 13572 fi 13573 13574-test -z "$AR" && AR=ar 13575-if test -n "$plugin_option"; then 13576- if $AR --help 2>&1 | grep -q "\--plugin"; then 13577- touch conftest.c 13578- $AR $plugin_option rc conftest.a conftest.c 13579- if test "$?" != 0; then 13580- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 13581+ touch conftest.c 13582+ $AR $plugin_option rc conftest.a conftest.c 13583+ if test "$?" != 0; then 13584+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 13585 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} 13586- else 13587- AR="$AR $plugin_option" 13588- fi 13589- rm -f conftest.* 13590+ else 13591+ AR="$AR $plugin_option" 13592 fi 13593-fi 13594-test -z "$AR_FLAGS" && AR_FLAGS=cru 13595+ rm -f conftest.* 13596+: ${AR=ar} 13597+: ${AR_FLAGS=cru} 13598 13599 13600 13601@@ -6801,6 +7057,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 13602 13603 13604 13605+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 13606+$as_echo_n "checking for archiver @FILE support... " >&6; } 13607+if ${lt_cv_ar_at_file+:} false; then : 13608+ $as_echo_n "(cached) " >&6 13609+else 13610+ lt_cv_ar_at_file=no 13611+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 13612+/* end confdefs.h. */ 13613+ 13614+int 13615+main () 13616+{ 13617+ 13618+ ; 13619+ return 0; 13620+} 13621+_ACEOF 13622+if ac_fn_c_try_compile "$LINENO"; then : 13623+ echo conftest.$ac_objext > conftest.lst 13624+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' 13625+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 13626+ (eval $lt_ar_try) 2>&5 13627+ ac_status=$? 13628+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 13629+ test $ac_status = 0; } 13630+ if test "$ac_status" -eq 0; then 13631+ # Ensure the archiver fails upon bogus file names. 13632+ rm -f conftest.$ac_objext libconftest.a 13633+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 13634+ (eval $lt_ar_try) 2>&5 13635+ ac_status=$? 13636+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 13637+ test $ac_status = 0; } 13638+ if test "$ac_status" -ne 0; then 13639+ lt_cv_ar_at_file=@ 13640+ fi 13641+ fi 13642+ rm -f conftest.* libconftest.a 13643+ 13644+fi 13645+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 13646+ 13647+fi 13648+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 13649+$as_echo "$lt_cv_ar_at_file" >&6; } 13650+ 13651+if test "x$lt_cv_ar_at_file" = xno; then 13652+ archiver_list_spec= 13653+else 13654+ archiver_list_spec=$lt_cv_ar_at_file 13655+fi 13656+ 13657+ 13658+ 13659+ 13660+ 13661+ 13662+ 13663 if test -n "$ac_tool_prefix"; then 13664 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 13665 set dummy ${ac_tool_prefix}strip; ac_word=$2 13666@@ -7140,8 +7454,8 @@ esac 13667 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 13668 13669 # Transform an extracted symbol line into symbol name and symbol address 13670-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 13671-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'" 13672+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 13673+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'" 13674 13675 # Handle CRLF in mingw tool chain 13676 opt_cr= 13677@@ -7177,6 +7491,7 @@ for ac_symprfx in "" "_"; do 13678 else 13679 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 13680 fi 13681+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" 13682 13683 # Check to see that the pipe works correctly. 13684 pipe_works=no 13685@@ -7218,6 +7533,18 @@ _LT_EOF 13686 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 13687 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 13688 cat <<_LT_EOF > conftest.$ac_ext 13689+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ 13690+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) 13691+/* DATA imports from DLLs on WIN32 con't be const, because runtime 13692+ relocations are performed -- see ld's documentation on pseudo-relocs. */ 13693+# define LT_DLSYM_CONST 13694+#elif defined(__osf__) 13695+/* This system does not cope well with relocations in const data. */ 13696+# define LT_DLSYM_CONST 13697+#else 13698+# define LT_DLSYM_CONST const 13699+#endif 13700+ 13701 #ifdef __cplusplus 13702 extern "C" { 13703 #endif 13704@@ -7229,7 +7556,7 @@ _LT_EOF 13705 cat <<_LT_EOF >> conftest.$ac_ext 13706 13707 /* The mapping between symbol names and symbols. */ 13708-const struct { 13709+LT_DLSYM_CONST struct { 13710 const char *name; 13711 void *address; 13712 } 13713@@ -7255,8 +7582,8 @@ static const void *lt_preloaded_setup() { 13714 _LT_EOF 13715 # Now try linking the two files. 13716 mv conftest.$ac_objext conftstm.$ac_objext 13717- lt_save_LIBS="$LIBS" 13718- lt_save_CFLAGS="$CFLAGS" 13719+ lt_globsym_save_LIBS=$LIBS 13720+ lt_globsym_save_CFLAGS=$CFLAGS 13721 LIBS="conftstm.$ac_objext" 13722 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 13723 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 13724@@ -7266,8 +7593,8 @@ _LT_EOF 13725 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 13726 pipe_works=yes 13727 fi 13728- LIBS="$lt_save_LIBS" 13729- CFLAGS="$lt_save_CFLAGS" 13730+ LIBS=$lt_globsym_save_LIBS 13731+ CFLAGS=$lt_globsym_save_CFLAGS 13732 else 13733 echo "cannot find nm_test_func in $nlist" >&5 13734 fi 13735@@ -7304,6 +7631,17 @@ else 13736 $as_echo "ok" >&6; } 13737 fi 13738 13739+# Response file support. 13740+if test "$lt_cv_nm_interface" = "MS dumpbin"; then 13741+ nm_file_list_spec='@' 13742+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then 13743+ nm_file_list_spec='@' 13744+fi 13745+ 13746+ 13747+ 13748+ 13749+ 13750 13751 13752 13753@@ -7320,6 +7658,44 @@ fi 13754 13755 13756 13757+ 13758+ 13759+ 13760+ 13761+ 13762+ 13763+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 13764+$as_echo_n "checking for sysroot... " >&6; } 13765+ 13766+# Check whether --with-libtool-sysroot was given. 13767+if test "${with_libtool_sysroot+set}" = set; then : 13768+ withval=$with_libtool_sysroot; 13769+else 13770+ with_libtool_sysroot=no 13771+fi 13772+ 13773+ 13774+lt_sysroot= 13775+case ${with_libtool_sysroot} in #( 13776+ yes) 13777+ if test "$GCC" = yes; then 13778+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` 13779+ fi 13780+ ;; #( 13781+ /*) 13782+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` 13783+ ;; #( 13784+ no|'') 13785+ ;; #( 13786+ *) 13787+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 13788+$as_echo "${with_libtool_sysroot}" >&6; } 13789+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 13790+ ;; 13791+esac 13792+ 13793+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 13794+$as_echo "${lt_sysroot:-no}" >&6; } 13795 13796 13797 13798@@ -7531,6 +7907,123 @@ esac 13799 13800 need_locks="$enable_libtool_lock" 13801 13802+if test -n "$ac_tool_prefix"; then 13803+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. 13804+set dummy ${ac_tool_prefix}mt; ac_word=$2 13805+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13806+$as_echo_n "checking for $ac_word... " >&6; } 13807+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : 13808+ $as_echo_n "(cached) " >&6 13809+else 13810+ if test -n "$MANIFEST_TOOL"; then 13811+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. 13812+else 13813+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 13814+for as_dir in $PATH 13815+do 13816+ IFS=$as_save_IFS 13817+ test -z "$as_dir" && as_dir=. 13818+ for ac_exec_ext in '' $ac_executable_extensions; do 13819+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 13820+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" 13821+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 13822+ break 2 13823+ fi 13824+done 13825+ done 13826+IFS=$as_save_IFS 13827+ 13828+fi 13829+fi 13830+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL 13831+if test -n "$MANIFEST_TOOL"; then 13832+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 13833+$as_echo "$MANIFEST_TOOL" >&6; } 13834+else 13835+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 13836+$as_echo "no" >&6; } 13837+fi 13838+ 13839+ 13840+fi 13841+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then 13842+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL 13843+ # Extract the first word of "mt", so it can be a program name with args. 13844+set dummy mt; ac_word=$2 13845+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13846+$as_echo_n "checking for $ac_word... " >&6; } 13847+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : 13848+ $as_echo_n "(cached) " >&6 13849+else 13850+ if test -n "$ac_ct_MANIFEST_TOOL"; then 13851+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. 13852+else 13853+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 13854+for as_dir in $PATH 13855+do 13856+ IFS=$as_save_IFS 13857+ test -z "$as_dir" && as_dir=. 13858+ for ac_exec_ext in '' $ac_executable_extensions; do 13859+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 13860+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" 13861+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 13862+ break 2 13863+ fi 13864+done 13865+ done 13866+IFS=$as_save_IFS 13867+ 13868+fi 13869+fi 13870+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL 13871+if test -n "$ac_ct_MANIFEST_TOOL"; then 13872+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 13873+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } 13874+else 13875+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 13876+$as_echo "no" >&6; } 13877+fi 13878+ 13879+ if test "x$ac_ct_MANIFEST_TOOL" = x; then 13880+ MANIFEST_TOOL=":" 13881+ else 13882+ case $cross_compiling:$ac_tool_warned in 13883+yes:) 13884+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 13885+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 13886+ac_tool_warned=yes ;; 13887+esac 13888+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL 13889+ fi 13890+else 13891+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" 13892+fi 13893+ 13894+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt 13895+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 13896+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } 13897+if ${lt_cv_path_mainfest_tool+:} false; then : 13898+ $as_echo_n "(cached) " >&6 13899+else 13900+ lt_cv_path_mainfest_tool=no 13901+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 13902+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out 13903+ cat conftest.err >&5 13904+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then 13905+ lt_cv_path_mainfest_tool=yes 13906+ fi 13907+ rm -f conftest* 13908+fi 13909+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 13910+$as_echo "$lt_cv_path_mainfest_tool" >&6; } 13911+if test "x$lt_cv_path_mainfest_tool" != xyes; then 13912+ MANIFEST_TOOL=: 13913+fi 13914+ 13915+ 13916+ 13917+ 13918+ 13919 13920 case $host_os in 13921 rhapsody* | darwin*) 13922@@ -8094,6 +8587,8 @@ _LT_EOF 13923 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 13924 echo "$AR cru libconftest.a conftest.o" >&5 13925 $AR cru libconftest.a conftest.o 2>&5 13926+ echo "$RANLIB libconftest.a" >&5 13927+ $RANLIB libconftest.a 2>&5 13928 cat > conftest.c << _LT_EOF 13929 int main() { return 0;} 13930 _LT_EOF 13931@@ -8162,6 +8657,16 @@ done 13932 13933 13934 13935+func_stripname_cnf () 13936+{ 13937+ case ${2} in 13938+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; 13939+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; 13940+ esac 13941+} # func_stripname_cnf 13942+ 13943+ 13944+ 13945 13946 13947 # Set options 13948@@ -8677,8 +9182,6 @@ fi 13949 lt_prog_compiler_pic= 13950 lt_prog_compiler_static= 13951 13952-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 13953-$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 13954 13955 if test "$GCC" = yes; then 13956 lt_prog_compiler_wl='-Wl,' 13957@@ -8844,6 +9347,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 13958 lt_prog_compiler_pic='--shared' 13959 lt_prog_compiler_static='--static' 13960 ;; 13961+ nagfor*) 13962+ # NAG Fortran compiler 13963+ lt_prog_compiler_wl='-Wl,-Wl,,' 13964+ lt_prog_compiler_pic='-PIC' 13965+ lt_prog_compiler_static='-Bstatic' 13966+ ;; 13967 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 13968 # Portland Group compilers (*not* the Pentium gcc compiler, 13969 # which looks to be a dead project) 13970@@ -8906,7 +9415,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 13971 lt_prog_compiler_pic='-KPIC' 13972 lt_prog_compiler_static='-Bstatic' 13973 case $cc_basename in 13974- f77* | f90* | f95*) 13975+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) 13976 lt_prog_compiler_wl='-Qoption ld ';; 13977 *) 13978 lt_prog_compiler_wl='-Wl,';; 13979@@ -8963,13 +9472,17 @@ case $host_os in 13980 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 13981 ;; 13982 esac 13983-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 13984-$as_echo "$lt_prog_compiler_pic" >&6; } 13985- 13986- 13987- 13988- 13989 13990+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 13991+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 13992+if ${lt_cv_prog_compiler_pic+:} false; then : 13993+ $as_echo_n "(cached) " >&6 13994+else 13995+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic 13996+fi 13997+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 13998+$as_echo "$lt_cv_prog_compiler_pic" >&6; } 13999+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic 14000 14001 # 14002 # Check to make sure the PIC flag actually works. 14003@@ -9030,6 +9543,11 @@ fi 14004 14005 14006 14007+ 14008+ 14009+ 14010+ 14011+ 14012 # 14013 # Check to make sure the static flag actually works. 14014 # 14015@@ -9380,7 +9898,8 @@ _LT_EOF 14016 allow_undefined_flag=unsupported 14017 always_export_symbols=no 14018 enable_shared_with_static_runtimes=yes 14019- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 14020+ 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' 14021+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' 14022 14023 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 14024 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 14025@@ -9479,12 +9998,12 @@ _LT_EOF 14026 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 14027 hardcode_libdir_flag_spec= 14028 hardcode_libdir_flag_spec_ld='-rpath $libdir' 14029- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' 14030+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' 14031 if test "x$supports_anon_versioning" = xyes; then 14032 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ 14033 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ 14034 echo "local: *; };" >> $output_objdir/$libname.ver~ 14035- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 14036+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 14037 fi 14038 ;; 14039 esac 14040@@ -9498,8 +10017,8 @@ _LT_EOF 14041 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 14042 wlarc= 14043 else 14044- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 14045- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 14046+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 14047+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 14048 fi 14049 ;; 14050 14051@@ -9517,8 +10036,8 @@ _LT_EOF 14052 14053 _LT_EOF 14054 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 14055- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 14056- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 14057+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 14058+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 14059 else 14060 ld_shlibs=no 14061 fi 14062@@ -9564,8 +10083,8 @@ _LT_EOF 14063 14064 *) 14065 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 14066- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 14067- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 14068+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 14069+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 14070 else 14071 ld_shlibs=no 14072 fi 14073@@ -9695,7 +10214,13 @@ _LT_EOF 14074 allow_undefined_flag='-berok' 14075 # Determine the default libpath from the value encoded in an 14076 # empty executable. 14077- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 14078+ if test "${lt_cv_aix_libpath+set}" = set; then 14079+ aix_libpath=$lt_cv_aix_libpath 14080+else 14081+ if ${lt_cv_aix_libpath_+:} false; then : 14082+ $as_echo_n "(cached) " >&6 14083+else 14084+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 14085 /* end confdefs.h. */ 14086 14087 int 14088@@ -9708,22 +10233,29 @@ main () 14089 _ACEOF 14090 if ac_fn_c_try_link "$LINENO"; then : 14091 14092-lt_aix_libpath_sed=' 14093- /Import File Strings/,/^$/ { 14094- /^0/ { 14095- s/^0 *\(.*\)$/\1/ 14096- p 14097- } 14098- }' 14099-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 14100-# Check for a 64-bit object if we didn't find anything. 14101-if test -z "$aix_libpath"; then 14102- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 14103-fi 14104+ lt_aix_libpath_sed=' 14105+ /Import File Strings/,/^$/ { 14106+ /^0/ { 14107+ s/^0 *\([^ ]*\) *$/\1/ 14108+ p 14109+ } 14110+ }' 14111+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 14112+ # Check for a 64-bit object if we didn't find anything. 14113+ if test -z "$lt_cv_aix_libpath_"; then 14114+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 14115+ fi 14116 fi 14117 rm -f core conftest.err conftest.$ac_objext \ 14118 conftest$ac_exeext conftest.$ac_ext 14119-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14120+ if test -z "$lt_cv_aix_libpath_"; then 14121+ lt_cv_aix_libpath_="/usr/lib:/lib" 14122+ fi 14123+ 14124+fi 14125+ 14126+ aix_libpath=$lt_cv_aix_libpath_ 14127+fi 14128 14129 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 14130 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" 14131@@ -9735,7 +10267,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14132 else 14133 # Determine the default libpath from the value encoded in an 14134 # empty executable. 14135- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 14136+ if test "${lt_cv_aix_libpath+set}" = set; then 14137+ aix_libpath=$lt_cv_aix_libpath 14138+else 14139+ if ${lt_cv_aix_libpath_+:} false; then : 14140+ $as_echo_n "(cached) " >&6 14141+else 14142+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 14143 /* end confdefs.h. */ 14144 14145 int 14146@@ -9748,22 +10286,29 @@ main () 14147 _ACEOF 14148 if ac_fn_c_try_link "$LINENO"; then : 14149 14150-lt_aix_libpath_sed=' 14151- /Import File Strings/,/^$/ { 14152- /^0/ { 14153- s/^0 *\(.*\)$/\1/ 14154- p 14155- } 14156- }' 14157-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 14158-# Check for a 64-bit object if we didn't find anything. 14159-if test -z "$aix_libpath"; then 14160- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 14161-fi 14162+ lt_aix_libpath_sed=' 14163+ /Import File Strings/,/^$/ { 14164+ /^0/ { 14165+ s/^0 *\([^ ]*\) *$/\1/ 14166+ p 14167+ } 14168+ }' 14169+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 14170+ # Check for a 64-bit object if we didn't find anything. 14171+ if test -z "$lt_cv_aix_libpath_"; then 14172+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 14173+ fi 14174 fi 14175 rm -f core conftest.err conftest.$ac_objext \ 14176 conftest$ac_exeext conftest.$ac_ext 14177-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14178+ if test -z "$lt_cv_aix_libpath_"; then 14179+ lt_cv_aix_libpath_="/usr/lib:/lib" 14180+ fi 14181+ 14182+fi 14183+ 14184+ aix_libpath=$lt_cv_aix_libpath_ 14185+fi 14186 14187 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 14188 # Warning - without using the other run time loading flags, 14189@@ -9807,21 +10352,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14190 # When not using gcc, we currently assume that we are using 14191 # Microsoft Visual C++. 14192 # hardcode_libdir_flag_spec is actually meaningless, as there is 14193- # no search path for DLLs. 14194- hardcode_libdir_flag_spec=' ' 14195- allow_undefined_flag=unsupported 14196- # Tell ltmain to make .lib files, not .a files. 14197- libext=lib 14198- # Tell ltmain to make .dll files, not .so files. 14199- shrext_cmds=".dll" 14200- # FIXME: Setting linknames here is a bad hack. 14201- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 14202- # The linker will automatically build a .lib file if we build a DLL. 14203- old_archive_from_new_cmds='true' 14204- # FIXME: Should let the user specify the lib program. 14205- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 14206- fix_srcfile_path='`cygpath -w "$srcfile"`' 14207- enable_shared_with_static_runtimes=yes 14208+ # no search path for DLLs. 14209+ case $cc_basename in 14210+ cl*) 14211+ # Native MSVC 14212+ hardcode_libdir_flag_spec=' ' 14213+ allow_undefined_flag=unsupported 14214+ always_export_symbols=yes 14215+ file_list_spec='@' 14216+ # Tell ltmain to make .lib files, not .a files. 14217+ libext=lib 14218+ # Tell ltmain to make .dll files, not .so files. 14219+ shrext_cmds=".dll" 14220+ # FIXME: Setting linknames here is a bad hack. 14221+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' 14222+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 14223+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; 14224+ else 14225+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; 14226+ fi~ 14227+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ 14228+ linknames=' 14229+ # The linker will not automatically build a static lib if we build a DLL. 14230+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' 14231+ enable_shared_with_static_runtimes=yes 14232+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 14233+ # Don't use ranlib 14234+ old_postinstall_cmds='chmod 644 $oldlib' 14235+ postlink_cmds='lt_outputfile="@OUTPUT@"~ 14236+ lt_tool_outputfile="@TOOL_OUTPUT@"~ 14237+ case $lt_outputfile in 14238+ *.exe|*.EXE) ;; 14239+ *) 14240+ lt_outputfile="$lt_outputfile.exe" 14241+ lt_tool_outputfile="$lt_tool_outputfile.exe" 14242+ ;; 14243+ esac~ 14244+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then 14245+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; 14246+ $RM "$lt_outputfile.manifest"; 14247+ fi' 14248+ ;; 14249+ *) 14250+ # Assume MSVC wrapper 14251+ hardcode_libdir_flag_spec=' ' 14252+ allow_undefined_flag=unsupported 14253+ # Tell ltmain to make .lib files, not .a files. 14254+ libext=lib 14255+ # Tell ltmain to make .dll files, not .so files. 14256+ shrext_cmds=".dll" 14257+ # FIXME: Setting linknames here is a bad hack. 14258+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 14259+ # The linker will automatically build a .lib file if we build a DLL. 14260+ old_archive_from_new_cmds='true' 14261+ # FIXME: Should let the user specify the lib program. 14262+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 14263+ enable_shared_with_static_runtimes=yes 14264+ ;; 14265+ esac 14266 ;; 14267 14268 darwin* | rhapsody*) 14269@@ -9882,7 +10470,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14270 14271 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 14272 freebsd* | dragonfly*) 14273- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' 14274+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' 14275 hardcode_libdir_flag_spec='-R$libdir' 14276 hardcode_direct=yes 14277 hardcode_shlibpath_var=no 14278@@ -9890,7 +10478,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14279 14280 hpux9*) 14281 if test "$GCC" = yes; then 14282- 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' 14283+ 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' 14284 else 14285 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' 14286 fi 14287@@ -9906,7 +10494,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14288 14289 hpux10*) 14290 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 14291- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 14292+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 14293 else 14294 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 14295 fi 14296@@ -9930,10 +10518,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14297 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 14298 ;; 14299 ia64*) 14300- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 14301+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 14302 ;; 14303 *) 14304- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 14305+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 14306 ;; 14307 esac 14308 else 14309@@ -10012,23 +10600,36 @@ fi 14310 14311 irix5* | irix6* | nonstopux*) 14312 if test "$GCC" = yes; then 14313- 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' 14314+ 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' 14315 # Try to use the -exported_symbol ld option, if it does not 14316 # work, assume that -exports_file does not work either and 14317 # implicitly export all symbols. 14318- save_LDFLAGS="$LDFLAGS" 14319- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 14320- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 14321+ # This should be the same for all languages, so no per-tag cache variable. 14322+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 14323+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } 14324+if ${lt_cv_irix_exported_symbol+:} false; then : 14325+ $as_echo_n "(cached) " >&6 14326+else 14327+ save_LDFLAGS="$LDFLAGS" 14328+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 14329+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 14330 /* end confdefs.h. */ 14331-int foo(void) {} 14332+int foo (void) { return 0; } 14333 _ACEOF 14334 if ac_fn_c_try_link "$LINENO"; then : 14335- 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' 14336- 14337+ lt_cv_irix_exported_symbol=yes 14338+else 14339+ lt_cv_irix_exported_symbol=no 14340 fi 14341 rm -f core conftest.err conftest.$ac_objext \ 14342 conftest$ac_exeext conftest.$ac_ext 14343- LDFLAGS="$save_LDFLAGS" 14344+ LDFLAGS="$save_LDFLAGS" 14345+fi 14346+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 14347+$as_echo "$lt_cv_irix_exported_symbol" >&6; } 14348+ if test "$lt_cv_irix_exported_symbol" = yes; then 14349+ 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' 14350+ fi 14351 else 14352 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' 14353 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' 14354@@ -10113,7 +10714,7 @@ rm -f core conftest.err conftest.$ac_objext \ 14355 osf4* | osf5*) # as osf3* with the addition of -msym flag 14356 if test "$GCC" = yes; then 14357 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 14358- 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' 14359+ 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' 14360 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 14361 else 14362 allow_undefined_flag=' -expect_unresolved \*' 14363@@ -10132,9 +10733,9 @@ rm -f core conftest.err conftest.$ac_objext \ 14364 no_undefined_flag=' -z defs' 14365 if test "$GCC" = yes; then 14366 wlarc='${wl}' 14367- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 14368+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 14369 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ 14370- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' 14371+ $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' 14372 else 14373 case `$CC -V 2>&1` in 14374 *"Compilers 5.0"*) 14375@@ -10710,8 +11311,9 @@ cygwin* | mingw* | pw32* | cegcc*) 14376 need_version=no 14377 need_lib_prefix=no 14378 14379- case $GCC,$host_os in 14380- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) 14381+ case $GCC,$cc_basename in 14382+ yes,*) 14383+ # gcc 14384 library_names_spec='$libname.dll.a' 14385 # DLL is installed to $(libdir)/../bin by postinstall_cmds 14386 postinstall_cmds='base_file=`basename \${file}`~ 14387@@ -10744,13 +11346,71 @@ cygwin* | mingw* | pw32* | cegcc*) 14388 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 14389 ;; 14390 esac 14391+ dynamic_linker='Win32 ld.exe' 14392+ ;; 14393+ 14394+ *,cl*) 14395+ # Native MSVC 14396+ libname_spec='$name' 14397+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 14398+ library_names_spec='${libname}.dll.lib' 14399+ 14400+ case $build_os in 14401+ mingw*) 14402+ sys_lib_search_path_spec= 14403+ lt_save_ifs=$IFS 14404+ IFS=';' 14405+ for lt_path in $LIB 14406+ do 14407+ IFS=$lt_save_ifs 14408+ # Let DOS variable expansion print the short 8.3 style file name. 14409+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` 14410+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" 14411+ done 14412+ IFS=$lt_save_ifs 14413+ # Convert to MSYS style. 14414+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` 14415+ ;; 14416+ cygwin*) 14417+ # Convert to unix form, then to dos form, then back to unix form 14418+ # but this time dos style (no spaces!) so that the unix form looks 14419+ # like /cygdrive/c/PROGRA~1:/cygdr... 14420+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` 14421+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` 14422+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 14423+ ;; 14424+ *) 14425+ sys_lib_search_path_spec="$LIB" 14426+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then 14427+ # It is most probably a Windows format PATH. 14428+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` 14429+ else 14430+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 14431+ fi 14432+ # FIXME: find the short name or the path components, as spaces are 14433+ # common. (e.g. "Program Files" -> "PROGRA~1") 14434+ ;; 14435+ esac 14436+ 14437+ # DLL is installed to $(libdir)/../bin by postinstall_cmds 14438+ postinstall_cmds='base_file=`basename \${file}`~ 14439+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ 14440+ dldir=$destdir/`dirname \$dlpath`~ 14441+ test -d \$dldir || mkdir -p \$dldir~ 14442+ $install_prog $dir/$dlname \$dldir/$dlname' 14443+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ 14444+ dlpath=$dir/\$dldll~ 14445+ $RM \$dlpath' 14446+ shlibpath_overrides_runpath=yes 14447+ dynamic_linker='Win32 link.exe' 14448 ;; 14449 14450 *) 14451+ # Assume MSVC wrapper 14452 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' 14453+ dynamic_linker='Win32 ld.exe' 14454 ;; 14455 esac 14456- dynamic_linker='Win32 ld.exe' 14457 # FIXME: first we should search . and the directory the executable is in 14458 shlibpath_var=PATH 14459 ;; 14460@@ -11628,7 +12288,7 @@ else 14461 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 14462 lt_status=$lt_dlunknown 14463 cat > conftest.$ac_ext <<_LT_EOF 14464-#line 11628 "configure" 14465+#line $LINENO "configure" 14466 #include "confdefs.h" 14467 14468 #if HAVE_DLFCN_H 14469@@ -11672,10 +12332,10 @@ else 14470 /* When -fvisbility=hidden is used, assume the code has been annotated 14471 correspondingly for the symbols needed. */ 14472 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 14473-void fnord () __attribute__((visibility("default"))); 14474+int fnord () __attribute__((visibility("default"))); 14475 #endif 14476 14477-void fnord () { int i=42; } 14478+int fnord () { return 42; } 14479 int main () 14480 { 14481 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 14482@@ -11734,7 +12394,7 @@ else 14483 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 14484 lt_status=$lt_dlunknown 14485 cat > conftest.$ac_ext <<_LT_EOF 14486-#line 11734 "configure" 14487+#line $LINENO "configure" 14488 #include "confdefs.h" 14489 14490 #if HAVE_DLFCN_H 14491@@ -11778,10 +12438,10 @@ else 14492 /* When -fvisbility=hidden is used, assume the code has been annotated 14493 correspondingly for the symbols needed. */ 14494 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 14495-void fnord () __attribute__((visibility("default"))); 14496+int fnord () __attribute__((visibility("default"))); 14497 #endif 14498 14499-void fnord () { int i=42; } 14500+int fnord () { return 42; } 14501 int main () 14502 { 14503 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 14504@@ -12173,6 +12833,7 @@ $RM -r conftest* 14505 14506 # Allow CC to be a program name with arguments. 14507 lt_save_CC=$CC 14508+ lt_save_CFLAGS=$CFLAGS 14509 lt_save_LD=$LD 14510 lt_save_GCC=$GCC 14511 GCC=$GXX 14512@@ -12190,6 +12851,7 @@ $RM -r conftest* 14513 fi 14514 test -z "${LDCXX+set}" || LD=$LDCXX 14515 CC=${CXX-"c++"} 14516+ CFLAGS=$CXXFLAGS 14517 compiler=$CC 14518 compiler_CXX=$CC 14519 for cc_temp in $compiler""; do 14520@@ -12472,7 +13134,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie 14521 allow_undefined_flag_CXX='-berok' 14522 # Determine the default libpath from the value encoded in an empty 14523 # executable. 14524- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 14525+ if test "${lt_cv_aix_libpath+set}" = set; then 14526+ aix_libpath=$lt_cv_aix_libpath 14527+else 14528+ if ${lt_cv_aix_libpath__CXX+:} false; then : 14529+ $as_echo_n "(cached) " >&6 14530+else 14531+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 14532 /* end confdefs.h. */ 14533 14534 int 14535@@ -12485,22 +13153,29 @@ main () 14536 _ACEOF 14537 if ac_fn_cxx_try_link "$LINENO"; then : 14538 14539-lt_aix_libpath_sed=' 14540- /Import File Strings/,/^$/ { 14541- /^0/ { 14542- s/^0 *\(.*\)$/\1/ 14543- p 14544- } 14545- }' 14546-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 14547-# Check for a 64-bit object if we didn't find anything. 14548-if test -z "$aix_libpath"; then 14549- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 14550-fi 14551+ lt_aix_libpath_sed=' 14552+ /Import File Strings/,/^$/ { 14553+ /^0/ { 14554+ s/^0 *\([^ ]*\) *$/\1/ 14555+ p 14556+ } 14557+ }' 14558+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 14559+ # Check for a 64-bit object if we didn't find anything. 14560+ if test -z "$lt_cv_aix_libpath__CXX"; then 14561+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 14562+ fi 14563 fi 14564 rm -f core conftest.err conftest.$ac_objext \ 14565 conftest$ac_exeext conftest.$ac_ext 14566-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14567+ if test -z "$lt_cv_aix_libpath__CXX"; then 14568+ lt_cv_aix_libpath__CXX="/usr/lib:/lib" 14569+ fi 14570+ 14571+fi 14572+ 14573+ aix_libpath=$lt_cv_aix_libpath__CXX 14574+fi 14575 14576 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" 14577 14578@@ -12513,7 +13188,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14579 else 14580 # Determine the default libpath from the value encoded in an 14581 # empty executable. 14582- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 14583+ if test "${lt_cv_aix_libpath+set}" = set; then 14584+ aix_libpath=$lt_cv_aix_libpath 14585+else 14586+ if ${lt_cv_aix_libpath__CXX+:} false; then : 14587+ $as_echo_n "(cached) " >&6 14588+else 14589+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 14590 /* end confdefs.h. */ 14591 14592 int 14593@@ -12526,22 +13207,29 @@ main () 14594 _ACEOF 14595 if ac_fn_cxx_try_link "$LINENO"; then : 14596 14597-lt_aix_libpath_sed=' 14598- /Import File Strings/,/^$/ { 14599- /^0/ { 14600- s/^0 *\(.*\)$/\1/ 14601- p 14602- } 14603- }' 14604-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 14605-# Check for a 64-bit object if we didn't find anything. 14606-if test -z "$aix_libpath"; then 14607- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 14608-fi 14609+ lt_aix_libpath_sed=' 14610+ /Import File Strings/,/^$/ { 14611+ /^0/ { 14612+ s/^0 *\([^ ]*\) *$/\1/ 14613+ p 14614+ } 14615+ }' 14616+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 14617+ # Check for a 64-bit object if we didn't find anything. 14618+ if test -z "$lt_cv_aix_libpath__CXX"; then 14619+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 14620+ fi 14621 fi 14622 rm -f core conftest.err conftest.$ac_objext \ 14623 conftest$ac_exeext conftest.$ac_ext 14624-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14625+ if test -z "$lt_cv_aix_libpath__CXX"; then 14626+ lt_cv_aix_libpath__CXX="/usr/lib:/lib" 14627+ fi 14628+ 14629+fi 14630+ 14631+ aix_libpath=$lt_cv_aix_libpath__CXX 14632+fi 14633 14634 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" 14635 # Warning - without using the other run time loading flags, 14636@@ -12584,29 +13272,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14637 ;; 14638 14639 cygwin* | mingw* | pw32* | cegcc*) 14640- # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, 14641- # as there is no search path for DLLs. 14642- hardcode_libdir_flag_spec_CXX='-L$libdir' 14643- export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' 14644- allow_undefined_flag_CXX=unsupported 14645- always_export_symbols_CXX=no 14646- enable_shared_with_static_runtimes_CXX=yes 14647- 14648- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 14649- 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' 14650- # If the export-symbols file already is a .def file (1st line 14651- # is EXPORTS), use it as is; otherwise, prepend... 14652- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 14653- cp $export_symbols $output_objdir/$soname.def; 14654- else 14655- echo EXPORTS > $output_objdir/$soname.def; 14656- cat $export_symbols >> $output_objdir/$soname.def; 14657- fi~ 14658- $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' 14659- else 14660- ld_shlibs_CXX=no 14661- fi 14662- ;; 14663+ case $GXX,$cc_basename in 14664+ ,cl* | no,cl*) 14665+ # Native MSVC 14666+ # hardcode_libdir_flag_spec is actually meaningless, as there is 14667+ # no search path for DLLs. 14668+ hardcode_libdir_flag_spec_CXX=' ' 14669+ allow_undefined_flag_CXX=unsupported 14670+ always_export_symbols_CXX=yes 14671+ file_list_spec_CXX='@' 14672+ # Tell ltmain to make .lib files, not .a files. 14673+ libext=lib 14674+ # Tell ltmain to make .dll files, not .so files. 14675+ shrext_cmds=".dll" 14676+ # FIXME: Setting linknames here is a bad hack. 14677+ archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' 14678+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 14679+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; 14680+ else 14681+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; 14682+ fi~ 14683+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ 14684+ linknames=' 14685+ # The linker will not automatically build a static lib if we build a DLL. 14686+ # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true' 14687+ enable_shared_with_static_runtimes_CXX=yes 14688+ # Don't use ranlib 14689+ old_postinstall_cmds_CXX='chmod 644 $oldlib' 14690+ postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~ 14691+ lt_tool_outputfile="@TOOL_OUTPUT@"~ 14692+ case $lt_outputfile in 14693+ *.exe|*.EXE) ;; 14694+ *) 14695+ lt_outputfile="$lt_outputfile.exe" 14696+ lt_tool_outputfile="$lt_tool_outputfile.exe" 14697+ ;; 14698+ esac~ 14699+ func_to_tool_file "$lt_outputfile"~ 14700+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then 14701+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; 14702+ $RM "$lt_outputfile.manifest"; 14703+ fi' 14704+ ;; 14705+ *) 14706+ # g++ 14707+ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, 14708+ # as there is no search path for DLLs. 14709+ hardcode_libdir_flag_spec_CXX='-L$libdir' 14710+ export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' 14711+ allow_undefined_flag_CXX=unsupported 14712+ always_export_symbols_CXX=no 14713+ enable_shared_with_static_runtimes_CXX=yes 14714+ 14715+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 14716+ 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' 14717+ # If the export-symbols file already is a .def file (1st line 14718+ # is EXPORTS), use it as is; otherwise, prepend... 14719+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 14720+ cp $export_symbols $output_objdir/$soname.def; 14721+ else 14722+ echo EXPORTS > $output_objdir/$soname.def; 14723+ cat $export_symbols >> $output_objdir/$soname.def; 14724+ fi~ 14725+ $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' 14726+ else 14727+ ld_shlibs_CXX=no 14728+ fi 14729+ ;; 14730+ esac 14731+ ;; 14732 darwin* | rhapsody*) 14733 14734 14735@@ -12712,7 +13446,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14736 ;; 14737 *) 14738 if test "$GXX" = yes; then 14739- 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' 14740+ 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' 14741 else 14742 # FIXME: insert proper C++ library support 14743 ld_shlibs_CXX=no 14744@@ -12783,10 +13517,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14745 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 14746 ;; 14747 ia64*) 14748- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 14749+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 14750 ;; 14751 *) 14752- 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' 14753+ 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' 14754 ;; 14755 esac 14756 fi 14757@@ -12827,9 +13561,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14758 *) 14759 if test "$GXX" = yes; then 14760 if test "$with_gnu_ld" = no; then 14761- 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' 14762+ 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' 14763 else 14764- 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' 14765+ 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' 14766 fi 14767 fi 14768 link_all_deplibs_CXX=yes 14769@@ -12899,20 +13633,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14770 prelink_cmds_CXX='tpldir=Template.dir~ 14771 rm -rf $tpldir~ 14772 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ 14773- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' 14774+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' 14775 old_archive_cmds_CXX='tpldir=Template.dir~ 14776 rm -rf $tpldir~ 14777 $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ 14778- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ 14779+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ 14780 $RANLIB $oldlib' 14781 archive_cmds_CXX='tpldir=Template.dir~ 14782 rm -rf $tpldir~ 14783 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ 14784- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' 14785+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' 14786 archive_expsym_cmds_CXX='tpldir=Template.dir~ 14787 rm -rf $tpldir~ 14788 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ 14789- $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' 14790+ $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' 14791 ;; 14792 *) # Version 6 and above use weak symbols 14793 archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' 14794@@ -13107,7 +13841,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14795 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' 14796 ;; 14797 *) 14798- 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' 14799+ 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' 14800 ;; 14801 esac 14802 14803@@ -13153,7 +13887,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14804 14805 solaris*) 14806 case $cc_basename in 14807- CC*) 14808+ CC* | sunCC*) 14809 # Sun C++ 4.2, 5.x and Centerline C++ 14810 archive_cmds_need_lc_CXX=yes 14811 no_undefined_flag_CXX=' -zdefs' 14812@@ -13194,9 +13928,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14813 if test "$GXX" = yes && test "$with_gnu_ld" = no; then 14814 no_undefined_flag_CXX=' ${wl}-z ${wl}defs' 14815 if $CC --version | $GREP -v '^2\.7' > /dev/null; then 14816- archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' 14817+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' 14818 archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ 14819- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' 14820+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' 14821 14822 # Commands to make compiler produce verbose output that lists 14823 # what "hidden" libraries, object files and flags are used when 14824@@ -13331,6 +14065,13 @@ private: 14825 }; 14826 _LT_EOF 14827 14828+ 14829+_lt_libdeps_save_CFLAGS=$CFLAGS 14830+case "$CC $CFLAGS " in #( 14831+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; 14832+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; 14833+esac 14834+ 14835 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 14836 (eval $ac_compile) 2>&5 14837 ac_status=$? 14838@@ -13344,7 +14085,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 14839 pre_test_object_deps_done=no 14840 14841 for p in `eval "$output_verbose_link_cmd"`; do 14842- case $p in 14843+ case ${prev}${p} in 14844 14845 -L* | -R* | -l*) 14846 # Some compilers place space between "-{L,R}" and the path. 14847@@ -13353,13 +14094,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 14848 test $p = "-R"; then 14849 prev=$p 14850 continue 14851- else 14852- prev= 14853 fi 14854 14855+ # Expand the sysroot to ease extracting the directories later. 14856+ if test -z "$prev"; then 14857+ case $p in 14858+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; 14859+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; 14860+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; 14861+ esac 14862+ fi 14863+ case $p in 14864+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; 14865+ esac 14866 if test "$pre_test_object_deps_done" = no; then 14867- case $p in 14868- -L* | -R*) 14869+ case ${prev} in 14870+ -L | -R) 14871 # Internal compiler library paths should come after those 14872 # provided the user. The postdeps already come after the 14873 # user supplied libs so there is no need to process them. 14874@@ -13379,8 +14129,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 14875 postdeps_CXX="${postdeps_CXX} ${prev}${p}" 14876 fi 14877 fi 14878+ prev= 14879 ;; 14880 14881+ *.lto.$objext) ;; # Ignore GCC LTO objects 14882 *.$objext) 14883 # This assumes that the test object file only shows up 14884 # once in the compiler output. 14885@@ -13416,6 +14168,7 @@ else 14886 fi 14887 14888 $RM -f confest.$objext 14889+CFLAGS=$_lt_libdeps_save_CFLAGS 14890 14891 # PORTME: override above test on systems where it is broken 14892 case $host_os in 14893@@ -13451,7 +14204,7 @@ linux*) 14894 14895 solaris*) 14896 case $cc_basename in 14897- CC*) 14898+ CC* | sunCC*) 14899 # The more standards-conforming stlport4 library is 14900 # incompatible with the Cstd library. Avoid specifying 14901 # it if it's in CXXFLAGS. Ignore libCrun as 14902@@ -13516,8 +14269,6 @@ fi 14903 lt_prog_compiler_pic_CXX= 14904 lt_prog_compiler_static_CXX= 14905 14906-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 14907-$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 14908 14909 # C++ specific cases for pic, static, wl, etc. 14910 if test "$GXX" = yes; then 14911@@ -13622,6 +14373,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 14912 ;; 14913 esac 14914 ;; 14915+ mingw* | cygwin* | os2* | pw32* | cegcc*) 14916+ # This hack is so that the source file can tell whether it is being 14917+ # built for inclusion in a dll (and should export symbols for example). 14918+ lt_prog_compiler_pic_CXX='-DDLL_EXPORT' 14919+ ;; 14920 dgux*) 14921 case $cc_basename in 14922 ec++*) 14923@@ -13774,7 +14530,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 14924 ;; 14925 solaris*) 14926 case $cc_basename in 14927- CC*) 14928+ CC* | sunCC*) 14929 # Sun C++ 4.2, 5.x and Centerline C++ 14930 lt_prog_compiler_pic_CXX='-KPIC' 14931 lt_prog_compiler_static_CXX='-Bstatic' 14932@@ -13839,10 +14595,17 @@ case $host_os in 14933 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" 14934 ;; 14935 esac 14936-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5 14937-$as_echo "$lt_prog_compiler_pic_CXX" >&6; } 14938- 14939 14940+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 14941+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 14942+if ${lt_cv_prog_compiler_pic_CXX+:} false; then : 14943+ $as_echo_n "(cached) " >&6 14944+else 14945+ lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX 14946+fi 14947+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 14948+$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; } 14949+lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX 14950 14951 # 14952 # Check to make sure the PIC flag actually works. 14953@@ -13900,6 +14663,8 @@ fi 14954 14955 14956 14957+ 14958+ 14959 # 14960 # Check to make sure the static flag actually works. 14961 # 14962@@ -14077,6 +14842,7 @@ fi 14963 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } 14964 14965 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 14966+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' 14967 case $host_os in 14968 aix[4-9]*) 14969 # If we're using GNU nm, then we don't want the "-C" option. 14970@@ -14091,15 +14857,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie 14971 ;; 14972 pw32*) 14973 export_symbols_cmds_CXX="$ltdll_cmds" 14974- ;; 14975+ ;; 14976 cygwin* | mingw* | cegcc*) 14977- 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' 14978- ;; 14979+ case $cc_basename in 14980+ cl*) ;; 14981+ *) 14982+ 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' 14983+ exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' 14984+ ;; 14985+ esac 14986+ ;; 14987 *) 14988 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 14989- ;; 14990+ ;; 14991 esac 14992- exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' 14993 14994 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 14995 $as_echo "$ld_shlibs_CXX" >&6; } 14996@@ -14362,8 +15133,9 @@ cygwin* | mingw* | pw32* | cegcc*) 14997 need_version=no 14998 need_lib_prefix=no 14999 15000- case $GCC,$host_os in 15001- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) 15002+ case $GCC,$cc_basename in 15003+ yes,*) 15004+ # gcc 15005 library_names_spec='$libname.dll.a' 15006 # DLL is installed to $(libdir)/../bin by postinstall_cmds 15007 postinstall_cmds='base_file=`basename \${file}`~ 15008@@ -14395,13 +15167,71 @@ cygwin* | mingw* | pw32* | cegcc*) 15009 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 15010 ;; 15011 esac 15012+ dynamic_linker='Win32 ld.exe' 15013+ ;; 15014+ 15015+ *,cl*) 15016+ # Native MSVC 15017+ libname_spec='$name' 15018+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 15019+ library_names_spec='${libname}.dll.lib' 15020+ 15021+ case $build_os in 15022+ mingw*) 15023+ sys_lib_search_path_spec= 15024+ lt_save_ifs=$IFS 15025+ IFS=';' 15026+ for lt_path in $LIB 15027+ do 15028+ IFS=$lt_save_ifs 15029+ # Let DOS variable expansion print the short 8.3 style file name. 15030+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` 15031+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" 15032+ done 15033+ IFS=$lt_save_ifs 15034+ # Convert to MSYS style. 15035+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` 15036+ ;; 15037+ cygwin*) 15038+ # Convert to unix form, then to dos form, then back to unix form 15039+ # but this time dos style (no spaces!) so that the unix form looks 15040+ # like /cygdrive/c/PROGRA~1:/cygdr... 15041+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` 15042+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` 15043+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 15044+ ;; 15045+ *) 15046+ sys_lib_search_path_spec="$LIB" 15047+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then 15048+ # It is most probably a Windows format PATH. 15049+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` 15050+ else 15051+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 15052+ fi 15053+ # FIXME: find the short name or the path components, as spaces are 15054+ # common. (e.g. "Program Files" -> "PROGRA~1") 15055+ ;; 15056+ esac 15057+ 15058+ # DLL is installed to $(libdir)/../bin by postinstall_cmds 15059+ postinstall_cmds='base_file=`basename \${file}`~ 15060+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ 15061+ dldir=$destdir/`dirname \$dlpath`~ 15062+ test -d \$dldir || mkdir -p \$dldir~ 15063+ $install_prog $dir/$dlname \$dldir/$dlname' 15064+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ 15065+ dlpath=$dir/\$dldll~ 15066+ $RM \$dlpath' 15067+ shlibpath_overrides_runpath=yes 15068+ dynamic_linker='Win32 link.exe' 15069 ;; 15070 15071 *) 15072+ # Assume MSVC wrapper 15073 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' 15074+ dynamic_linker='Win32 ld.exe' 15075 ;; 15076 esac 15077- dynamic_linker='Win32 ld.exe' 15078 # FIXME: first we should search . and the directory the executable is in 15079 shlibpath_var=PATH 15080 ;; 15081@@ -14941,6 +15771,7 @@ fi 15082 fi # test -n "$compiler" 15083 15084 CC=$lt_save_CC 15085+ CFLAGS=$lt_save_CFLAGS 15086 LDCXX=$LD 15087 LD=$lt_save_LD 15088 GCC=$lt_save_GCC 15089@@ -18322,13 +19153,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 15090 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 15091 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 15092 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 15093+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' 15094+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' 15095 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' 15096 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' 15097 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' 15098 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' 15099 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' 15100+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' 15101+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' 15102+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' 15103+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' 15104 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' 15105 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' 15106+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' 15107 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 15108 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 15109 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 15110@@ -18343,14 +19181,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 15111 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 15112 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 15113 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"`' 15114+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' 15115+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' 15116 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' 15117 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' 15118 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' 15119-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 15120 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' 15121+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 15122 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' 15123 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' 15124 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' 15125+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' 15126 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 15127 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 15128 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 15129@@ -18383,12 +19224,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 15130 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 15131 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 15132 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 15133-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' 15134 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' 15135 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' 15136 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' 15137 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' 15138 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' 15139+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' 15140 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 15141 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 15142 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 15143@@ -18427,8 +19268,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote 15144 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' 15145 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' 15146 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' 15147-lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' 15148 lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`' 15149+lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' 15150 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' 15151 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' 15152 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' 15153@@ -18455,12 +19296,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ 15154 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' 15155 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' 15156 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' 15157-fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`' 15158 always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`' 15159 export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`' 15160 exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`' 15161 include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`' 15162 prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`' 15163+postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`' 15164 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' 15165 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' 15166 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' 15167@@ -18498,8 +19339,13 @@ reload_flag \ 15168 OBJDUMP \ 15169 deplibs_check_method \ 15170 file_magic_cmd \ 15171+file_magic_glob \ 15172+want_nocaseglob \ 15173+DLLTOOL \ 15174+sharedlib_from_linklib_cmd \ 15175 AR \ 15176 AR_FLAGS \ 15177+archiver_list_spec \ 15178 STRIP \ 15179 RANLIB \ 15180 CC \ 15181@@ -18509,12 +19355,14 @@ lt_cv_sys_global_symbol_pipe \ 15182 lt_cv_sys_global_symbol_to_cdecl \ 15183 lt_cv_sys_global_symbol_to_c_name_address \ 15184 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 15185+nm_file_list_spec \ 15186 lt_prog_compiler_no_builtin_flag \ 15187-lt_prog_compiler_wl \ 15188 lt_prog_compiler_pic \ 15189+lt_prog_compiler_wl \ 15190 lt_prog_compiler_static \ 15191 lt_cv_prog_compiler_c_o \ 15192 need_locks \ 15193+MANIFEST_TOOL \ 15194 DSYMUTIL \ 15195 NMEDIT \ 15196 LIPO \ 15197@@ -18530,7 +19378,6 @@ no_undefined_flag \ 15198 hardcode_libdir_flag_spec \ 15199 hardcode_libdir_flag_spec_ld \ 15200 hardcode_libdir_separator \ 15201-fix_srcfile_path \ 15202 exclude_expsyms \ 15203 include_expsyms \ 15204 file_list_spec \ 15205@@ -18552,8 +19399,8 @@ LD_CXX \ 15206 reload_flag_CXX \ 15207 compiler_CXX \ 15208 lt_prog_compiler_no_builtin_flag_CXX \ 15209-lt_prog_compiler_wl_CXX \ 15210 lt_prog_compiler_pic_CXX \ 15211+lt_prog_compiler_wl_CXX \ 15212 lt_prog_compiler_static_CXX \ 15213 lt_cv_prog_compiler_c_o_CXX \ 15214 export_dynamic_flag_spec_CXX \ 15215@@ -18565,7 +19412,6 @@ no_undefined_flag_CXX \ 15216 hardcode_libdir_flag_spec_CXX \ 15217 hardcode_libdir_flag_spec_ld_CXX \ 15218 hardcode_libdir_separator_CXX \ 15219-fix_srcfile_path_CXX \ 15220 exclude_expsyms_CXX \ 15221 include_expsyms_CXX \ 15222 file_list_spec_CXX \ 15223@@ -18599,6 +19445,7 @@ module_cmds \ 15224 module_expsym_cmds \ 15225 export_symbols_cmds \ 15226 prelink_cmds \ 15227+postlink_cmds \ 15228 postinstall_cmds \ 15229 postuninstall_cmds \ 15230 finish_cmds \ 15231@@ -18613,7 +19460,8 @@ archive_expsym_cmds_CXX \ 15232 module_cmds_CXX \ 15233 module_expsym_cmds_CXX \ 15234 export_symbols_cmds_CXX \ 15235-prelink_cmds_CXX; do 15236+prelink_cmds_CXX \ 15237+postlink_cmds_CXX; do 15238 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in 15239 *[\\\\\\\`\\"\\\$]*) 15240 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" 15241@@ -19378,7 +20226,8 @@ $as_echo X"$file" | 15242 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 15243 # 15244 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 15245-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. 15246+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, 15247+# Inc. 15248 # Written by Gordon Matzigkeit, 1996 15249 # 15250 # This file is part of GNU Libtool. 15251@@ -19481,19 +20330,42 @@ SP2NL=$lt_lt_SP2NL 15252 # turn newlines into spaces. 15253 NL2SP=$lt_lt_NL2SP 15254 15255+# convert \$build file names to \$host format. 15256+to_host_file_cmd=$lt_cv_to_host_file_cmd 15257+ 15258+# convert \$build files to toolchain format. 15259+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 15260+ 15261 # An object symbol dumper. 15262 OBJDUMP=$lt_OBJDUMP 15263 15264 # Method to check whether dependent libraries are shared objects. 15265 deplibs_check_method=$lt_deplibs_check_method 15266 15267-# Command to use when deplibs_check_method == "file_magic". 15268+# Command to use when deplibs_check_method = "file_magic". 15269 file_magic_cmd=$lt_file_magic_cmd 15270 15271+# How to find potential files when deplibs_check_method = "file_magic". 15272+file_magic_glob=$lt_file_magic_glob 15273+ 15274+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". 15275+want_nocaseglob=$lt_want_nocaseglob 15276+ 15277+# DLL creation program. 15278+DLLTOOL=$lt_DLLTOOL 15279+ 15280+# Command to associate shared and link libraries. 15281+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd 15282+ 15283 # The archiver. 15284 AR=$lt_AR 15285+ 15286+# Flags to create an archive. 15287 AR_FLAGS=$lt_AR_FLAGS 15288 15289+# How to feed a file listing to the archiver. 15290+archiver_list_spec=$lt_archiver_list_spec 15291+ 15292 # A symbol stripping program. 15293 STRIP=$lt_STRIP 15294 15295@@ -19523,6 +20395,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 15296 # Transform the output of nm in a C name address pair when lib prefix is needed. 15297 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 15298 15299+# Specify filename containing input files for \$NM. 15300+nm_file_list_spec=$lt_nm_file_list_spec 15301+ 15302+# The root where to search for dependent libraries,and in which our libraries should be installed. 15303+lt_sysroot=$lt_sysroot 15304+ 15305 # The name of the directory that contains temporary libtool files. 15306 objdir=$objdir 15307 15308@@ -19532,6 +20410,9 @@ MAGIC_CMD=$MAGIC_CMD 15309 # Must we lock files when doing compilation? 15310 need_locks=$lt_need_locks 15311 15312+# Manifest tool. 15313+MANIFEST_TOOL=$lt_MANIFEST_TOOL 15314+ 15315 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 15316 DSYMUTIL=$lt_DSYMUTIL 15317 15318@@ -19646,12 +20527,12 @@ with_gcc=$GCC 15319 # Compiler flag to turn off builtin functions. 15320 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 15321 15322-# How to pass a linker flag through the compiler. 15323-wl=$lt_lt_prog_compiler_wl 15324- 15325 # Additional compiler flags for building library objects. 15326 pic_flag=$lt_lt_prog_compiler_pic 15327 15328+# How to pass a linker flag through the compiler. 15329+wl=$lt_lt_prog_compiler_wl 15330+ 15331 # Compiler flag to prevent dynamic linking. 15332 link_static_flag=$lt_lt_prog_compiler_static 15333 15334@@ -19738,9 +20619,6 @@ inherit_rpath=$inherit_rpath 15335 # Whether libtool must link a program against all its dependency libraries. 15336 link_all_deplibs=$link_all_deplibs 15337 15338-# Fix the shell variable \$srcfile for the compiler. 15339-fix_srcfile_path=$lt_fix_srcfile_path 15340- 15341 # Set to "yes" if exported symbols are required. 15342 always_export_symbols=$always_export_symbols 15343 15344@@ -19756,6 +20634,9 @@ include_expsyms=$lt_include_expsyms 15345 # Commands necessary for linking programs (against libraries) with templates. 15346 prelink_cmds=$lt_prelink_cmds 15347 15348+# Commands necessary for finishing linking programs. 15349+postlink_cmds=$lt_postlink_cmds 15350+ 15351 # Specify filename containing input files. 15352 file_list_spec=$lt_file_list_spec 15353 15354@@ -19802,210 +20683,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 15355 # if finds mixed CR/LF and LF-only lines. Since sed operates in 15356 # text mode, it properly converts lines to CR/LF. This bash problem 15357 # is reportedly fixed, but why not run on old versions too? 15358- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ 15359- || (rm -f "$cfgfile"; exit 1) 15360- 15361- case $xsi_shell in 15362- yes) 15363- cat << \_LT_EOF >> "$cfgfile" 15364- 15365-# func_dirname file append nondir_replacement 15366-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 15367-# otherwise set result to NONDIR_REPLACEMENT. 15368-func_dirname () 15369-{ 15370- case ${1} in 15371- */*) func_dirname_result="${1%/*}${2}" ;; 15372- * ) func_dirname_result="${3}" ;; 15373- esac 15374-} 15375- 15376-# func_basename file 15377-func_basename () 15378-{ 15379- func_basename_result="${1##*/}" 15380-} 15381- 15382-# func_dirname_and_basename file append nondir_replacement 15383-# perform func_basename and func_dirname in a single function 15384-# call: 15385-# dirname: Compute the dirname of FILE. If nonempty, 15386-# add APPEND to the result, otherwise set result 15387-# to NONDIR_REPLACEMENT. 15388-# value returned in "$func_dirname_result" 15389-# basename: Compute filename of FILE. 15390-# value retuned in "$func_basename_result" 15391-# Implementation must be kept synchronized with func_dirname 15392-# and func_basename. For efficiency, we do not delegate to 15393-# those functions but instead duplicate the functionality here. 15394-func_dirname_and_basename () 15395-{ 15396- case ${1} in 15397- */*) func_dirname_result="${1%/*}${2}" ;; 15398- * ) func_dirname_result="${3}" ;; 15399- esac 15400- func_basename_result="${1##*/}" 15401-} 15402- 15403-# func_stripname prefix suffix name 15404-# strip PREFIX and SUFFIX off of NAME. 15405-# PREFIX and SUFFIX must not contain globbing or regex special 15406-# characters, hashes, percent signs, but SUFFIX may contain a leading 15407-# dot (in which case that matches only a dot). 15408-func_stripname () 15409-{ 15410- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are 15411- # positional parameters, so assign one to ordinary parameter first. 15412- func_stripname_result=${3} 15413- func_stripname_result=${func_stripname_result#"${1}"} 15414- func_stripname_result=${func_stripname_result%"${2}"} 15415-} 15416- 15417-# func_opt_split 15418-func_opt_split () 15419-{ 15420- func_opt_split_opt=${1%%=*} 15421- func_opt_split_arg=${1#*=} 15422-} 15423- 15424-# func_lo2o object 15425-func_lo2o () 15426-{ 15427- case ${1} in 15428- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; 15429- *) func_lo2o_result=${1} ;; 15430- esac 15431-} 15432- 15433-# func_xform libobj-or-source 15434-func_xform () 15435-{ 15436- func_xform_result=${1%.*}.lo 15437-} 15438- 15439-# func_arith arithmetic-term... 15440-func_arith () 15441-{ 15442- func_arith_result=$(( $* )) 15443-} 15444- 15445-# func_len string 15446-# STRING may not start with a hyphen. 15447-func_len () 15448-{ 15449- func_len_result=${#1} 15450-} 15451- 15452-_LT_EOF 15453- ;; 15454- *) # Bourne compatible functions. 15455- cat << \_LT_EOF >> "$cfgfile" 15456- 15457-# func_dirname file append nondir_replacement 15458-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 15459-# otherwise set result to NONDIR_REPLACEMENT. 15460-func_dirname () 15461-{ 15462- # Extract subdirectory from the argument. 15463- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` 15464- if test "X$func_dirname_result" = "X${1}"; then 15465- func_dirname_result="${3}" 15466- else 15467- func_dirname_result="$func_dirname_result${2}" 15468- fi 15469-} 15470- 15471-# func_basename file 15472-func_basename () 15473-{ 15474- func_basename_result=`$ECHO "${1}" | $SED "$basename"` 15475-} 15476- 15477- 15478-# func_stripname prefix suffix name 15479-# strip PREFIX and SUFFIX off of NAME. 15480-# PREFIX and SUFFIX must not contain globbing or regex special 15481-# characters, hashes, percent signs, but SUFFIX may contain a leading 15482-# dot (in which case that matches only a dot). 15483-# func_strip_suffix prefix name 15484-func_stripname () 15485-{ 15486- case ${2} in 15487- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; 15488- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; 15489- esac 15490-} 15491- 15492-# sed scripts: 15493-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' 15494-my_sed_long_arg='1s/^-[^=]*=//' 15495- 15496-# func_opt_split 15497-func_opt_split () 15498-{ 15499- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` 15500- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` 15501-} 15502- 15503-# func_lo2o object 15504-func_lo2o () 15505-{ 15506- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` 15507-} 15508- 15509-# func_xform libobj-or-source 15510-func_xform () 15511-{ 15512- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` 15513-} 15514- 15515-# func_arith arithmetic-term... 15516-func_arith () 15517-{ 15518- func_arith_result=`expr "$@"` 15519-} 15520- 15521-# func_len string 15522-# STRING may not start with a hyphen. 15523-func_len () 15524-{ 15525- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` 15526-} 15527- 15528-_LT_EOF 15529-esac 15530- 15531-case $lt_shell_append in 15532- yes) 15533- cat << \_LT_EOF >> "$cfgfile" 15534- 15535-# func_append var value 15536-# Append VALUE to the end of shell variable VAR. 15537-func_append () 15538-{ 15539- eval "$1+=\$2" 15540-} 15541-_LT_EOF 15542- ;; 15543- *) 15544- cat << \_LT_EOF >> "$cfgfile" 15545- 15546-# func_append var value 15547-# Append VALUE to the end of shell variable VAR. 15548-func_append () 15549-{ 15550- eval "$1=\$$1\$2" 15551-} 15552- 15553-_LT_EOF 15554- ;; 15555- esac 15556- 15557- 15558- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ 15559- || (rm -f "$cfgfile"; exit 1) 15560- 15561- mv -f "$cfgfile" "$ofile" || 15562+ sed '$q' "$ltmain" >> "$cfgfile" \ 15563+ || (rm -f "$cfgfile"; exit 1) 15564+ 15565+ if test x"$xsi_shell" = xyes; then 15566+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ 15567+func_dirname ()\ 15568+{\ 15569+\ case ${1} in\ 15570+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 15571+\ * ) func_dirname_result="${3}" ;;\ 15572+\ esac\ 15573+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ 15574+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 15575+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 15576+test 0 -eq $? || _lt_function_replace_fail=: 15577+ 15578+ 15579+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ 15580+func_basename ()\ 15581+{\ 15582+\ func_basename_result="${1##*/}"\ 15583+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ 15584+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 15585+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 15586+test 0 -eq $? || _lt_function_replace_fail=: 15587+ 15588+ 15589+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ 15590+func_dirname_and_basename ()\ 15591+{\ 15592+\ case ${1} in\ 15593+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 15594+\ * ) func_dirname_result="${3}" ;;\ 15595+\ esac\ 15596+\ func_basename_result="${1##*/}"\ 15597+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ 15598+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 15599+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 15600+test 0 -eq $? || _lt_function_replace_fail=: 15601+ 15602+ 15603+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ 15604+func_stripname ()\ 15605+{\ 15606+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ 15607+\ # positional parameters, so assign one to ordinary parameter first.\ 15608+\ func_stripname_result=${3}\ 15609+\ func_stripname_result=${func_stripname_result#"${1}"}\ 15610+\ func_stripname_result=${func_stripname_result%"${2}"}\ 15611+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ 15612+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 15613+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 15614+test 0 -eq $? || _lt_function_replace_fail=: 15615+ 15616+ 15617+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ 15618+func_split_long_opt ()\ 15619+{\ 15620+\ func_split_long_opt_name=${1%%=*}\ 15621+\ func_split_long_opt_arg=${1#*=}\ 15622+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ 15623+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 15624+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 15625+test 0 -eq $? || _lt_function_replace_fail=: 15626+ 15627+ 15628+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ 15629+func_split_short_opt ()\ 15630+{\ 15631+\ func_split_short_opt_arg=${1#??}\ 15632+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ 15633+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ 15634+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 15635+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 15636+test 0 -eq $? || _lt_function_replace_fail=: 15637+ 15638+ 15639+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ 15640+func_lo2o ()\ 15641+{\ 15642+\ case ${1} in\ 15643+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ 15644+\ *) func_lo2o_result=${1} ;;\ 15645+\ esac\ 15646+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ 15647+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 15648+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 15649+test 0 -eq $? || _lt_function_replace_fail=: 15650+ 15651+ 15652+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ 15653+func_xform ()\ 15654+{\ 15655+ func_xform_result=${1%.*}.lo\ 15656+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ 15657+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 15658+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 15659+test 0 -eq $? || _lt_function_replace_fail=: 15660+ 15661+ 15662+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ 15663+func_arith ()\ 15664+{\ 15665+ func_arith_result=$(( $* ))\ 15666+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ 15667+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 15668+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 15669+test 0 -eq $? || _lt_function_replace_fail=: 15670+ 15671+ 15672+ sed -e '/^func_len ()$/,/^} # func_len /c\ 15673+func_len ()\ 15674+{\ 15675+ func_len_result=${#1}\ 15676+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ 15677+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 15678+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 15679+test 0 -eq $? || _lt_function_replace_fail=: 15680+ 15681+fi 15682+ 15683+if test x"$lt_shell_append" = xyes; then 15684+ sed -e '/^func_append ()$/,/^} # func_append /c\ 15685+func_append ()\ 15686+{\ 15687+ eval "${1}+=\\${2}"\ 15688+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ 15689+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 15690+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 15691+test 0 -eq $? || _lt_function_replace_fail=: 15692+ 15693+ 15694+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ 15695+func_append_quoted ()\ 15696+{\ 15697+\ func_quote_for_eval "${2}"\ 15698+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ 15699+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ 15700+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 15701+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 15702+test 0 -eq $? || _lt_function_replace_fail=: 15703+ 15704+ 15705+ # Save a `func_append' function call where possible by direct use of '+=' 15706+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ 15707+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 15708+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 15709+ test 0 -eq $? || _lt_function_replace_fail=: 15710+else 15711+ # Save a `func_append' function call even when '+=' is not available 15712+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ 15713+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 15714+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 15715+ test 0 -eq $? || _lt_function_replace_fail=: 15716+fi 15717+ 15718+if test x"$_lt_function_replace_fail" = x":"; then 15719+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 15720+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} 15721+fi 15722+ 15723+ 15724+ mv -f "$cfgfile" "$ofile" || 15725 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 15726 chmod +x "$ofile" 15727 15728@@ -20033,12 +20873,12 @@ with_gcc=$GCC_CXX 15729 # Compiler flag to turn off builtin functions. 15730 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX 15731 15732-# How to pass a linker flag through the compiler. 15733-wl=$lt_lt_prog_compiler_wl_CXX 15734- 15735 # Additional compiler flags for building library objects. 15736 pic_flag=$lt_lt_prog_compiler_pic_CXX 15737 15738+# How to pass a linker flag through the compiler. 15739+wl=$lt_lt_prog_compiler_wl_CXX 15740+ 15741 # Compiler flag to prevent dynamic linking. 15742 link_static_flag=$lt_lt_prog_compiler_static_CXX 15743 15744@@ -20125,9 +20965,6 @@ inherit_rpath=$inherit_rpath_CXX 15745 # Whether libtool must link a program against all its dependency libraries. 15746 link_all_deplibs=$link_all_deplibs_CXX 15747 15748-# Fix the shell variable \$srcfile for the compiler. 15749-fix_srcfile_path=$lt_fix_srcfile_path_CXX 15750- 15751 # Set to "yes" if exported symbols are required. 15752 always_export_symbols=$always_export_symbols_CXX 15753 15754@@ -20143,6 +20980,9 @@ include_expsyms=$lt_include_expsyms_CXX 15755 # Commands necessary for linking programs (against libraries) with templates. 15756 prelink_cmds=$lt_prelink_cmds_CXX 15757 15758+# Commands necessary for finishing linking programs. 15759+postlink_cmds=$lt_postlink_cmds_CXX 15760+ 15761 # Specify filename containing input files. 15762 file_list_spec=$lt_file_list_spec_CXX 15763 15764diff --git a/libbacktrace/Makefile.in b/libbacktrace/Makefile.in 15765index 0a61880ba67..5889b0477cd 100644 15766--- a/libbacktrace/Makefile.in 15767+++ b/libbacktrace/Makefile.in 15768@@ -827,6 +827,7 @@ CPP = @CPP@ 15769 CPPFLAGS = @CPPFLAGS@ 15770 CYGPATH_W = @CYGPATH_W@ 15771 DEFS = @DEFS@ 15772+DLLTOOL = @DLLTOOL@ 15773 DSYMUTIL = @DSYMUTIL@ 15774 DUMPBIN = @DUMPBIN@ 15775 DWZ = @DWZ@ 15776@@ -854,6 +855,7 @@ LN_S = @LN_S@ 15777 LTLIBOBJS = @LTLIBOBJS@ 15778 MAINT = @MAINT@ 15779 MAKEINFO = @MAKEINFO@ 15780+MANIFEST_TOOL = @MANIFEST_TOOL@ 15781 MKDIR_P = @MKDIR_P@ 15782 NM = @NM@ 15783 NMEDIT = @NMEDIT@ 15784@@ -886,6 +888,7 @@ abs_builddir = @abs_builddir@ 15785 abs_srcdir = @abs_srcdir@ 15786 abs_top_builddir = @abs_top_builddir@ 15787 abs_top_srcdir = @abs_top_srcdir@ 15788+ac_ct_AR = @ac_ct_AR@ 15789 ac_ct_CC = @ac_ct_CC@ 15790 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ 15791 am__leading_dot = @am__leading_dot@ 15792diff --git a/libbacktrace/configure b/libbacktrace/configure 15793index 406b67b8cbc..b648da40aab 100755 15794--- a/libbacktrace/configure 15795+++ b/libbacktrace/configure 15796@@ -680,7 +680,10 @@ OTOOL 15797 LIPO 15798 NMEDIT 15799 DSYMUTIL 15800+MANIFEST_TOOL 15801+ac_ct_AR 15802 AR 15803+DLLTOOL 15804 OBJDUMP 15805 LN_S 15806 NM 15807@@ -798,6 +801,7 @@ enable_static 15808 with_pic 15809 enable_fast_install 15810 with_gnu_ld 15811+with_libtool_sysroot 15812 enable_libtool_lock 15813 enable_largefile 15814 enable_cet 15815@@ -1458,6 +1462,8 @@ Optional Packages: 15816 --with-pic try to use only PIC/non-PIC objects [default=use 15817 both] 15818 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 15819+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR 15820+ (or the compiler's sysroot if not specified). 15821 --with-system-libunwind use installed libunwind 15822 15823 Some influential environment variables: 15824@@ -5446,8 +5452,8 @@ esac 15825 15826 15827 15828-macro_version='2.2.7a' 15829-macro_revision='1.3134' 15830+macro_version='2.4' 15831+macro_revision='1.3293' 15832 15833 15834 15835@@ -5487,7 +5493,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 15836 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 15837 $as_echo_n "checking how to print strings... " >&6; } 15838 # Test print first, because it will be a builtin if present. 15839-if test "X`print -r -- -n 2>/dev/null`" = X-n && \ 15840+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ 15841 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 15842 ECHO='print -r --' 15843 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 15844@@ -6180,8 +6186,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 15845 # Try some XSI features 15846 xsi_shell=no 15847 ( _lt_dummy="a/b/c" 15848- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ 15849- = c,a/b,, \ 15850+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ 15851+ = c,a/b,b/c, \ 15852 && eval 'test $(( 1 + 1 )) -eq 2 \ 15853 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 15854 && xsi_shell=yes 15855@@ -6230,6 +6236,80 @@ esac 15856 15857 15858 15859+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 15860+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } 15861+if ${lt_cv_to_host_file_cmd+:} false; then : 15862+ $as_echo_n "(cached) " >&6 15863+else 15864+ case $host in 15865+ *-*-mingw* ) 15866+ case $build in 15867+ *-*-mingw* ) # actually msys 15868+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 15869+ ;; 15870+ *-*-cygwin* ) 15871+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 15872+ ;; 15873+ * ) # otherwise, assume *nix 15874+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 15875+ ;; 15876+ esac 15877+ ;; 15878+ *-*-cygwin* ) 15879+ case $build in 15880+ *-*-mingw* ) # actually msys 15881+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin 15882+ ;; 15883+ *-*-cygwin* ) 15884+ lt_cv_to_host_file_cmd=func_convert_file_noop 15885+ ;; 15886+ * ) # otherwise, assume *nix 15887+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin 15888+ ;; 15889+ esac 15890+ ;; 15891+ * ) # unhandled hosts (and "normal" native builds) 15892+ lt_cv_to_host_file_cmd=func_convert_file_noop 15893+ ;; 15894+esac 15895+ 15896+fi 15897+ 15898+to_host_file_cmd=$lt_cv_to_host_file_cmd 15899+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 15900+$as_echo "$lt_cv_to_host_file_cmd" >&6; } 15901+ 15902+ 15903+ 15904+ 15905+ 15906+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 15907+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } 15908+if ${lt_cv_to_tool_file_cmd+:} false; then : 15909+ $as_echo_n "(cached) " >&6 15910+else 15911+ #assume ordinary cross tools, or native build. 15912+lt_cv_to_tool_file_cmd=func_convert_file_noop 15913+case $host in 15914+ *-*-mingw* ) 15915+ case $build in 15916+ *-*-mingw* ) # actually msys 15917+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 15918+ ;; 15919+ esac 15920+ ;; 15921+esac 15922+ 15923+fi 15924+ 15925+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 15926+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 15927+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } 15928+ 15929+ 15930+ 15931+ 15932+ 15933 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 15934 $as_echo_n "checking for $LD option to reload object files... " >&6; } 15935 if ${lt_cv_ld_reload_flag+:} false; then : 15936@@ -6246,6 +6326,11 @@ case $reload_flag in 15937 esac 15938 reload_cmds='$LD$reload_flag -o $output$reload_objs' 15939 case $host_os in 15940+ cygwin* | mingw* | pw32* | cegcc*) 15941+ if test "$GCC" != yes; then 15942+ reload_cmds=false 15943+ fi 15944+ ;; 15945 darwin*) 15946 if test "$GCC" = yes; then 15947 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 15948@@ -6414,7 +6499,8 @@ mingw* | pw32*) 15949 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 15950 lt_cv_file_magic_cmd='func_win32_libid' 15951 else 15952- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' 15953+ # Keep this pattern in sync with the one in func_win32_libid. 15954+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' 15955 lt_cv_file_magic_cmd='$OBJDUMP -f' 15956 fi 15957 ;; 15958@@ -6568,6 +6654,21 @@ esac 15959 fi 15960 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 15961 $as_echo "$lt_cv_deplibs_check_method" >&6; } 15962+ 15963+file_magic_glob= 15964+want_nocaseglob=no 15965+if test "$build" = "$host"; then 15966+ case $host_os in 15967+ mingw* | pw32*) 15968+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then 15969+ want_nocaseglob=yes 15970+ else 15971+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` 15972+ fi 15973+ ;; 15974+ esac 15975+fi 15976+ 15977 file_magic_cmd=$lt_cv_file_magic_cmd 15978 deplibs_check_method=$lt_cv_deplibs_check_method 15979 test -z "$deplibs_check_method" && deplibs_check_method=unknown 15980@@ -6583,6 +6684,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 15981 15982 15983 15984+ 15985+ 15986+ 15987+ 15988+ 15989+ 15990+ 15991+ 15992+ 15993+ 15994+if test -n "$ac_tool_prefix"; then 15995+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. 15996+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 15997+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 15998+$as_echo_n "checking for $ac_word... " >&6; } 15999+if ${ac_cv_prog_DLLTOOL+:} false; then : 16000+ $as_echo_n "(cached) " >&6 16001+else 16002+ if test -n "$DLLTOOL"; then 16003+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. 16004+else 16005+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 16006+for as_dir in $PATH 16007+do 16008+ IFS=$as_save_IFS 16009+ test -z "$as_dir" && as_dir=. 16010+ for ac_exec_ext in '' $ac_executable_extensions; do 16011+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 16012+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" 16013+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 16014+ break 2 16015+ fi 16016+done 16017+ done 16018+IFS=$as_save_IFS 16019+ 16020+fi 16021+fi 16022+DLLTOOL=$ac_cv_prog_DLLTOOL 16023+if test -n "$DLLTOOL"; then 16024+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 16025+$as_echo "$DLLTOOL" >&6; } 16026+else 16027+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 16028+$as_echo "no" >&6; } 16029+fi 16030+ 16031+ 16032+fi 16033+if test -z "$ac_cv_prog_DLLTOOL"; then 16034+ ac_ct_DLLTOOL=$DLLTOOL 16035+ # Extract the first word of "dlltool", so it can be a program name with args. 16036+set dummy dlltool; ac_word=$2 16037+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 16038+$as_echo_n "checking for $ac_word... " >&6; } 16039+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : 16040+ $as_echo_n "(cached) " >&6 16041+else 16042+ if test -n "$ac_ct_DLLTOOL"; then 16043+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. 16044+else 16045+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 16046+for as_dir in $PATH 16047+do 16048+ IFS=$as_save_IFS 16049+ test -z "$as_dir" && as_dir=. 16050+ for ac_exec_ext in '' $ac_executable_extensions; do 16051+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 16052+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" 16053+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 16054+ break 2 16055+ fi 16056+done 16057+ done 16058+IFS=$as_save_IFS 16059+ 16060+fi 16061+fi 16062+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL 16063+if test -n "$ac_ct_DLLTOOL"; then 16064+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 16065+$as_echo "$ac_ct_DLLTOOL" >&6; } 16066+else 16067+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 16068+$as_echo "no" >&6; } 16069+fi 16070+ 16071+ if test "x$ac_ct_DLLTOOL" = x; then 16072+ DLLTOOL="false" 16073+ else 16074+ case $cross_compiling:$ac_tool_warned in 16075+yes:) 16076+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 16077+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 16078+ac_tool_warned=yes ;; 16079+esac 16080+ DLLTOOL=$ac_ct_DLLTOOL 16081+ fi 16082+else 16083+ DLLTOOL="$ac_cv_prog_DLLTOOL" 16084+fi 16085+ 16086+test -z "$DLLTOOL" && DLLTOOL=dlltool 16087+ 16088+ 16089+ 16090+ 16091+ 16092+ 16093+ 16094+ 16095+ 16096+ 16097+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 16098+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } 16099+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : 16100+ $as_echo_n "(cached) " >&6 16101+else 16102+ lt_cv_sharedlib_from_linklib_cmd='unknown' 16103+ 16104+case $host_os in 16105+cygwin* | mingw* | pw32* | cegcc*) 16106+ # two different shell functions defined in ltmain.sh 16107+ # decide which to use based on capabilities of $DLLTOOL 16108+ case `$DLLTOOL --help 2>&1` in 16109+ *--identify-strict*) 16110+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib 16111+ ;; 16112+ *) 16113+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback 16114+ ;; 16115+ esac 16116+ ;; 16117+*) 16118+ # fallback: assume linklib IS sharedlib 16119+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" 16120+ ;; 16121+esac 16122+ 16123+fi 16124+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 16125+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } 16126+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd 16127+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO 16128+ 16129+ 16130+ 16131+ 16132+ 16133+ 16134+ 16135 plugin_option= 16136 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 16137 for plugin in $plugin_names; do 16138@@ -6597,8 +6849,10 @@ for plugin in $plugin_names; do 16139 done 16140 16141 if test -n "$ac_tool_prefix"; then 16142- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 16143-set dummy ${ac_tool_prefix}ar; ac_word=$2 16144+ for ac_prog in ar 16145+ do 16146+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 16147+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 16148 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 16149 $as_echo_n "checking for $ac_word... " >&6; } 16150 if ${ac_cv_prog_AR+:} false; then : 16151@@ -6614,7 +6868,7 @@ do 16152 test -z "$as_dir" && as_dir=. 16153 for ac_exec_ext in '' $ac_executable_extensions; do 16154 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 16155- ac_cv_prog_AR="${ac_tool_prefix}ar" 16156+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" 16157 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 16158 break 2 16159 fi 16160@@ -6634,11 +6888,15 @@ $as_echo "no" >&6; } 16161 fi 16162 16163 16164+ test -n "$AR" && break 16165+ done 16166 fi 16167-if test -z "$ac_cv_prog_AR"; then 16168+if test -z "$AR"; then 16169 ac_ct_AR=$AR 16170- # Extract the first word of "ar", so it can be a program name with args. 16171-set dummy ar; ac_word=$2 16172+ for ac_prog in ar 16173+do 16174+ # Extract the first word of "$ac_prog", so it can be a program name with args. 16175+set dummy $ac_prog; ac_word=$2 16176 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 16177 $as_echo_n "checking for $ac_word... " >&6; } 16178 if ${ac_cv_prog_ac_ct_AR+:} false; then : 16179@@ -6654,7 +6912,7 @@ do 16180 test -z "$as_dir" && as_dir=. 16181 for ac_exec_ext in '' $ac_executable_extensions; do 16182 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 16183- ac_cv_prog_ac_ct_AR="ar" 16184+ ac_cv_prog_ac_ct_AR="$ac_prog" 16185 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 16186 break 2 16187 fi 16188@@ -6673,6 +6931,10 @@ else 16189 $as_echo "no" >&6; } 16190 fi 16191 16192+ 16193+ test -n "$ac_ct_AR" && break 16194+done 16195+ 16196 if test "x$ac_ct_AR" = x; then 16197 AR="false" 16198 else 16199@@ -6684,25 +6946,19 @@ ac_tool_warned=yes ;; 16200 esac 16201 AR=$ac_ct_AR 16202 fi 16203-else 16204- AR="$ac_cv_prog_AR" 16205 fi 16206 16207-test -z "$AR" && AR=ar 16208-if test -n "$plugin_option"; then 16209- if $AR --help 2>&1 | grep -q "\--plugin"; then 16210- touch conftest.c 16211- $AR $plugin_option rc conftest.a conftest.c 16212- if test "$?" != 0; then 16213- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 16214+ touch conftest.c 16215+ $AR $plugin_option rc conftest.a conftest.c 16216+ if test "$?" != 0; then 16217+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 16218 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} 16219- else 16220- AR="$AR $plugin_option" 16221- fi 16222- rm -f conftest.* 16223+ else 16224+ AR="$AR $plugin_option" 16225 fi 16226-fi 16227-test -z "$AR_FLAGS" && AR_FLAGS=cru 16228+ rm -f conftest.* 16229+: ${AR=ar} 16230+: ${AR_FLAGS=cru} 16231 16232 16233 16234@@ -6714,6 +6970,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 16235 16236 16237 16238+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 16239+$as_echo_n "checking for archiver @FILE support... " >&6; } 16240+if ${lt_cv_ar_at_file+:} false; then : 16241+ $as_echo_n "(cached) " >&6 16242+else 16243+ lt_cv_ar_at_file=no 16244+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 16245+/* end confdefs.h. */ 16246+ 16247+int 16248+main () 16249+{ 16250+ 16251+ ; 16252+ return 0; 16253+} 16254+_ACEOF 16255+if ac_fn_c_try_compile "$LINENO"; then : 16256+ echo conftest.$ac_objext > conftest.lst 16257+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' 16258+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 16259+ (eval $lt_ar_try) 2>&5 16260+ ac_status=$? 16261+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 16262+ test $ac_status = 0; } 16263+ if test "$ac_status" -eq 0; then 16264+ # Ensure the archiver fails upon bogus file names. 16265+ rm -f conftest.$ac_objext libconftest.a 16266+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 16267+ (eval $lt_ar_try) 2>&5 16268+ ac_status=$? 16269+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 16270+ test $ac_status = 0; } 16271+ if test "$ac_status" -ne 0; then 16272+ lt_cv_ar_at_file=@ 16273+ fi 16274+ fi 16275+ rm -f conftest.* libconftest.a 16276+ 16277+fi 16278+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 16279+ 16280+fi 16281+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 16282+$as_echo "$lt_cv_ar_at_file" >&6; } 16283+ 16284+if test "x$lt_cv_ar_at_file" = xno; then 16285+ archiver_list_spec= 16286+else 16287+ archiver_list_spec=$lt_cv_ar_at_file 16288+fi 16289+ 16290+ 16291+ 16292+ 16293+ 16294+ 16295+ 16296 if test -n "$ac_tool_prefix"; then 16297 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 16298 set dummy ${ac_tool_prefix}strip; ac_word=$2 16299@@ -7053,8 +7367,8 @@ esac 16300 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 16301 16302 # Transform an extracted symbol line into symbol name and symbol address 16303-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 16304-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'" 16305+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 16306+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'" 16307 16308 # Handle CRLF in mingw tool chain 16309 opt_cr= 16310@@ -7090,6 +7404,7 @@ for ac_symprfx in "" "_"; do 16311 else 16312 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 16313 fi 16314+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" 16315 16316 # Check to see that the pipe works correctly. 16317 pipe_works=no 16318@@ -7131,6 +7446,18 @@ _LT_EOF 16319 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 16320 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 16321 cat <<_LT_EOF > conftest.$ac_ext 16322+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ 16323+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) 16324+/* DATA imports from DLLs on WIN32 con't be const, because runtime 16325+ relocations are performed -- see ld's documentation on pseudo-relocs. */ 16326+# define LT_DLSYM_CONST 16327+#elif defined(__osf__) 16328+/* This system does not cope well with relocations in const data. */ 16329+# define LT_DLSYM_CONST 16330+#else 16331+# define LT_DLSYM_CONST const 16332+#endif 16333+ 16334 #ifdef __cplusplus 16335 extern "C" { 16336 #endif 16337@@ -7142,7 +7469,7 @@ _LT_EOF 16338 cat <<_LT_EOF >> conftest.$ac_ext 16339 16340 /* The mapping between symbol names and symbols. */ 16341-const struct { 16342+LT_DLSYM_CONST struct { 16343 const char *name; 16344 void *address; 16345 } 16346@@ -7168,8 +7495,8 @@ static const void *lt_preloaded_setup() { 16347 _LT_EOF 16348 # Now try linking the two files. 16349 mv conftest.$ac_objext conftstm.$ac_objext 16350- lt_save_LIBS="$LIBS" 16351- lt_save_CFLAGS="$CFLAGS" 16352+ lt_globsym_save_LIBS=$LIBS 16353+ lt_globsym_save_CFLAGS=$CFLAGS 16354 LIBS="conftstm.$ac_objext" 16355 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 16356 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 16357@@ -7179,8 +7506,8 @@ _LT_EOF 16358 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 16359 pipe_works=yes 16360 fi 16361- LIBS="$lt_save_LIBS" 16362- CFLAGS="$lt_save_CFLAGS" 16363+ LIBS=$lt_globsym_save_LIBS 16364+ CFLAGS=$lt_globsym_save_CFLAGS 16365 else 16366 echo "cannot find nm_test_func in $nlist" >&5 16367 fi 16368@@ -7217,6 +7544,18 @@ else 16369 $as_echo "ok" >&6; } 16370 fi 16371 16372+# Response file support. 16373+if test "$lt_cv_nm_interface" = "MS dumpbin"; then 16374+ nm_file_list_spec='@' 16375+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then 16376+ nm_file_list_spec='@' 16377+fi 16378+ 16379+ 16380+ 16381+ 16382+ 16383+ 16384 16385 16386 16387@@ -7233,6 +7572,43 @@ fi 16388 16389 16390 16391+ 16392+ 16393+ 16394+ 16395+ 16396+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 16397+$as_echo_n "checking for sysroot... " >&6; } 16398+ 16399+# Check whether --with-libtool-sysroot was given. 16400+if test "${with_libtool_sysroot+set}" = set; then : 16401+ withval=$with_libtool_sysroot; 16402+else 16403+ with_libtool_sysroot=no 16404+fi 16405+ 16406+ 16407+lt_sysroot= 16408+case ${with_libtool_sysroot} in #( 16409+ yes) 16410+ if test "$GCC" = yes; then 16411+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` 16412+ fi 16413+ ;; #( 16414+ /*) 16415+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` 16416+ ;; #( 16417+ no|'') 16418+ ;; #( 16419+ *) 16420+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 16421+$as_echo "${with_libtool_sysroot}" >&6; } 16422+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 16423+ ;; 16424+esac 16425+ 16426+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 16427+$as_echo "${lt_sysroot:-no}" >&6; } 16428 16429 16430 16431@@ -7444,6 +7820,123 @@ esac 16432 16433 need_locks="$enable_libtool_lock" 16434 16435+if test -n "$ac_tool_prefix"; then 16436+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. 16437+set dummy ${ac_tool_prefix}mt; ac_word=$2 16438+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 16439+$as_echo_n "checking for $ac_word... " >&6; } 16440+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : 16441+ $as_echo_n "(cached) " >&6 16442+else 16443+ if test -n "$MANIFEST_TOOL"; then 16444+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. 16445+else 16446+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 16447+for as_dir in $PATH 16448+do 16449+ IFS=$as_save_IFS 16450+ test -z "$as_dir" && as_dir=. 16451+ for ac_exec_ext in '' $ac_executable_extensions; do 16452+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 16453+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" 16454+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 16455+ break 2 16456+ fi 16457+done 16458+ done 16459+IFS=$as_save_IFS 16460+ 16461+fi 16462+fi 16463+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL 16464+if test -n "$MANIFEST_TOOL"; then 16465+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 16466+$as_echo "$MANIFEST_TOOL" >&6; } 16467+else 16468+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 16469+$as_echo "no" >&6; } 16470+fi 16471+ 16472+ 16473+fi 16474+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then 16475+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL 16476+ # Extract the first word of "mt", so it can be a program name with args. 16477+set dummy mt; ac_word=$2 16478+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 16479+$as_echo_n "checking for $ac_word... " >&6; } 16480+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : 16481+ $as_echo_n "(cached) " >&6 16482+else 16483+ if test -n "$ac_ct_MANIFEST_TOOL"; then 16484+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. 16485+else 16486+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 16487+for as_dir in $PATH 16488+do 16489+ IFS=$as_save_IFS 16490+ test -z "$as_dir" && as_dir=. 16491+ for ac_exec_ext in '' $ac_executable_extensions; do 16492+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 16493+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" 16494+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 16495+ break 2 16496+ fi 16497+done 16498+ done 16499+IFS=$as_save_IFS 16500+ 16501+fi 16502+fi 16503+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL 16504+if test -n "$ac_ct_MANIFEST_TOOL"; then 16505+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 16506+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } 16507+else 16508+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 16509+$as_echo "no" >&6; } 16510+fi 16511+ 16512+ if test "x$ac_ct_MANIFEST_TOOL" = x; then 16513+ MANIFEST_TOOL=":" 16514+ else 16515+ case $cross_compiling:$ac_tool_warned in 16516+yes:) 16517+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 16518+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 16519+ac_tool_warned=yes ;; 16520+esac 16521+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL 16522+ fi 16523+else 16524+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" 16525+fi 16526+ 16527+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt 16528+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 16529+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } 16530+if ${lt_cv_path_mainfest_tool+:} false; then : 16531+ $as_echo_n "(cached) " >&6 16532+else 16533+ lt_cv_path_mainfest_tool=no 16534+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 16535+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out 16536+ cat conftest.err >&5 16537+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then 16538+ lt_cv_path_mainfest_tool=yes 16539+ fi 16540+ rm -f conftest* 16541+fi 16542+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 16543+$as_echo "$lt_cv_path_mainfest_tool" >&6; } 16544+if test "x$lt_cv_path_mainfest_tool" != xyes; then 16545+ MANIFEST_TOOL=: 16546+fi 16547+ 16548+ 16549+ 16550+ 16551+ 16552 16553 case $host_os in 16554 rhapsody* | darwin*) 16555@@ -8007,6 +8500,8 @@ _LT_EOF 16556 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 16557 echo "$AR cru libconftest.a conftest.o" >&5 16558 $AR cru libconftest.a conftest.o 2>&5 16559+ echo "$RANLIB libconftest.a" >&5 16560+ $RANLIB libconftest.a 2>&5 16561 cat > conftest.c << _LT_EOF 16562 int main() { return 0;} 16563 _LT_EOF 16564@@ -8589,8 +9084,6 @@ fi 16565 lt_prog_compiler_pic= 16566 lt_prog_compiler_static= 16567 16568-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 16569-$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 16570 16571 if test "$GCC" = yes; then 16572 lt_prog_compiler_wl='-Wl,' 16573@@ -8756,6 +9249,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 16574 lt_prog_compiler_pic='--shared' 16575 lt_prog_compiler_static='--static' 16576 ;; 16577+ nagfor*) 16578+ # NAG Fortran compiler 16579+ lt_prog_compiler_wl='-Wl,-Wl,,' 16580+ lt_prog_compiler_pic='-PIC' 16581+ lt_prog_compiler_static='-Bstatic' 16582+ ;; 16583 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 16584 # Portland Group compilers (*not* the Pentium gcc compiler, 16585 # which looks to be a dead project) 16586@@ -8818,7 +9317,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 16587 lt_prog_compiler_pic='-KPIC' 16588 lt_prog_compiler_static='-Bstatic' 16589 case $cc_basename in 16590- f77* | f90* | f95*) 16591+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) 16592 lt_prog_compiler_wl='-Qoption ld ';; 16593 *) 16594 lt_prog_compiler_wl='-Wl,';; 16595@@ -8875,13 +9374,17 @@ case $host_os in 16596 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 16597 ;; 16598 esac 16599-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 16600-$as_echo "$lt_prog_compiler_pic" >&6; } 16601- 16602- 16603- 16604- 16605 16606+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 16607+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 16608+if ${lt_cv_prog_compiler_pic+:} false; then : 16609+ $as_echo_n "(cached) " >&6 16610+else 16611+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic 16612+fi 16613+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 16614+$as_echo "$lt_cv_prog_compiler_pic" >&6; } 16615+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic 16616 16617 # 16618 # Check to make sure the PIC flag actually works. 16619@@ -8942,6 +9445,11 @@ fi 16620 16621 16622 16623+ 16624+ 16625+ 16626+ 16627+ 16628 # 16629 # Check to make sure the static flag actually works. 16630 # 16631@@ -9292,7 +9800,8 @@ _LT_EOF 16632 allow_undefined_flag=unsupported 16633 always_export_symbols=no 16634 enable_shared_with_static_runtimes=yes 16635- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 16636+ 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' 16637+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' 16638 16639 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 16640 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 16641@@ -9391,12 +9900,12 @@ _LT_EOF 16642 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 16643 hardcode_libdir_flag_spec= 16644 hardcode_libdir_flag_spec_ld='-rpath $libdir' 16645- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' 16646+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' 16647 if test "x$supports_anon_versioning" = xyes; then 16648 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ 16649 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ 16650 echo "local: *; };" >> $output_objdir/$libname.ver~ 16651- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 16652+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 16653 fi 16654 ;; 16655 esac 16656@@ -9410,8 +9919,8 @@ _LT_EOF 16657 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 16658 wlarc= 16659 else 16660- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 16661- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 16662+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 16663+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 16664 fi 16665 ;; 16666 16667@@ -9429,8 +9938,8 @@ _LT_EOF 16668 16669 _LT_EOF 16670 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 16671- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 16672- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 16673+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 16674+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 16675 else 16676 ld_shlibs=no 16677 fi 16678@@ -9476,8 +9985,8 @@ _LT_EOF 16679 16680 *) 16681 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 16682- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 16683- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 16684+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 16685+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 16686 else 16687 ld_shlibs=no 16688 fi 16689@@ -9607,7 +10116,13 @@ _LT_EOF 16690 allow_undefined_flag='-berok' 16691 # Determine the default libpath from the value encoded in an 16692 # empty executable. 16693- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 16694+ if test "${lt_cv_aix_libpath+set}" = set; then 16695+ aix_libpath=$lt_cv_aix_libpath 16696+else 16697+ if ${lt_cv_aix_libpath_+:} false; then : 16698+ $as_echo_n "(cached) " >&6 16699+else 16700+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 16701 /* end confdefs.h. */ 16702 16703 int 16704@@ -9620,22 +10135,29 @@ main () 16705 _ACEOF 16706 if ac_fn_c_try_link "$LINENO"; then : 16707 16708-lt_aix_libpath_sed=' 16709- /Import File Strings/,/^$/ { 16710- /^0/ { 16711- s/^0 *\(.*\)$/\1/ 16712- p 16713- } 16714- }' 16715-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 16716-# Check for a 64-bit object if we didn't find anything. 16717-if test -z "$aix_libpath"; then 16718- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 16719-fi 16720+ lt_aix_libpath_sed=' 16721+ /Import File Strings/,/^$/ { 16722+ /^0/ { 16723+ s/^0 *\([^ ]*\) *$/\1/ 16724+ p 16725+ } 16726+ }' 16727+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 16728+ # Check for a 64-bit object if we didn't find anything. 16729+ if test -z "$lt_cv_aix_libpath_"; then 16730+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 16731+ fi 16732 fi 16733 rm -f core conftest.err conftest.$ac_objext \ 16734 conftest$ac_exeext conftest.$ac_ext 16735-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 16736+ if test -z "$lt_cv_aix_libpath_"; then 16737+ lt_cv_aix_libpath_="/usr/lib:/lib" 16738+ fi 16739+ 16740+fi 16741+ 16742+ aix_libpath=$lt_cv_aix_libpath_ 16743+fi 16744 16745 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 16746 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" 16747@@ -9647,7 +10169,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 16748 else 16749 # Determine the default libpath from the value encoded in an 16750 # empty executable. 16751- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 16752+ if test "${lt_cv_aix_libpath+set}" = set; then 16753+ aix_libpath=$lt_cv_aix_libpath 16754+else 16755+ if ${lt_cv_aix_libpath_+:} false; then : 16756+ $as_echo_n "(cached) " >&6 16757+else 16758+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 16759 /* end confdefs.h. */ 16760 16761 int 16762@@ -9660,22 +10188,29 @@ main () 16763 _ACEOF 16764 if ac_fn_c_try_link "$LINENO"; then : 16765 16766-lt_aix_libpath_sed=' 16767- /Import File Strings/,/^$/ { 16768- /^0/ { 16769- s/^0 *\(.*\)$/\1/ 16770- p 16771- } 16772- }' 16773-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 16774-# Check for a 64-bit object if we didn't find anything. 16775-if test -z "$aix_libpath"; then 16776- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 16777-fi 16778+ lt_aix_libpath_sed=' 16779+ /Import File Strings/,/^$/ { 16780+ /^0/ { 16781+ s/^0 *\([^ ]*\) *$/\1/ 16782+ p 16783+ } 16784+ }' 16785+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 16786+ # Check for a 64-bit object if we didn't find anything. 16787+ if test -z "$lt_cv_aix_libpath_"; then 16788+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 16789+ fi 16790 fi 16791 rm -f core conftest.err conftest.$ac_objext \ 16792 conftest$ac_exeext conftest.$ac_ext 16793-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 16794+ if test -z "$lt_cv_aix_libpath_"; then 16795+ lt_cv_aix_libpath_="/usr/lib:/lib" 16796+ fi 16797+ 16798+fi 16799+ 16800+ aix_libpath=$lt_cv_aix_libpath_ 16801+fi 16802 16803 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 16804 # Warning - without using the other run time loading flags, 16805@@ -9720,20 +10255,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 16806 # Microsoft Visual C++. 16807 # hardcode_libdir_flag_spec is actually meaningless, as there is 16808 # no search path for DLLs. 16809- hardcode_libdir_flag_spec=' ' 16810- allow_undefined_flag=unsupported 16811- # Tell ltmain to make .lib files, not .a files. 16812- libext=lib 16813- # Tell ltmain to make .dll files, not .so files. 16814- shrext_cmds=".dll" 16815- # FIXME: Setting linknames here is a bad hack. 16816- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 16817- # The linker will automatically build a .lib file if we build a DLL. 16818- old_archive_from_new_cmds='true' 16819- # FIXME: Should let the user specify the lib program. 16820- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 16821- fix_srcfile_path='`cygpath -w "$srcfile"`' 16822- enable_shared_with_static_runtimes=yes 16823+ case $cc_basename in 16824+ cl*) 16825+ # Native MSVC 16826+ hardcode_libdir_flag_spec=' ' 16827+ allow_undefined_flag=unsupported 16828+ always_export_symbols=yes 16829+ file_list_spec='@' 16830+ # Tell ltmain to make .lib files, not .a files. 16831+ libext=lib 16832+ # Tell ltmain to make .dll files, not .so files. 16833+ shrext_cmds=".dll" 16834+ # FIXME: Setting linknames here is a bad hack. 16835+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' 16836+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 16837+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; 16838+ else 16839+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; 16840+ fi~ 16841+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ 16842+ linknames=' 16843+ # The linker will not automatically build a static lib if we build a DLL. 16844+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' 16845+ enable_shared_with_static_runtimes=yes 16846+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 16847+ # Don't use ranlib 16848+ old_postinstall_cmds='chmod 644 $oldlib' 16849+ postlink_cmds='lt_outputfile="@OUTPUT@"~ 16850+ lt_tool_outputfile="@TOOL_OUTPUT@"~ 16851+ case $lt_outputfile in 16852+ *.exe|*.EXE) ;; 16853+ *) 16854+ lt_outputfile="$lt_outputfile.exe" 16855+ lt_tool_outputfile="$lt_tool_outputfile.exe" 16856+ ;; 16857+ esac~ 16858+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then 16859+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; 16860+ $RM "$lt_outputfile.manifest"; 16861+ fi' 16862+ ;; 16863+ *) 16864+ # Assume MSVC wrapper 16865+ hardcode_libdir_flag_spec=' ' 16866+ allow_undefined_flag=unsupported 16867+ # Tell ltmain to make .lib files, not .a files. 16868+ libext=lib 16869+ # Tell ltmain to make .dll files, not .so files. 16870+ shrext_cmds=".dll" 16871+ # FIXME: Setting linknames here is a bad hack. 16872+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 16873+ # The linker will automatically build a .lib file if we build a DLL. 16874+ old_archive_from_new_cmds='true' 16875+ # FIXME: Should let the user specify the lib program. 16876+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 16877+ enable_shared_with_static_runtimes=yes 16878+ ;; 16879+ esac 16880 ;; 16881 16882 darwin* | rhapsody*) 16883@@ -9794,7 +10372,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 16884 16885 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 16886 freebsd* | dragonfly*) 16887- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' 16888+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' 16889 hardcode_libdir_flag_spec='-R$libdir' 16890 hardcode_direct=yes 16891 hardcode_shlibpath_var=no 16892@@ -9802,7 +10380,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 16893 16894 hpux9*) 16895 if test "$GCC" = yes; then 16896- 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' 16897+ 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' 16898 else 16899 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' 16900 fi 16901@@ -9818,7 +10396,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 16902 16903 hpux10*) 16904 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 16905- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 16906+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 16907 else 16908 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 16909 fi 16910@@ -9842,10 +10420,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 16911 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 16912 ;; 16913 ia64*) 16914- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 16915+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 16916 ;; 16917 *) 16918- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 16919+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 16920 ;; 16921 esac 16922 else 16923@@ -9924,23 +10502,36 @@ fi 16924 16925 irix5* | irix6* | nonstopux*) 16926 if test "$GCC" = yes; then 16927- 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' 16928+ 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' 16929 # Try to use the -exported_symbol ld option, if it does not 16930 # work, assume that -exports_file does not work either and 16931 # implicitly export all symbols. 16932- save_LDFLAGS="$LDFLAGS" 16933- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 16934- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 16935+ # This should be the same for all languages, so no per-tag cache variable. 16936+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 16937+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } 16938+if ${lt_cv_irix_exported_symbol+:} false; then : 16939+ $as_echo_n "(cached) " >&6 16940+else 16941+ save_LDFLAGS="$LDFLAGS" 16942+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 16943+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 16944 /* end confdefs.h. */ 16945-int foo(void) {} 16946+int foo (void) { return 0; } 16947 _ACEOF 16948 if ac_fn_c_try_link "$LINENO"; then : 16949- 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' 16950- 16951+ lt_cv_irix_exported_symbol=yes 16952+else 16953+ lt_cv_irix_exported_symbol=no 16954 fi 16955 rm -f core conftest.err conftest.$ac_objext \ 16956 conftest$ac_exeext conftest.$ac_ext 16957- LDFLAGS="$save_LDFLAGS" 16958+ LDFLAGS="$save_LDFLAGS" 16959+fi 16960+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 16961+$as_echo "$lt_cv_irix_exported_symbol" >&6; } 16962+ if test "$lt_cv_irix_exported_symbol" = yes; then 16963+ 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' 16964+ fi 16965 else 16966 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' 16967 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' 16968@@ -10025,7 +10616,7 @@ rm -f core conftest.err conftest.$ac_objext \ 16969 osf4* | osf5*) # as osf3* with the addition of -msym flag 16970 if test "$GCC" = yes; then 16971 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 16972- 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' 16973+ 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' 16974 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 16975 else 16976 allow_undefined_flag=' -expect_unresolved \*' 16977@@ -10044,9 +10635,9 @@ rm -f core conftest.err conftest.$ac_objext \ 16978 no_undefined_flag=' -z defs' 16979 if test "$GCC" = yes; then 16980 wlarc='${wl}' 16981- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 16982+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 16983 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ 16984- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' 16985+ $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' 16986 else 16987 case `$CC -V 2>&1` in 16988 *"Compilers 5.0"*) 16989@@ -10622,8 +11213,9 @@ cygwin* | mingw* | pw32* | cegcc*) 16990 need_version=no 16991 need_lib_prefix=no 16992 16993- case $GCC,$host_os in 16994- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) 16995+ case $GCC,$cc_basename in 16996+ yes,*) 16997+ # gcc 16998 library_names_spec='$libname.dll.a' 16999 # DLL is installed to $(libdir)/../bin by postinstall_cmds 17000 postinstall_cmds='base_file=`basename \${file}`~ 17001@@ -10656,13 +11248,71 @@ cygwin* | mingw* | pw32* | cegcc*) 17002 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 17003 ;; 17004 esac 17005+ dynamic_linker='Win32 ld.exe' 17006+ ;; 17007+ 17008+ *,cl*) 17009+ # Native MSVC 17010+ libname_spec='$name' 17011+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 17012+ library_names_spec='${libname}.dll.lib' 17013+ 17014+ case $build_os in 17015+ mingw*) 17016+ sys_lib_search_path_spec= 17017+ lt_save_ifs=$IFS 17018+ IFS=';' 17019+ for lt_path in $LIB 17020+ do 17021+ IFS=$lt_save_ifs 17022+ # Let DOS variable expansion print the short 8.3 style file name. 17023+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` 17024+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" 17025+ done 17026+ IFS=$lt_save_ifs 17027+ # Convert to MSYS style. 17028+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` 17029+ ;; 17030+ cygwin*) 17031+ # Convert to unix form, then to dos form, then back to unix form 17032+ # but this time dos style (no spaces!) so that the unix form looks 17033+ # like /cygdrive/c/PROGRA~1:/cygdr... 17034+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` 17035+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` 17036+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 17037+ ;; 17038+ *) 17039+ sys_lib_search_path_spec="$LIB" 17040+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then 17041+ # It is most probably a Windows format PATH. 17042+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` 17043+ else 17044+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 17045+ fi 17046+ # FIXME: find the short name or the path components, as spaces are 17047+ # common. (e.g. "Program Files" -> "PROGRA~1") 17048+ ;; 17049+ esac 17050+ 17051+ # DLL is installed to $(libdir)/../bin by postinstall_cmds 17052+ postinstall_cmds='base_file=`basename \${file}`~ 17053+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ 17054+ dldir=$destdir/`dirname \$dlpath`~ 17055+ test -d \$dldir || mkdir -p \$dldir~ 17056+ $install_prog $dir/$dlname \$dldir/$dlname' 17057+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ 17058+ dlpath=$dir/\$dldll~ 17059+ $RM \$dlpath' 17060+ shlibpath_overrides_runpath=yes 17061+ dynamic_linker='Win32 link.exe' 17062 ;; 17063 17064 *) 17065+ # Assume MSVC wrapper 17066 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' 17067+ dynamic_linker='Win32 ld.exe' 17068 ;; 17069 esac 17070- dynamic_linker='Win32 ld.exe' 17071 # FIXME: first we should search . and the directory the executable is in 17072 shlibpath_var=PATH 17073 ;; 17074@@ -11540,7 +12190,7 @@ else 17075 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 17076 lt_status=$lt_dlunknown 17077 cat > conftest.$ac_ext <<_LT_EOF 17078-#line 11543 "configure" 17079+#line $LINENO "configure" 17080 #include "confdefs.h" 17081 17082 #if HAVE_DLFCN_H 17083@@ -11584,10 +12234,10 @@ else 17084 /* When -fvisbility=hidden is used, assume the code has been annotated 17085 correspondingly for the symbols needed. */ 17086 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 17087-void fnord () __attribute__((visibility("default"))); 17088+int fnord () __attribute__((visibility("default"))); 17089 #endif 17090 17091-void fnord () { int i=42; } 17092+int fnord () { return 42; } 17093 int main () 17094 { 17095 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 17096@@ -11646,7 +12296,7 @@ else 17097 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 17098 lt_status=$lt_dlunknown 17099 cat > conftest.$ac_ext <<_LT_EOF 17100-#line 11649 "configure" 17101+#line $LINENO "configure" 17102 #include "confdefs.h" 17103 17104 #if HAVE_DLFCN_H 17105@@ -11690,10 +12340,10 @@ else 17106 /* When -fvisbility=hidden is used, assume the code has been annotated 17107 correspondingly for the symbols needed. */ 17108 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 17109-void fnord () __attribute__((visibility("default"))); 17110+int fnord () __attribute__((visibility("default"))); 17111 #endif 17112 17113-void fnord () { int i=42; } 17114+int fnord () { return 42; } 17115 int main () 17116 { 17117 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 17118@@ -14979,13 +15629,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 17119 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 17120 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 17121 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 17122+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' 17123+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' 17124 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' 17125 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' 17126 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' 17127 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' 17128 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' 17129+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' 17130+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' 17131+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' 17132+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' 17133 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' 17134 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' 17135+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' 17136 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 17137 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 17138 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 17139@@ -15000,14 +15657,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 17140 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 17141 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 17142 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"`' 17143+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' 17144+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' 17145 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' 17146 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' 17147 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' 17148-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 17149 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' 17150+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 17151 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' 17152 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' 17153 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' 17154+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' 17155 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 17156 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 17157 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 17158@@ -15040,12 +15700,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 17159 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 17160 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 17161 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 17162-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' 17163 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' 17164 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' 17165 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' 17166 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' 17167 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' 17168+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' 17169 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 17170 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 17171 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 17172@@ -15100,8 +15760,13 @@ reload_flag \ 17173 OBJDUMP \ 17174 deplibs_check_method \ 17175 file_magic_cmd \ 17176+file_magic_glob \ 17177+want_nocaseglob \ 17178+DLLTOOL \ 17179+sharedlib_from_linklib_cmd \ 17180 AR \ 17181 AR_FLAGS \ 17182+archiver_list_spec \ 17183 STRIP \ 17184 RANLIB \ 17185 CC \ 17186@@ -15111,12 +15776,14 @@ lt_cv_sys_global_symbol_pipe \ 17187 lt_cv_sys_global_symbol_to_cdecl \ 17188 lt_cv_sys_global_symbol_to_c_name_address \ 17189 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 17190+nm_file_list_spec \ 17191 lt_prog_compiler_no_builtin_flag \ 17192-lt_prog_compiler_wl \ 17193 lt_prog_compiler_pic \ 17194+lt_prog_compiler_wl \ 17195 lt_prog_compiler_static \ 17196 lt_cv_prog_compiler_c_o \ 17197 need_locks \ 17198+MANIFEST_TOOL \ 17199 DSYMUTIL \ 17200 NMEDIT \ 17201 LIPO \ 17202@@ -15132,7 +15799,6 @@ no_undefined_flag \ 17203 hardcode_libdir_flag_spec \ 17204 hardcode_libdir_flag_spec_ld \ 17205 hardcode_libdir_separator \ 17206-fix_srcfile_path \ 17207 exclude_expsyms \ 17208 include_expsyms \ 17209 file_list_spec \ 17210@@ -15168,6 +15834,7 @@ module_cmds \ 17211 module_expsym_cmds \ 17212 export_symbols_cmds \ 17213 prelink_cmds \ 17214+postlink_cmds \ 17215 postinstall_cmds \ 17216 postuninstall_cmds \ 17217 finish_cmds \ 17218@@ -15866,7 +16533,8 @@ esac ;; 17219 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 17220 # 17221 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 17222-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. 17223+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, 17224+# Inc. 17225 # Written by Gordon Matzigkeit, 1996 17226 # 17227 # This file is part of GNU Libtool. 17228@@ -15969,19 +16637,42 @@ SP2NL=$lt_lt_SP2NL 17229 # turn newlines into spaces. 17230 NL2SP=$lt_lt_NL2SP 17231 17232+# convert \$build file names to \$host format. 17233+to_host_file_cmd=$lt_cv_to_host_file_cmd 17234+ 17235+# convert \$build files to toolchain format. 17236+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 17237+ 17238 # An object symbol dumper. 17239 OBJDUMP=$lt_OBJDUMP 17240 17241 # Method to check whether dependent libraries are shared objects. 17242 deplibs_check_method=$lt_deplibs_check_method 17243 17244-# Command to use when deplibs_check_method == "file_magic". 17245+# Command to use when deplibs_check_method = "file_magic". 17246 file_magic_cmd=$lt_file_magic_cmd 17247 17248+# How to find potential files when deplibs_check_method = "file_magic". 17249+file_magic_glob=$lt_file_magic_glob 17250+ 17251+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". 17252+want_nocaseglob=$lt_want_nocaseglob 17253+ 17254+# DLL creation program. 17255+DLLTOOL=$lt_DLLTOOL 17256+ 17257+# Command to associate shared and link libraries. 17258+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd 17259+ 17260 # The archiver. 17261 AR=$lt_AR 17262+ 17263+# Flags to create an archive. 17264 AR_FLAGS=$lt_AR_FLAGS 17265 17266+# How to feed a file listing to the archiver. 17267+archiver_list_spec=$lt_archiver_list_spec 17268+ 17269 # A symbol stripping program. 17270 STRIP=$lt_STRIP 17271 17272@@ -16011,6 +16702,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 17273 # Transform the output of nm in a C name address pair when lib prefix is needed. 17274 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 17275 17276+# Specify filename containing input files for \$NM. 17277+nm_file_list_spec=$lt_nm_file_list_spec 17278+ 17279+# The root where to search for dependent libraries,and in which our libraries should be installed. 17280+lt_sysroot=$lt_sysroot 17281+ 17282 # The name of the directory that contains temporary libtool files. 17283 objdir=$objdir 17284 17285@@ -16020,6 +16717,9 @@ MAGIC_CMD=$MAGIC_CMD 17286 # Must we lock files when doing compilation? 17287 need_locks=$lt_need_locks 17288 17289+# Manifest tool. 17290+MANIFEST_TOOL=$lt_MANIFEST_TOOL 17291+ 17292 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 17293 DSYMUTIL=$lt_DSYMUTIL 17294 17295@@ -16134,12 +16834,12 @@ with_gcc=$GCC 17296 # Compiler flag to turn off builtin functions. 17297 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 17298 17299-# How to pass a linker flag through the compiler. 17300-wl=$lt_lt_prog_compiler_wl 17301- 17302 # Additional compiler flags for building library objects. 17303 pic_flag=$lt_lt_prog_compiler_pic 17304 17305+# How to pass a linker flag through the compiler. 17306+wl=$lt_lt_prog_compiler_wl 17307+ 17308 # Compiler flag to prevent dynamic linking. 17309 link_static_flag=$lt_lt_prog_compiler_static 17310 17311@@ -16226,9 +16926,6 @@ inherit_rpath=$inherit_rpath 17312 # Whether libtool must link a program against all its dependency libraries. 17313 link_all_deplibs=$link_all_deplibs 17314 17315-# Fix the shell variable \$srcfile for the compiler. 17316-fix_srcfile_path=$lt_fix_srcfile_path 17317- 17318 # Set to "yes" if exported symbols are required. 17319 always_export_symbols=$always_export_symbols 17320 17321@@ -16244,6 +16941,9 @@ include_expsyms=$lt_include_expsyms 17322 # Commands necessary for linking programs (against libraries) with templates. 17323 prelink_cmds=$lt_prelink_cmds 17324 17325+# Commands necessary for finishing linking programs. 17326+postlink_cmds=$lt_postlink_cmds 17327+ 17328 # Specify filename containing input files. 17329 file_list_spec=$lt_file_list_spec 17330 17331@@ -16276,210 +16976,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 17332 # if finds mixed CR/LF and LF-only lines. Since sed operates in 17333 # text mode, it properly converts lines to CR/LF. This bash problem 17334 # is reportedly fixed, but why not run on old versions too? 17335- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ 17336- || (rm -f "$cfgfile"; exit 1) 17337- 17338- case $xsi_shell in 17339- yes) 17340- cat << \_LT_EOF >> "$cfgfile" 17341- 17342-# func_dirname file append nondir_replacement 17343-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 17344-# otherwise set result to NONDIR_REPLACEMENT. 17345-func_dirname () 17346-{ 17347- case ${1} in 17348- */*) func_dirname_result="${1%/*}${2}" ;; 17349- * ) func_dirname_result="${3}" ;; 17350- esac 17351-} 17352- 17353-# func_basename file 17354-func_basename () 17355-{ 17356- func_basename_result="${1##*/}" 17357-} 17358- 17359-# func_dirname_and_basename file append nondir_replacement 17360-# perform func_basename and func_dirname in a single function 17361-# call: 17362-# dirname: Compute the dirname of FILE. If nonempty, 17363-# add APPEND to the result, otherwise set result 17364-# to NONDIR_REPLACEMENT. 17365-# value returned in "$func_dirname_result" 17366-# basename: Compute filename of FILE. 17367-# value retuned in "$func_basename_result" 17368-# Implementation must be kept synchronized with func_dirname 17369-# and func_basename. For efficiency, we do not delegate to 17370-# those functions but instead duplicate the functionality here. 17371-func_dirname_and_basename () 17372-{ 17373- case ${1} in 17374- */*) func_dirname_result="${1%/*}${2}" ;; 17375- * ) func_dirname_result="${3}" ;; 17376- esac 17377- func_basename_result="${1##*/}" 17378-} 17379- 17380-# func_stripname prefix suffix name 17381-# strip PREFIX and SUFFIX off of NAME. 17382-# PREFIX and SUFFIX must not contain globbing or regex special 17383-# characters, hashes, percent signs, but SUFFIX may contain a leading 17384-# dot (in which case that matches only a dot). 17385-func_stripname () 17386-{ 17387- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are 17388- # positional parameters, so assign one to ordinary parameter first. 17389- func_stripname_result=${3} 17390- func_stripname_result=${func_stripname_result#"${1}"} 17391- func_stripname_result=${func_stripname_result%"${2}"} 17392-} 17393- 17394-# func_opt_split 17395-func_opt_split () 17396-{ 17397- func_opt_split_opt=${1%%=*} 17398- func_opt_split_arg=${1#*=} 17399-} 17400- 17401-# func_lo2o object 17402-func_lo2o () 17403-{ 17404- case ${1} in 17405- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; 17406- *) func_lo2o_result=${1} ;; 17407- esac 17408-} 17409- 17410-# func_xform libobj-or-source 17411-func_xform () 17412-{ 17413- func_xform_result=${1%.*}.lo 17414-} 17415- 17416-# func_arith arithmetic-term... 17417-func_arith () 17418-{ 17419- func_arith_result=$(( $* )) 17420-} 17421- 17422-# func_len string 17423-# STRING may not start with a hyphen. 17424-func_len () 17425-{ 17426- func_len_result=${#1} 17427-} 17428- 17429-_LT_EOF 17430- ;; 17431- *) # Bourne compatible functions. 17432- cat << \_LT_EOF >> "$cfgfile" 17433- 17434-# func_dirname file append nondir_replacement 17435-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 17436-# otherwise set result to NONDIR_REPLACEMENT. 17437-func_dirname () 17438-{ 17439- # Extract subdirectory from the argument. 17440- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` 17441- if test "X$func_dirname_result" = "X${1}"; then 17442- func_dirname_result="${3}" 17443- else 17444- func_dirname_result="$func_dirname_result${2}" 17445- fi 17446-} 17447- 17448-# func_basename file 17449-func_basename () 17450-{ 17451- func_basename_result=`$ECHO "${1}" | $SED "$basename"` 17452-} 17453- 17454- 17455-# func_stripname prefix suffix name 17456-# strip PREFIX and SUFFIX off of NAME. 17457-# PREFIX and SUFFIX must not contain globbing or regex special 17458-# characters, hashes, percent signs, but SUFFIX may contain a leading 17459-# dot (in which case that matches only a dot). 17460-# func_strip_suffix prefix name 17461-func_stripname () 17462-{ 17463- case ${2} in 17464- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; 17465- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; 17466- esac 17467-} 17468- 17469-# sed scripts: 17470-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' 17471-my_sed_long_arg='1s/^-[^=]*=//' 17472- 17473-# func_opt_split 17474-func_opt_split () 17475-{ 17476- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` 17477- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` 17478-} 17479- 17480-# func_lo2o object 17481-func_lo2o () 17482-{ 17483- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` 17484-} 17485- 17486-# func_xform libobj-or-source 17487-func_xform () 17488-{ 17489- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` 17490-} 17491- 17492-# func_arith arithmetic-term... 17493-func_arith () 17494-{ 17495- func_arith_result=`expr "$@"` 17496-} 17497- 17498-# func_len string 17499-# STRING may not start with a hyphen. 17500-func_len () 17501-{ 17502- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` 17503-} 17504- 17505-_LT_EOF 17506-esac 17507- 17508-case $lt_shell_append in 17509- yes) 17510- cat << \_LT_EOF >> "$cfgfile" 17511- 17512-# func_append var value 17513-# Append VALUE to the end of shell variable VAR. 17514-func_append () 17515-{ 17516- eval "$1+=\$2" 17517-} 17518-_LT_EOF 17519- ;; 17520- *) 17521- cat << \_LT_EOF >> "$cfgfile" 17522- 17523-# func_append var value 17524-# Append VALUE to the end of shell variable VAR. 17525-func_append () 17526-{ 17527- eval "$1=\$$1\$2" 17528-} 17529- 17530-_LT_EOF 17531- ;; 17532- esac 17533- 17534- 17535- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ 17536- || (rm -f "$cfgfile"; exit 1) 17537- 17538- mv -f "$cfgfile" "$ofile" || 17539+ sed '$q' "$ltmain" >> "$cfgfile" \ 17540+ || (rm -f "$cfgfile"; exit 1) 17541+ 17542+ if test x"$xsi_shell" = xyes; then 17543+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ 17544+func_dirname ()\ 17545+{\ 17546+\ case ${1} in\ 17547+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 17548+\ * ) func_dirname_result="${3}" ;;\ 17549+\ esac\ 17550+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ 17551+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 17552+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 17553+test 0 -eq $? || _lt_function_replace_fail=: 17554+ 17555+ 17556+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ 17557+func_basename ()\ 17558+{\ 17559+\ func_basename_result="${1##*/}"\ 17560+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ 17561+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 17562+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 17563+test 0 -eq $? || _lt_function_replace_fail=: 17564+ 17565+ 17566+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ 17567+func_dirname_and_basename ()\ 17568+{\ 17569+\ case ${1} in\ 17570+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 17571+\ * ) func_dirname_result="${3}" ;;\ 17572+\ esac\ 17573+\ func_basename_result="${1##*/}"\ 17574+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ 17575+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 17576+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 17577+test 0 -eq $? || _lt_function_replace_fail=: 17578+ 17579+ 17580+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ 17581+func_stripname ()\ 17582+{\ 17583+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ 17584+\ # positional parameters, so assign one to ordinary parameter first.\ 17585+\ func_stripname_result=${3}\ 17586+\ func_stripname_result=${func_stripname_result#"${1}"}\ 17587+\ func_stripname_result=${func_stripname_result%"${2}"}\ 17588+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ 17589+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 17590+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 17591+test 0 -eq $? || _lt_function_replace_fail=: 17592+ 17593+ 17594+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ 17595+func_split_long_opt ()\ 17596+{\ 17597+\ func_split_long_opt_name=${1%%=*}\ 17598+\ func_split_long_opt_arg=${1#*=}\ 17599+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ 17600+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 17601+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 17602+test 0 -eq $? || _lt_function_replace_fail=: 17603+ 17604+ 17605+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ 17606+func_split_short_opt ()\ 17607+{\ 17608+\ func_split_short_opt_arg=${1#??}\ 17609+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ 17610+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ 17611+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 17612+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 17613+test 0 -eq $? || _lt_function_replace_fail=: 17614+ 17615+ 17616+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ 17617+func_lo2o ()\ 17618+{\ 17619+\ case ${1} in\ 17620+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ 17621+\ *) func_lo2o_result=${1} ;;\ 17622+\ esac\ 17623+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ 17624+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 17625+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 17626+test 0 -eq $? || _lt_function_replace_fail=: 17627+ 17628+ 17629+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ 17630+func_xform ()\ 17631+{\ 17632+ func_xform_result=${1%.*}.lo\ 17633+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ 17634+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 17635+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 17636+test 0 -eq $? || _lt_function_replace_fail=: 17637+ 17638+ 17639+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ 17640+func_arith ()\ 17641+{\ 17642+ func_arith_result=$(( $* ))\ 17643+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ 17644+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 17645+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 17646+test 0 -eq $? || _lt_function_replace_fail=: 17647+ 17648+ 17649+ sed -e '/^func_len ()$/,/^} # func_len /c\ 17650+func_len ()\ 17651+{\ 17652+ func_len_result=${#1}\ 17653+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ 17654+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 17655+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 17656+test 0 -eq $? || _lt_function_replace_fail=: 17657+ 17658+fi 17659+ 17660+if test x"$lt_shell_append" = xyes; then 17661+ sed -e '/^func_append ()$/,/^} # func_append /c\ 17662+func_append ()\ 17663+{\ 17664+ eval "${1}+=\\${2}"\ 17665+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ 17666+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 17667+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 17668+test 0 -eq $? || _lt_function_replace_fail=: 17669+ 17670+ 17671+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ 17672+func_append_quoted ()\ 17673+{\ 17674+\ func_quote_for_eval "${2}"\ 17675+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ 17676+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ 17677+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 17678+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 17679+test 0 -eq $? || _lt_function_replace_fail=: 17680+ 17681+ 17682+ # Save a `func_append' function call where possible by direct use of '+=' 17683+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ 17684+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 17685+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 17686+ test 0 -eq $? || _lt_function_replace_fail=: 17687+else 17688+ # Save a `func_append' function call even when '+=' is not available 17689+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ 17690+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 17691+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 17692+ test 0 -eq $? || _lt_function_replace_fail=: 17693+fi 17694+ 17695+if test x"$_lt_function_replace_fail" = x":"; then 17696+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 17697+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} 17698+fi 17699+ 17700+ 17701+ mv -f "$cfgfile" "$ofile" || 17702 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 17703 chmod +x "$ofile" 17704 17705diff --git a/libctf/Makefile.in b/libctf/Makefile.in 17706index f2b852e3fae..63e3b2e05ea 100644 17707--- a/libctf/Makefile.in 17708+++ b/libctf/Makefile.in 17709@@ -393,6 +393,7 @@ CYGPATH_W = @CYGPATH_W@ 17710 DATADIRNAME = @DATADIRNAME@ 17711 DEFS = @DEFS@ 17712 DEPDIR = @DEPDIR@ 17713+DLLTOOL = @DLLTOOL@ 17714 DSYMUTIL = @DSYMUTIL@ 17715 DUMPBIN = @DUMPBIN@ 17716 ECHO_C = @ECHO_C@ 17717@@ -426,6 +427,7 @@ LN_S = @LN_S@ 17718 LTLIBOBJS = @LTLIBOBJS@ 17719 MAINT = @MAINT@ 17720 MAKEINFO = @MAKEINFO@ 17721+MANIFEST_TOOL = @MANIFEST_TOOL@ 17722 MKDIR_P = @MKDIR_P@ 17723 NM = @NM@ 17724 NMEDIT = @NMEDIT@ 17725diff --git a/libctf/configure b/libctf/configure 17726index b347b292195..d6d6e341887 100755 17727--- a/libctf/configure 17728+++ b/libctf/configure 17729@@ -669,6 +669,8 @@ OTOOL 17730 LIPO 17731 NMEDIT 17732 DSYMUTIL 17733+MANIFEST_TOOL 17734+DLLTOOL 17735 OBJDUMP 17736 LN_S 17737 NM 17738@@ -800,6 +802,7 @@ enable_static 17739 with_pic 17740 enable_fast_install 17741 with_gnu_ld 17742+with_libtool_sysroot 17743 enable_libtool_lock 17744 enable_largefile 17745 enable_werror_always 17746@@ -1463,6 +1466,8 @@ Optional Packages: 17747 --with-pic try to use only PIC/non-PIC objects [default=use 17748 both] 17749 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 17750+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR 17751+ (or the compiler's sysroot if not specified). 17752 --with-system-zlib use installed libz 17753 17754 Some influential environment variables: 17755@@ -5568,8 +5573,8 @@ esac 17756 17757 17758 17759-macro_version='2.2.7a' 17760-macro_revision='1.3134' 17761+macro_version='2.4' 17762+macro_revision='1.3293' 17763 17764 17765 17766@@ -5609,7 +5614,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 17767 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 17768 $as_echo_n "checking how to print strings... " >&6; } 17769 # Test print first, because it will be a builtin if present. 17770-if test "X`print -r -- -n 2>/dev/null`" = X-n && \ 17771+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ 17772 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 17773 ECHO='print -r --' 17774 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 17775@@ -6302,8 +6307,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 17776 # Try some XSI features 17777 xsi_shell=no 17778 ( _lt_dummy="a/b/c" 17779- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ 17780- = c,a/b,, \ 17781+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ 17782+ = c,a/b,b/c, \ 17783 && eval 'test $(( 1 + 1 )) -eq 2 \ 17784 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 17785 && xsi_shell=yes 17786@@ -6352,6 +6357,80 @@ esac 17787 17788 17789 17790+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 17791+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } 17792+if ${lt_cv_to_host_file_cmd+:} false; then : 17793+ $as_echo_n "(cached) " >&6 17794+else 17795+ case $host in 17796+ *-*-mingw* ) 17797+ case $build in 17798+ *-*-mingw* ) # actually msys 17799+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 17800+ ;; 17801+ *-*-cygwin* ) 17802+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 17803+ ;; 17804+ * ) # otherwise, assume *nix 17805+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 17806+ ;; 17807+ esac 17808+ ;; 17809+ *-*-cygwin* ) 17810+ case $build in 17811+ *-*-mingw* ) # actually msys 17812+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin 17813+ ;; 17814+ *-*-cygwin* ) 17815+ lt_cv_to_host_file_cmd=func_convert_file_noop 17816+ ;; 17817+ * ) # otherwise, assume *nix 17818+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin 17819+ ;; 17820+ esac 17821+ ;; 17822+ * ) # unhandled hosts (and "normal" native builds) 17823+ lt_cv_to_host_file_cmd=func_convert_file_noop 17824+ ;; 17825+esac 17826+ 17827+fi 17828+ 17829+to_host_file_cmd=$lt_cv_to_host_file_cmd 17830+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 17831+$as_echo "$lt_cv_to_host_file_cmd" >&6; } 17832+ 17833+ 17834+ 17835+ 17836+ 17837+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 17838+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } 17839+if ${lt_cv_to_tool_file_cmd+:} false; then : 17840+ $as_echo_n "(cached) " >&6 17841+else 17842+ #assume ordinary cross tools, or native build. 17843+lt_cv_to_tool_file_cmd=func_convert_file_noop 17844+case $host in 17845+ *-*-mingw* ) 17846+ case $build in 17847+ *-*-mingw* ) # actually msys 17848+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 17849+ ;; 17850+ esac 17851+ ;; 17852+esac 17853+ 17854+fi 17855+ 17856+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 17857+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 17858+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } 17859+ 17860+ 17861+ 17862+ 17863+ 17864 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 17865 $as_echo_n "checking for $LD option to reload object files... " >&6; } 17866 if ${lt_cv_ld_reload_flag+:} false; then : 17867@@ -6368,6 +6447,11 @@ case $reload_flag in 17868 esac 17869 reload_cmds='$LD$reload_flag -o $output$reload_objs' 17870 case $host_os in 17871+ cygwin* | mingw* | pw32* | cegcc*) 17872+ if test "$GCC" != yes; then 17873+ reload_cmds=false 17874+ fi 17875+ ;; 17876 darwin*) 17877 if test "$GCC" = yes; then 17878 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 17879@@ -6536,7 +6620,8 @@ mingw* | pw32*) 17880 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 17881 lt_cv_file_magic_cmd='func_win32_libid' 17882 else 17883- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' 17884+ # Keep this pattern in sync with the one in func_win32_libid. 17885+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' 17886 lt_cv_file_magic_cmd='$OBJDUMP -f' 17887 fi 17888 ;; 17889@@ -6690,6 +6775,21 @@ esac 17890 fi 17891 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 17892 $as_echo "$lt_cv_deplibs_check_method" >&6; } 17893+ 17894+file_magic_glob= 17895+want_nocaseglob=no 17896+if test "$build" = "$host"; then 17897+ case $host_os in 17898+ mingw* | pw32*) 17899+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then 17900+ want_nocaseglob=yes 17901+ else 17902+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` 17903+ fi 17904+ ;; 17905+ esac 17906+fi 17907+ 17908 file_magic_cmd=$lt_cv_file_magic_cmd 17909 deplibs_check_method=$lt_cv_deplibs_check_method 17910 test -z "$deplibs_check_method" && deplibs_check_method=unknown 17911@@ -6705,6 +6805,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 17912 17913 17914 17915+ 17916+ 17917+ 17918+ 17919+ 17920+ 17921+ 17922+ 17923+ 17924+ 17925+if test -n "$ac_tool_prefix"; then 17926+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. 17927+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 17928+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 17929+$as_echo_n "checking for $ac_word... " >&6; } 17930+if ${ac_cv_prog_DLLTOOL+:} false; then : 17931+ $as_echo_n "(cached) " >&6 17932+else 17933+ if test -n "$DLLTOOL"; then 17934+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. 17935+else 17936+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 17937+for as_dir in $PATH 17938+do 17939+ IFS=$as_save_IFS 17940+ test -z "$as_dir" && as_dir=. 17941+ for ac_exec_ext in '' $ac_executable_extensions; do 17942+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 17943+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" 17944+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 17945+ break 2 17946+ fi 17947+done 17948+ done 17949+IFS=$as_save_IFS 17950+ 17951+fi 17952+fi 17953+DLLTOOL=$ac_cv_prog_DLLTOOL 17954+if test -n "$DLLTOOL"; then 17955+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 17956+$as_echo "$DLLTOOL" >&6; } 17957+else 17958+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 17959+$as_echo "no" >&6; } 17960+fi 17961+ 17962+ 17963+fi 17964+if test -z "$ac_cv_prog_DLLTOOL"; then 17965+ ac_ct_DLLTOOL=$DLLTOOL 17966+ # Extract the first word of "dlltool", so it can be a program name with args. 17967+set dummy dlltool; ac_word=$2 17968+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 17969+$as_echo_n "checking for $ac_word... " >&6; } 17970+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : 17971+ $as_echo_n "(cached) " >&6 17972+else 17973+ if test -n "$ac_ct_DLLTOOL"; then 17974+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. 17975+else 17976+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 17977+for as_dir in $PATH 17978+do 17979+ IFS=$as_save_IFS 17980+ test -z "$as_dir" && as_dir=. 17981+ for ac_exec_ext in '' $ac_executable_extensions; do 17982+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 17983+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" 17984+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 17985+ break 2 17986+ fi 17987+done 17988+ done 17989+IFS=$as_save_IFS 17990+ 17991+fi 17992+fi 17993+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL 17994+if test -n "$ac_ct_DLLTOOL"; then 17995+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 17996+$as_echo "$ac_ct_DLLTOOL" >&6; } 17997+else 17998+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 17999+$as_echo "no" >&6; } 18000+fi 18001+ 18002+ if test "x$ac_ct_DLLTOOL" = x; then 18003+ DLLTOOL="false" 18004+ else 18005+ case $cross_compiling:$ac_tool_warned in 18006+yes:) 18007+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 18008+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 18009+ac_tool_warned=yes ;; 18010+esac 18011+ DLLTOOL=$ac_ct_DLLTOOL 18012+ fi 18013+else 18014+ DLLTOOL="$ac_cv_prog_DLLTOOL" 18015+fi 18016+ 18017+test -z "$DLLTOOL" && DLLTOOL=dlltool 18018+ 18019+ 18020+ 18021+ 18022+ 18023+ 18024+ 18025+ 18026+ 18027+ 18028+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 18029+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } 18030+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : 18031+ $as_echo_n "(cached) " >&6 18032+else 18033+ lt_cv_sharedlib_from_linklib_cmd='unknown' 18034+ 18035+case $host_os in 18036+cygwin* | mingw* | pw32* | cegcc*) 18037+ # two different shell functions defined in ltmain.sh 18038+ # decide which to use based on capabilities of $DLLTOOL 18039+ case `$DLLTOOL --help 2>&1` in 18040+ *--identify-strict*) 18041+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib 18042+ ;; 18043+ *) 18044+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback 18045+ ;; 18046+ esac 18047+ ;; 18048+*) 18049+ # fallback: assume linklib IS sharedlib 18050+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" 18051+ ;; 18052+esac 18053+ 18054+fi 18055+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 18056+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } 18057+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd 18058+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO 18059+ 18060+ 18061+ 18062+ 18063+ 18064+ 18065+ 18066 plugin_option= 18067 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 18068 for plugin in $plugin_names; do 18069@@ -6719,8 +6970,10 @@ for plugin in $plugin_names; do 18070 done 18071 18072 if test -n "$ac_tool_prefix"; then 18073- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 18074-set dummy ${ac_tool_prefix}ar; ac_word=$2 18075+ for ac_prog in ar 18076+ do 18077+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 18078+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 18079 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 18080 $as_echo_n "checking for $ac_word... " >&6; } 18081 if ${ac_cv_prog_AR+:} false; then : 18082@@ -6736,7 +6989,7 @@ do 18083 test -z "$as_dir" && as_dir=. 18084 for ac_exec_ext in '' $ac_executable_extensions; do 18085 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 18086- ac_cv_prog_AR="${ac_tool_prefix}ar" 18087+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" 18088 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 18089 break 2 18090 fi 18091@@ -6756,11 +7009,15 @@ $as_echo "no" >&6; } 18092 fi 18093 18094 18095+ test -n "$AR" && break 18096+ done 18097 fi 18098-if test -z "$ac_cv_prog_AR"; then 18099+if test -z "$AR"; then 18100 ac_ct_AR=$AR 18101- # Extract the first word of "ar", so it can be a program name with args. 18102-set dummy ar; ac_word=$2 18103+ for ac_prog in ar 18104+do 18105+ # Extract the first word of "$ac_prog", so it can be a program name with args. 18106+set dummy $ac_prog; ac_word=$2 18107 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 18108 $as_echo_n "checking for $ac_word... " >&6; } 18109 if ${ac_cv_prog_ac_ct_AR+:} false; then : 18110@@ -6776,7 +7033,7 @@ do 18111 test -z "$as_dir" && as_dir=. 18112 for ac_exec_ext in '' $ac_executable_extensions; do 18113 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 18114- ac_cv_prog_ac_ct_AR="ar" 18115+ ac_cv_prog_ac_ct_AR="$ac_prog" 18116 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 18117 break 2 18118 fi 18119@@ -6795,6 +7052,10 @@ else 18120 $as_echo "no" >&6; } 18121 fi 18122 18123+ 18124+ test -n "$ac_ct_AR" && break 18125+done 18126+ 18127 if test "x$ac_ct_AR" = x; then 18128 AR="false" 18129 else 18130@@ -6806,25 +7067,19 @@ ac_tool_warned=yes ;; 18131 esac 18132 AR=$ac_ct_AR 18133 fi 18134-else 18135- AR="$ac_cv_prog_AR" 18136 fi 18137 18138-test -z "$AR" && AR=ar 18139-if test -n "$plugin_option"; then 18140- if $AR --help 2>&1 | grep -q "\--plugin"; then 18141- touch conftest.c 18142- $AR $plugin_option rc conftest.a conftest.c 18143- if test "$?" != 0; then 18144- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 18145+ touch conftest.c 18146+ $AR $plugin_option rc conftest.a conftest.c 18147+ if test "$?" != 0; then 18148+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 18149 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} 18150- else 18151- AR="$AR $plugin_option" 18152- fi 18153- rm -f conftest.* 18154+ else 18155+ AR="$AR $plugin_option" 18156 fi 18157-fi 18158-test -z "$AR_FLAGS" && AR_FLAGS=cru 18159+ rm -f conftest.* 18160+: ${AR=ar} 18161+: ${AR_FLAGS=cru} 18162 18163 18164 18165@@ -6836,6 +7091,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 18166 18167 18168 18169+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 18170+$as_echo_n "checking for archiver @FILE support... " >&6; } 18171+if ${lt_cv_ar_at_file+:} false; then : 18172+ $as_echo_n "(cached) " >&6 18173+else 18174+ lt_cv_ar_at_file=no 18175+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 18176+/* end confdefs.h. */ 18177+ 18178+int 18179+main () 18180+{ 18181+ 18182+ ; 18183+ return 0; 18184+} 18185+_ACEOF 18186+if ac_fn_c_try_compile "$LINENO"; then : 18187+ echo conftest.$ac_objext > conftest.lst 18188+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' 18189+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 18190+ (eval $lt_ar_try) 2>&5 18191+ ac_status=$? 18192+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 18193+ test $ac_status = 0; } 18194+ if test "$ac_status" -eq 0; then 18195+ # Ensure the archiver fails upon bogus file names. 18196+ rm -f conftest.$ac_objext libconftest.a 18197+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 18198+ (eval $lt_ar_try) 2>&5 18199+ ac_status=$? 18200+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 18201+ test $ac_status = 0; } 18202+ if test "$ac_status" -ne 0; then 18203+ lt_cv_ar_at_file=@ 18204+ fi 18205+ fi 18206+ rm -f conftest.* libconftest.a 18207+ 18208+fi 18209+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 18210+ 18211+fi 18212+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 18213+$as_echo "$lt_cv_ar_at_file" >&6; } 18214+ 18215+if test "x$lt_cv_ar_at_file" = xno; then 18216+ archiver_list_spec= 18217+else 18218+ archiver_list_spec=$lt_cv_ar_at_file 18219+fi 18220+ 18221+ 18222+ 18223+ 18224+ 18225+ 18226+ 18227 if test -n "$ac_tool_prefix"; then 18228 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 18229 set dummy ${ac_tool_prefix}strip; ac_word=$2 18230@@ -7175,8 +7488,8 @@ esac 18231 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 18232 18233 # Transform an extracted symbol line into symbol name and symbol address 18234-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 18235-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'" 18236+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 18237+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'" 18238 18239 # Handle CRLF in mingw tool chain 18240 opt_cr= 18241@@ -7212,6 +7525,7 @@ for ac_symprfx in "" "_"; do 18242 else 18243 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 18244 fi 18245+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" 18246 18247 # Check to see that the pipe works correctly. 18248 pipe_works=no 18249@@ -7253,6 +7567,18 @@ _LT_EOF 18250 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 18251 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 18252 cat <<_LT_EOF > conftest.$ac_ext 18253+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ 18254+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) 18255+/* DATA imports from DLLs on WIN32 con't be const, because runtime 18256+ relocations are performed -- see ld's documentation on pseudo-relocs. */ 18257+# define LT_DLSYM_CONST 18258+#elif defined(__osf__) 18259+/* This system does not cope well with relocations in const data. */ 18260+# define LT_DLSYM_CONST 18261+#else 18262+# define LT_DLSYM_CONST const 18263+#endif 18264+ 18265 #ifdef __cplusplus 18266 extern "C" { 18267 #endif 18268@@ -7264,7 +7590,7 @@ _LT_EOF 18269 cat <<_LT_EOF >> conftest.$ac_ext 18270 18271 /* The mapping between symbol names and symbols. */ 18272-const struct { 18273+LT_DLSYM_CONST struct { 18274 const char *name; 18275 void *address; 18276 } 18277@@ -7290,8 +7616,8 @@ static const void *lt_preloaded_setup() { 18278 _LT_EOF 18279 # Now try linking the two files. 18280 mv conftest.$ac_objext conftstm.$ac_objext 18281- lt_save_LIBS="$LIBS" 18282- lt_save_CFLAGS="$CFLAGS" 18283+ lt_globsym_save_LIBS=$LIBS 18284+ lt_globsym_save_CFLAGS=$CFLAGS 18285 LIBS="conftstm.$ac_objext" 18286 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 18287 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 18288@@ -7301,8 +7627,8 @@ _LT_EOF 18289 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 18290 pipe_works=yes 18291 fi 18292- LIBS="$lt_save_LIBS" 18293- CFLAGS="$lt_save_CFLAGS" 18294+ LIBS=$lt_globsym_save_LIBS 18295+ CFLAGS=$lt_globsym_save_CFLAGS 18296 else 18297 echo "cannot find nm_test_func in $nlist" >&5 18298 fi 18299@@ -7339,6 +7665,17 @@ else 18300 $as_echo "ok" >&6; } 18301 fi 18302 18303+# Response file support. 18304+if test "$lt_cv_nm_interface" = "MS dumpbin"; then 18305+ nm_file_list_spec='@' 18306+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then 18307+ nm_file_list_spec='@' 18308+fi 18309+ 18310+ 18311+ 18312+ 18313+ 18314 18315 18316 18317@@ -7355,6 +7692,44 @@ fi 18318 18319 18320 18321+ 18322+ 18323+ 18324+ 18325+ 18326+ 18327+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 18328+$as_echo_n "checking for sysroot... " >&6; } 18329+ 18330+# Check whether --with-libtool-sysroot was given. 18331+if test "${with_libtool_sysroot+set}" = set; then : 18332+ withval=$with_libtool_sysroot; 18333+else 18334+ with_libtool_sysroot=no 18335+fi 18336+ 18337+ 18338+lt_sysroot= 18339+case ${with_libtool_sysroot} in #( 18340+ yes) 18341+ if test "$GCC" = yes; then 18342+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` 18343+ fi 18344+ ;; #( 18345+ /*) 18346+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` 18347+ ;; #( 18348+ no|'') 18349+ ;; #( 18350+ *) 18351+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 18352+$as_echo "${with_libtool_sysroot}" >&6; } 18353+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 18354+ ;; 18355+esac 18356+ 18357+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 18358+$as_echo "${lt_sysroot:-no}" >&6; } 18359 18360 18361 18362@@ -7566,6 +7941,123 @@ esac 18363 18364 need_locks="$enable_libtool_lock" 18365 18366+if test -n "$ac_tool_prefix"; then 18367+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. 18368+set dummy ${ac_tool_prefix}mt; ac_word=$2 18369+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 18370+$as_echo_n "checking for $ac_word... " >&6; } 18371+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : 18372+ $as_echo_n "(cached) " >&6 18373+else 18374+ if test -n "$MANIFEST_TOOL"; then 18375+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. 18376+else 18377+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 18378+for as_dir in $PATH 18379+do 18380+ IFS=$as_save_IFS 18381+ test -z "$as_dir" && as_dir=. 18382+ for ac_exec_ext in '' $ac_executable_extensions; do 18383+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 18384+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" 18385+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 18386+ break 2 18387+ fi 18388+done 18389+ done 18390+IFS=$as_save_IFS 18391+ 18392+fi 18393+fi 18394+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL 18395+if test -n "$MANIFEST_TOOL"; then 18396+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 18397+$as_echo "$MANIFEST_TOOL" >&6; } 18398+else 18399+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 18400+$as_echo "no" >&6; } 18401+fi 18402+ 18403+ 18404+fi 18405+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then 18406+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL 18407+ # Extract the first word of "mt", so it can be a program name with args. 18408+set dummy mt; ac_word=$2 18409+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 18410+$as_echo_n "checking for $ac_word... " >&6; } 18411+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : 18412+ $as_echo_n "(cached) " >&6 18413+else 18414+ if test -n "$ac_ct_MANIFEST_TOOL"; then 18415+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. 18416+else 18417+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 18418+for as_dir in $PATH 18419+do 18420+ IFS=$as_save_IFS 18421+ test -z "$as_dir" && as_dir=. 18422+ for ac_exec_ext in '' $ac_executable_extensions; do 18423+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 18424+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" 18425+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 18426+ break 2 18427+ fi 18428+done 18429+ done 18430+IFS=$as_save_IFS 18431+ 18432+fi 18433+fi 18434+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL 18435+if test -n "$ac_ct_MANIFEST_TOOL"; then 18436+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 18437+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } 18438+else 18439+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 18440+$as_echo "no" >&6; } 18441+fi 18442+ 18443+ if test "x$ac_ct_MANIFEST_TOOL" = x; then 18444+ MANIFEST_TOOL=":" 18445+ else 18446+ case $cross_compiling:$ac_tool_warned in 18447+yes:) 18448+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 18449+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 18450+ac_tool_warned=yes ;; 18451+esac 18452+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL 18453+ fi 18454+else 18455+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" 18456+fi 18457+ 18458+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt 18459+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 18460+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } 18461+if ${lt_cv_path_mainfest_tool+:} false; then : 18462+ $as_echo_n "(cached) " >&6 18463+else 18464+ lt_cv_path_mainfest_tool=no 18465+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 18466+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out 18467+ cat conftest.err >&5 18468+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then 18469+ lt_cv_path_mainfest_tool=yes 18470+ fi 18471+ rm -f conftest* 18472+fi 18473+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 18474+$as_echo "$lt_cv_path_mainfest_tool" >&6; } 18475+if test "x$lt_cv_path_mainfest_tool" != xyes; then 18476+ MANIFEST_TOOL=: 18477+fi 18478+ 18479+ 18480+ 18481+ 18482+ 18483 18484 case $host_os in 18485 rhapsody* | darwin*) 18486@@ -8129,6 +8621,8 @@ _LT_EOF 18487 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 18488 echo "$AR cru libconftest.a conftest.o" >&5 18489 $AR cru libconftest.a conftest.o 2>&5 18490+ echo "$RANLIB libconftest.a" >&5 18491+ $RANLIB libconftest.a 2>&5 18492 cat > conftest.c << _LT_EOF 18493 int main() { return 0;} 18494 _LT_EOF 18495@@ -8681,8 +9175,6 @@ fi 18496 lt_prog_compiler_pic= 18497 lt_prog_compiler_static= 18498 18499-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 18500-$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 18501 18502 if test "$GCC" = yes; then 18503 lt_prog_compiler_wl='-Wl,' 18504@@ -8848,6 +9340,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 18505 lt_prog_compiler_pic='--shared' 18506 lt_prog_compiler_static='--static' 18507 ;; 18508+ nagfor*) 18509+ # NAG Fortran compiler 18510+ lt_prog_compiler_wl='-Wl,-Wl,,' 18511+ lt_prog_compiler_pic='-PIC' 18512+ lt_prog_compiler_static='-Bstatic' 18513+ ;; 18514 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 18515 # Portland Group compilers (*not* the Pentium gcc compiler, 18516 # which looks to be a dead project) 18517@@ -8910,7 +9408,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 18518 lt_prog_compiler_pic='-KPIC' 18519 lt_prog_compiler_static='-Bstatic' 18520 case $cc_basename in 18521- f77* | f90* | f95*) 18522+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) 18523 lt_prog_compiler_wl='-Qoption ld ';; 18524 *) 18525 lt_prog_compiler_wl='-Wl,';; 18526@@ -8967,13 +9465,17 @@ case $host_os in 18527 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 18528 ;; 18529 esac 18530-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 18531-$as_echo "$lt_prog_compiler_pic" >&6; } 18532- 18533- 18534- 18535- 18536 18537+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 18538+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 18539+if ${lt_cv_prog_compiler_pic+:} false; then : 18540+ $as_echo_n "(cached) " >&6 18541+else 18542+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic 18543+fi 18544+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 18545+$as_echo "$lt_cv_prog_compiler_pic" >&6; } 18546+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic 18547 18548 # 18549 # Check to make sure the PIC flag actually works. 18550@@ -9034,6 +9536,11 @@ fi 18551 18552 18553 18554+ 18555+ 18556+ 18557+ 18558+ 18559 # 18560 # Check to make sure the static flag actually works. 18561 # 18562@@ -9384,7 +9891,8 @@ _LT_EOF 18563 allow_undefined_flag=unsupported 18564 always_export_symbols=no 18565 enable_shared_with_static_runtimes=yes 18566- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 18567+ 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' 18568+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' 18569 18570 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 18571 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 18572@@ -9483,12 +9991,12 @@ _LT_EOF 18573 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 18574 hardcode_libdir_flag_spec= 18575 hardcode_libdir_flag_spec_ld='-rpath $libdir' 18576- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' 18577+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' 18578 if test "x$supports_anon_versioning" = xyes; then 18579 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ 18580 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ 18581 echo "local: *; };" >> $output_objdir/$libname.ver~ 18582- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 18583+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 18584 fi 18585 ;; 18586 esac 18587@@ -9502,8 +10010,8 @@ _LT_EOF 18588 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 18589 wlarc= 18590 else 18591- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 18592- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 18593+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 18594+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 18595 fi 18596 ;; 18597 18598@@ -9521,8 +10029,8 @@ _LT_EOF 18599 18600 _LT_EOF 18601 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 18602- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 18603- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 18604+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 18605+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 18606 else 18607 ld_shlibs=no 18608 fi 18609@@ -9568,8 +10076,8 @@ _LT_EOF 18610 18611 *) 18612 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 18613- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 18614- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 18615+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 18616+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 18617 else 18618 ld_shlibs=no 18619 fi 18620@@ -9699,7 +10207,13 @@ _LT_EOF 18621 allow_undefined_flag='-berok' 18622 # Determine the default libpath from the value encoded in an 18623 # empty executable. 18624- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 18625+ if test "${lt_cv_aix_libpath+set}" = set; then 18626+ aix_libpath=$lt_cv_aix_libpath 18627+else 18628+ if ${lt_cv_aix_libpath_+:} false; then : 18629+ $as_echo_n "(cached) " >&6 18630+else 18631+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 18632 /* end confdefs.h. */ 18633 18634 int 18635@@ -9712,22 +10226,29 @@ main () 18636 _ACEOF 18637 if ac_fn_c_try_link "$LINENO"; then : 18638 18639-lt_aix_libpath_sed=' 18640- /Import File Strings/,/^$/ { 18641- /^0/ { 18642- s/^0 *\(.*\)$/\1/ 18643- p 18644- } 18645- }' 18646-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 18647-# Check for a 64-bit object if we didn't find anything. 18648-if test -z "$aix_libpath"; then 18649- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 18650-fi 18651+ lt_aix_libpath_sed=' 18652+ /Import File Strings/,/^$/ { 18653+ /^0/ { 18654+ s/^0 *\([^ ]*\) *$/\1/ 18655+ p 18656+ } 18657+ }' 18658+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 18659+ # Check for a 64-bit object if we didn't find anything. 18660+ if test -z "$lt_cv_aix_libpath_"; then 18661+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 18662+ fi 18663 fi 18664 rm -f core conftest.err conftest.$ac_objext \ 18665 conftest$ac_exeext conftest.$ac_ext 18666-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 18667+ if test -z "$lt_cv_aix_libpath_"; then 18668+ lt_cv_aix_libpath_="/usr/lib:/lib" 18669+ fi 18670+ 18671+fi 18672+ 18673+ aix_libpath=$lt_cv_aix_libpath_ 18674+fi 18675 18676 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 18677 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" 18678@@ -9739,7 +10260,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 18679 else 18680 # Determine the default libpath from the value encoded in an 18681 # empty executable. 18682- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 18683+ if test "${lt_cv_aix_libpath+set}" = set; then 18684+ aix_libpath=$lt_cv_aix_libpath 18685+else 18686+ if ${lt_cv_aix_libpath_+:} false; then : 18687+ $as_echo_n "(cached) " >&6 18688+else 18689+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 18690 /* end confdefs.h. */ 18691 18692 int 18693@@ -9752,22 +10279,29 @@ main () 18694 _ACEOF 18695 if ac_fn_c_try_link "$LINENO"; then : 18696 18697-lt_aix_libpath_sed=' 18698- /Import File Strings/,/^$/ { 18699- /^0/ { 18700- s/^0 *\(.*\)$/\1/ 18701- p 18702- } 18703- }' 18704-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 18705-# Check for a 64-bit object if we didn't find anything. 18706-if test -z "$aix_libpath"; then 18707- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 18708-fi 18709+ lt_aix_libpath_sed=' 18710+ /Import File Strings/,/^$/ { 18711+ /^0/ { 18712+ s/^0 *\([^ ]*\) *$/\1/ 18713+ p 18714+ } 18715+ }' 18716+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 18717+ # Check for a 64-bit object if we didn't find anything. 18718+ if test -z "$lt_cv_aix_libpath_"; then 18719+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 18720+ fi 18721 fi 18722 rm -f core conftest.err conftest.$ac_objext \ 18723 conftest$ac_exeext conftest.$ac_ext 18724-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 18725+ if test -z "$lt_cv_aix_libpath_"; then 18726+ lt_cv_aix_libpath_="/usr/lib:/lib" 18727+ fi 18728+ 18729+fi 18730+ 18731+ aix_libpath=$lt_cv_aix_libpath_ 18732+fi 18733 18734 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 18735 # Warning - without using the other run time loading flags, 18736@@ -9812,20 +10346,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 18737 # Microsoft Visual C++. 18738 # hardcode_libdir_flag_spec is actually meaningless, as there is 18739 # no search path for DLLs. 18740- hardcode_libdir_flag_spec=' ' 18741- allow_undefined_flag=unsupported 18742- # Tell ltmain to make .lib files, not .a files. 18743- libext=lib 18744- # Tell ltmain to make .dll files, not .so files. 18745- shrext_cmds=".dll" 18746- # FIXME: Setting linknames here is a bad hack. 18747- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 18748- # The linker will automatically build a .lib file if we build a DLL. 18749- old_archive_from_new_cmds='true' 18750- # FIXME: Should let the user specify the lib program. 18751- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 18752- fix_srcfile_path='`cygpath -w "$srcfile"`' 18753- enable_shared_with_static_runtimes=yes 18754+ case $cc_basename in 18755+ cl*) 18756+ # Native MSVC 18757+ hardcode_libdir_flag_spec=' ' 18758+ allow_undefined_flag=unsupported 18759+ always_export_symbols=yes 18760+ file_list_spec='@' 18761+ # Tell ltmain to make .lib files, not .a files. 18762+ libext=lib 18763+ # Tell ltmain to make .dll files, not .so files. 18764+ shrext_cmds=".dll" 18765+ # FIXME: Setting linknames here is a bad hack. 18766+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' 18767+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 18768+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; 18769+ else 18770+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; 18771+ fi~ 18772+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ 18773+ linknames=' 18774+ # The linker will not automatically build a static lib if we build a DLL. 18775+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' 18776+ enable_shared_with_static_runtimes=yes 18777+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 18778+ # Don't use ranlib 18779+ old_postinstall_cmds='chmod 644 $oldlib' 18780+ postlink_cmds='lt_outputfile="@OUTPUT@"~ 18781+ lt_tool_outputfile="@TOOL_OUTPUT@"~ 18782+ case $lt_outputfile in 18783+ *.exe|*.EXE) ;; 18784+ *) 18785+ lt_outputfile="$lt_outputfile.exe" 18786+ lt_tool_outputfile="$lt_tool_outputfile.exe" 18787+ ;; 18788+ esac~ 18789+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then 18790+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; 18791+ $RM "$lt_outputfile.manifest"; 18792+ fi' 18793+ ;; 18794+ *) 18795+ # Assume MSVC wrapper 18796+ hardcode_libdir_flag_spec=' ' 18797+ allow_undefined_flag=unsupported 18798+ # Tell ltmain to make .lib files, not .a files. 18799+ libext=lib 18800+ # Tell ltmain to make .dll files, not .so files. 18801+ shrext_cmds=".dll" 18802+ # FIXME: Setting linknames here is a bad hack. 18803+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 18804+ # The linker will automatically build a .lib file if we build a DLL. 18805+ old_archive_from_new_cmds='true' 18806+ # FIXME: Should let the user specify the lib program. 18807+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 18808+ enable_shared_with_static_runtimes=yes 18809+ ;; 18810+ esac 18811 ;; 18812 18813 darwin* | rhapsody*) 18814@@ -9886,7 +10463,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 18815 18816 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 18817 freebsd* | dragonfly*) 18818- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' 18819+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' 18820 hardcode_libdir_flag_spec='-R$libdir' 18821 hardcode_direct=yes 18822 hardcode_shlibpath_var=no 18823@@ -9894,7 +10471,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 18824 18825 hpux9*) 18826 if test "$GCC" = yes; then 18827- 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' 18828+ 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' 18829 else 18830 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' 18831 fi 18832@@ -9910,7 +10487,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 18833 18834 hpux10*) 18835 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 18836- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 18837+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 18838 else 18839 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 18840 fi 18841@@ -9934,10 +10511,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 18842 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 18843 ;; 18844 ia64*) 18845- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 18846+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 18847 ;; 18848 *) 18849- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 18850+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 18851 ;; 18852 esac 18853 else 18854@@ -10016,23 +10593,36 @@ fi 18855 18856 irix5* | irix6* | nonstopux*) 18857 if test "$GCC" = yes; then 18858- 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' 18859+ 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' 18860 # Try to use the -exported_symbol ld option, if it does not 18861 # work, assume that -exports_file does not work either and 18862 # implicitly export all symbols. 18863- save_LDFLAGS="$LDFLAGS" 18864- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 18865- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 18866+ # This should be the same for all languages, so no per-tag cache variable. 18867+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 18868+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } 18869+if ${lt_cv_irix_exported_symbol+:} false; then : 18870+ $as_echo_n "(cached) " >&6 18871+else 18872+ save_LDFLAGS="$LDFLAGS" 18873+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 18874+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 18875 /* end confdefs.h. */ 18876-int foo(void) {} 18877+int foo (void) { return 0; } 18878 _ACEOF 18879 if ac_fn_c_try_link "$LINENO"; then : 18880- 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' 18881- 18882+ lt_cv_irix_exported_symbol=yes 18883+else 18884+ lt_cv_irix_exported_symbol=no 18885 fi 18886 rm -f core conftest.err conftest.$ac_objext \ 18887 conftest$ac_exeext conftest.$ac_ext 18888- LDFLAGS="$save_LDFLAGS" 18889+ LDFLAGS="$save_LDFLAGS" 18890+fi 18891+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 18892+$as_echo "$lt_cv_irix_exported_symbol" >&6; } 18893+ if test "$lt_cv_irix_exported_symbol" = yes; then 18894+ 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' 18895+ fi 18896 else 18897 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' 18898 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' 18899@@ -10117,7 +10707,7 @@ rm -f core conftest.err conftest.$ac_objext \ 18900 osf4* | osf5*) # as osf3* with the addition of -msym flag 18901 if test "$GCC" = yes; then 18902 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 18903- 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' 18904+ 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' 18905 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 18906 else 18907 allow_undefined_flag=' -expect_unresolved \*' 18908@@ -10136,9 +10726,9 @@ rm -f core conftest.err conftest.$ac_objext \ 18909 no_undefined_flag=' -z defs' 18910 if test "$GCC" = yes; then 18911 wlarc='${wl}' 18912- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 18913+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 18914 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ 18915- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' 18916+ $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' 18917 else 18918 case `$CC -V 2>&1` in 18919 *"Compilers 5.0"*) 18920@@ -10714,8 +11304,9 @@ cygwin* | mingw* | pw32* | cegcc*) 18921 need_version=no 18922 need_lib_prefix=no 18923 18924- case $GCC,$host_os in 18925- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) 18926+ case $GCC,$cc_basename in 18927+ yes,*) 18928+ # gcc 18929 library_names_spec='$libname.dll.a' 18930 # DLL is installed to $(libdir)/../bin by postinstall_cmds 18931 postinstall_cmds='base_file=`basename \${file}`~ 18932@@ -10748,13 +11339,71 @@ cygwin* | mingw* | pw32* | cegcc*) 18933 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 18934 ;; 18935 esac 18936+ dynamic_linker='Win32 ld.exe' 18937+ ;; 18938+ 18939+ *,cl*) 18940+ # Native MSVC 18941+ libname_spec='$name' 18942+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 18943+ library_names_spec='${libname}.dll.lib' 18944+ 18945+ case $build_os in 18946+ mingw*) 18947+ sys_lib_search_path_spec= 18948+ lt_save_ifs=$IFS 18949+ IFS=';' 18950+ for lt_path in $LIB 18951+ do 18952+ IFS=$lt_save_ifs 18953+ # Let DOS variable expansion print the short 8.3 style file name. 18954+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` 18955+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" 18956+ done 18957+ IFS=$lt_save_ifs 18958+ # Convert to MSYS style. 18959+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` 18960+ ;; 18961+ cygwin*) 18962+ # Convert to unix form, then to dos form, then back to unix form 18963+ # but this time dos style (no spaces!) so that the unix form looks 18964+ # like /cygdrive/c/PROGRA~1:/cygdr... 18965+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` 18966+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` 18967+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 18968+ ;; 18969+ *) 18970+ sys_lib_search_path_spec="$LIB" 18971+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then 18972+ # It is most probably a Windows format PATH. 18973+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` 18974+ else 18975+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 18976+ fi 18977+ # FIXME: find the short name or the path components, as spaces are 18978+ # common. (e.g. "Program Files" -> "PROGRA~1") 18979+ ;; 18980+ esac 18981+ 18982+ # DLL is installed to $(libdir)/../bin by postinstall_cmds 18983+ postinstall_cmds='base_file=`basename \${file}`~ 18984+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ 18985+ dldir=$destdir/`dirname \$dlpath`~ 18986+ test -d \$dldir || mkdir -p \$dldir~ 18987+ $install_prog $dir/$dlname \$dldir/$dlname' 18988+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ 18989+ dlpath=$dir/\$dldll~ 18990+ $RM \$dlpath' 18991+ shlibpath_overrides_runpath=yes 18992+ dynamic_linker='Win32 link.exe' 18993 ;; 18994 18995 *) 18996+ # Assume MSVC wrapper 18997 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' 18998+ dynamic_linker='Win32 ld.exe' 18999 ;; 19000 esac 19001- dynamic_linker='Win32 ld.exe' 19002 # FIXME: first we should search . and the directory the executable is in 19003 shlibpath_var=PATH 19004 ;; 19005@@ -11632,7 +12281,7 @@ else 19006 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 19007 lt_status=$lt_dlunknown 19008 cat > conftest.$ac_ext <<_LT_EOF 19009-#line 11635 "configure" 19010+#line $LINENO "configure" 19011 #include "confdefs.h" 19012 19013 #if HAVE_DLFCN_H 19014@@ -11676,10 +12325,10 @@ else 19015 /* When -fvisbility=hidden is used, assume the code has been annotated 19016 correspondingly for the symbols needed. */ 19017 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 19018-void fnord () __attribute__((visibility("default"))); 19019+int fnord () __attribute__((visibility("default"))); 19020 #endif 19021 19022-void fnord () { int i=42; } 19023+int fnord () { return 42; } 19024 int main () 19025 { 19026 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 19027@@ -11738,7 +12387,7 @@ else 19028 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 19029 lt_status=$lt_dlunknown 19030 cat > conftest.$ac_ext <<_LT_EOF 19031-#line 11741 "configure" 19032+#line $LINENO "configure" 19033 #include "confdefs.h" 19034 19035 #if HAVE_DLFCN_H 19036@@ -11782,10 +12431,10 @@ else 19037 /* When -fvisbility=hidden is used, assume the code has been annotated 19038 correspondingly for the symbols needed. */ 19039 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 19040-void fnord () __attribute__((visibility("default"))); 19041+int fnord () __attribute__((visibility("default"))); 19042 #endif 19043 19044-void fnord () { int i=42; } 19045+int fnord () { return 42; } 19046 int main () 19047 { 19048 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 19049@@ -15832,13 +16481,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 19050 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 19051 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 19052 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 19053+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' 19054+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' 19055 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' 19056 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' 19057 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' 19058 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' 19059 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' 19060+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' 19061+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' 19062+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' 19063+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' 19064 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' 19065 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' 19066+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' 19067 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 19068 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 19069 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 19070@@ -15853,14 +16509,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 19071 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 19072 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 19073 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"`' 19074+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' 19075+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' 19076 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' 19077 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' 19078 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' 19079-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 19080 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' 19081+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 19082 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' 19083 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' 19084 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' 19085+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' 19086 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 19087 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 19088 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 19089@@ -15893,12 +16552,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 19090 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 19091 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 19092 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 19093-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' 19094 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' 19095 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' 19096 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' 19097 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' 19098 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' 19099+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' 19100 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 19101 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 19102 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 19103@@ -15953,8 +16612,13 @@ reload_flag \ 19104 OBJDUMP \ 19105 deplibs_check_method \ 19106 file_magic_cmd \ 19107+file_magic_glob \ 19108+want_nocaseglob \ 19109+DLLTOOL \ 19110+sharedlib_from_linklib_cmd \ 19111 AR \ 19112 AR_FLAGS \ 19113+archiver_list_spec \ 19114 STRIP \ 19115 RANLIB \ 19116 CC \ 19117@@ -15964,12 +16628,14 @@ lt_cv_sys_global_symbol_pipe \ 19118 lt_cv_sys_global_symbol_to_cdecl \ 19119 lt_cv_sys_global_symbol_to_c_name_address \ 19120 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 19121+nm_file_list_spec \ 19122 lt_prog_compiler_no_builtin_flag \ 19123-lt_prog_compiler_wl \ 19124 lt_prog_compiler_pic \ 19125+lt_prog_compiler_wl \ 19126 lt_prog_compiler_static \ 19127 lt_cv_prog_compiler_c_o \ 19128 need_locks \ 19129+MANIFEST_TOOL \ 19130 DSYMUTIL \ 19131 NMEDIT \ 19132 LIPO \ 19133@@ -15985,7 +16651,6 @@ no_undefined_flag \ 19134 hardcode_libdir_flag_spec \ 19135 hardcode_libdir_flag_spec_ld \ 19136 hardcode_libdir_separator \ 19137-fix_srcfile_path \ 19138 exclude_expsyms \ 19139 include_expsyms \ 19140 file_list_spec \ 19141@@ -16021,6 +16686,7 @@ module_cmds \ 19142 module_expsym_cmds \ 19143 export_symbols_cmds \ 19144 prelink_cmds \ 19145+postlink_cmds \ 19146 postinstall_cmds \ 19147 postuninstall_cmds \ 19148 finish_cmds \ 19149@@ -16778,7 +17444,8 @@ $as_echo X"$file" | 19150 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 19151 # 19152 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 19153-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. 19154+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, 19155+# Inc. 19156 # Written by Gordon Matzigkeit, 1996 19157 # 19158 # This file is part of GNU Libtool. 19159@@ -16881,19 +17548,42 @@ SP2NL=$lt_lt_SP2NL 19160 # turn newlines into spaces. 19161 NL2SP=$lt_lt_NL2SP 19162 19163+# convert \$build file names to \$host format. 19164+to_host_file_cmd=$lt_cv_to_host_file_cmd 19165+ 19166+# convert \$build files to toolchain format. 19167+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 19168+ 19169 # An object symbol dumper. 19170 OBJDUMP=$lt_OBJDUMP 19171 19172 # Method to check whether dependent libraries are shared objects. 19173 deplibs_check_method=$lt_deplibs_check_method 19174 19175-# Command to use when deplibs_check_method == "file_magic". 19176+# Command to use when deplibs_check_method = "file_magic". 19177 file_magic_cmd=$lt_file_magic_cmd 19178 19179+# How to find potential files when deplibs_check_method = "file_magic". 19180+file_magic_glob=$lt_file_magic_glob 19181+ 19182+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". 19183+want_nocaseglob=$lt_want_nocaseglob 19184+ 19185+# DLL creation program. 19186+DLLTOOL=$lt_DLLTOOL 19187+ 19188+# Command to associate shared and link libraries. 19189+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd 19190+ 19191 # The archiver. 19192 AR=$lt_AR 19193+ 19194+# Flags to create an archive. 19195 AR_FLAGS=$lt_AR_FLAGS 19196 19197+# How to feed a file listing to the archiver. 19198+archiver_list_spec=$lt_archiver_list_spec 19199+ 19200 # A symbol stripping program. 19201 STRIP=$lt_STRIP 19202 19203@@ -16923,6 +17613,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 19204 # Transform the output of nm in a C name address pair when lib prefix is needed. 19205 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 19206 19207+# Specify filename containing input files for \$NM. 19208+nm_file_list_spec=$lt_nm_file_list_spec 19209+ 19210+# The root where to search for dependent libraries,and in which our libraries should be installed. 19211+lt_sysroot=$lt_sysroot 19212+ 19213 # The name of the directory that contains temporary libtool files. 19214 objdir=$objdir 19215 19216@@ -16932,6 +17628,9 @@ MAGIC_CMD=$MAGIC_CMD 19217 # Must we lock files when doing compilation? 19218 need_locks=$lt_need_locks 19219 19220+# Manifest tool. 19221+MANIFEST_TOOL=$lt_MANIFEST_TOOL 19222+ 19223 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 19224 DSYMUTIL=$lt_DSYMUTIL 19225 19226@@ -17046,12 +17745,12 @@ with_gcc=$GCC 19227 # Compiler flag to turn off builtin functions. 19228 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 19229 19230-# How to pass a linker flag through the compiler. 19231-wl=$lt_lt_prog_compiler_wl 19232- 19233 # Additional compiler flags for building library objects. 19234 pic_flag=$lt_lt_prog_compiler_pic 19235 19236+# How to pass a linker flag through the compiler. 19237+wl=$lt_lt_prog_compiler_wl 19238+ 19239 # Compiler flag to prevent dynamic linking. 19240 link_static_flag=$lt_lt_prog_compiler_static 19241 19242@@ -17138,9 +17837,6 @@ inherit_rpath=$inherit_rpath 19243 # Whether libtool must link a program against all its dependency libraries. 19244 link_all_deplibs=$link_all_deplibs 19245 19246-# Fix the shell variable \$srcfile for the compiler. 19247-fix_srcfile_path=$lt_fix_srcfile_path 19248- 19249 # Set to "yes" if exported symbols are required. 19250 always_export_symbols=$always_export_symbols 19251 19252@@ -17156,6 +17852,9 @@ include_expsyms=$lt_include_expsyms 19253 # Commands necessary for linking programs (against libraries) with templates. 19254 prelink_cmds=$lt_prelink_cmds 19255 19256+# Commands necessary for finishing linking programs. 19257+postlink_cmds=$lt_postlink_cmds 19258+ 19259 # Specify filename containing input files. 19260 file_list_spec=$lt_file_list_spec 19261 19262@@ -17188,210 +17887,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 19263 # if finds mixed CR/LF and LF-only lines. Since sed operates in 19264 # text mode, it properly converts lines to CR/LF. This bash problem 19265 # is reportedly fixed, but why not run on old versions too? 19266- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ 19267- || (rm -f "$cfgfile"; exit 1) 19268- 19269- case $xsi_shell in 19270- yes) 19271- cat << \_LT_EOF >> "$cfgfile" 19272- 19273-# func_dirname file append nondir_replacement 19274-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 19275-# otherwise set result to NONDIR_REPLACEMENT. 19276-func_dirname () 19277-{ 19278- case ${1} in 19279- */*) func_dirname_result="${1%/*}${2}" ;; 19280- * ) func_dirname_result="${3}" ;; 19281- esac 19282-} 19283- 19284-# func_basename file 19285-func_basename () 19286-{ 19287- func_basename_result="${1##*/}" 19288-} 19289- 19290-# func_dirname_and_basename file append nondir_replacement 19291-# perform func_basename and func_dirname in a single function 19292-# call: 19293-# dirname: Compute the dirname of FILE. If nonempty, 19294-# add APPEND to the result, otherwise set result 19295-# to NONDIR_REPLACEMENT. 19296-# value returned in "$func_dirname_result" 19297-# basename: Compute filename of FILE. 19298-# value retuned in "$func_basename_result" 19299-# Implementation must be kept synchronized with func_dirname 19300-# and func_basename. For efficiency, we do not delegate to 19301-# those functions but instead duplicate the functionality here. 19302-func_dirname_and_basename () 19303-{ 19304- case ${1} in 19305- */*) func_dirname_result="${1%/*}${2}" ;; 19306- * ) func_dirname_result="${3}" ;; 19307- esac 19308- func_basename_result="${1##*/}" 19309-} 19310- 19311-# func_stripname prefix suffix name 19312-# strip PREFIX and SUFFIX off of NAME. 19313-# PREFIX and SUFFIX must not contain globbing or regex special 19314-# characters, hashes, percent signs, but SUFFIX may contain a leading 19315-# dot (in which case that matches only a dot). 19316-func_stripname () 19317-{ 19318- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are 19319- # positional parameters, so assign one to ordinary parameter first. 19320- func_stripname_result=${3} 19321- func_stripname_result=${func_stripname_result#"${1}"} 19322- func_stripname_result=${func_stripname_result%"${2}"} 19323-} 19324- 19325-# func_opt_split 19326-func_opt_split () 19327-{ 19328- func_opt_split_opt=${1%%=*} 19329- func_opt_split_arg=${1#*=} 19330-} 19331- 19332-# func_lo2o object 19333-func_lo2o () 19334-{ 19335- case ${1} in 19336- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; 19337- *) func_lo2o_result=${1} ;; 19338- esac 19339-} 19340- 19341-# func_xform libobj-or-source 19342-func_xform () 19343-{ 19344- func_xform_result=${1%.*}.lo 19345-} 19346- 19347-# func_arith arithmetic-term... 19348-func_arith () 19349-{ 19350- func_arith_result=$(( $* )) 19351-} 19352- 19353-# func_len string 19354-# STRING may not start with a hyphen. 19355-func_len () 19356-{ 19357- func_len_result=${#1} 19358-} 19359- 19360-_LT_EOF 19361- ;; 19362- *) # Bourne compatible functions. 19363- cat << \_LT_EOF >> "$cfgfile" 19364- 19365-# func_dirname file append nondir_replacement 19366-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 19367-# otherwise set result to NONDIR_REPLACEMENT. 19368-func_dirname () 19369-{ 19370- # Extract subdirectory from the argument. 19371- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` 19372- if test "X$func_dirname_result" = "X${1}"; then 19373- func_dirname_result="${3}" 19374- else 19375- func_dirname_result="$func_dirname_result${2}" 19376- fi 19377-} 19378- 19379-# func_basename file 19380-func_basename () 19381-{ 19382- func_basename_result=`$ECHO "${1}" | $SED "$basename"` 19383-} 19384- 19385- 19386-# func_stripname prefix suffix name 19387-# strip PREFIX and SUFFIX off of NAME. 19388-# PREFIX and SUFFIX must not contain globbing or regex special 19389-# characters, hashes, percent signs, but SUFFIX may contain a leading 19390-# dot (in which case that matches only a dot). 19391-# func_strip_suffix prefix name 19392-func_stripname () 19393-{ 19394- case ${2} in 19395- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; 19396- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; 19397- esac 19398-} 19399- 19400-# sed scripts: 19401-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' 19402-my_sed_long_arg='1s/^-[^=]*=//' 19403- 19404-# func_opt_split 19405-func_opt_split () 19406-{ 19407- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` 19408- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` 19409-} 19410- 19411-# func_lo2o object 19412-func_lo2o () 19413-{ 19414- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` 19415-} 19416- 19417-# func_xform libobj-or-source 19418-func_xform () 19419-{ 19420- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` 19421-} 19422- 19423-# func_arith arithmetic-term... 19424-func_arith () 19425-{ 19426- func_arith_result=`expr "$@"` 19427-} 19428- 19429-# func_len string 19430-# STRING may not start with a hyphen. 19431-func_len () 19432-{ 19433- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` 19434-} 19435- 19436-_LT_EOF 19437-esac 19438- 19439-case $lt_shell_append in 19440- yes) 19441- cat << \_LT_EOF >> "$cfgfile" 19442- 19443-# func_append var value 19444-# Append VALUE to the end of shell variable VAR. 19445-func_append () 19446-{ 19447- eval "$1+=\$2" 19448-} 19449-_LT_EOF 19450- ;; 19451- *) 19452- cat << \_LT_EOF >> "$cfgfile" 19453- 19454-# func_append var value 19455-# Append VALUE to the end of shell variable VAR. 19456-func_append () 19457-{ 19458- eval "$1=\$$1\$2" 19459-} 19460- 19461-_LT_EOF 19462- ;; 19463- esac 19464- 19465- 19466- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ 19467- || (rm -f "$cfgfile"; exit 1) 19468- 19469- mv -f "$cfgfile" "$ofile" || 19470+ sed '$q' "$ltmain" >> "$cfgfile" \ 19471+ || (rm -f "$cfgfile"; exit 1) 19472+ 19473+ if test x"$xsi_shell" = xyes; then 19474+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ 19475+func_dirname ()\ 19476+{\ 19477+\ case ${1} in\ 19478+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 19479+\ * ) func_dirname_result="${3}" ;;\ 19480+\ esac\ 19481+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ 19482+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 19483+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 19484+test 0 -eq $? || _lt_function_replace_fail=: 19485+ 19486+ 19487+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ 19488+func_basename ()\ 19489+{\ 19490+\ func_basename_result="${1##*/}"\ 19491+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ 19492+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 19493+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 19494+test 0 -eq $? || _lt_function_replace_fail=: 19495+ 19496+ 19497+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ 19498+func_dirname_and_basename ()\ 19499+{\ 19500+\ case ${1} in\ 19501+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 19502+\ * ) func_dirname_result="${3}" ;;\ 19503+\ esac\ 19504+\ func_basename_result="${1##*/}"\ 19505+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ 19506+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 19507+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 19508+test 0 -eq $? || _lt_function_replace_fail=: 19509+ 19510+ 19511+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ 19512+func_stripname ()\ 19513+{\ 19514+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ 19515+\ # positional parameters, so assign one to ordinary parameter first.\ 19516+\ func_stripname_result=${3}\ 19517+\ func_stripname_result=${func_stripname_result#"${1}"}\ 19518+\ func_stripname_result=${func_stripname_result%"${2}"}\ 19519+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ 19520+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 19521+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 19522+test 0 -eq $? || _lt_function_replace_fail=: 19523+ 19524+ 19525+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ 19526+func_split_long_opt ()\ 19527+{\ 19528+\ func_split_long_opt_name=${1%%=*}\ 19529+\ func_split_long_opt_arg=${1#*=}\ 19530+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ 19531+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 19532+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 19533+test 0 -eq $? || _lt_function_replace_fail=: 19534+ 19535+ 19536+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ 19537+func_split_short_opt ()\ 19538+{\ 19539+\ func_split_short_opt_arg=${1#??}\ 19540+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ 19541+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ 19542+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 19543+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 19544+test 0 -eq $? || _lt_function_replace_fail=: 19545+ 19546+ 19547+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ 19548+func_lo2o ()\ 19549+{\ 19550+\ case ${1} in\ 19551+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ 19552+\ *) func_lo2o_result=${1} ;;\ 19553+\ esac\ 19554+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ 19555+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 19556+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 19557+test 0 -eq $? || _lt_function_replace_fail=: 19558+ 19559+ 19560+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ 19561+func_xform ()\ 19562+{\ 19563+ func_xform_result=${1%.*}.lo\ 19564+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ 19565+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 19566+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 19567+test 0 -eq $? || _lt_function_replace_fail=: 19568+ 19569+ 19570+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ 19571+func_arith ()\ 19572+{\ 19573+ func_arith_result=$(( $* ))\ 19574+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ 19575+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 19576+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 19577+test 0 -eq $? || _lt_function_replace_fail=: 19578+ 19579+ 19580+ sed -e '/^func_len ()$/,/^} # func_len /c\ 19581+func_len ()\ 19582+{\ 19583+ func_len_result=${#1}\ 19584+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ 19585+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 19586+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 19587+test 0 -eq $? || _lt_function_replace_fail=: 19588+ 19589+fi 19590+ 19591+if test x"$lt_shell_append" = xyes; then 19592+ sed -e '/^func_append ()$/,/^} # func_append /c\ 19593+func_append ()\ 19594+{\ 19595+ eval "${1}+=\\${2}"\ 19596+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ 19597+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 19598+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 19599+test 0 -eq $? || _lt_function_replace_fail=: 19600+ 19601+ 19602+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ 19603+func_append_quoted ()\ 19604+{\ 19605+\ func_quote_for_eval "${2}"\ 19606+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ 19607+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ 19608+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 19609+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 19610+test 0 -eq $? || _lt_function_replace_fail=: 19611+ 19612+ 19613+ # Save a `func_append' function call where possible by direct use of '+=' 19614+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ 19615+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 19616+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 19617+ test 0 -eq $? || _lt_function_replace_fail=: 19618+else 19619+ # Save a `func_append' function call even when '+=' is not available 19620+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ 19621+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 19622+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 19623+ test 0 -eq $? || _lt_function_replace_fail=: 19624+fi 19625+ 19626+if test x"$_lt_function_replace_fail" = x":"; then 19627+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 19628+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} 19629+fi 19630+ 19631+ 19632+ mv -f "$cfgfile" "$ofile" || 19633 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 19634 chmod +x "$ofile" 19635 19636diff --git a/libsframe/Makefile.in b/libsframe/Makefile.in 19637index 107b82ccfdc..4a4459bf5eb 100644 19638--- a/libsframe/Makefile.in 19639+++ b/libsframe/Makefile.in 19640@@ -1,7 +1,7 @@ 19641-# Makefile.in generated by automake 1.15.1 from Makefile.am. 19642+# Makefile.in generated by automake 1.16.5 from Makefile.am. 19643 # @configure_input@ 19644 19645-# Copyright (C) 1994-2017 Free Software Foundation, Inc. 19646+# Copyright (C) 1994-2021 Free Software Foundation, Inc. 19647 19648 # This Makefile.in is free software; the Free Software Foundation 19649 # gives unlimited permission to copy and/or distribute it, 19650@@ -139,6 +139,10 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs 19651 CONFIG_HEADER = config.h 19652 CONFIG_CLEAN_FILES = 19653 CONFIG_CLEAN_VPATH_FILES = 19654+@HAVE_COMPAT_DEJAGNU_TRUE@am__EXEEXT_1 = testsuite/libsframe.decode/be-flipping$(EXEEXT) \ 19655+@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.decode/frecnt-1$(EXEEXT) \ 19656+@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.decode/frecnt-2$(EXEEXT) \ 19657+@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.encode/encode-1$(EXEEXT) 19658 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; 19659 am__vpath_adj = case $$p in \ 19660 $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ 19661@@ -179,27 +183,27 @@ am__v_lt_0 = --silent 19662 am__v_lt_1 = 19663 @INSTALL_LIBBFD_FALSE@am_libsframe_la_rpath = 19664 @INSTALL_LIBBFD_TRUE@am_libsframe_la_rpath = -rpath $(libdir) 19665-@HAVE_COMPAT_DEJAGNU_TRUE@am__EXEEXT_1 = testsuite/libsframe.decode/be-flipping$(EXEEXT) \ 19666-@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.decode/frecnt-1$(EXEEXT) \ 19667-@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.decode/frecnt-2$(EXEEXT) \ 19668-@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.encode/encode-1$(EXEEXT) 19669 am__dirstamp = $(am__leading_dot)dirstamp 19670-am_testsuite_libsframe_decode_be_flipping_OBJECTS = testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.$(OBJEXT) 19671+am_testsuite_libsframe_decode_be_flipping_OBJECTS = \ 19672+ testsuite/libsframe.decode/be_flipping-be-flipping.$(OBJEXT) 19673 testsuite_libsframe_decode_be_flipping_OBJECTS = \ 19674 $(am_testsuite_libsframe_decode_be_flipping_OBJECTS) 19675 testsuite_libsframe_decode_be_flipping_DEPENDENCIES = \ 19676 ${top_builddir}/libsframe.la 19677-am_testsuite_libsframe_decode_frecnt_1_OBJECTS = testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.$(OBJEXT) 19678+am_testsuite_libsframe_decode_frecnt_1_OBJECTS = \ 19679+ testsuite/libsframe.decode/frecnt_1-frecnt-1.$(OBJEXT) 19680 testsuite_libsframe_decode_frecnt_1_OBJECTS = \ 19681 $(am_testsuite_libsframe_decode_frecnt_1_OBJECTS) 19682 testsuite_libsframe_decode_frecnt_1_DEPENDENCIES = \ 19683 ${top_builddir}/libsframe.la 19684-am_testsuite_libsframe_decode_frecnt_2_OBJECTS = testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.$(OBJEXT) 19685+am_testsuite_libsframe_decode_frecnt_2_OBJECTS = \ 19686+ testsuite/libsframe.decode/frecnt_2-frecnt-2.$(OBJEXT) 19687 testsuite_libsframe_decode_frecnt_2_OBJECTS = \ 19688 $(am_testsuite_libsframe_decode_frecnt_2_OBJECTS) 19689 testsuite_libsframe_decode_frecnt_2_DEPENDENCIES = \ 19690 ${top_builddir}/libsframe.la 19691-am_testsuite_libsframe_encode_encode_1_OBJECTS = testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.$(OBJEXT) 19692+am_testsuite_libsframe_encode_encode_1_OBJECTS = \ 19693+ testsuite/libsframe.encode/encode_1-encode-1.$(OBJEXT) 19694 testsuite_libsframe_encode_encode_1_OBJECTS = \ 19695 $(am_testsuite_libsframe_encode_encode_1_OBJECTS) 19696 testsuite_libsframe_encode_encode_1_DEPENDENCIES = \ 19697@@ -218,7 +222,14 @@ am__v_at_0 = @ 19698 am__v_at_1 = 19699 DEFAULT_INCLUDES = -I.@am__isrc@ 19700 depcomp = $(SHELL) $(top_srcdir)/../depcomp 19701-am__depfiles_maybe = depfiles 19702+am__maybe_remake_depfiles = depfiles 19703+am__depfiles_remade = ./$(DEPDIR)/libsframe_la-sframe-dump.Plo \ 19704+ ./$(DEPDIR)/libsframe_la-sframe-error.Plo \ 19705+ ./$(DEPDIR)/libsframe_la-sframe.Plo \ 19706+ testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Po \ 19707+ testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Po \ 19708+ testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Po \ 19709+ testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Po 19710 am__mv = mv -f 19711 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ 19712 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) 19713@@ -295,8 +306,8 @@ am__can_run_installinfo = \ 19714 esac 19715 am__include_HEADERS_DIST = $(INCDIR)/sframe.h $(INCDIR)/sframe-api.h 19716 HEADERS = $(include_HEADERS) 19717-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ 19718- $(LISP)config.h.in 19719+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \ 19720+ config.h.in 19721 # Read a list of newline-separated strings from the standard input, 19722 # and print each of them once, without duplicates. Input order is 19723 # *not* preserved. 19724@@ -313,9 +324,6 @@ am__define_uniq_tagged_files = \ 19725 unique=`for i in $$list; do \ 19726 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ 19727 done | $(am__uniquify_input)` 19728-ETAGS = etags 19729-CTAGS = ctags 19730-CSCOPE = cscope 19731 AM_RECURSIVE_TARGETS = cscope 19732 DEJATOOL = $(PACKAGE) 19733 RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir 19734@@ -341,6 +349,8 @@ am__post_remove_distdir = $(am__remove_distdir) 19735 DIST_ARCHIVES = $(distdir).tar.gz 19736 GZIP_ENV = --best 19737 DIST_TARGETS = dist-gzip 19738+# Exists only to be overridden by the user if desired. 19739+AM_DISTCHECK_DVI_TARGET = dvi 19740 distuninstallcheck_listfiles = find . -type f -print 19741 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ 19742 | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' 19743@@ -359,15 +369,19 @@ CFLAGS = @CFLAGS@ 19744 COMPAT_DEJAGNU = @COMPAT_DEJAGNU@ 19745 CPP = @CPP@ 19746 CPPFLAGS = @CPPFLAGS@ 19747+CSCOPE = @CSCOPE@ 19748+CTAGS = @CTAGS@ 19749 CYGPATH_W = @CYGPATH_W@ 19750 DEFS = @DEFS@ 19751 DEPDIR = @DEPDIR@ 19752+DLLTOOL = @DLLTOOL@ 19753 DSYMUTIL = @DSYMUTIL@ 19754 DUMPBIN = @DUMPBIN@ 19755 ECHO_C = @ECHO_C@ 19756 ECHO_N = @ECHO_N@ 19757 ECHO_T = @ECHO_T@ 19758 EGREP = @EGREP@ 19759+ETAGS = @ETAGS@ 19760 EXEEXT = @EXEEXT@ 19761 FGREP = @FGREP@ 19762 GREP = @GREP@ 19763@@ -386,6 +400,7 @@ LN_S = @LN_S@ 19764 LTLIBOBJS = @LTLIBOBJS@ 19765 MAINT = @MAINT@ 19766 MAKEINFO = @MAKEINFO@ 19767+MANIFEST_TOOL = @MANIFEST_TOOL@ 19768 MKDIR_P = @MKDIR_P@ 19769 NM = @NM@ 19770 NMEDIT = @NMEDIT@ 19771@@ -541,8 +556,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status 19772 echo ' $(SHELL) ./config.status'; \ 19773 $(SHELL) ./config.status;; \ 19774 *) \ 19775- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ 19776- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ 19777+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \ 19778+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \ 19779 esac; 19780 $(srcdir)/doc/local.mk $(srcdir)/testsuite/local.mk $(srcdir)/testsuite/libsframe.decode/local.mk $(srcdir)/testsuite/libsframe.encode/local.mk $(am__empty): 19781 19782@@ -570,6 +585,15 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 19783 distclean-hdr: 19784 -rm -f config.h stamp-h1 19785 19786+clean-checkPROGRAMS: 19787+ @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ 19788+ echo " rm -f" $$list; \ 19789+ rm -f $$list || exit $$?; \ 19790+ test -n "$(EXEEXT)" || exit 0; \ 19791+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ 19792+ echo " rm -f" $$list; \ 19793+ rm -f $$list 19794+ 19795 install-libLTLIBRARIES: $(lib_LTLIBRARIES) 19796 @$(NORMAL_INSTALL) 19797 @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ 19798@@ -618,36 +642,27 @@ clean-noinstLTLIBRARIES: 19799 19800 libsframe.la: $(libsframe_la_OBJECTS) $(libsframe_la_DEPENDENCIES) $(EXTRA_libsframe_la_DEPENDENCIES) 19801 $(AM_V_CCLD)$(LINK) $(am_libsframe_la_rpath) $(libsframe_la_OBJECTS) $(libsframe_la_LIBADD) $(LIBS) 19802- 19803-clean-checkPROGRAMS: 19804- @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ 19805- echo " rm -f" $$list; \ 19806- rm -f $$list || exit $$?; \ 19807- test -n "$(EXEEXT)" || exit 0; \ 19808- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ 19809- echo " rm -f" $$list; \ 19810- rm -f $$list 19811 testsuite/libsframe.decode/$(am__dirstamp): 19812 @$(MKDIR_P) testsuite/libsframe.decode 19813 @: > testsuite/libsframe.decode/$(am__dirstamp) 19814 testsuite/libsframe.decode/$(DEPDIR)/$(am__dirstamp): 19815 @$(MKDIR_P) testsuite/libsframe.decode/$(DEPDIR) 19816 @: > testsuite/libsframe.decode/$(DEPDIR)/$(am__dirstamp) 19817-testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.$(OBJEXT): \ 19818+testsuite/libsframe.decode/be_flipping-be-flipping.$(OBJEXT): \ 19819 testsuite/libsframe.decode/$(am__dirstamp) \ 19820 testsuite/libsframe.decode/$(DEPDIR)/$(am__dirstamp) 19821 19822 testsuite/libsframe.decode/be-flipping$(EXEEXT): $(testsuite_libsframe_decode_be_flipping_OBJECTS) $(testsuite_libsframe_decode_be_flipping_DEPENDENCIES) $(EXTRA_testsuite_libsframe_decode_be_flipping_DEPENDENCIES) testsuite/libsframe.decode/$(am__dirstamp) 19823 @rm -f testsuite/libsframe.decode/be-flipping$(EXEEXT) 19824 $(AM_V_CCLD)$(LINK) $(testsuite_libsframe_decode_be_flipping_OBJECTS) $(testsuite_libsframe_decode_be_flipping_LDADD) $(LIBS) 19825-testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.$(OBJEXT): \ 19826+testsuite/libsframe.decode/frecnt_1-frecnt-1.$(OBJEXT): \ 19827 testsuite/libsframe.decode/$(am__dirstamp) \ 19828 testsuite/libsframe.decode/$(DEPDIR)/$(am__dirstamp) 19829 19830 testsuite/libsframe.decode/frecnt-1$(EXEEXT): $(testsuite_libsframe_decode_frecnt_1_OBJECTS) $(testsuite_libsframe_decode_frecnt_1_DEPENDENCIES) $(EXTRA_testsuite_libsframe_decode_frecnt_1_DEPENDENCIES) testsuite/libsframe.decode/$(am__dirstamp) 19831 @rm -f testsuite/libsframe.decode/frecnt-1$(EXEEXT) 19832 $(AM_V_CCLD)$(LINK) $(testsuite_libsframe_decode_frecnt_1_OBJECTS) $(testsuite_libsframe_decode_frecnt_1_LDADD) $(LIBS) 19833-testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.$(OBJEXT): \ 19834+testsuite/libsframe.decode/frecnt_2-frecnt-2.$(OBJEXT): \ 19835 testsuite/libsframe.decode/$(am__dirstamp) \ 19836 testsuite/libsframe.decode/$(DEPDIR)/$(am__dirstamp) 19837 19838@@ -660,7 +675,7 @@ testsuite/libsframe.encode/$(am__dirstamp): 19839 testsuite/libsframe.encode/$(DEPDIR)/$(am__dirstamp): 19840 @$(MKDIR_P) testsuite/libsframe.encode/$(DEPDIR) 19841 @: > testsuite/libsframe.encode/$(DEPDIR)/$(am__dirstamp) 19842-testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.$(OBJEXT): \ 19843+testsuite/libsframe.encode/encode_1-encode-1.$(OBJEXT): \ 19844 testsuite/libsframe.encode/$(am__dirstamp) \ 19845 testsuite/libsframe.encode/$(DEPDIR)/$(am__dirstamp) 19846 19847@@ -676,13 +691,19 @@ mostlyclean-compile: 19848 distclean-compile: 19849 -rm -f *.tab.c 19850 19851-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsframe_la-sframe-dump.Plo@am__quote@ 19852-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsframe_la-sframe-error.Plo@am__quote@ 19853-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsframe_la-sframe.Plo@am__quote@ 19854-@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_be_flipping-be-flipping.Po@am__quote@ 19855-@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_1-frecnt-1.Po@am__quote@ 19856-@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_2-frecnt-2.Po@am__quote@ 19857-@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.encode/$(DEPDIR)/testsuite_libsframe_encode_encode_1-encode-1.Po@am__quote@ 19858+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsframe_la-sframe-dump.Plo@am__quote@ # am--include-marker 19859+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsframe_la-sframe-error.Plo@am__quote@ # am--include-marker 19860+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsframe_la-sframe.Plo@am__quote@ # am--include-marker 19861+@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Po@am__quote@ # am--include-marker 19862+@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Po@am__quote@ # am--include-marker 19863+@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Po@am__quote@ # am--include-marker 19864+@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Po@am__quote@ # am--include-marker 19865+ 19866+$(am__depfiles_remade): 19867+ @$(MKDIR_P) $(@D) 19868+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@ 19869+ 19870+am--depfiles: $(am__depfiles_remade) 19871 19872 .c.o: 19873 @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ 19874@@ -729,61 +750,61 @@ libsframe_la-sframe-error.lo: sframe-error.c 19875 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 19876 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsframe_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsframe_la-sframe-error.lo `test -f 'sframe-error.c' || echo '$(srcdir)/'`sframe-error.c 19877 19878-testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.o: testsuite/libsframe.decode/be-flipping.c 19879-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_be_flipping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.o -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_be_flipping-be-flipping.Tpo -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.o `test -f 'testsuite/libsframe.decode/be-flipping.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/be-flipping.c 19880-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_be_flipping-be-flipping.Tpo testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_be_flipping-be-flipping.Po 19881-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/be-flipping.c' object='testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.o' libtool=no @AMDEPBACKSLASH@ 19882+testsuite/libsframe.decode/be_flipping-be-flipping.o: testsuite/libsframe.decode/be-flipping.c 19883+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_be_flipping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/be_flipping-be-flipping.o -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Tpo -c -o testsuite/libsframe.decode/be_flipping-be-flipping.o `test -f 'testsuite/libsframe.decode/be-flipping.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/be-flipping.c 19884+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Tpo testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Po 19885+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/be-flipping.c' object='testsuite/libsframe.decode/be_flipping-be-flipping.o' libtool=no @AMDEPBACKSLASH@ 19886 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 19887-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_be_flipping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.o `test -f 'testsuite/libsframe.decode/be-flipping.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/be-flipping.c 19888+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_be_flipping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/be_flipping-be-flipping.o `test -f 'testsuite/libsframe.decode/be-flipping.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/be-flipping.c 19889 19890-testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.obj: testsuite/libsframe.decode/be-flipping.c 19891-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_be_flipping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.obj -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_be_flipping-be-flipping.Tpo -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.obj `if test -f 'testsuite/libsframe.decode/be-flipping.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/be-flipping.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/be-flipping.c'; fi` 19892-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_be_flipping-be-flipping.Tpo testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_be_flipping-be-flipping.Po 19893-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/be-flipping.c' object='testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.obj' libtool=no @AMDEPBACKSLASH@ 19894+testsuite/libsframe.decode/be_flipping-be-flipping.obj: testsuite/libsframe.decode/be-flipping.c 19895+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_be_flipping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/be_flipping-be-flipping.obj -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Tpo -c -o testsuite/libsframe.decode/be_flipping-be-flipping.obj `if test -f 'testsuite/libsframe.decode/be-flipping.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/be-flipping.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/be-flipping.c'; fi` 19896+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Tpo testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Po 19897+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/be-flipping.c' object='testsuite/libsframe.decode/be_flipping-be-flipping.obj' libtool=no @AMDEPBACKSLASH@ 19898 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 19899-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_be_flipping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.obj `if test -f 'testsuite/libsframe.decode/be-flipping.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/be-flipping.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/be-flipping.c'; fi` 19900+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_be_flipping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/be_flipping-be-flipping.obj `if test -f 'testsuite/libsframe.decode/be-flipping.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/be-flipping.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/be-flipping.c'; fi` 19901 19902-testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.o: testsuite/libsframe.decode/frecnt-1.c 19903-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.o -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_1-frecnt-1.Tpo -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.o `test -f 'testsuite/libsframe.decode/frecnt-1.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/frecnt-1.c 19904-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_1-frecnt-1.Tpo testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_1-frecnt-1.Po 19905-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/frecnt-1.c' object='testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.o' libtool=no @AMDEPBACKSLASH@ 19906+testsuite/libsframe.decode/frecnt_1-frecnt-1.o: testsuite/libsframe.decode/frecnt-1.c 19907+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/frecnt_1-frecnt-1.o -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Tpo -c -o testsuite/libsframe.decode/frecnt_1-frecnt-1.o `test -f 'testsuite/libsframe.decode/frecnt-1.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/frecnt-1.c 19908+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Tpo testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Po 19909+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/frecnt-1.c' object='testsuite/libsframe.decode/frecnt_1-frecnt-1.o' libtool=no @AMDEPBACKSLASH@ 19910 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 19911-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.o `test -f 'testsuite/libsframe.decode/frecnt-1.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/frecnt-1.c 19912+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/frecnt_1-frecnt-1.o `test -f 'testsuite/libsframe.decode/frecnt-1.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/frecnt-1.c 19913 19914-testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.obj: testsuite/libsframe.decode/frecnt-1.c 19915-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.obj -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_1-frecnt-1.Tpo -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.obj `if test -f 'testsuite/libsframe.decode/frecnt-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/frecnt-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/frecnt-1.c'; fi` 19916-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_1-frecnt-1.Tpo testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_1-frecnt-1.Po 19917-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/frecnt-1.c' object='testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.obj' libtool=no @AMDEPBACKSLASH@ 19918+testsuite/libsframe.decode/frecnt_1-frecnt-1.obj: testsuite/libsframe.decode/frecnt-1.c 19919+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/frecnt_1-frecnt-1.obj -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Tpo -c -o testsuite/libsframe.decode/frecnt_1-frecnt-1.obj `if test -f 'testsuite/libsframe.decode/frecnt-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/frecnt-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/frecnt-1.c'; fi` 19920+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Tpo testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Po 19921+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/frecnt-1.c' object='testsuite/libsframe.decode/frecnt_1-frecnt-1.obj' libtool=no @AMDEPBACKSLASH@ 19922 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 19923-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.obj `if test -f 'testsuite/libsframe.decode/frecnt-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/frecnt-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/frecnt-1.c'; fi` 19924+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/frecnt_1-frecnt-1.obj `if test -f 'testsuite/libsframe.decode/frecnt-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/frecnt-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/frecnt-1.c'; fi` 19925 19926-testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.o: testsuite/libsframe.decode/frecnt-2.c 19927-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_2_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.o -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_2-frecnt-2.Tpo -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.o `test -f 'testsuite/libsframe.decode/frecnt-2.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/frecnt-2.c 19928-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_2-frecnt-2.Tpo testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_2-frecnt-2.Po 19929-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/frecnt-2.c' object='testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.o' libtool=no @AMDEPBACKSLASH@ 19930+testsuite/libsframe.decode/frecnt_2-frecnt-2.o: testsuite/libsframe.decode/frecnt-2.c 19931+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_2_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/frecnt_2-frecnt-2.o -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Tpo -c -o testsuite/libsframe.decode/frecnt_2-frecnt-2.o `test -f 'testsuite/libsframe.decode/frecnt-2.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/frecnt-2.c 19932+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Tpo testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Po 19933+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/frecnt-2.c' object='testsuite/libsframe.decode/frecnt_2-frecnt-2.o' libtool=no @AMDEPBACKSLASH@ 19934 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 19935-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_2_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.o `test -f 'testsuite/libsframe.decode/frecnt-2.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/frecnt-2.c 19936+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_2_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/frecnt_2-frecnt-2.o `test -f 'testsuite/libsframe.decode/frecnt-2.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/frecnt-2.c 19937 19938-testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.obj: testsuite/libsframe.decode/frecnt-2.c 19939-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_2_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.obj -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_2-frecnt-2.Tpo -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.obj `if test -f 'testsuite/libsframe.decode/frecnt-2.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/frecnt-2.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/frecnt-2.c'; fi` 19940-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_2-frecnt-2.Tpo testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_2-frecnt-2.Po 19941-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/frecnt-2.c' object='testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.obj' libtool=no @AMDEPBACKSLASH@ 19942+testsuite/libsframe.decode/frecnt_2-frecnt-2.obj: testsuite/libsframe.decode/frecnt-2.c 19943+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_2_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/frecnt_2-frecnt-2.obj -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Tpo -c -o testsuite/libsframe.decode/frecnt_2-frecnt-2.obj `if test -f 'testsuite/libsframe.decode/frecnt-2.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/frecnt-2.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/frecnt-2.c'; fi` 19944+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Tpo testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Po 19945+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/frecnt-2.c' object='testsuite/libsframe.decode/frecnt_2-frecnt-2.obj' libtool=no @AMDEPBACKSLASH@ 19946 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 19947-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_2_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.obj `if test -f 'testsuite/libsframe.decode/frecnt-2.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/frecnt-2.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/frecnt-2.c'; fi` 19948+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_2_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/frecnt_2-frecnt-2.obj `if test -f 'testsuite/libsframe.decode/frecnt-2.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/frecnt-2.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/frecnt-2.c'; fi` 19949 19950-testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.o: testsuite/libsframe.encode/encode-1.c 19951-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_encode_encode_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.o -MD -MP -MF testsuite/libsframe.encode/$(DEPDIR)/testsuite_libsframe_encode_encode_1-encode-1.Tpo -c -o testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.o `test -f 'testsuite/libsframe.encode/encode-1.c' || echo '$(srcdir)/'`testsuite/libsframe.encode/encode-1.c 19952-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.encode/$(DEPDIR)/testsuite_libsframe_encode_encode_1-encode-1.Tpo testsuite/libsframe.encode/$(DEPDIR)/testsuite_libsframe_encode_encode_1-encode-1.Po 19953-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.encode/encode-1.c' object='testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.o' libtool=no @AMDEPBACKSLASH@ 19954+testsuite/libsframe.encode/encode_1-encode-1.o: testsuite/libsframe.encode/encode-1.c 19955+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_encode_encode_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.encode/encode_1-encode-1.o -MD -MP -MF testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Tpo -c -o testsuite/libsframe.encode/encode_1-encode-1.o `test -f 'testsuite/libsframe.encode/encode-1.c' || echo '$(srcdir)/'`testsuite/libsframe.encode/encode-1.c 19956+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Tpo testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Po 19957+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.encode/encode-1.c' object='testsuite/libsframe.encode/encode_1-encode-1.o' libtool=no @AMDEPBACKSLASH@ 19958 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 19959-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_encode_encode_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.o `test -f 'testsuite/libsframe.encode/encode-1.c' || echo '$(srcdir)/'`testsuite/libsframe.encode/encode-1.c 19960+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_encode_encode_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.encode/encode_1-encode-1.o `test -f 'testsuite/libsframe.encode/encode-1.c' || echo '$(srcdir)/'`testsuite/libsframe.encode/encode-1.c 19961 19962-testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.obj: testsuite/libsframe.encode/encode-1.c 19963-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_encode_encode_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.obj -MD -MP -MF testsuite/libsframe.encode/$(DEPDIR)/testsuite_libsframe_encode_encode_1-encode-1.Tpo -c -o testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.obj `if test -f 'testsuite/libsframe.encode/encode-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.encode/encode-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.encode/encode-1.c'; fi` 19964-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.encode/$(DEPDIR)/testsuite_libsframe_encode_encode_1-encode-1.Tpo testsuite/libsframe.encode/$(DEPDIR)/testsuite_libsframe_encode_encode_1-encode-1.Po 19965-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.encode/encode-1.c' object='testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.obj' libtool=no @AMDEPBACKSLASH@ 19966+testsuite/libsframe.encode/encode_1-encode-1.obj: testsuite/libsframe.encode/encode-1.c 19967+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_encode_encode_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.encode/encode_1-encode-1.obj -MD -MP -MF testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Tpo -c -o testsuite/libsframe.encode/encode_1-encode-1.obj `if test -f 'testsuite/libsframe.encode/encode-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.encode/encode-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.encode/encode-1.c'; fi` 19968+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Tpo testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Po 19969+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.encode/encode-1.c' object='testsuite/libsframe.encode/encode_1-encode-1.obj' libtool=no @AMDEPBACKSLASH@ 19970 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 19971-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_encode_encode_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.obj `if test -f 'testsuite/libsframe.encode/encode-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.encode/encode-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.encode/encode-1.c'; fi` 19972+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_encode_encode_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.encode/encode_1-encode-1.obj `if test -f 'testsuite/libsframe.encode/encode-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.encode/encode-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.encode/encode-1.c'; fi` 19973 19974 mostlyclean-libtool: 19975 -rm -f *.lo 19976@@ -1020,7 +1041,7 @@ site.exp: Makefile $(EXTRA_DEJAGNU_SITE_CONFIG) 19977 @echo '# Do not edit here. If you wish to override these values' >>site.tmp 19978 @echo '# edit the last section' >>site.tmp 19979 @echo 'set srcdir "$(srcdir)"' >>site.tmp 19980- @echo "set objdir `pwd`" >>site.tmp 19981+ @echo "set objdir \"`pwd`\"" >>site.tmp 19982 @echo 'set build_alias "$(build_alias)"' >>site.tmp 19983 @echo 'set build_triplet $(build_triplet)' >>site.tmp 19984 @echo 'set host_alias "$(host_alias)"' >>site.tmp 19985@@ -1044,8 +1065,10 @@ distclean-DEJAGNU: 19986 -l='$(DEJATOOL)'; for tool in $$l; do \ 19987 rm -f $$tool.sum $$tool.log; \ 19988 done 19989+distdir: $(BUILT_SOURCES) 19990+ $(MAKE) $(AM_MAKEFLAGS) distdir-am 19991 19992-distdir: $(DISTFILES) 19993+distdir-am: $(DISTFILES) 19994 $(am__remove_distdir) 19995 test -d "$(distdir)" || mkdir "$(distdir)" 19996 @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ 19997@@ -1103,6 +1126,10 @@ dist-xz: distdir 19998 tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz 19999 $(am__post_remove_distdir) 20000 20001+dist-zstd: distdir 20002+ tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst 20003+ $(am__post_remove_distdir) 20004+ 20005 dist-tarZ: distdir 20006 @echo WARNING: "Support for distribution archives compressed with" \ 20007 "legacy program 'compress' is deprecated." >&2 20008@@ -1145,6 +1172,8 @@ distcheck: dist 20009 eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ 20010 *.zip*) \ 20011 unzip $(distdir).zip ;;\ 20012+ *.tar.zst*) \ 20013+ zstd -dc $(distdir).tar.zst | $(am__untar) ;;\ 20014 esac 20015 chmod -R a-w $(distdir) 20016 chmod u+w $(distdir) 20017@@ -1160,7 +1189,7 @@ distcheck: dist 20018 $(DISTCHECK_CONFIGURE_FLAGS) \ 20019 --srcdir=../.. --prefix="$$dc_install_base" \ 20020 && $(MAKE) $(AM_MAKEFLAGS) \ 20021- && $(MAKE) $(AM_MAKEFLAGS) dvi \ 20022+ && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \ 20023 && $(MAKE) $(AM_MAKEFLAGS) check \ 20024 && $(MAKE) $(AM_MAKEFLAGS) install \ 20025 && $(MAKE) $(AM_MAKEFLAGS) installcheck \ 20026@@ -1216,6 +1245,8 @@ check-am: all-am 20027 $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU 20028 check: check-am 20029 all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(HEADERS) config.h 20030+install-checkPROGRAMS: install-libLTLIBRARIES 20031+ 20032 installdirs: 20033 for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(includedir)"; do \ 20034 test -z "$$dir" || $(MKDIR_P) "$$dir"; \ 20035@@ -1266,7 +1297,13 @@ clean-am: clean-aminfo clean-checkPROGRAMS clean-generic \ 20036 20037 distclean: distclean-am 20038 -rm -f $(am__CONFIG_DISTCLEAN_FILES) 20039- -rm -rf ./$(DEPDIR) testsuite/libsframe.decode/$(DEPDIR) testsuite/libsframe.encode/$(DEPDIR) 20040+ -rm -f ./$(DEPDIR)/libsframe_la-sframe-dump.Plo 20041+ -rm -f ./$(DEPDIR)/libsframe_la-sframe-error.Plo 20042+ -rm -f ./$(DEPDIR)/libsframe_la-sframe.Plo 20043+ -rm -f testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Po 20044+ -rm -f testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Po 20045+ -rm -f testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Po 20046+ -rm -f testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Po 20047 -rm -f Makefile 20048 distclean-am: clean-am distclean-DEJAGNU distclean-compile \ 20049 distclean-generic distclean-hdr distclean-libtool \ 20050@@ -1406,7 +1443,13 @@ installcheck-am: 20051 maintainer-clean: maintainer-clean-am 20052 -rm -f $(am__CONFIG_DISTCLEAN_FILES) 20053 -rm -rf $(top_srcdir)/autom4te.cache 20054- -rm -rf ./$(DEPDIR) testsuite/libsframe.decode/$(DEPDIR) testsuite/libsframe.encode/$(DEPDIR) 20055+ -rm -f ./$(DEPDIR)/libsframe_la-sframe-dump.Plo 20056+ -rm -f ./$(DEPDIR)/libsframe_la-sframe-error.Plo 20057+ -rm -f ./$(DEPDIR)/libsframe_la-sframe.Plo 20058+ -rm -f testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Po 20059+ -rm -f testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Po 20060+ -rm -f testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Po 20061+ -rm -f testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Po 20062 -rm -f Makefile 20063 maintainer-clean-am: distclean-am maintainer-clean-aminfo \ 20064 maintainer-clean-generic 20065@@ -1430,28 +1473,28 @@ uninstall-am: uninstall-dvi-am uninstall-html-am \ 20066 20067 .MAKE: all check-am install-am install-strip 20068 20069-.PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-DEJAGNU \ 20070- check-am clean clean-aminfo clean-checkPROGRAMS clean-cscope \ 20071- clean-generic clean-libLTLIBRARIES clean-libtool \ 20072+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles am--refresh check \ 20073+ check-DEJAGNU check-am clean clean-aminfo clean-checkPROGRAMS \ 20074+ clean-cscope clean-generic clean-libLTLIBRARIES clean-libtool \ 20075 clean-noinstLTLIBRARIES cscope cscopelist-am ctags ctags-am \ 20076 dist dist-all dist-bzip2 dist-gzip dist-info dist-lzip \ 20077- dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \ 20078- distclean-DEJAGNU distclean-compile distclean-generic \ 20079- distclean-hdr distclean-libtool distclean-tags distcleancheck \ 20080- distdir distuninstallcheck dvi dvi-am html html-am html-local \ 20081- info info-am install install-am install-data install-data-am \ 20082- install-dvi install-dvi-am install-exec install-exec-am \ 20083- install-html install-html-am install-includeHEADERS \ 20084- install-info install-info-am install-libLTLIBRARIES \ 20085- install-man install-pdf install-pdf-am install-ps \ 20086- install-ps-am install-strip installcheck installcheck-am \ 20087- installdirs maintainer-clean maintainer-clean-aminfo \ 20088- maintainer-clean-generic mostlyclean mostlyclean-aminfo \ 20089- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ 20090- pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ 20091- uninstall-dvi-am uninstall-html-am uninstall-includeHEADERS \ 20092- uninstall-info-am uninstall-libLTLIBRARIES uninstall-pdf-am \ 20093- uninstall-ps-am 20094+ dist-shar dist-tarZ dist-xz dist-zip dist-zstd distcheck \ 20095+ distclean distclean-DEJAGNU distclean-compile \ 20096+ distclean-generic distclean-hdr distclean-libtool \ 20097+ distclean-tags distcleancheck distdir distuninstallcheck dvi \ 20098+ dvi-am html html-am html-local info info-am install install-am \ 20099+ install-data install-data-am install-dvi install-dvi-am \ 20100+ install-exec install-exec-am install-html install-html-am \ 20101+ install-includeHEADERS install-info install-info-am \ 20102+ install-libLTLIBRARIES install-man install-pdf install-pdf-am \ 20103+ install-ps install-ps-am install-strip installcheck \ 20104+ installcheck-am installdirs maintainer-clean \ 20105+ maintainer-clean-aminfo maintainer-clean-generic mostlyclean \ 20106+ mostlyclean-aminfo mostlyclean-compile mostlyclean-generic \ 20107+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ 20108+ uninstall-am uninstall-dvi-am uninstall-html-am \ 20109+ uninstall-includeHEADERS uninstall-info-am \ 20110+ uninstall-libLTLIBRARIES uninstall-pdf-am uninstall-ps-am 20111 20112 .PRECIOUS: Makefile 20113 20114diff --git a/libsframe/aclocal.m4 b/libsframe/aclocal.m4 20115index b0cdd6b184d..c83d4f62ece 100644 20116--- a/libsframe/aclocal.m4 20117+++ b/libsframe/aclocal.m4 20118@@ -1,6 +1,6 @@ 20119-# generated automatically by aclocal 1.15.1 -*- Autoconf -*- 20120+# generated automatically by aclocal 1.16.5 -*- Autoconf -*- 20121 20122-# Copyright (C) 1996-2017 Free Software Foundation, Inc. 20123+# Copyright (C) 1996-2021 Free Software Foundation, Inc. 20124 20125 # This file is free software; the Free Software Foundation 20126 # gives unlimited permission to copy and/or distribute it, 20127@@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to. 20128 If you have problems, you may need to regenerate the build system entirely. 20129 To do so, use the procedure documented by the package, typically 'autoreconf'.])]) 20130 20131-# Copyright (C) 2002-2017 Free Software Foundation, Inc. 20132+# Copyright (C) 2002-2021 Free Software Foundation, Inc. 20133 # 20134 # This file is free software; the Free Software Foundation 20135 # gives unlimited permission to copy and/or distribute it, 20136@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.]) 20137 # generated from the m4 files accompanying Automake X.Y. 20138 # (This private macro should not be called outside this file.) 20139 AC_DEFUN([AM_AUTOMAKE_VERSION], 20140-[am__api_version='1.15' 20141+[am__api_version='1.16' 20142 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to 20143 dnl require some minimum version. Point them to the right macro. 20144-m4_if([$1], [1.15.1], [], 20145+m4_if([$1], [1.16.5], [], 20146 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl 20147 ]) 20148 20149@@ -51,12 +51,12 @@ m4_define([_AM_AUTOCONF_VERSION], []) 20150 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. 20151 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. 20152 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], 20153-[AM_AUTOMAKE_VERSION([1.15.1])dnl 20154+[AM_AUTOMAKE_VERSION([1.16.5])dnl 20155 m4_ifndef([AC_AUTOCONF_VERSION], 20156 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl 20157 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) 20158 20159-# Copyright (C) 2011-2017 Free Software Foundation, Inc. 20160+# Copyright (C) 2011-2021 Free Software Foundation, Inc. 20161 # 20162 # This file is free software; the Free Software Foundation 20163 # gives unlimited permission to copy and/or distribute it, 20164@@ -118,7 +118,7 @@ AC_SUBST([AR])dnl 20165 20166 # AM_AUX_DIR_EXPAND -*- Autoconf -*- 20167 20168-# Copyright (C) 2001-2017 Free Software Foundation, Inc. 20169+# Copyright (C) 2001-2021 Free Software Foundation, Inc. 20170 # 20171 # This file is free software; the Free Software Foundation 20172 # gives unlimited permission to copy and/or distribute it, 20173@@ -170,7 +170,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` 20174 20175 # AM_CONDITIONAL -*- Autoconf -*- 20176 20177-# Copyright (C) 1997-2017 Free Software Foundation, Inc. 20178+# Copyright (C) 1997-2021 Free Software Foundation, Inc. 20179 # 20180 # This file is free software; the Free Software Foundation 20181 # gives unlimited permission to copy and/or distribute it, 20182@@ -201,7 +201,7 @@ AC_CONFIG_COMMANDS_PRE( 20183 Usually this means the macro was only invoked conditionally.]]) 20184 fi])]) 20185 20186-# Copyright (C) 1999-2017 Free Software Foundation, Inc. 20187+# Copyright (C) 1999-2021 Free Software Foundation, Inc. 20188 # 20189 # This file is free software; the Free Software Foundation 20190 # gives unlimited permission to copy and/or distribute it, 20191@@ -392,13 +392,12 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl 20192 20193 # Generate code to set up dependency tracking. -*- Autoconf -*- 20194 20195-# Copyright (C) 1999-2017 Free Software Foundation, Inc. 20196+# Copyright (C) 1999-2021 Free Software Foundation, Inc. 20197 # 20198 # This file is free software; the Free Software Foundation 20199 # gives unlimited permission to copy and/or distribute it, 20200 # with or without modifications, as long as this notice is preserved. 20201 20202- 20203 # _AM_OUTPUT_DEPENDENCY_COMMANDS 20204 # ------------------------------ 20205 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], 20206@@ -406,49 +405,43 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], 20207 # Older Autoconf quotes --file arguments for eval, but not when files 20208 # are listed without --file. Let's play safe and only enable the eval 20209 # if we detect the quoting. 20210- case $CONFIG_FILES in 20211- *\'*) eval set x "$CONFIG_FILES" ;; 20212- *) set x $CONFIG_FILES ;; 20213- esac 20214+ # TODO: see whether this extra hack can be removed once we start 20215+ # requiring Autoconf 2.70 or later. 20216+ AS_CASE([$CONFIG_FILES], 20217+ [*\'*], [eval set x "$CONFIG_FILES"], 20218+ [*], [set x $CONFIG_FILES]) 20219 shift 20220- for mf 20221+ # Used to flag and report bootstrapping failures. 20222+ am_rc=0 20223+ for am_mf 20224 do 20225 # Strip MF so we end up with the name of the file. 20226- mf=`echo "$mf" | sed -e 's/:.*$//'` 20227- # Check whether this is an Automake generated Makefile or not. 20228- # We used to match only the files named 'Makefile.in', but 20229- # some people rename them; so instead we look at the file content. 20230- # Grep'ing the first line is not enough: some people post-process 20231- # each Makefile.in and add a new line on top of each file to say so. 20232- # Grep'ing the whole file is not good either: AIX grep has a line 20233+ am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'` 20234+ # Check whether this is an Automake generated Makefile which includes 20235+ # dependency-tracking related rules and includes. 20236+ # Grep'ing the whole file directly is not great: AIX grep has a line 20237 # limit of 2048, but all sed's we know have understand at least 4000. 20238- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then 20239- dirpart=`AS_DIRNAME("$mf")` 20240- else 20241- continue 20242- fi 20243- # Extract the definition of DEPDIR, am__include, and am__quote 20244- # from the Makefile without running 'make'. 20245- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` 20246- test -z "$DEPDIR" && continue 20247- am__include=`sed -n 's/^am__include = //p' < "$mf"` 20248- test -z "$am__include" && continue 20249- am__quote=`sed -n 's/^am__quote = //p' < "$mf"` 20250- # Find all dependency output files, they are included files with 20251- # $(DEPDIR) in their names. We invoke sed twice because it is the 20252- # simplest approach to changing $(DEPDIR) to its actual value in the 20253- # expansion. 20254- for file in `sed -n " 20255- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ 20256- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do 20257- # Make sure the directory exists. 20258- test -f "$dirpart/$file" && continue 20259- fdir=`AS_DIRNAME(["$file"])` 20260- AS_MKDIR_P([$dirpart/$fdir]) 20261- # echo "creating $dirpart/$file" 20262- echo '# dummy' > "$dirpart/$file" 20263- done 20264+ sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ 20265+ || continue 20266+ am_dirpart=`AS_DIRNAME(["$am_mf"])` 20267+ am_filepart=`AS_BASENAME(["$am_mf"])` 20268+ AM_RUN_LOG([cd "$am_dirpart" \ 20269+ && sed -e '/# am--include-marker/d' "$am_filepart" \ 20270+ | $MAKE -f - am--depfiles]) || am_rc=$? 20271 done 20272+ if test $am_rc -ne 0; then 20273+ AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments 20274+ for automatic dependency tracking. If GNU make was not used, consider 20275+ re-running the configure script with MAKE="gmake" (or whatever is 20276+ necessary). You can also try re-running configure with the 20277+ '--disable-dependency-tracking' option to at least be able to build 20278+ the package (albeit without support for automatic dependency tracking).]) 20279+ fi 20280+ AS_UNSET([am_dirpart]) 20281+ AS_UNSET([am_filepart]) 20282+ AS_UNSET([am_mf]) 20283+ AS_UNSET([am_rc]) 20284+ rm -f conftest-deps.mk 20285 } 20286 ])# _AM_OUTPUT_DEPENDENCY_COMMANDS 20287 20288@@ -457,18 +450,17 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], 20289 # ----------------------------- 20290 # This macro should only be invoked once -- use via AC_REQUIRE. 20291 # 20292-# This code is only required when automatic dependency tracking 20293-# is enabled. FIXME. This creates each '.P' file that we will 20294-# need in order to bootstrap the dependency handling code. 20295+# This code is only required when automatic dependency tracking is enabled. 20296+# This creates each '.Po' and '.Plo' makefile fragment that we'll need in 20297+# order to bootstrap the dependency handling code. 20298 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], 20299 [AC_CONFIG_COMMANDS([depfiles], 20300 [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], 20301- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) 20302-]) 20303+ [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])]) 20304 20305 # Do all the work for Automake. -*- Autoconf -*- 20306 20307-# Copyright (C) 1996-2017 Free Software Foundation, Inc. 20308+# Copyright (C) 1996-2021 Free Software Foundation, Inc. 20309 # 20310 # This file is free software; the Free Software Foundation 20311 # gives unlimited permission to copy and/or distribute it, 20312@@ -496,6 +488,10 @@ m4_defn([AC_PROG_CC]) 20313 # release and drop the old call support. 20314 AC_DEFUN([AM_INIT_AUTOMAKE], 20315 [AC_PREREQ([2.65])dnl 20316+m4_ifdef([_$0_ALREADY_INIT], 20317+ [m4_fatal([$0 expanded multiple times 20318+]m4_defn([_$0_ALREADY_INIT]))], 20319+ [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl 20320 dnl Autoconf wants to disallow AM_ names. We explicitly allow 20321 dnl the ones we care about. 20322 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl 20323@@ -532,7 +528,7 @@ m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl 20324 [_AM_SET_OPTIONS([$1])dnl 20325 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. 20326 m4_if( 20327- m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), 20328+ m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]), 20329 [ok:ok],, 20330 [m4_fatal([AC_INIT should be called with package and version arguments])])dnl 20331 AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl 20332@@ -555,8 +551,8 @@ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl 20333 AC_REQUIRE([AC_PROG_MKDIR_P])dnl 20334 # For better backward compatibility. To be removed once Automake 1.9.x 20335 # dies out for good. For more background, see: 20336-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> 20337-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> 20338+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> 20339+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> 20340 AC_SUBST([mkdir_p], ['$(MKDIR_P)']) 20341 # We need awk for the "check" target (and possibly the TAP driver). The 20342 # system "awk" is bad on some platforms. 20343@@ -584,6 +580,20 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], 20344 [m4_define([AC_PROG_OBJCXX], 20345 m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl 20346 ]) 20347+# Variables for tags utilities; see am/tags.am 20348+if test -z "$CTAGS"; then 20349+ CTAGS=ctags 20350+fi 20351+AC_SUBST([CTAGS]) 20352+if test -z "$ETAGS"; then 20353+ ETAGS=etags 20354+fi 20355+AC_SUBST([ETAGS]) 20356+if test -z "$CSCOPE"; then 20357+ CSCOPE=cscope 20358+fi 20359+AC_SUBST([CSCOPE]) 20360+ 20361 AC_REQUIRE([AM_SILENT_RULES])dnl 20362 dnl The testsuite driver may need to know about EXEEXT, so add the 20363 dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This 20364@@ -623,7 +633,7 @@ END 20365 Aborting the configuration process, to ensure you take notice of the issue. 20366 20367 You can download and install GNU coreutils to get an 'rm' implementation 20368-that behaves properly: <http://www.gnu.org/software/coreutils/>. 20369+that behaves properly: <https://www.gnu.org/software/coreutils/>. 20370 20371 If you want to complete the configuration process using your problematic 20372 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM 20373@@ -665,7 +675,7 @@ for _am_header in $config_headers :; do 20374 done 20375 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) 20376 20377-# Copyright (C) 2001-2017 Free Software Foundation, Inc. 20378+# Copyright (C) 2001-2021 Free Software Foundation, Inc. 20379 # 20380 # This file is free software; the Free Software Foundation 20381 # gives unlimited permission to copy and/or distribute it, 20382@@ -689,7 +699,7 @@ AC_SUBST([install_sh])]) 20383 # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- 20384 # From Jim Meyering 20385 20386-# Copyright (C) 1996-2017 Free Software Foundation, Inc. 20387+# Copyright (C) 1996-2021 Free Software Foundation, Inc. 20388 # 20389 # This file is free software; the Free Software Foundation 20390 # gives unlimited permission to copy and/or distribute it, 20391@@ -724,7 +734,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) 20392 20393 # Check to see how 'make' treats includes. -*- Autoconf -*- 20394 20395-# Copyright (C) 2001-2017 Free Software Foundation, Inc. 20396+# Copyright (C) 2001-2021 Free Software Foundation, Inc. 20397 # 20398 # This file is free software; the Free Software Foundation 20399 # gives unlimited permission to copy and/or distribute it, 20400@@ -732,49 +742,42 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) 20401 20402 # AM_MAKE_INCLUDE() 20403 # ----------------- 20404-# Check to see how make treats includes. 20405+# Check whether make has an 'include' directive that can support all 20406+# the idioms we need for our automatic dependency tracking code. 20407 AC_DEFUN([AM_MAKE_INCLUDE], 20408-[am_make=${MAKE-make} 20409-cat > confinc << 'END' 20410+[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive]) 20411+cat > confinc.mk << 'END' 20412 am__doit: 20413- @echo this is the am__doit target 20414+ @echo this is the am__doit target >confinc.out 20415 .PHONY: am__doit 20416 END 20417-# If we don't find an include directive, just comment out the code. 20418-AC_MSG_CHECKING([for style of include used by $am_make]) 20419 am__include="#" 20420 am__quote= 20421-_am_result=none 20422-# First try GNU make style include. 20423-echo "include confinc" > confmf 20424-# Ignore all kinds of additional output from 'make'. 20425-case `$am_make -s -f confmf 2> /dev/null` in #( 20426-*the\ am__doit\ target*) 20427- am__include=include 20428- am__quote= 20429- _am_result=GNU 20430- ;; 20431-esac 20432-# Now try BSD make style include. 20433-if test "$am__include" = "#"; then 20434- echo '.include "confinc"' > confmf 20435- case `$am_make -s -f confmf 2> /dev/null` in #( 20436- *the\ am__doit\ target*) 20437- am__include=.include 20438- am__quote="\"" 20439- _am_result=BSD 20440- ;; 20441- esac 20442-fi 20443-AC_SUBST([am__include]) 20444-AC_SUBST([am__quote]) 20445-AC_MSG_RESULT([$_am_result]) 20446-rm -f confinc confmf 20447-]) 20448+# BSD make does it like this. 20449+echo '.include "confinc.mk" # ignored' > confmf.BSD 20450+# Other make implementations (GNU, Solaris 10, AIX) do it like this. 20451+echo 'include confinc.mk # ignored' > confmf.GNU 20452+_am_result=no 20453+for s in GNU BSD; do 20454+ AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out]) 20455+ AS_CASE([$?:`cat confinc.out 2>/dev/null`], 20456+ ['0:this is the am__doit target'], 20457+ [AS_CASE([$s], 20458+ [BSD], [am__include='.include' am__quote='"'], 20459+ [am__include='include' am__quote=''])]) 20460+ if test "$am__include" != "#"; then 20461+ _am_result="yes ($s style)" 20462+ break 20463+ fi 20464+done 20465+rm -f confinc.* confmf.* 20466+AC_MSG_RESULT([${_am_result}]) 20467+AC_SUBST([am__include])]) 20468+AC_SUBST([am__quote])]) 20469 20470 # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- 20471 20472-# Copyright (C) 1997-2017 Free Software Foundation, Inc. 20473+# Copyright (C) 1997-2021 Free Software Foundation, Inc. 20474 # 20475 # This file is free software; the Free Software Foundation 20476 # gives unlimited permission to copy and/or distribute it, 20477@@ -795,12 +798,7 @@ AC_DEFUN([AM_MISSING_HAS_RUN], 20478 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl 20479 AC_REQUIRE_AUX_FILE([missing])dnl 20480 if test x"${MISSING+set}" != xset; then 20481- case $am_aux_dir in 20482- *\ * | *\ *) 20483- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; 20484- *) 20485- MISSING="\${SHELL} $am_aux_dir/missing" ;; 20486- esac 20487+ MISSING="\${SHELL} '$am_aux_dir/missing'" 20488 fi 20489 # Use eval to expand $SHELL 20490 if eval "$MISSING --is-lightweight"; then 20491@@ -813,7 +811,7 @@ fi 20492 20493 # Helper functions for option handling. -*- Autoconf -*- 20494 20495-# Copyright (C) 2001-2017 Free Software Foundation, Inc. 20496+# Copyright (C) 2001-2021 Free Software Foundation, Inc. 20497 # 20498 # This file is free software; the Free Software Foundation 20499 # gives unlimited permission to copy and/or distribute it, 20500@@ -842,7 +840,7 @@ AC_DEFUN([_AM_SET_OPTIONS], 20501 AC_DEFUN([_AM_IF_OPTION], 20502 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) 20503 20504-# Copyright (C) 1999-2017 Free Software Foundation, Inc. 20505+# Copyright (C) 1999-2021 Free Software Foundation, Inc. 20506 # 20507 # This file is free software; the Free Software Foundation 20508 # gives unlimited permission to copy and/or distribute it, 20509@@ -889,7 +887,7 @@ AC_LANG_POP([C])]) 20510 # For backward compatibility. 20511 AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) 20512 20513-# Copyright (C) 2001-2017 Free Software Foundation, Inc. 20514+# Copyright (C) 2001-2021 Free Software Foundation, Inc. 20515 # 20516 # This file is free software; the Free Software Foundation 20517 # gives unlimited permission to copy and/or distribute it, 20518@@ -908,7 +906,7 @@ AC_DEFUN([AM_RUN_LOG], 20519 20520 # Check to make sure that the build environment is sane. -*- Autoconf -*- 20521 20522-# Copyright (C) 1996-2017 Free Software Foundation, Inc. 20523+# Copyright (C) 1996-2021 Free Software Foundation, Inc. 20524 # 20525 # This file is free software; the Free Software Foundation 20526 # gives unlimited permission to copy and/or distribute it, 20527@@ -989,7 +987,7 @@ AC_CONFIG_COMMANDS_PRE( 20528 rm -f conftest.file 20529 ]) 20530 20531-# Copyright (C) 2009-2017 Free Software Foundation, Inc. 20532+# Copyright (C) 2009-2021 Free Software Foundation, Inc. 20533 # 20534 # This file is free software; the Free Software Foundation 20535 # gives unlimited permission to copy and/or distribute it, 20536@@ -1049,7 +1047,7 @@ AC_SUBST([AM_BACKSLASH])dnl 20537 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl 20538 ]) 20539 20540-# Copyright (C) 2001-2017 Free Software Foundation, Inc. 20541+# Copyright (C) 2001-2021 Free Software Foundation, Inc. 20542 # 20543 # This file is free software; the Free Software Foundation 20544 # gives unlimited permission to copy and/or distribute it, 20545@@ -1077,7 +1075,7 @@ fi 20546 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" 20547 AC_SUBST([INSTALL_STRIP_PROGRAM])]) 20548 20549-# Copyright (C) 2006-2017 Free Software Foundation, Inc. 20550+# Copyright (C) 2006-2021 Free Software Foundation, Inc. 20551 # 20552 # This file is free software; the Free Software Foundation 20553 # gives unlimited permission to copy and/or distribute it, 20554@@ -1096,7 +1094,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) 20555 20556 # Check how to create a tarball. -*- Autoconf -*- 20557 20558-# Copyright (C) 2004-2017 Free Software Foundation, Inc. 20559+# Copyright (C) 2004-2021 Free Software Foundation, Inc. 20560 # 20561 # This file is free software; the Free Software Foundation 20562 # gives unlimited permission to copy and/or distribute it, 20563diff --git a/libsframe/configure b/libsframe/configure 20564index 7bbed5d8ccf..795e7802110 100755 20565--- a/libsframe/configure 20566+++ b/libsframe/configure 20567@@ -654,6 +654,8 @@ OTOOL 20568 LIPO 20569 NMEDIT 20570 DSYMUTIL 20571+MANIFEST_TOOL 20572+DLLTOOL 20573 OBJDUMP 20574 LN_S 20575 NM 20576@@ -678,6 +680,9 @@ AM_BACKSLASH 20577 AM_DEFAULT_VERBOSITY 20578 AM_DEFAULT_V 20579 AM_V 20580+CSCOPE 20581+ETAGS 20582+CTAGS 20583 am__fastdepCC_FALSE 20584 am__fastdepCC_TRUE 20585 CCDEPMODE 20586@@ -685,7 +690,6 @@ am__nodep 20587 AMDEPBACKSLASH 20588 AMDEP_FALSE 20589 AMDEP_TRUE 20590-am__quote 20591 am__include 20592 DEPDIR 20593 am__untar 20594@@ -758,7 +762,8 @@ PACKAGE_VERSION 20595 PACKAGE_TARNAME 20596 PACKAGE_NAME 20597 PATH_SEPARATOR 20598-SHELL' 20599+SHELL 20600+am__quote' 20601 ac_subst_files='' 20602 ac_user_opts=' 20603 enable_option_checking 20604@@ -769,6 +774,7 @@ enable_static 20605 with_pic 20606 enable_fast_install 20607 with_gnu_ld 20608+with_libtool_sysroot 20609 enable_libtool_lock 20610 enable_largefile 20611 enable_maintainer_mode 20612@@ -1424,6 +1430,8 @@ Optional Packages: 20613 --with-pic try to use only PIC/non-PIC objects [default=use 20614 both] 20615 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 20616+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR 20617+ (or the compiler's sysroot if not specified). 20618 20619 Some influential environment variables: 20620 CC C compiler command 20621@@ -3606,7 +3614,7 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; } 20622 $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h 20623 20624 20625-am__api_version='1.15' 20626+am__api_version='1.16' 20627 20628 # Find a good install program. We prefer a C program (faster), 20629 # so one script is as good as another. But avoid the broken or 20630@@ -3779,12 +3787,7 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' 20631 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` 20632 20633 if test x"${MISSING+set}" != xset; then 20634- case $am_aux_dir in 20635- *\ * | *\ *) 20636- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; 20637- *) 20638- MISSING="\${SHELL} $am_aux_dir/missing" ;; 20639- esac 20640+ MISSING="\${SHELL} '$am_aux_dir/missing'" 20641 fi 20642 # Use eval to expand $SHELL 20643 if eval "$MISSING --is-lightweight"; then 20644@@ -4032,45 +4035,45 @@ DEPDIR="${am__leading_dot}deps" 20645 20646 ac_config_commands="$ac_config_commands depfiles" 20647 20648- 20649-am_make=${MAKE-make} 20650-cat > confinc << 'END' 20651+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 20652+$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; } 20653+cat > confinc.mk << 'END' 20654 am__doit: 20655- @echo this is the am__doit target 20656+ @echo this is the am__doit target >confinc.out 20657 .PHONY: am__doit 20658 END 20659-# If we don't find an include directive, just comment out the code. 20660-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 20661-$as_echo_n "checking for style of include used by $am_make... " >&6; } 20662 am__include="#" 20663 am__quote= 20664-_am_result=none 20665-# First try GNU make style include. 20666-echo "include confinc" > confmf 20667-# Ignore all kinds of additional output from 'make'. 20668-case `$am_make -s -f confmf 2> /dev/null` in #( 20669-*the\ am__doit\ target*) 20670- am__include=include 20671- am__quote= 20672- _am_result=GNU 20673- ;; 20674-esac 20675-# Now try BSD make style include. 20676-if test "$am__include" = "#"; then 20677- echo '.include "confinc"' > confmf 20678- case `$am_make -s -f confmf 2> /dev/null` in #( 20679- *the\ am__doit\ target*) 20680- am__include=.include 20681- am__quote="\"" 20682- _am_result=BSD 20683+# BSD make does it like this. 20684+echo '.include "confinc.mk" # ignored' > confmf.BSD 20685+# Other make implementations (GNU, Solaris 10, AIX) do it like this. 20686+echo 'include confinc.mk # ignored' > confmf.GNU 20687+_am_result=no 20688+for s in GNU BSD; do 20689+ { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5 20690+ (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5 20691+ ac_status=$? 20692+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 20693+ (exit $ac_status); } 20694+ case $?:`cat confinc.out 2>/dev/null` in #( 20695+ '0:this is the am__doit target') : 20696+ case $s in #( 20697+ BSD) : 20698+ am__include='.include' am__quote='"' ;; #( 20699+ *) : 20700+ am__include='include' am__quote='' ;; 20701+esac ;; #( 20702+ *) : 20703 ;; 20704- esac 20705-fi 20706- 20707- 20708-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 20709-$as_echo "$_am_result" >&6; } 20710-rm -f confinc confmf 20711+esac 20712+ if test "$am__include" != "#"; then 20713+ _am_result="yes ($s style)" 20714+ break 20715+ fi 20716+done 20717+rm -f confinc.* confmf.* 20718+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 20719+$as_echo "${_am_result}" >&6; } 20720 20721 # Check whether --enable-dependency-tracking was given. 20722 if test "${enable_dependency_tracking+set}" = set; then : 20723@@ -4182,8 +4185,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} 20724 20725 # For better backward compatibility. To be removed once Automake 1.9.x 20726 # dies out for good. For more background, see: 20727-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> 20728-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> 20729+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> 20730+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> 20731 mkdir_p='$(MKDIR_P)' 20732 20733 # We need awk for the "check" target (and possibly the TAP driver). The 20734@@ -4330,6 +4333,20 @@ else 20735 fi 20736 20737 20738+# Variables for tags utilities; see am/tags.am 20739+if test -z "$CTAGS"; then 20740+ CTAGS=ctags 20741+fi 20742+ 20743+if test -z "$ETAGS"; then 20744+ ETAGS=etags 20745+fi 20746+ 20747+if test -z "$CSCOPE"; then 20748+ CSCOPE=cscope 20749+fi 20750+ 20751+ 20752 20753 # POSIX will say in a future version that running "rm -f" with no argument 20754 # is OK; and we want to be able to make that assumption in our Makefile 20755@@ -4362,7 +4379,7 @@ END 20756 Aborting the configuration process, to ensure you take notice of the issue. 20757 20758 You can download and install GNU coreutils to get an 'rm' implementation 20759-that behaves properly: <http://www.gnu.org/software/coreutils/>. 20760+that behaves properly: <https://www.gnu.org/software/coreutils/>. 20761 20762 If you want to complete the configuration process using your problematic 20763 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM 20764@@ -5308,8 +5325,8 @@ esac 20765 20766 20767 20768-macro_version='2.2.7a' 20769-macro_revision='1.3134' 20770+macro_version='2.4' 20771+macro_revision='1.3293' 20772 20773 20774 20775@@ -5420,7 +5437,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 20776 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 20777 $as_echo_n "checking how to print strings... " >&6; } 20778 # Test print first, because it will be a builtin if present. 20779-if test "X`print -r -- -n 2>/dev/null`" = X-n && \ 20780+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ 20781 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 20782 ECHO='print -r --' 20783 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 20784@@ -6113,8 +6130,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 20785 # Try some XSI features 20786 xsi_shell=no 20787 ( _lt_dummy="a/b/c" 20788- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ 20789- = c,a/b,, \ 20790+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ 20791+ = c,a/b,b/c, \ 20792 && eval 'test $(( 1 + 1 )) -eq 2 \ 20793 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 20794 && xsi_shell=yes 20795@@ -6163,6 +6180,80 @@ esac 20796 20797 20798 20799+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 20800+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } 20801+if ${lt_cv_to_host_file_cmd+:} false; then : 20802+ $as_echo_n "(cached) " >&6 20803+else 20804+ case $host in 20805+ *-*-mingw* ) 20806+ case $build in 20807+ *-*-mingw* ) # actually msys 20808+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 20809+ ;; 20810+ *-*-cygwin* ) 20811+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 20812+ ;; 20813+ * ) # otherwise, assume *nix 20814+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 20815+ ;; 20816+ esac 20817+ ;; 20818+ *-*-cygwin* ) 20819+ case $build in 20820+ *-*-mingw* ) # actually msys 20821+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin 20822+ ;; 20823+ *-*-cygwin* ) 20824+ lt_cv_to_host_file_cmd=func_convert_file_noop 20825+ ;; 20826+ * ) # otherwise, assume *nix 20827+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin 20828+ ;; 20829+ esac 20830+ ;; 20831+ * ) # unhandled hosts (and "normal" native builds) 20832+ lt_cv_to_host_file_cmd=func_convert_file_noop 20833+ ;; 20834+esac 20835+ 20836+fi 20837+ 20838+to_host_file_cmd=$lt_cv_to_host_file_cmd 20839+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 20840+$as_echo "$lt_cv_to_host_file_cmd" >&6; } 20841+ 20842+ 20843+ 20844+ 20845+ 20846+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 20847+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } 20848+if ${lt_cv_to_tool_file_cmd+:} false; then : 20849+ $as_echo_n "(cached) " >&6 20850+else 20851+ #assume ordinary cross tools, or native build. 20852+lt_cv_to_tool_file_cmd=func_convert_file_noop 20853+case $host in 20854+ *-*-mingw* ) 20855+ case $build in 20856+ *-*-mingw* ) # actually msys 20857+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 20858+ ;; 20859+ esac 20860+ ;; 20861+esac 20862+ 20863+fi 20864+ 20865+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 20866+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 20867+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } 20868+ 20869+ 20870+ 20871+ 20872+ 20873 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 20874 $as_echo_n "checking for $LD option to reload object files... " >&6; } 20875 if ${lt_cv_ld_reload_flag+:} false; then : 20876@@ -6179,6 +6270,11 @@ case $reload_flag in 20877 esac 20878 reload_cmds='$LD$reload_flag -o $output$reload_objs' 20879 case $host_os in 20880+ cygwin* | mingw* | pw32* | cegcc*) 20881+ if test "$GCC" != yes; then 20882+ reload_cmds=false 20883+ fi 20884+ ;; 20885 darwin*) 20886 if test "$GCC" = yes; then 20887 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 20888@@ -6347,7 +6443,8 @@ mingw* | pw32*) 20889 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 20890 lt_cv_file_magic_cmd='func_win32_libid' 20891 else 20892- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' 20893+ # Keep this pattern in sync with the one in func_win32_libid. 20894+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' 20895 lt_cv_file_magic_cmd='$OBJDUMP -f' 20896 fi 20897 ;; 20898@@ -6501,6 +6598,21 @@ esac 20899 fi 20900 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 20901 $as_echo "$lt_cv_deplibs_check_method" >&6; } 20902+ 20903+file_magic_glob= 20904+want_nocaseglob=no 20905+if test "$build" = "$host"; then 20906+ case $host_os in 20907+ mingw* | pw32*) 20908+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then 20909+ want_nocaseglob=yes 20910+ else 20911+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` 20912+ fi 20913+ ;; 20914+ esac 20915+fi 20916+ 20917 file_magic_cmd=$lt_cv_file_magic_cmd 20918 deplibs_check_method=$lt_cv_deplibs_check_method 20919 test -z "$deplibs_check_method" && deplibs_check_method=unknown 20920@@ -6516,6 +6628,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 20921 20922 20923 20924+ 20925+ 20926+ 20927+ 20928+ 20929+ 20930+ 20931+ 20932+ 20933+ 20934+if test -n "$ac_tool_prefix"; then 20935+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. 20936+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 20937+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 20938+$as_echo_n "checking for $ac_word... " >&6; } 20939+if ${ac_cv_prog_DLLTOOL+:} false; then : 20940+ $as_echo_n "(cached) " >&6 20941+else 20942+ if test -n "$DLLTOOL"; then 20943+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. 20944+else 20945+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 20946+for as_dir in $PATH 20947+do 20948+ IFS=$as_save_IFS 20949+ test -z "$as_dir" && as_dir=. 20950+ for ac_exec_ext in '' $ac_executable_extensions; do 20951+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 20952+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" 20953+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 20954+ break 2 20955+ fi 20956+done 20957+ done 20958+IFS=$as_save_IFS 20959+ 20960+fi 20961+fi 20962+DLLTOOL=$ac_cv_prog_DLLTOOL 20963+if test -n "$DLLTOOL"; then 20964+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 20965+$as_echo "$DLLTOOL" >&6; } 20966+else 20967+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 20968+$as_echo "no" >&6; } 20969+fi 20970+ 20971+ 20972+fi 20973+if test -z "$ac_cv_prog_DLLTOOL"; then 20974+ ac_ct_DLLTOOL=$DLLTOOL 20975+ # Extract the first word of "dlltool", so it can be a program name with args. 20976+set dummy dlltool; ac_word=$2 20977+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 20978+$as_echo_n "checking for $ac_word... " >&6; } 20979+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : 20980+ $as_echo_n "(cached) " >&6 20981+else 20982+ if test -n "$ac_ct_DLLTOOL"; then 20983+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. 20984+else 20985+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 20986+for as_dir in $PATH 20987+do 20988+ IFS=$as_save_IFS 20989+ test -z "$as_dir" && as_dir=. 20990+ for ac_exec_ext in '' $ac_executable_extensions; do 20991+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 20992+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" 20993+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 20994+ break 2 20995+ fi 20996+done 20997+ done 20998+IFS=$as_save_IFS 20999+ 21000+fi 21001+fi 21002+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL 21003+if test -n "$ac_ct_DLLTOOL"; then 21004+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 21005+$as_echo "$ac_ct_DLLTOOL" >&6; } 21006+else 21007+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 21008+$as_echo "no" >&6; } 21009+fi 21010+ 21011+ if test "x$ac_ct_DLLTOOL" = x; then 21012+ DLLTOOL="false" 21013+ else 21014+ case $cross_compiling:$ac_tool_warned in 21015+yes:) 21016+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 21017+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 21018+ac_tool_warned=yes ;; 21019+esac 21020+ DLLTOOL=$ac_ct_DLLTOOL 21021+ fi 21022+else 21023+ DLLTOOL="$ac_cv_prog_DLLTOOL" 21024+fi 21025+ 21026+test -z "$DLLTOOL" && DLLTOOL=dlltool 21027+ 21028+ 21029+ 21030+ 21031+ 21032+ 21033+ 21034+ 21035+ 21036+ 21037+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 21038+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } 21039+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : 21040+ $as_echo_n "(cached) " >&6 21041+else 21042+ lt_cv_sharedlib_from_linklib_cmd='unknown' 21043+ 21044+case $host_os in 21045+cygwin* | mingw* | pw32* | cegcc*) 21046+ # two different shell functions defined in ltmain.sh 21047+ # decide which to use based on capabilities of $DLLTOOL 21048+ case `$DLLTOOL --help 2>&1` in 21049+ *--identify-strict*) 21050+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib 21051+ ;; 21052+ *) 21053+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback 21054+ ;; 21055+ esac 21056+ ;; 21057+*) 21058+ # fallback: assume linklib IS sharedlib 21059+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" 21060+ ;; 21061+esac 21062+ 21063+fi 21064+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 21065+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } 21066+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd 21067+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO 21068+ 21069+ 21070+ 21071+ 21072+ 21073+ 21074+ 21075 plugin_option= 21076 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 21077 for plugin in $plugin_names; do 21078@@ -6530,8 +6793,10 @@ for plugin in $plugin_names; do 21079 done 21080 21081 if test -n "$ac_tool_prefix"; then 21082- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 21083-set dummy ${ac_tool_prefix}ar; ac_word=$2 21084+ for ac_prog in ar 21085+ do 21086+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 21087+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 21088 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 21089 $as_echo_n "checking for $ac_word... " >&6; } 21090 if ${ac_cv_prog_AR+:} false; then : 21091@@ -6547,7 +6812,7 @@ do 21092 test -z "$as_dir" && as_dir=. 21093 for ac_exec_ext in '' $ac_executable_extensions; do 21094 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 21095- ac_cv_prog_AR="${ac_tool_prefix}ar" 21096+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" 21097 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 21098 break 2 21099 fi 21100@@ -6567,11 +6832,15 @@ $as_echo "no" >&6; } 21101 fi 21102 21103 21104+ test -n "$AR" && break 21105+ done 21106 fi 21107-if test -z "$ac_cv_prog_AR"; then 21108+if test -z "$AR"; then 21109 ac_ct_AR=$AR 21110- # Extract the first word of "ar", so it can be a program name with args. 21111-set dummy ar; ac_word=$2 21112+ for ac_prog in ar 21113+do 21114+ # Extract the first word of "$ac_prog", so it can be a program name with args. 21115+set dummy $ac_prog; ac_word=$2 21116 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 21117 $as_echo_n "checking for $ac_word... " >&6; } 21118 if ${ac_cv_prog_ac_ct_AR+:} false; then : 21119@@ -6587,7 +6856,7 @@ do 21120 test -z "$as_dir" && as_dir=. 21121 for ac_exec_ext in '' $ac_executable_extensions; do 21122 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 21123- ac_cv_prog_ac_ct_AR="ar" 21124+ ac_cv_prog_ac_ct_AR="$ac_prog" 21125 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 21126 break 2 21127 fi 21128@@ -6606,6 +6875,10 @@ else 21129 $as_echo "no" >&6; } 21130 fi 21131 21132+ 21133+ test -n "$ac_ct_AR" && break 21134+done 21135+ 21136 if test "x$ac_ct_AR" = x; then 21137 AR="false" 21138 else 21139@@ -6617,29 +6890,81 @@ ac_tool_warned=yes ;; 21140 esac 21141 AR=$ac_ct_AR 21142 fi 21143-else 21144- AR="$ac_cv_prog_AR" 21145 fi 21146 21147-test -z "$AR" && AR=ar 21148-if test -n "$plugin_option"; then 21149- if $AR --help 2>&1 | grep -q "\--plugin"; then 21150- touch conftest.c 21151- $AR $plugin_option rc conftest.a conftest.c 21152- if test "$?" != 0; then 21153- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 21154+ touch conftest.c 21155+ $AR $plugin_option rc conftest.a conftest.c 21156+ if test "$?" != 0; then 21157+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 21158 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} 21159- else 21160- AR="$AR $plugin_option" 21161- fi 21162- rm -f conftest.* 21163+ else 21164+ AR="$AR $plugin_option" 21165 fi 21166-fi 21167-test -z "$AR_FLAGS" && AR_FLAGS=cru 21168+ rm -f conftest.* 21169+: ${AR=ar} 21170+: ${AR_FLAGS=cru} 21171+ 21172+ 21173+ 21174+ 21175+ 21176+ 21177+ 21178 21179 21180 21181 21182+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 21183+$as_echo_n "checking for archiver @FILE support... " >&6; } 21184+if ${lt_cv_ar_at_file+:} false; then : 21185+ $as_echo_n "(cached) " >&6 21186+else 21187+ lt_cv_ar_at_file=no 21188+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 21189+/* end confdefs.h. */ 21190+ 21191+int 21192+main () 21193+{ 21194+ 21195+ ; 21196+ return 0; 21197+} 21198+_ACEOF 21199+if ac_fn_c_try_compile "$LINENO"; then : 21200+ echo conftest.$ac_objext > conftest.lst 21201+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' 21202+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 21203+ (eval $lt_ar_try) 2>&5 21204+ ac_status=$? 21205+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 21206+ test $ac_status = 0; } 21207+ if test "$ac_status" -eq 0; then 21208+ # Ensure the archiver fails upon bogus file names. 21209+ rm -f conftest.$ac_objext libconftest.a 21210+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 21211+ (eval $lt_ar_try) 2>&5 21212+ ac_status=$? 21213+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 21214+ test $ac_status = 0; } 21215+ if test "$ac_status" -ne 0; then 21216+ lt_cv_ar_at_file=@ 21217+ fi 21218+ fi 21219+ rm -f conftest.* libconftest.a 21220+ 21221+fi 21222+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 21223+ 21224+fi 21225+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 21226+$as_echo "$lt_cv_ar_at_file" >&6; } 21227+ 21228+if test "x$lt_cv_ar_at_file" = xno; then 21229+ archiver_list_spec= 21230+else 21231+ archiver_list_spec=$lt_cv_ar_at_file 21232+fi 21233 21234 21235 21236@@ -6986,8 +7311,8 @@ esac 21237 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 21238 21239 # Transform an extracted symbol line into symbol name and symbol address 21240-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 21241-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'" 21242+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 21243+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'" 21244 21245 # Handle CRLF in mingw tool chain 21246 opt_cr= 21247@@ -7023,6 +7348,7 @@ for ac_symprfx in "" "_"; do 21248 else 21249 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 21250 fi 21251+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" 21252 21253 # Check to see that the pipe works correctly. 21254 pipe_works=no 21255@@ -7064,6 +7390,18 @@ _LT_EOF 21256 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 21257 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 21258 cat <<_LT_EOF > conftest.$ac_ext 21259+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ 21260+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) 21261+/* DATA imports from DLLs on WIN32 con't be const, because runtime 21262+ relocations are performed -- see ld's documentation on pseudo-relocs. */ 21263+# define LT_DLSYM_CONST 21264+#elif defined(__osf__) 21265+/* This system does not cope well with relocations in const data. */ 21266+# define LT_DLSYM_CONST 21267+#else 21268+# define LT_DLSYM_CONST const 21269+#endif 21270+ 21271 #ifdef __cplusplus 21272 extern "C" { 21273 #endif 21274@@ -7075,7 +7413,7 @@ _LT_EOF 21275 cat <<_LT_EOF >> conftest.$ac_ext 21276 21277 /* The mapping between symbol names and symbols. */ 21278-const struct { 21279+LT_DLSYM_CONST struct { 21280 const char *name; 21281 void *address; 21282 } 21283@@ -7101,8 +7439,8 @@ static const void *lt_preloaded_setup() { 21284 _LT_EOF 21285 # Now try linking the two files. 21286 mv conftest.$ac_objext conftstm.$ac_objext 21287- lt_save_LIBS="$LIBS" 21288- lt_save_CFLAGS="$CFLAGS" 21289+ lt_globsym_save_LIBS=$LIBS 21290+ lt_globsym_save_CFLAGS=$CFLAGS 21291 LIBS="conftstm.$ac_objext" 21292 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 21293 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 21294@@ -7112,8 +7450,8 @@ _LT_EOF 21295 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 21296 pipe_works=yes 21297 fi 21298- LIBS="$lt_save_LIBS" 21299- CFLAGS="$lt_save_CFLAGS" 21300+ LIBS=$lt_globsym_save_LIBS 21301+ CFLAGS=$lt_globsym_save_CFLAGS 21302 else 21303 echo "cannot find nm_test_func in $nlist" >&5 21304 fi 21305@@ -7150,6 +7488,16 @@ else 21306 $as_echo "ok" >&6; } 21307 fi 21308 21309+# Response file support. 21310+if test "$lt_cv_nm_interface" = "MS dumpbin"; then 21311+ nm_file_list_spec='@' 21312+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then 21313+ nm_file_list_spec='@' 21314+fi 21315+ 21316+ 21317+ 21318+ 21319 21320 21321 21322@@ -7166,6 +7514,45 @@ fi 21323 21324 21325 21326+ 21327+ 21328+ 21329+ 21330+ 21331+ 21332+ 21333+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 21334+$as_echo_n "checking for sysroot... " >&6; } 21335+ 21336+# Check whether --with-libtool-sysroot was given. 21337+if test "${with_libtool_sysroot+set}" = set; then : 21338+ withval=$with_libtool_sysroot; 21339+else 21340+ with_libtool_sysroot=no 21341+fi 21342+ 21343+ 21344+lt_sysroot= 21345+case ${with_libtool_sysroot} in #( 21346+ yes) 21347+ if test "$GCC" = yes; then 21348+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` 21349+ fi 21350+ ;; #( 21351+ /*) 21352+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` 21353+ ;; #( 21354+ no|'') 21355+ ;; #( 21356+ *) 21357+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 21358+$as_echo "${with_libtool_sysroot}" >&6; } 21359+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 21360+ ;; 21361+esac 21362+ 21363+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 21364+$as_echo "${lt_sysroot:-no}" >&6; } 21365 21366 21367 21368@@ -7371,11 +7758,128 @@ sparc*-*solaris*) 21369 ;; 21370 esac 21371 fi 21372- rm -rf conftest* 21373- ;; 21374+ rm -rf conftest* 21375+ ;; 21376+esac 21377+ 21378+need_locks="$enable_libtool_lock" 21379+ 21380+if test -n "$ac_tool_prefix"; then 21381+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. 21382+set dummy ${ac_tool_prefix}mt; ac_word=$2 21383+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 21384+$as_echo_n "checking for $ac_word... " >&6; } 21385+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : 21386+ $as_echo_n "(cached) " >&6 21387+else 21388+ if test -n "$MANIFEST_TOOL"; then 21389+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. 21390+else 21391+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 21392+for as_dir in $PATH 21393+do 21394+ IFS=$as_save_IFS 21395+ test -z "$as_dir" && as_dir=. 21396+ for ac_exec_ext in '' $ac_executable_extensions; do 21397+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 21398+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" 21399+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 21400+ break 2 21401+ fi 21402+done 21403+ done 21404+IFS=$as_save_IFS 21405+ 21406+fi 21407+fi 21408+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL 21409+if test -n "$MANIFEST_TOOL"; then 21410+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 21411+$as_echo "$MANIFEST_TOOL" >&6; } 21412+else 21413+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 21414+$as_echo "no" >&6; } 21415+fi 21416+ 21417+ 21418+fi 21419+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then 21420+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL 21421+ # Extract the first word of "mt", so it can be a program name with args. 21422+set dummy mt; ac_word=$2 21423+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 21424+$as_echo_n "checking for $ac_word... " >&6; } 21425+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : 21426+ $as_echo_n "(cached) " >&6 21427+else 21428+ if test -n "$ac_ct_MANIFEST_TOOL"; then 21429+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. 21430+else 21431+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 21432+for as_dir in $PATH 21433+do 21434+ IFS=$as_save_IFS 21435+ test -z "$as_dir" && as_dir=. 21436+ for ac_exec_ext in '' $ac_executable_extensions; do 21437+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 21438+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" 21439+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 21440+ break 2 21441+ fi 21442+done 21443+ done 21444+IFS=$as_save_IFS 21445+ 21446+fi 21447+fi 21448+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL 21449+if test -n "$ac_ct_MANIFEST_TOOL"; then 21450+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 21451+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } 21452+else 21453+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 21454+$as_echo "no" >&6; } 21455+fi 21456+ 21457+ if test "x$ac_ct_MANIFEST_TOOL" = x; then 21458+ MANIFEST_TOOL=":" 21459+ else 21460+ case $cross_compiling:$ac_tool_warned in 21461+yes:) 21462+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 21463+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 21464+ac_tool_warned=yes ;; 21465 esac 21466+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL 21467+ fi 21468+else 21469+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" 21470+fi 21471+ 21472+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt 21473+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 21474+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } 21475+if ${lt_cv_path_mainfest_tool+:} false; then : 21476+ $as_echo_n "(cached) " >&6 21477+else 21478+ lt_cv_path_mainfest_tool=no 21479+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 21480+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out 21481+ cat conftest.err >&5 21482+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then 21483+ lt_cv_path_mainfest_tool=yes 21484+ fi 21485+ rm -f conftest* 21486+fi 21487+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 21488+$as_echo "$lt_cv_path_mainfest_tool" >&6; } 21489+if test "x$lt_cv_path_mainfest_tool" != xyes; then 21490+ MANIFEST_TOOL=: 21491+fi 21492+ 21493+ 21494+ 21495 21496-need_locks="$enable_libtool_lock" 21497 21498 21499 case $host_os in 21500@@ -7940,6 +8444,8 @@ _LT_EOF 21501 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 21502 echo "$AR cru libconftest.a conftest.o" >&5 21503 $AR cru libconftest.a conftest.o 2>&5 21504+ echo "$RANLIB libconftest.a" >&5 21505+ $RANLIB libconftest.a 2>&5 21506 cat > conftest.c << _LT_EOF 21507 int main() { return 0;} 21508 _LT_EOF 21509@@ -8492,8 +8998,6 @@ fi 21510 lt_prog_compiler_pic= 21511 lt_prog_compiler_static= 21512 21513-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 21514-$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 21515 21516 if test "$GCC" = yes; then 21517 lt_prog_compiler_wl='-Wl,' 21518@@ -8659,6 +9163,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 21519 lt_prog_compiler_pic='--shared' 21520 lt_prog_compiler_static='--static' 21521 ;; 21522+ nagfor*) 21523+ # NAG Fortran compiler 21524+ lt_prog_compiler_wl='-Wl,-Wl,,' 21525+ lt_prog_compiler_pic='-PIC' 21526+ lt_prog_compiler_static='-Bstatic' 21527+ ;; 21528 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 21529 # Portland Group compilers (*not* the Pentium gcc compiler, 21530 # which looks to be a dead project) 21531@@ -8721,7 +9231,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 21532 lt_prog_compiler_pic='-KPIC' 21533 lt_prog_compiler_static='-Bstatic' 21534 case $cc_basename in 21535- f77* | f90* | f95*) 21536+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) 21537 lt_prog_compiler_wl='-Qoption ld ';; 21538 *) 21539 lt_prog_compiler_wl='-Wl,';; 21540@@ -8778,13 +9288,17 @@ case $host_os in 21541 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 21542 ;; 21543 esac 21544-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 21545-$as_echo "$lt_prog_compiler_pic" >&6; } 21546- 21547- 21548- 21549- 21550 21551+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 21552+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 21553+if ${lt_cv_prog_compiler_pic+:} false; then : 21554+ $as_echo_n "(cached) " >&6 21555+else 21556+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic 21557+fi 21558+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 21559+$as_echo "$lt_cv_prog_compiler_pic" >&6; } 21560+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic 21561 21562 # 21563 # Check to make sure the PIC flag actually works. 21564@@ -8845,6 +9359,11 @@ fi 21565 21566 21567 21568+ 21569+ 21570+ 21571+ 21572+ 21573 # 21574 # Check to make sure the static flag actually works. 21575 # 21576@@ -9195,7 +9714,8 @@ _LT_EOF 21577 allow_undefined_flag=unsupported 21578 always_export_symbols=no 21579 enable_shared_with_static_runtimes=yes 21580- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 21581+ 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' 21582+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' 21583 21584 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 21585 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 21586@@ -9294,12 +9814,12 @@ _LT_EOF 21587 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 21588 hardcode_libdir_flag_spec= 21589 hardcode_libdir_flag_spec_ld='-rpath $libdir' 21590- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' 21591+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' 21592 if test "x$supports_anon_versioning" = xyes; then 21593 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ 21594 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ 21595 echo "local: *; };" >> $output_objdir/$libname.ver~ 21596- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 21597+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 21598 fi 21599 ;; 21600 esac 21601@@ -9313,8 +9833,8 @@ _LT_EOF 21602 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 21603 wlarc= 21604 else 21605- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 21606- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 21607+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 21608+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 21609 fi 21610 ;; 21611 21612@@ -9332,8 +9852,8 @@ _LT_EOF 21613 21614 _LT_EOF 21615 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 21616- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 21617- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 21618+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 21619+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 21620 else 21621 ld_shlibs=no 21622 fi 21623@@ -9379,8 +9899,8 @@ _LT_EOF 21624 21625 *) 21626 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 21627- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 21628- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 21629+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 21630+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 21631 else 21632 ld_shlibs=no 21633 fi 21634@@ -9510,7 +10030,13 @@ _LT_EOF 21635 allow_undefined_flag='-berok' 21636 # Determine the default libpath from the value encoded in an 21637 # empty executable. 21638- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 21639+ if test "${lt_cv_aix_libpath+set}" = set; then 21640+ aix_libpath=$lt_cv_aix_libpath 21641+else 21642+ if ${lt_cv_aix_libpath_+:} false; then : 21643+ $as_echo_n "(cached) " >&6 21644+else 21645+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 21646 /* end confdefs.h. */ 21647 21648 int 21649@@ -9523,22 +10049,29 @@ main () 21650 _ACEOF 21651 if ac_fn_c_try_link "$LINENO"; then : 21652 21653-lt_aix_libpath_sed=' 21654- /Import File Strings/,/^$/ { 21655- /^0/ { 21656- s/^0 *\(.*\)$/\1/ 21657- p 21658- } 21659- }' 21660-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 21661-# Check for a 64-bit object if we didn't find anything. 21662-if test -z "$aix_libpath"; then 21663- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 21664-fi 21665+ lt_aix_libpath_sed=' 21666+ /Import File Strings/,/^$/ { 21667+ /^0/ { 21668+ s/^0 *\([^ ]*\) *$/\1/ 21669+ p 21670+ } 21671+ }' 21672+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 21673+ # Check for a 64-bit object if we didn't find anything. 21674+ if test -z "$lt_cv_aix_libpath_"; then 21675+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 21676+ fi 21677 fi 21678 rm -f core conftest.err conftest.$ac_objext \ 21679 conftest$ac_exeext conftest.$ac_ext 21680-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 21681+ if test -z "$lt_cv_aix_libpath_"; then 21682+ lt_cv_aix_libpath_="/usr/lib:/lib" 21683+ fi 21684+ 21685+fi 21686+ 21687+ aix_libpath=$lt_cv_aix_libpath_ 21688+fi 21689 21690 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 21691 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" 21692@@ -9550,7 +10083,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 21693 else 21694 # Determine the default libpath from the value encoded in an 21695 # empty executable. 21696- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 21697+ if test "${lt_cv_aix_libpath+set}" = set; then 21698+ aix_libpath=$lt_cv_aix_libpath 21699+else 21700+ if ${lt_cv_aix_libpath_+:} false; then : 21701+ $as_echo_n "(cached) " >&6 21702+else 21703+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 21704 /* end confdefs.h. */ 21705 21706 int 21707@@ -9563,22 +10102,29 @@ main () 21708 _ACEOF 21709 if ac_fn_c_try_link "$LINENO"; then : 21710 21711-lt_aix_libpath_sed=' 21712- /Import File Strings/,/^$/ { 21713- /^0/ { 21714- s/^0 *\(.*\)$/\1/ 21715- p 21716- } 21717- }' 21718-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 21719-# Check for a 64-bit object if we didn't find anything. 21720-if test -z "$aix_libpath"; then 21721- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 21722-fi 21723+ lt_aix_libpath_sed=' 21724+ /Import File Strings/,/^$/ { 21725+ /^0/ { 21726+ s/^0 *\([^ ]*\) *$/\1/ 21727+ p 21728+ } 21729+ }' 21730+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 21731+ # Check for a 64-bit object if we didn't find anything. 21732+ if test -z "$lt_cv_aix_libpath_"; then 21733+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 21734+ fi 21735 fi 21736 rm -f core conftest.err conftest.$ac_objext \ 21737 conftest$ac_exeext conftest.$ac_ext 21738-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 21739+ if test -z "$lt_cv_aix_libpath_"; then 21740+ lt_cv_aix_libpath_="/usr/lib:/lib" 21741+ fi 21742+ 21743+fi 21744+ 21745+ aix_libpath=$lt_cv_aix_libpath_ 21746+fi 21747 21748 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 21749 # Warning - without using the other run time loading flags, 21750@@ -9623,20 +10169,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 21751 # Microsoft Visual C++. 21752 # hardcode_libdir_flag_spec is actually meaningless, as there is 21753 # no search path for DLLs. 21754- hardcode_libdir_flag_spec=' ' 21755- allow_undefined_flag=unsupported 21756- # Tell ltmain to make .lib files, not .a files. 21757- libext=lib 21758- # Tell ltmain to make .dll files, not .so files. 21759- shrext_cmds=".dll" 21760- # FIXME: Setting linknames here is a bad hack. 21761- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 21762- # The linker will automatically build a .lib file if we build a DLL. 21763- old_archive_from_new_cmds='true' 21764- # FIXME: Should let the user specify the lib program. 21765- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 21766- fix_srcfile_path='`cygpath -w "$srcfile"`' 21767- enable_shared_with_static_runtimes=yes 21768+ case $cc_basename in 21769+ cl*) 21770+ # Native MSVC 21771+ hardcode_libdir_flag_spec=' ' 21772+ allow_undefined_flag=unsupported 21773+ always_export_symbols=yes 21774+ file_list_spec='@' 21775+ # Tell ltmain to make .lib files, not .a files. 21776+ libext=lib 21777+ # Tell ltmain to make .dll files, not .so files. 21778+ shrext_cmds=".dll" 21779+ # FIXME: Setting linknames here is a bad hack. 21780+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' 21781+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 21782+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; 21783+ else 21784+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; 21785+ fi~ 21786+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ 21787+ linknames=' 21788+ # The linker will not automatically build a static lib if we build a DLL. 21789+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' 21790+ enable_shared_with_static_runtimes=yes 21791+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 21792+ # Don't use ranlib 21793+ old_postinstall_cmds='chmod 644 $oldlib' 21794+ postlink_cmds='lt_outputfile="@OUTPUT@"~ 21795+ lt_tool_outputfile="@TOOL_OUTPUT@"~ 21796+ case $lt_outputfile in 21797+ *.exe|*.EXE) ;; 21798+ *) 21799+ lt_outputfile="$lt_outputfile.exe" 21800+ lt_tool_outputfile="$lt_tool_outputfile.exe" 21801+ ;; 21802+ esac~ 21803+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then 21804+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; 21805+ $RM "$lt_outputfile.manifest"; 21806+ fi' 21807+ ;; 21808+ *) 21809+ # Assume MSVC wrapper 21810+ hardcode_libdir_flag_spec=' ' 21811+ allow_undefined_flag=unsupported 21812+ # Tell ltmain to make .lib files, not .a files. 21813+ libext=lib 21814+ # Tell ltmain to make .dll files, not .so files. 21815+ shrext_cmds=".dll" 21816+ # FIXME: Setting linknames here is a bad hack. 21817+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 21818+ # The linker will automatically build a .lib file if we build a DLL. 21819+ old_archive_from_new_cmds='true' 21820+ # FIXME: Should let the user specify the lib program. 21821+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 21822+ enable_shared_with_static_runtimes=yes 21823+ ;; 21824+ esac 21825 ;; 21826 21827 darwin* | rhapsody*) 21828@@ -9697,7 +10286,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 21829 21830 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 21831 freebsd* | dragonfly*) 21832- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' 21833+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' 21834 hardcode_libdir_flag_spec='-R$libdir' 21835 hardcode_direct=yes 21836 hardcode_shlibpath_var=no 21837@@ -9705,7 +10294,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 21838 21839 hpux9*) 21840 if test "$GCC" = yes; then 21841- 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' 21842+ 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' 21843 else 21844 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' 21845 fi 21846@@ -9721,7 +10310,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 21847 21848 hpux10*) 21849 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 21850- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 21851+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 21852 else 21853 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 21854 fi 21855@@ -9745,10 +10334,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 21856 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 21857 ;; 21858 ia64*) 21859- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 21860+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 21861 ;; 21862 *) 21863- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 21864+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 21865 ;; 21866 esac 21867 else 21868@@ -9827,23 +10416,36 @@ fi 21869 21870 irix5* | irix6* | nonstopux*) 21871 if test "$GCC" = yes; then 21872- 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' 21873+ 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' 21874 # Try to use the -exported_symbol ld option, if it does not 21875 # work, assume that -exports_file does not work either and 21876 # implicitly export all symbols. 21877- save_LDFLAGS="$LDFLAGS" 21878- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 21879- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 21880+ # This should be the same for all languages, so no per-tag cache variable. 21881+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 21882+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } 21883+if ${lt_cv_irix_exported_symbol+:} false; then : 21884+ $as_echo_n "(cached) " >&6 21885+else 21886+ save_LDFLAGS="$LDFLAGS" 21887+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 21888+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 21889 /* end confdefs.h. */ 21890-int foo(void) {} 21891+int foo (void) { return 0; } 21892 _ACEOF 21893 if ac_fn_c_try_link "$LINENO"; then : 21894- 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' 21895- 21896+ lt_cv_irix_exported_symbol=yes 21897+else 21898+ lt_cv_irix_exported_symbol=no 21899 fi 21900 rm -f core conftest.err conftest.$ac_objext \ 21901 conftest$ac_exeext conftest.$ac_ext 21902- LDFLAGS="$save_LDFLAGS" 21903+ LDFLAGS="$save_LDFLAGS" 21904+fi 21905+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 21906+$as_echo "$lt_cv_irix_exported_symbol" >&6; } 21907+ if test "$lt_cv_irix_exported_symbol" = yes; then 21908+ 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' 21909+ fi 21910 else 21911 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' 21912 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' 21913@@ -9928,7 +10530,7 @@ rm -f core conftest.err conftest.$ac_objext \ 21914 osf4* | osf5*) # as osf3* with the addition of -msym flag 21915 if test "$GCC" = yes; then 21916 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 21917- 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' 21918+ 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' 21919 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 21920 else 21921 allow_undefined_flag=' -expect_unresolved \*' 21922@@ -9947,9 +10549,9 @@ rm -f core conftest.err conftest.$ac_objext \ 21923 no_undefined_flag=' -z defs' 21924 if test "$GCC" = yes; then 21925 wlarc='${wl}' 21926- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 21927+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 21928 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ 21929- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' 21930+ $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' 21931 else 21932 case `$CC -V 2>&1` in 21933 *"Compilers 5.0"*) 21934@@ -10525,8 +11127,9 @@ cygwin* | mingw* | pw32* | cegcc*) 21935 need_version=no 21936 need_lib_prefix=no 21937 21938- case $GCC,$host_os in 21939- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) 21940+ case $GCC,$cc_basename in 21941+ yes,*) 21942+ # gcc 21943 library_names_spec='$libname.dll.a' 21944 # DLL is installed to $(libdir)/../bin by postinstall_cmds 21945 postinstall_cmds='base_file=`basename \${file}`~ 21946@@ -10559,13 +11162,71 @@ cygwin* | mingw* | pw32* | cegcc*) 21947 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 21948 ;; 21949 esac 21950+ dynamic_linker='Win32 ld.exe' 21951+ ;; 21952+ 21953+ *,cl*) 21954+ # Native MSVC 21955+ libname_spec='$name' 21956+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 21957+ library_names_spec='${libname}.dll.lib' 21958+ 21959+ case $build_os in 21960+ mingw*) 21961+ sys_lib_search_path_spec= 21962+ lt_save_ifs=$IFS 21963+ IFS=';' 21964+ for lt_path in $LIB 21965+ do 21966+ IFS=$lt_save_ifs 21967+ # Let DOS variable expansion print the short 8.3 style file name. 21968+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` 21969+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" 21970+ done 21971+ IFS=$lt_save_ifs 21972+ # Convert to MSYS style. 21973+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` 21974+ ;; 21975+ cygwin*) 21976+ # Convert to unix form, then to dos form, then back to unix form 21977+ # but this time dos style (no spaces!) so that the unix form looks 21978+ # like /cygdrive/c/PROGRA~1:/cygdr... 21979+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` 21980+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` 21981+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 21982+ ;; 21983+ *) 21984+ sys_lib_search_path_spec="$LIB" 21985+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then 21986+ # It is most probably a Windows format PATH. 21987+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` 21988+ else 21989+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 21990+ fi 21991+ # FIXME: find the short name or the path components, as spaces are 21992+ # common. (e.g. "Program Files" -> "PROGRA~1") 21993+ ;; 21994+ esac 21995+ 21996+ # DLL is installed to $(libdir)/../bin by postinstall_cmds 21997+ postinstall_cmds='base_file=`basename \${file}`~ 21998+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ 21999+ dldir=$destdir/`dirname \$dlpath`~ 22000+ test -d \$dldir || mkdir -p \$dldir~ 22001+ $install_prog $dir/$dlname \$dldir/$dlname' 22002+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ 22003+ dlpath=$dir/\$dldll~ 22004+ $RM \$dlpath' 22005+ shlibpath_overrides_runpath=yes 22006+ dynamic_linker='Win32 link.exe' 22007 ;; 22008 22009 *) 22010+ # Assume MSVC wrapper 22011 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' 22012+ dynamic_linker='Win32 ld.exe' 22013 ;; 22014 esac 22015- dynamic_linker='Win32 ld.exe' 22016 # FIXME: first we should search . and the directory the executable is in 22017 shlibpath_var=PATH 22018 ;; 22019@@ -11443,7 +12104,7 @@ else 22020 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 22021 lt_status=$lt_dlunknown 22022 cat > conftest.$ac_ext <<_LT_EOF 22023-#line 11446 "configure" 22024+#line $LINENO "configure" 22025 #include "confdefs.h" 22026 22027 #if HAVE_DLFCN_H 22028@@ -11487,10 +12148,10 @@ else 22029 /* When -fvisbility=hidden is used, assume the code has been annotated 22030 correspondingly for the symbols needed. */ 22031 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 22032-void fnord () __attribute__((visibility("default"))); 22033+int fnord () __attribute__((visibility("default"))); 22034 #endif 22035 22036-void fnord () { int i=42; } 22037+int fnord () { return 42; } 22038 int main () 22039 { 22040 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 22041@@ -11549,7 +12210,7 @@ else 22042 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 22043 lt_status=$lt_dlunknown 22044 cat > conftest.$ac_ext <<_LT_EOF 22045-#line 11552 "configure" 22046+#line $LINENO "configure" 22047 #include "confdefs.h" 22048 22049 #if HAVE_DLFCN_H 22050@@ -11593,10 +12254,10 @@ else 22051 /* When -fvisbility=hidden is used, assume the code has been annotated 22052 correspondingly for the symbols needed. */ 22053 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 22054-void fnord () __attribute__((visibility("default"))); 22055+int fnord () __attribute__((visibility("default"))); 22056 #endif 22057 22058-void fnord () { int i=42; } 22059+int fnord () { return 42; } 22060 int main () 22061 { 22062 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 22063@@ -13361,7 +14022,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 22064 # 22065 # INIT-COMMANDS 22066 # 22067-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" 22068+AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}" 22069 22070 22071 # The HP-UX ksh and POSIX shell print the target directory to stdout 22072@@ -13399,13 +14060,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 22073 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 22074 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 22075 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 22076+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' 22077+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' 22078 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' 22079 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' 22080 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' 22081 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' 22082 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' 22083+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' 22084+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' 22085+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' 22086+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' 22087 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' 22088 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' 22089+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' 22090 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 22091 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 22092 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 22093@@ -13420,14 +14088,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 22094 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 22095 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 22096 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"`' 22097+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' 22098+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' 22099 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' 22100 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' 22101 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' 22102-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 22103 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' 22104+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 22105 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' 22106 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' 22107 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' 22108+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' 22109 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 22110 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 22111 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 22112@@ -13460,12 +14131,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 22113 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 22114 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 22115 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 22116-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' 22117 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' 22118 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' 22119 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' 22120 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' 22121 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' 22122+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' 22123 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 22124 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 22125 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 22126@@ -13520,8 +14191,13 @@ reload_flag \ 22127 OBJDUMP \ 22128 deplibs_check_method \ 22129 file_magic_cmd \ 22130+file_magic_glob \ 22131+want_nocaseglob \ 22132+DLLTOOL \ 22133+sharedlib_from_linklib_cmd \ 22134 AR \ 22135 AR_FLAGS \ 22136+archiver_list_spec \ 22137 STRIP \ 22138 RANLIB \ 22139 CC \ 22140@@ -13531,12 +14207,14 @@ lt_cv_sys_global_symbol_pipe \ 22141 lt_cv_sys_global_symbol_to_cdecl \ 22142 lt_cv_sys_global_symbol_to_c_name_address \ 22143 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 22144+nm_file_list_spec \ 22145 lt_prog_compiler_no_builtin_flag \ 22146-lt_prog_compiler_wl \ 22147 lt_prog_compiler_pic \ 22148+lt_prog_compiler_wl \ 22149 lt_prog_compiler_static \ 22150 lt_cv_prog_compiler_c_o \ 22151 need_locks \ 22152+MANIFEST_TOOL \ 22153 DSYMUTIL \ 22154 NMEDIT \ 22155 LIPO \ 22156@@ -13552,7 +14230,6 @@ no_undefined_flag \ 22157 hardcode_libdir_flag_spec \ 22158 hardcode_libdir_flag_spec_ld \ 22159 hardcode_libdir_separator \ 22160-fix_srcfile_path \ 22161 exclude_expsyms \ 22162 include_expsyms \ 22163 file_list_spec \ 22164@@ -13588,6 +14265,7 @@ module_cmds \ 22165 module_expsym_cmds \ 22166 export_symbols_cmds \ 22167 prelink_cmds \ 22168+postlink_cmds \ 22169 postinstall_cmds \ 22170 postuninstall_cmds \ 22171 finish_cmds \ 22172@@ -14234,29 +14912,35 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} 22173 # Older Autoconf quotes --file arguments for eval, but not when files 22174 # are listed without --file. Let's play safe and only enable the eval 22175 # if we detect the quoting. 22176- case $CONFIG_FILES in 22177- *\'*) eval set x "$CONFIG_FILES" ;; 22178- *) set x $CONFIG_FILES ;; 22179- esac 22180+ # TODO: see whether this extra hack can be removed once we start 22181+ # requiring Autoconf 2.70 or later. 22182+ case $CONFIG_FILES in #( 22183+ *\'*) : 22184+ eval set x "$CONFIG_FILES" ;; #( 22185+ *) : 22186+ set x $CONFIG_FILES ;; #( 22187+ *) : 22188+ ;; 22189+esac 22190 shift 22191- for mf 22192+ # Used to flag and report bootstrapping failures. 22193+ am_rc=0 22194+ for am_mf 22195 do 22196 # Strip MF so we end up with the name of the file. 22197- mf=`echo "$mf" | sed -e 's/:.*$//'` 22198- # Check whether this is an Automake generated Makefile or not. 22199- # We used to match only the files named 'Makefile.in', but 22200- # some people rename them; so instead we look at the file content. 22201- # Grep'ing the first line is not enough: some people post-process 22202- # each Makefile.in and add a new line on top of each file to say so. 22203- # Grep'ing the whole file is not good either: AIX grep has a line 22204+ am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'` 22205+ # Check whether this is an Automake generated Makefile which includes 22206+ # dependency-tracking related rules and includes. 22207+ # Grep'ing the whole file directly is not great: AIX grep has a line 22208 # limit of 2048, but all sed's we know have understand at least 4000. 22209- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then 22210- dirpart=`$as_dirname -- "$mf" || 22211-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ 22212- X"$mf" : 'X\(//\)[^/]' \| \ 22213- X"$mf" : 'X\(//\)$' \| \ 22214- X"$mf" : 'X\(/\)' \| . 2>/dev/null || 22215-$as_echo X"$mf" | 22216+ sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ 22217+ || continue 22218+ am_dirpart=`$as_dirname -- "$am_mf" || 22219+$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ 22220+ X"$am_mf" : 'X\(//\)[^/]' \| \ 22221+ X"$am_mf" : 'X\(//\)$' \| \ 22222+ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || 22223+$as_echo X"$am_mf" | 22224 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ 22225 s//\1/ 22226 q 22227@@ -14274,53 +14958,50 @@ $as_echo X"$mf" | 22228 q 22229 } 22230 s/.*/./; q'` 22231- else 22232- continue 22233- fi 22234- # Extract the definition of DEPDIR, am__include, and am__quote 22235- # from the Makefile without running 'make'. 22236- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` 22237- test -z "$DEPDIR" && continue 22238- am__include=`sed -n 's/^am__include = //p' < "$mf"` 22239- test -z "$am__include" && continue 22240- am__quote=`sed -n 's/^am__quote = //p' < "$mf"` 22241- # Find all dependency output files, they are included files with 22242- # $(DEPDIR) in their names. We invoke sed twice because it is the 22243- # simplest approach to changing $(DEPDIR) to its actual value in the 22244- # expansion. 22245- for file in `sed -n " 22246- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ 22247- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do 22248- # Make sure the directory exists. 22249- test -f "$dirpart/$file" && continue 22250- fdir=`$as_dirname -- "$file" || 22251-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ 22252- X"$file" : 'X\(//\)[^/]' \| \ 22253- X"$file" : 'X\(//\)$' \| \ 22254- X"$file" : 'X\(/\)' \| . 2>/dev/null || 22255-$as_echo X"$file" | 22256- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ 22257- s//\1/ 22258- q 22259- } 22260- /^X\(\/\/\)[^/].*/{ 22261+ am_filepart=`$as_basename -- "$am_mf" || 22262+$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \ 22263+ X"$am_mf" : 'X\(//\)$' \| \ 22264+ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || 22265+$as_echo X/"$am_mf" | 22266+ sed '/^.*\/\([^/][^/]*\)\/*$/{ 22267 s//\1/ 22268 q 22269 } 22270- /^X\(\/\/\)$/{ 22271+ /^X\/\(\/\/\)$/{ 22272 s//\1/ 22273 q 22274 } 22275- /^X\(\/\).*/{ 22276+ /^X\/\(\/\).*/{ 22277 s//\1/ 22278 q 22279 } 22280 s/.*/./; q'` 22281- as_dir=$dirpart/$fdir; as_fn_mkdir_p 22282- # echo "creating $dirpart/$file" 22283- echo '# dummy' > "$dirpart/$file" 22284- done 22285+ { echo "$as_me:$LINENO: cd "$am_dirpart" \ 22286+ && sed -e '/# am--include-marker/d' "$am_filepart" \ 22287+ | $MAKE -f - am--depfiles" >&5 22288+ (cd "$am_dirpart" \ 22289+ && sed -e '/# am--include-marker/d' "$am_filepart" \ 22290+ | $MAKE -f - am--depfiles) >&5 2>&5 22291+ ac_status=$? 22292+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 22293+ (exit $ac_status); } || am_rc=$? 22294 done 22295+ if test $am_rc -ne 0; then 22296+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 22297+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 22298+as_fn_error $? "Something went wrong bootstrapping makefile fragments 22299+ for automatic dependency tracking. If GNU make was not used, consider 22300+ re-running the configure script with MAKE=\"gmake\" (or whatever is 22301+ necessary). You can also try re-running configure with the 22302+ '--disable-dependency-tracking' option to at least be able to build 22303+ the package (albeit without support for automatic dependency tracking). 22304+See \`config.log' for more details" "$LINENO" 5; } 22305+ fi 22306+ { am_dirpart=; unset am_dirpart;} 22307+ { am_filepart=; unset am_filepart;} 22308+ { am_mf=; unset am_mf;} 22309+ { am_rc=; unset am_rc;} 22310+ rm -f conftest-deps.mk 22311 } 22312 ;; 22313 "libtool":C) 22314@@ -14344,7 +15025,8 @@ $as_echo X"$file" | 22315 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 22316 # 22317 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 22318-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. 22319+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, 22320+# Inc. 22321 # Written by Gordon Matzigkeit, 1996 22322 # 22323 # This file is part of GNU Libtool. 22324@@ -14447,19 +15129,42 @@ SP2NL=$lt_lt_SP2NL 22325 # turn newlines into spaces. 22326 NL2SP=$lt_lt_NL2SP 22327 22328+# convert \$build file names to \$host format. 22329+to_host_file_cmd=$lt_cv_to_host_file_cmd 22330+ 22331+# convert \$build files to toolchain format. 22332+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 22333+ 22334 # An object symbol dumper. 22335 OBJDUMP=$lt_OBJDUMP 22336 22337 # Method to check whether dependent libraries are shared objects. 22338 deplibs_check_method=$lt_deplibs_check_method 22339 22340-# Command to use when deplibs_check_method == "file_magic". 22341+# Command to use when deplibs_check_method = "file_magic". 22342 file_magic_cmd=$lt_file_magic_cmd 22343 22344+# How to find potential files when deplibs_check_method = "file_magic". 22345+file_magic_glob=$lt_file_magic_glob 22346+ 22347+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". 22348+want_nocaseglob=$lt_want_nocaseglob 22349+ 22350+# DLL creation program. 22351+DLLTOOL=$lt_DLLTOOL 22352+ 22353+# Command to associate shared and link libraries. 22354+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd 22355+ 22356 # The archiver. 22357 AR=$lt_AR 22358+ 22359+# Flags to create an archive. 22360 AR_FLAGS=$lt_AR_FLAGS 22361 22362+# How to feed a file listing to the archiver. 22363+archiver_list_spec=$lt_archiver_list_spec 22364+ 22365 # A symbol stripping program. 22366 STRIP=$lt_STRIP 22367 22368@@ -14489,6 +15194,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 22369 # Transform the output of nm in a C name address pair when lib prefix is needed. 22370 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 22371 22372+# Specify filename containing input files for \$NM. 22373+nm_file_list_spec=$lt_nm_file_list_spec 22374+ 22375+# The root where to search for dependent libraries,and in which our libraries should be installed. 22376+lt_sysroot=$lt_sysroot 22377+ 22378 # The name of the directory that contains temporary libtool files. 22379 objdir=$objdir 22380 22381@@ -14498,6 +15209,9 @@ MAGIC_CMD=$MAGIC_CMD 22382 # Must we lock files when doing compilation? 22383 need_locks=$lt_need_locks 22384 22385+# Manifest tool. 22386+MANIFEST_TOOL=$lt_MANIFEST_TOOL 22387+ 22388 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 22389 DSYMUTIL=$lt_DSYMUTIL 22390 22391@@ -14612,12 +15326,12 @@ with_gcc=$GCC 22392 # Compiler flag to turn off builtin functions. 22393 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 22394 22395-# How to pass a linker flag through the compiler. 22396-wl=$lt_lt_prog_compiler_wl 22397- 22398 # Additional compiler flags for building library objects. 22399 pic_flag=$lt_lt_prog_compiler_pic 22400 22401+# How to pass a linker flag through the compiler. 22402+wl=$lt_lt_prog_compiler_wl 22403+ 22404 # Compiler flag to prevent dynamic linking. 22405 link_static_flag=$lt_lt_prog_compiler_static 22406 22407@@ -14704,9 +15418,6 @@ inherit_rpath=$inherit_rpath 22408 # Whether libtool must link a program against all its dependency libraries. 22409 link_all_deplibs=$link_all_deplibs 22410 22411-# Fix the shell variable \$srcfile for the compiler. 22412-fix_srcfile_path=$lt_fix_srcfile_path 22413- 22414 # Set to "yes" if exported symbols are required. 22415 always_export_symbols=$always_export_symbols 22416 22417@@ -14722,6 +15433,9 @@ include_expsyms=$lt_include_expsyms 22418 # Commands necessary for linking programs (against libraries) with templates. 22419 prelink_cmds=$lt_prelink_cmds 22420 22421+# Commands necessary for finishing linking programs. 22422+postlink_cmds=$lt_postlink_cmds 22423+ 22424 # Specify filename containing input files. 22425 file_list_spec=$lt_file_list_spec 22426 22427@@ -14754,210 +15468,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 22428 # if finds mixed CR/LF and LF-only lines. Since sed operates in 22429 # text mode, it properly converts lines to CR/LF. This bash problem 22430 # is reportedly fixed, but why not run on old versions too? 22431- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ 22432- || (rm -f "$cfgfile"; exit 1) 22433- 22434- case $xsi_shell in 22435- yes) 22436- cat << \_LT_EOF >> "$cfgfile" 22437- 22438-# func_dirname file append nondir_replacement 22439-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 22440-# otherwise set result to NONDIR_REPLACEMENT. 22441-func_dirname () 22442-{ 22443- case ${1} in 22444- */*) func_dirname_result="${1%/*}${2}" ;; 22445- * ) func_dirname_result="${3}" ;; 22446- esac 22447-} 22448- 22449-# func_basename file 22450-func_basename () 22451-{ 22452- func_basename_result="${1##*/}" 22453-} 22454- 22455-# func_dirname_and_basename file append nondir_replacement 22456-# perform func_basename and func_dirname in a single function 22457-# call: 22458-# dirname: Compute the dirname of FILE. If nonempty, 22459-# add APPEND to the result, otherwise set result 22460-# to NONDIR_REPLACEMENT. 22461-# value returned in "$func_dirname_result" 22462-# basename: Compute filename of FILE. 22463-# value retuned in "$func_basename_result" 22464-# Implementation must be kept synchronized with func_dirname 22465-# and func_basename. For efficiency, we do not delegate to 22466-# those functions but instead duplicate the functionality here. 22467-func_dirname_and_basename () 22468-{ 22469- case ${1} in 22470- */*) func_dirname_result="${1%/*}${2}" ;; 22471- * ) func_dirname_result="${3}" ;; 22472- esac 22473- func_basename_result="${1##*/}" 22474-} 22475- 22476-# func_stripname prefix suffix name 22477-# strip PREFIX and SUFFIX off of NAME. 22478-# PREFIX and SUFFIX must not contain globbing or regex special 22479-# characters, hashes, percent signs, but SUFFIX may contain a leading 22480-# dot (in which case that matches only a dot). 22481-func_stripname () 22482-{ 22483- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are 22484- # positional parameters, so assign one to ordinary parameter first. 22485- func_stripname_result=${3} 22486- func_stripname_result=${func_stripname_result#"${1}"} 22487- func_stripname_result=${func_stripname_result%"${2}"} 22488-} 22489- 22490-# func_opt_split 22491-func_opt_split () 22492-{ 22493- func_opt_split_opt=${1%%=*} 22494- func_opt_split_arg=${1#*=} 22495-} 22496- 22497-# func_lo2o object 22498-func_lo2o () 22499-{ 22500- case ${1} in 22501- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; 22502- *) func_lo2o_result=${1} ;; 22503- esac 22504-} 22505- 22506-# func_xform libobj-or-source 22507-func_xform () 22508-{ 22509- func_xform_result=${1%.*}.lo 22510-} 22511- 22512-# func_arith arithmetic-term... 22513-func_arith () 22514-{ 22515- func_arith_result=$(( $* )) 22516-} 22517- 22518-# func_len string 22519-# STRING may not start with a hyphen. 22520-func_len () 22521-{ 22522- func_len_result=${#1} 22523-} 22524- 22525-_LT_EOF 22526- ;; 22527- *) # Bourne compatible functions. 22528- cat << \_LT_EOF >> "$cfgfile" 22529- 22530-# func_dirname file append nondir_replacement 22531-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 22532-# otherwise set result to NONDIR_REPLACEMENT. 22533-func_dirname () 22534-{ 22535- # Extract subdirectory from the argument. 22536- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` 22537- if test "X$func_dirname_result" = "X${1}"; then 22538- func_dirname_result="${3}" 22539- else 22540- func_dirname_result="$func_dirname_result${2}" 22541- fi 22542-} 22543- 22544-# func_basename file 22545-func_basename () 22546-{ 22547- func_basename_result=`$ECHO "${1}" | $SED "$basename"` 22548-} 22549- 22550- 22551-# func_stripname prefix suffix name 22552-# strip PREFIX and SUFFIX off of NAME. 22553-# PREFIX and SUFFIX must not contain globbing or regex special 22554-# characters, hashes, percent signs, but SUFFIX may contain a leading 22555-# dot (in which case that matches only a dot). 22556-# func_strip_suffix prefix name 22557-func_stripname () 22558-{ 22559- case ${2} in 22560- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; 22561- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; 22562- esac 22563-} 22564- 22565-# sed scripts: 22566-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' 22567-my_sed_long_arg='1s/^-[^=]*=//' 22568- 22569-# func_opt_split 22570-func_opt_split () 22571-{ 22572- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` 22573- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` 22574-} 22575- 22576-# func_lo2o object 22577-func_lo2o () 22578-{ 22579- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` 22580-} 22581- 22582-# func_xform libobj-or-source 22583-func_xform () 22584-{ 22585- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` 22586-} 22587- 22588-# func_arith arithmetic-term... 22589-func_arith () 22590-{ 22591- func_arith_result=`expr "$@"` 22592-} 22593- 22594-# func_len string 22595-# STRING may not start with a hyphen. 22596-func_len () 22597-{ 22598- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` 22599-} 22600- 22601-_LT_EOF 22602-esac 22603- 22604-case $lt_shell_append in 22605- yes) 22606- cat << \_LT_EOF >> "$cfgfile" 22607- 22608-# func_append var value 22609-# Append VALUE to the end of shell variable VAR. 22610-func_append () 22611-{ 22612- eval "$1+=\$2" 22613-} 22614-_LT_EOF 22615- ;; 22616- *) 22617- cat << \_LT_EOF >> "$cfgfile" 22618- 22619-# func_append var value 22620-# Append VALUE to the end of shell variable VAR. 22621-func_append () 22622-{ 22623- eval "$1=\$$1\$2" 22624-} 22625- 22626-_LT_EOF 22627- ;; 22628- esac 22629- 22630- 22631- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ 22632- || (rm -f "$cfgfile"; exit 1) 22633- 22634- mv -f "$cfgfile" "$ofile" || 22635+ sed '$q' "$ltmain" >> "$cfgfile" \ 22636+ || (rm -f "$cfgfile"; exit 1) 22637+ 22638+ if test x"$xsi_shell" = xyes; then 22639+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ 22640+func_dirname ()\ 22641+{\ 22642+\ case ${1} in\ 22643+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 22644+\ * ) func_dirname_result="${3}" ;;\ 22645+\ esac\ 22646+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ 22647+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 22648+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 22649+test 0 -eq $? || _lt_function_replace_fail=: 22650+ 22651+ 22652+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ 22653+func_basename ()\ 22654+{\ 22655+\ func_basename_result="${1##*/}"\ 22656+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ 22657+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 22658+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 22659+test 0 -eq $? || _lt_function_replace_fail=: 22660+ 22661+ 22662+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ 22663+func_dirname_and_basename ()\ 22664+{\ 22665+\ case ${1} in\ 22666+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 22667+\ * ) func_dirname_result="${3}" ;;\ 22668+\ esac\ 22669+\ func_basename_result="${1##*/}"\ 22670+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ 22671+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 22672+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 22673+test 0 -eq $? || _lt_function_replace_fail=: 22674+ 22675+ 22676+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ 22677+func_stripname ()\ 22678+{\ 22679+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ 22680+\ # positional parameters, so assign one to ordinary parameter first.\ 22681+\ func_stripname_result=${3}\ 22682+\ func_stripname_result=${func_stripname_result#"${1}"}\ 22683+\ func_stripname_result=${func_stripname_result%"${2}"}\ 22684+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ 22685+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 22686+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 22687+test 0 -eq $? || _lt_function_replace_fail=: 22688+ 22689+ 22690+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ 22691+func_split_long_opt ()\ 22692+{\ 22693+\ func_split_long_opt_name=${1%%=*}\ 22694+\ func_split_long_opt_arg=${1#*=}\ 22695+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ 22696+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 22697+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 22698+test 0 -eq $? || _lt_function_replace_fail=: 22699+ 22700+ 22701+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ 22702+func_split_short_opt ()\ 22703+{\ 22704+\ func_split_short_opt_arg=${1#??}\ 22705+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ 22706+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ 22707+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 22708+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 22709+test 0 -eq $? || _lt_function_replace_fail=: 22710+ 22711+ 22712+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ 22713+func_lo2o ()\ 22714+{\ 22715+\ case ${1} in\ 22716+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ 22717+\ *) func_lo2o_result=${1} ;;\ 22718+\ esac\ 22719+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ 22720+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 22721+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 22722+test 0 -eq $? || _lt_function_replace_fail=: 22723+ 22724+ 22725+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ 22726+func_xform ()\ 22727+{\ 22728+ func_xform_result=${1%.*}.lo\ 22729+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ 22730+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 22731+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 22732+test 0 -eq $? || _lt_function_replace_fail=: 22733+ 22734+ 22735+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ 22736+func_arith ()\ 22737+{\ 22738+ func_arith_result=$(( $* ))\ 22739+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ 22740+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 22741+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 22742+test 0 -eq $? || _lt_function_replace_fail=: 22743+ 22744+ 22745+ sed -e '/^func_len ()$/,/^} # func_len /c\ 22746+func_len ()\ 22747+{\ 22748+ func_len_result=${#1}\ 22749+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ 22750+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 22751+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 22752+test 0 -eq $? || _lt_function_replace_fail=: 22753+ 22754+fi 22755+ 22756+if test x"$lt_shell_append" = xyes; then 22757+ sed -e '/^func_append ()$/,/^} # func_append /c\ 22758+func_append ()\ 22759+{\ 22760+ eval "${1}+=\\${2}"\ 22761+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ 22762+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 22763+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 22764+test 0 -eq $? || _lt_function_replace_fail=: 22765+ 22766+ 22767+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ 22768+func_append_quoted ()\ 22769+{\ 22770+\ func_quote_for_eval "${2}"\ 22771+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ 22772+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ 22773+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 22774+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 22775+test 0 -eq $? || _lt_function_replace_fail=: 22776+ 22777+ 22778+ # Save a `func_append' function call where possible by direct use of '+=' 22779+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ 22780+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 22781+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 22782+ test 0 -eq $? || _lt_function_replace_fail=: 22783+else 22784+ # Save a `func_append' function call even when '+=' is not available 22785+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ 22786+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 22787+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 22788+ test 0 -eq $? || _lt_function_replace_fail=: 22789+fi 22790+ 22791+if test x"$_lt_function_replace_fail" = x":"; then 22792+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 22793+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} 22794+fi 22795+ 22796+ 22797+ mv -f "$cfgfile" "$ofile" || 22798 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 22799 chmod +x "$ofile" 22800 22801diff --git a/libtool.m4 b/libtool.m4 22802index ad63ebbb385..b65c22bf80d 100644 22803--- a/libtool.m4 22804+++ b/libtool.m4 22805@@ -1,7 +1,8 @@ 22806 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- 22807 # 22808 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 22809-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. 22810+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, 22811+# Inc. 22812 # Written by Gordon Matzigkeit, 1996 22813 # 22814 # This file is free software; the Free Software Foundation gives 22815@@ -10,7 +11,8 @@ 22816 22817 m4_define([_LT_COPYING], [dnl 22818 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 22819-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. 22820+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, 22821+# Inc. 22822 # Written by Gordon Matzigkeit, 1996 22823 # 22824 # This file is part of GNU Libtool. 22825@@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl 22826 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 22827 ]) 22828 22829-# serial 56 LT_INIT 22830+# serial 57 LT_INIT 22831 22832 22833 # LT_PREREQ(VERSION) 22834@@ -166,10 +168,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl 22835 dnl 22836 m4_require([_LT_FILEUTILS_DEFAULTS])dnl 22837 m4_require([_LT_CHECK_SHELL_FEATURES])dnl 22838+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl 22839 m4_require([_LT_CMD_RELOAD])dnl 22840 m4_require([_LT_CHECK_MAGIC_METHOD])dnl 22841+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl 22842 m4_require([_LT_CMD_OLD_ARCHIVE])dnl 22843 m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl 22844+m4_require([_LT_WITH_SYSROOT])dnl 22845 22846 _LT_CONFIG_LIBTOOL_INIT([ 22847 # See if we are running on zsh, and set the options which allow our 22848@@ -632,7 +637,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl 22849 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) 22850 configured by $[0], generated by m4_PACKAGE_STRING. 22851 22852-Copyright (C) 2009 Free Software Foundation, Inc. 22853+Copyright (C) 2010 Free Software Foundation, Inc. 22854 This config.lt script is free software; the Free Software Foundation 22855 gives unlimited permision to copy, distribute and modify it." 22856 22857@@ -746,15 +751,12 @@ _LT_EOF 22858 # if finds mixed CR/LF and LF-only lines. Since sed operates in 22859 # text mode, it properly converts lines to CR/LF. This bash problem 22860 # is reportedly fixed, but why not run on old versions too? 22861- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ 22862- || (rm -f "$cfgfile"; exit 1) 22863+ sed '$q' "$ltmain" >> "$cfgfile" \ 22864+ || (rm -f "$cfgfile"; exit 1) 22865 22866- _LT_PROG_XSI_SHELLFNS 22867+ _LT_PROG_REPLACE_SHELLFNS 22868 22869- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ 22870- || (rm -f "$cfgfile"; exit 1) 22871- 22872- mv -f "$cfgfile" "$ofile" || 22873+ mv -f "$cfgfile" "$ofile" || 22874 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 22875 chmod +x "$ofile" 22876 ], 22877@@ -980,6 +982,8 @@ _LT_EOF 22878 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD 22879 echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD 22880 $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD 22881+ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD 22882+ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD 22883 cat > conftest.c << _LT_EOF 22884 int main() { return 0;} 22885 _LT_EOF 22886@@ -1069,30 +1073,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], 22887 fi 22888 ]) 22889 22890-# _LT_SYS_MODULE_PATH_AIX 22891-# ----------------------- 22892+# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) 22893+# ---------------------------------- 22894 # Links a minimal program and checks the executable 22895 # for the system default hardcoded library path. In most cases, 22896 # this is /usr/lib:/lib, but when the MPI compilers are used 22897 # the location of the communication and MPI libs are included too. 22898 # If we don't find anything, use the default library path according 22899 # to the aix ld manual. 22900+# Store the results from the different compilers for each TAGNAME. 22901+# Allow to override them for all tags through lt_cv_aix_libpath. 22902 m4_defun([_LT_SYS_MODULE_PATH_AIX], 22903 [m4_require([_LT_DECL_SED])dnl 22904-AC_LINK_IFELSE([AC_LANG_SOURCE([AC_LANG_PROGRAM])],[ 22905-lt_aix_libpath_sed=' 22906- /Import File Strings/,/^$/ { 22907- /^0/ { 22908- s/^0 *\(.*\)$/\1/ 22909- p 22910- } 22911- }' 22912-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 22913-# Check for a 64-bit object if we didn't find anything. 22914-if test -z "$aix_libpath"; then 22915- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 22916-fi],[]) 22917-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 22918+if test "${lt_cv_aix_libpath+set}" = set; then 22919+ aix_libpath=$lt_cv_aix_libpath 22920+else 22921+ AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], 22922+ [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ 22923+ lt_aix_libpath_sed='[ 22924+ /Import File Strings/,/^$/ { 22925+ /^0/ { 22926+ s/^0 *\([^ ]*\) *$/\1/ 22927+ p 22928+ } 22929+ }]' 22930+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 22931+ # Check for a 64-bit object if we didn't find anything. 22932+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then 22933+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 22934+ fi],[]) 22935+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then 22936+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" 22937+ fi 22938+ ]) 22939+ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) 22940+fi 22941 ])# _LT_SYS_MODULE_PATH_AIX 22942 22943 22944@@ -1117,7 +1132,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 22945 22946 AC_MSG_CHECKING([how to print strings]) 22947 # Test print first, because it will be a builtin if present. 22948-if test "X`print -r -- -n 2>/dev/null`" = X-n && \ 22949+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ 22950 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 22951 ECHO='print -r --' 22952 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 22953@@ -1161,6 +1176,39 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) 22954 ])# _LT_PROG_ECHO_BACKSLASH 22955 22956 22957+# _LT_WITH_SYSROOT 22958+# ---------------- 22959+AC_DEFUN([_LT_WITH_SYSROOT], 22960+[AC_MSG_CHECKING([for sysroot]) 22961+AC_ARG_WITH([libtool-sysroot], 22962+[ --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR 22963+ (or the compiler's sysroot if not specified).], 22964+[], [with_libtool_sysroot=no]) 22965+ 22966+dnl lt_sysroot will always be passed unquoted. We quote it here 22967+dnl in case the user passed a directory name. 22968+lt_sysroot= 22969+case ${with_libtool_sysroot} in #( 22970+ yes) 22971+ if test "$GCC" = yes; then 22972+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` 22973+ fi 22974+ ;; #( 22975+ /*) 22976+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` 22977+ ;; #( 22978+ no|'') 22979+ ;; #( 22980+ *) 22981+ AC_MSG_RESULT([${with_libtool_sysroot}]) 22982+ AC_MSG_ERROR([The sysroot must be an absolute path.]) 22983+ ;; 22984+esac 22985+ 22986+ AC_MSG_RESULT([${lt_sysroot:-no}]) 22987+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl 22988+[dependent libraries, and in which our libraries should be installed.])]) 22989+ 22990 # _LT_ENABLE_LOCK 22991 # --------------- 22992 m4_defun([_LT_ENABLE_LOCK], 22993@@ -1320,6 +1368,51 @@ need_locks="$enable_libtool_lock" 22994 ])# _LT_ENABLE_LOCK 22995 22996 22997+# _LT_PROG_AR 22998+# ----------- 22999+m4_defun([_LT_PROG_AR], 23000+[AC_CHECK_TOOLS(AR, [ar], false) 23001+ touch conftest.c 23002+ $AR $plugin_option rc conftest.a conftest.c 23003+ if test "$?" != 0; then 23004+ AC_MSG_WARN([Failed: $AR $plugin_option rc]) 23005+ else 23006+ AR="$AR $plugin_option" 23007+ fi 23008+ rm -f conftest.* 23009+: ${AR=ar} 23010+: ${AR_FLAGS=cru} 23011+_LT_DECL([], [AR], [1], [The archiver]) 23012+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) 23013+ 23014+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], 23015+ [lt_cv_ar_at_file=no 23016+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM], 23017+ [echo conftest.$ac_objext > conftest.lst 23018+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' 23019+ AC_TRY_EVAL([lt_ar_try]) 23020+ if test "$ac_status" -eq 0; then 23021+ # Ensure the archiver fails upon bogus file names. 23022+ rm -f conftest.$ac_objext libconftest.a 23023+ AC_TRY_EVAL([lt_ar_try]) 23024+ if test "$ac_status" -ne 0; then 23025+ lt_cv_ar_at_file=@ 23026+ fi 23027+ fi 23028+ rm -f conftest.* libconftest.a 23029+ ]) 23030+ ]) 23031+ 23032+if test "x$lt_cv_ar_at_file" = xno; then 23033+ archiver_list_spec= 23034+else 23035+ archiver_list_spec=$lt_cv_ar_at_file 23036+fi 23037+_LT_DECL([], [archiver_list_spec], [1], 23038+ [How to feed a file listing to the archiver]) 23039+])# _LT_PROG_AR 23040+ 23041+ 23042 # _LT_CMD_OLD_ARCHIVE 23043 # ------------------- 23044 m4_defun([_LT_CMD_OLD_ARCHIVE], 23045@@ -1336,23 +1429,7 @@ for plugin in $plugin_names; do 23046 fi 23047 done 23048 23049-AC_CHECK_TOOL(AR, ar, false) 23050-test -z "$AR" && AR=ar 23051-if test -n "$plugin_option"; then 23052- if $AR --help 2>&1 | grep -q "\--plugin"; then 23053- touch conftest.c 23054- $AR $plugin_option rc conftest.a conftest.c 23055- if test "$?" != 0; then 23056- AC_MSG_WARN([Failed: $AR $plugin_option rc]) 23057- else 23058- AR="$AR $plugin_option" 23059- fi 23060- rm -f conftest.* 23061- fi 23062-fi 23063-test -z "$AR_FLAGS" && AR_FLAGS=cru 23064-_LT_DECL([], [AR], [1], [The archiver]) 23065-_LT_DECL([], [AR_FLAGS], [1]) 23066+_LT_PROG_AR 23067 23068 AC_CHECK_TOOL(STRIP, strip, :) 23069 test -z "$STRIP" && STRIP=: 23070@@ -1653,7 +1730,7 @@ else 23071 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 23072 lt_status=$lt_dlunknown 23073 cat > conftest.$ac_ext <<_LT_EOF 23074-[#line __oline__ "configure" 23075+[#line $LINENO "configure" 23076 #include "confdefs.h" 23077 23078 #if HAVE_DLFCN_H 23079@@ -1697,10 +1774,10 @@ else 23080 /* When -fvisbility=hidden is used, assume the code has been annotated 23081 correspondingly for the symbols needed. */ 23082 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 23083-void fnord () __attribute__((visibility("default"))); 23084+int fnord () __attribute__((visibility("default"))); 23085 #endif 23086 23087-void fnord () { int i=42; } 23088+int fnord () { return 42; } 23089 int main () 23090 { 23091 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 23092@@ -2240,8 +2317,9 @@ cygwin* | mingw* | pw32* | cegcc*) 23093 need_version=no 23094 need_lib_prefix=no 23095 23096- case $GCC,$host_os in 23097- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) 23098+ case $GCC,$cc_basename in 23099+ yes,*) 23100+ # gcc 23101 library_names_spec='$libname.dll.a' 23102 # DLL is installed to $(libdir)/../bin by postinstall_cmds 23103 postinstall_cmds='base_file=`basename \${file}`~ 23104@@ -2274,13 +2352,71 @@ m4_if([$1], [],[ 23105 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' 23106 ;; 23107 esac 23108+ dynamic_linker='Win32 ld.exe' 23109+ ;; 23110+ 23111+ *,cl*) 23112+ # Native MSVC 23113+ libname_spec='$name' 23114+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' 23115+ library_names_spec='${libname}.dll.lib' 23116+ 23117+ case $build_os in 23118+ mingw*) 23119+ sys_lib_search_path_spec= 23120+ lt_save_ifs=$IFS 23121+ IFS=';' 23122+ for lt_path in $LIB 23123+ do 23124+ IFS=$lt_save_ifs 23125+ # Let DOS variable expansion print the short 8.3 style file name. 23126+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` 23127+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" 23128+ done 23129+ IFS=$lt_save_ifs 23130+ # Convert to MSYS style. 23131+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` 23132+ ;; 23133+ cygwin*) 23134+ # Convert to unix form, then to dos form, then back to unix form 23135+ # but this time dos style (no spaces!) so that the unix form looks 23136+ # like /cygdrive/c/PROGRA~1:/cygdr... 23137+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` 23138+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` 23139+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 23140+ ;; 23141+ *) 23142+ sys_lib_search_path_spec="$LIB" 23143+ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then 23144+ # It is most probably a Windows format PATH. 23145+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` 23146+ else 23147+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 23148+ fi 23149+ # FIXME: find the short name or the path components, as spaces are 23150+ # common. (e.g. "Program Files" -> "PROGRA~1") 23151+ ;; 23152+ esac 23153+ 23154+ # DLL is installed to $(libdir)/../bin by postinstall_cmds 23155+ postinstall_cmds='base_file=`basename \${file}`~ 23156+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ 23157+ dldir=$destdir/`dirname \$dlpath`~ 23158+ test -d \$dldir || mkdir -p \$dldir~ 23159+ $install_prog $dir/$dlname \$dldir/$dlname' 23160+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ 23161+ dlpath=$dir/\$dldll~ 23162+ $RM \$dlpath' 23163+ shlibpath_overrides_runpath=yes 23164+ dynamic_linker='Win32 link.exe' 23165 ;; 23166 23167 *) 23168+ # Assume MSVC wrapper 23169 library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' 23170+ dynamic_linker='Win32 ld.exe' 23171 ;; 23172 esac 23173- dynamic_linker='Win32 ld.exe' 23174 # FIXME: first we should search . and the directory the executable is in 23175 shlibpath_var=PATH 23176 ;; 23177@@ -2970,6 +3106,11 @@ case $reload_flag in 23178 esac 23179 reload_cmds='$LD$reload_flag -o $output$reload_objs' 23180 case $host_os in 23181+ cygwin* | mingw* | pw32* | cegcc*) 23182+ if test "$GCC" != yes; then 23183+ reload_cmds=false 23184+ fi 23185+ ;; 23186 darwin*) 23187 if test "$GCC" = yes; then 23188 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 23189@@ -3036,7 +3177,8 @@ mingw* | pw32*) 23190 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 23191 lt_cv_file_magic_cmd='func_win32_libid' 23192 else 23193- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' 23194+ # Keep this pattern in sync with the one in func_win32_libid. 23195+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' 23196 lt_cv_file_magic_cmd='$OBJDUMP -f' 23197 fi 23198 ;; 23199@@ -3187,6 +3329,21 @@ tpf*) 23200 ;; 23201 esac 23202 ]) 23203+ 23204+file_magic_glob= 23205+want_nocaseglob=no 23206+if test "$build" = "$host"; then 23207+ case $host_os in 23208+ mingw* | pw32*) 23209+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then 23210+ want_nocaseglob=yes 23211+ else 23212+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` 23213+ fi 23214+ ;; 23215+ esac 23216+fi 23217+ 23218 file_magic_cmd=$lt_cv_file_magic_cmd 23219 deplibs_check_method=$lt_cv_deplibs_check_method 23220 test -z "$deplibs_check_method" && deplibs_check_method=unknown 23221@@ -3194,7 +3351,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 23222 _LT_DECL([], [deplibs_check_method], [1], 23223 [Method to check whether dependent libraries are shared objects]) 23224 _LT_DECL([], [file_magic_cmd], [1], 23225- [Command to use when deplibs_check_method == "file_magic"]) 23226+ [Command to use when deplibs_check_method = "file_magic"]) 23227+_LT_DECL([], [file_magic_glob], [1], 23228+ [How to find potential files when deplibs_check_method = "file_magic"]) 23229+_LT_DECL([], [want_nocaseglob], [1], 23230+ [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) 23231 ])# _LT_CHECK_MAGIC_METHOD 23232 23233 23234@@ -3305,6 +3466,67 @@ dnl aclocal-1.4 backwards compatibility: 23235 dnl AC_DEFUN([AM_PROG_NM], []) 23236 dnl AC_DEFUN([AC_PROG_NM], []) 23237 23238+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB 23239+# -------------------------------- 23240+# how to determine the name of the shared library 23241+# associated with a specific link library. 23242+# -- PORTME fill in with the dynamic library characteristics 23243+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], 23244+[m4_require([_LT_DECL_EGREP]) 23245+m4_require([_LT_DECL_OBJDUMP]) 23246+m4_require([_LT_DECL_DLLTOOL]) 23247+AC_CACHE_CHECK([how to associate runtime and link libraries], 23248+lt_cv_sharedlib_from_linklib_cmd, 23249+[lt_cv_sharedlib_from_linklib_cmd='unknown' 23250+ 23251+case $host_os in 23252+cygwin* | mingw* | pw32* | cegcc*) 23253+ # two different shell functions defined in ltmain.sh 23254+ # decide which to use based on capabilities of $DLLTOOL 23255+ case `$DLLTOOL --help 2>&1` in 23256+ *--identify-strict*) 23257+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib 23258+ ;; 23259+ *) 23260+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback 23261+ ;; 23262+ esac 23263+ ;; 23264+*) 23265+ # fallback: assume linklib IS sharedlib 23266+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" 23267+ ;; 23268+esac 23269+]) 23270+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd 23271+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO 23272+ 23273+_LT_DECL([], [sharedlib_from_linklib_cmd], [1], 23274+ [Command to associate shared and link libraries]) 23275+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB 23276+ 23277+ 23278+# _LT_PATH_MANIFEST_TOOL 23279+# ---------------------- 23280+# locate the manifest tool 23281+m4_defun([_LT_PATH_MANIFEST_TOOL], 23282+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) 23283+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt 23284+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], 23285+ [lt_cv_path_mainfest_tool=no 23286+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD 23287+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out 23288+ cat conftest.err >&AS_MESSAGE_LOG_FD 23289+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then 23290+ lt_cv_path_mainfest_tool=yes 23291+ fi 23292+ rm -f conftest*]) 23293+if test "x$lt_cv_path_mainfest_tool" != xyes; then 23294+ MANIFEST_TOOL=: 23295+fi 23296+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl 23297+])# _LT_PATH_MANIFEST_TOOL 23298+ 23299 23300 # LT_LIB_M 23301 # -------- 23302@@ -3431,8 +3653,8 @@ esac 23303 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 23304 23305 # Transform an extracted symbol line into symbol name and symbol address 23306-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" 23307-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'" 23308+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" 23309+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'" 23310 23311 # Handle CRLF in mingw tool chain 23312 opt_cr= 23313@@ -3468,6 +3690,7 @@ for ac_symprfx in "" "_"; do 23314 else 23315 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 23316 fi 23317+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" 23318 23319 # Check to see that the pipe works correctly. 23320 pipe_works=no 23321@@ -3501,6 +3724,18 @@ _LT_EOF 23322 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 23323 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 23324 cat <<_LT_EOF > conftest.$ac_ext 23325+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ 23326+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) 23327+/* DATA imports from DLLs on WIN32 con't be const, because runtime 23328+ relocations are performed -- see ld's documentation on pseudo-relocs. */ 23329+# define LT@&t@_DLSYM_CONST 23330+#elif defined(__osf__) 23331+/* This system does not cope well with relocations in const data. */ 23332+# define LT@&t@_DLSYM_CONST 23333+#else 23334+# define LT@&t@_DLSYM_CONST const 23335+#endif 23336+ 23337 #ifdef __cplusplus 23338 extern "C" { 23339 #endif 23340@@ -3512,7 +3747,7 @@ _LT_EOF 23341 cat <<_LT_EOF >> conftest.$ac_ext 23342 23343 /* The mapping between symbol names and symbols. */ 23344-const struct { 23345+LT@&t@_DLSYM_CONST struct { 23346 const char *name; 23347 void *address; 23348 } 23349@@ -3538,15 +3773,15 @@ static const void *lt_preloaded_setup() { 23350 _LT_EOF 23351 # Now try linking the two files. 23352 mv conftest.$ac_objext conftstm.$ac_objext 23353- lt_save_LIBS="$LIBS" 23354- lt_save_CFLAGS="$CFLAGS" 23355+ lt_globsym_save_LIBS=$LIBS 23356+ lt_globsym_save_CFLAGS=$CFLAGS 23357 LIBS="conftstm.$ac_objext" 23358 CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" 23359 if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then 23360 pipe_works=yes 23361 fi 23362- LIBS="$lt_save_LIBS" 23363- CFLAGS="$lt_save_CFLAGS" 23364+ LIBS=$lt_globsym_save_LIBS 23365+ CFLAGS=$lt_globsym_save_CFLAGS 23366 else 23367 echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD 23368 fi 23369@@ -3579,6 +3814,13 @@ else 23370 AC_MSG_RESULT(ok) 23371 fi 23372 23373+# Response file support. 23374+if test "$lt_cv_nm_interface" = "MS dumpbin"; then 23375+ nm_file_list_spec='@' 23376+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then 23377+ nm_file_list_spec='@' 23378+fi 23379+ 23380 _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], 23381 [Take the output of nm and produce a listing of raw symbols and C names]) 23382 _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], 23383@@ -3589,6 +3831,8 @@ _LT_DECL([global_symbol_to_c_name_address], 23384 _LT_DECL([global_symbol_to_c_name_address_lib_prefix], 23385 [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], 23386 [Transform the output of nm in a C name address pair when lib prefix is needed]) 23387+_LT_DECL([], [nm_file_list_spec], [1], 23388+ [Specify filename containing input files for $NM]) 23389 ]) # _LT_CMD_GLOBAL_SYMBOLS 23390 23391 23392@@ -3600,7 +3844,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)= 23393 _LT_TAGVAR(lt_prog_compiler_pic, $1)= 23394 _LT_TAGVAR(lt_prog_compiler_static, $1)= 23395 23396-AC_MSG_CHECKING([for $compiler option to produce PIC]) 23397 m4_if([$1], [CXX], [ 23398 # C++ specific cases for pic, static, wl, etc. 23399 if test "$GXX" = yes; then 23400@@ -3706,6 +3949,12 @@ m4_if([$1], [CXX], [ 23401 ;; 23402 esac 23403 ;; 23404+ mingw* | cygwin* | os2* | pw32* | cegcc*) 23405+ # This hack is so that the source file can tell whether it is being 23406+ # built for inclusion in a dll (and should export symbols for example). 23407+ m4_if([$1], [GCJ], [], 23408+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) 23409+ ;; 23410 dgux*) 23411 case $cc_basename in 23412 ec++*) 23413@@ -3858,7 +4107,7 @@ m4_if([$1], [CXX], [ 23414 ;; 23415 solaris*) 23416 case $cc_basename in 23417- CC*) 23418+ CC* | sunCC*) 23419 # Sun C++ 4.2, 5.x and Centerline C++ 23420 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' 23421 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' 23422@@ -4081,6 +4330,12 @@ m4_if([$1], [CXX], [ 23423 _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' 23424 _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' 23425 ;; 23426+ nagfor*) 23427+ # NAG Fortran compiler 23428+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' 23429+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' 23430+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' 23431+ ;; 23432 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 23433 # Portland Group compilers (*not* the Pentium gcc compiler, 23434 # which looks to be a dead project) 23435@@ -4143,7 +4398,7 @@ m4_if([$1], [CXX], [ 23436 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' 23437 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' 23438 case $cc_basename in 23439- f77* | f90* | f95*) 23440+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) 23441 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; 23442 *) 23443 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; 23444@@ -4200,9 +4455,11 @@ case $host_os in 23445 _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" 23446 ;; 23447 esac 23448-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) 23449-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], 23450- [How to pass a linker flag through the compiler]) 23451+ 23452+AC_CACHE_CHECK([for $compiler option to produce PIC], 23453+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], 23454+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) 23455+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) 23456 23457 # 23458 # Check to make sure the PIC flag actually works. 23459@@ -4221,6 +4478,8 @@ fi 23460 _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], 23461 [Additional compiler flags for building library objects]) 23462 23463+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], 23464+ [How to pass a linker flag through the compiler]) 23465 # 23466 # Check to make sure the static flag actually works. 23467 # 23468@@ -4241,6 +4500,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], 23469 m4_defun([_LT_LINKER_SHLIBS], 23470 [AC_REQUIRE([LT_PATH_LD])dnl 23471 AC_REQUIRE([LT_PATH_NM])dnl 23472+m4_require([_LT_PATH_MANIFEST_TOOL])dnl 23473 m4_require([_LT_FILEUTILS_DEFAULTS])dnl 23474 m4_require([_LT_DECL_EGREP])dnl 23475 m4_require([_LT_DECL_SED])dnl 23476@@ -4249,6 +4509,7 @@ m4_require([_LT_TAG_COMPILER])dnl 23477 AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) 23478 m4_if([$1], [CXX], [ 23479 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 23480+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] 23481 case $host_os in 23482 aix[[4-9]]*) 23483 # If we're using GNU nm, then we don't want the "-C" option. 23484@@ -4263,15 +4524,20 @@ m4_if([$1], [CXX], [ 23485 ;; 23486 pw32*) 23487 _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" 23488- ;; 23489+ ;; 23490 cygwin* | mingw* | cegcc*) 23491- _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' 23492- ;; 23493+ case $cc_basename in 23494+ cl*) ;; 23495+ *) 23496+ _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' 23497+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] 23498+ ;; 23499+ esac 23500+ ;; 23501 *) 23502 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 23503- ;; 23504+ ;; 23505 esac 23506- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] 23507 ], [ 23508 runpath_var= 23509 _LT_TAGVAR(allow_undefined_flag, $1)= 23510@@ -4439,7 +4705,8 @@ _LT_EOF 23511 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported 23512 _LT_TAGVAR(always_export_symbols, $1)=no 23513 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes 23514- _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' 23515+ _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' 23516+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] 23517 23518 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 23519 _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' 23520@@ -4538,12 +4805,12 @@ _LT_EOF 23521 _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' 23522 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= 23523 _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' 23524- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' 23525+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' 23526 if test "x$supports_anon_versioning" = xyes; then 23527 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ 23528 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ 23529 echo "local: *; };" >> $output_objdir/$libname.ver~ 23530- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 23531+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 23532 fi 23533 ;; 23534 esac 23535@@ -4557,8 +4824,8 @@ _LT_EOF 23536 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 23537 wlarc= 23538 else 23539- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 23540- _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' 23541+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 23542+ _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' 23543 fi 23544 ;; 23545 23546@@ -4576,8 +4843,8 @@ _LT_EOF 23547 23548 _LT_EOF 23549 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 23550- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 23551- _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' 23552+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 23553+ _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' 23554 else 23555 _LT_TAGVAR(ld_shlibs, $1)=no 23556 fi 23557@@ -4623,8 +4890,8 @@ _LT_EOF 23558 23559 *) 23560 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 23561- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 23562- _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' 23563+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 23564+ _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' 23565 else 23566 _LT_TAGVAR(ld_shlibs, $1)=no 23567 fi 23568@@ -4754,7 +5021,7 @@ _LT_EOF 23569 _LT_TAGVAR(allow_undefined_flag, $1)='-berok' 23570 # Determine the default libpath from the value encoded in an 23571 # empty executable. 23572- _LT_SYS_MODULE_PATH_AIX 23573+ _LT_SYS_MODULE_PATH_AIX([$1]) 23574 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" 23575 _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" 23576 else 23577@@ -4765,7 +5032,7 @@ _LT_EOF 23578 else 23579 # Determine the default libpath from the value encoded in an 23580 # empty executable. 23581- _LT_SYS_MODULE_PATH_AIX 23582+ _LT_SYS_MODULE_PATH_AIX([$1]) 23583 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" 23584 # Warning - without using the other run time loading flags, 23585 # -berok will link without error, but may produce a broken library. 23586@@ -4809,20 +5076,63 @@ _LT_EOF 23587 # Microsoft Visual C++. 23588 # hardcode_libdir_flag_spec is actually meaningless, as there is 23589 # no search path for DLLs. 23590- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' 23591- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported 23592- # Tell ltmain to make .lib files, not .a files. 23593- libext=lib 23594- # Tell ltmain to make .dll files, not .so files. 23595- shrext_cmds=".dll" 23596- # FIXME: Setting linknames here is a bad hack. 23597- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 23598- # The linker will automatically build a .lib file if we build a DLL. 23599- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' 23600- # FIXME: Should let the user specify the lib program. 23601- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' 23602- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' 23603- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes 23604+ case $cc_basename in 23605+ cl*) 23606+ # Native MSVC 23607+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' 23608+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported 23609+ _LT_TAGVAR(always_export_symbols, $1)=yes 23610+ _LT_TAGVAR(file_list_spec, $1)='@' 23611+ # Tell ltmain to make .lib files, not .a files. 23612+ libext=lib 23613+ # Tell ltmain to make .dll files, not .so files. 23614+ shrext_cmds=".dll" 23615+ # FIXME: Setting linknames here is a bad hack. 23616+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' 23617+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 23618+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; 23619+ else 23620+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; 23621+ fi~ 23622+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ 23623+ linknames=' 23624+ # The linker will not automatically build a static lib if we build a DLL. 23625+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' 23626+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes 23627+ _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' 23628+ # Don't use ranlib 23629+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' 23630+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ 23631+ lt_tool_outputfile="@TOOL_OUTPUT@"~ 23632+ case $lt_outputfile in 23633+ *.exe|*.EXE) ;; 23634+ *) 23635+ lt_outputfile="$lt_outputfile.exe" 23636+ lt_tool_outputfile="$lt_tool_outputfile.exe" 23637+ ;; 23638+ esac~ 23639+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then 23640+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; 23641+ $RM "$lt_outputfile.manifest"; 23642+ fi' 23643+ ;; 23644+ *) 23645+ # Assume MSVC wrapper 23646+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' 23647+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported 23648+ # Tell ltmain to make .lib files, not .a files. 23649+ libext=lib 23650+ # Tell ltmain to make .dll files, not .so files. 23651+ shrext_cmds=".dll" 23652+ # FIXME: Setting linknames here is a bad hack. 23653+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 23654+ # The linker will automatically build a .lib file if we build a DLL. 23655+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' 23656+ # FIXME: Should let the user specify the lib program. 23657+ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' 23658+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes 23659+ ;; 23660+ esac 23661 ;; 23662 23663 darwin* | rhapsody*) 23664@@ -4856,7 +5166,7 @@ _LT_EOF 23665 23666 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 23667 freebsd* | dragonfly*) 23668- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' 23669+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' 23670 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' 23671 _LT_TAGVAR(hardcode_direct, $1)=yes 23672 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no 23673@@ -4864,7 +5174,7 @@ _LT_EOF 23674 23675 hpux9*) 23676 if test "$GCC" = yes; then 23677- _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' 23678+ _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' 23679 else 23680 _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' 23681 fi 23682@@ -4880,7 +5190,7 @@ _LT_EOF 23683 23684 hpux10*) 23685 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 23686- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 23687+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 23688 else 23689 _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 23690 fi 23691@@ -4904,10 +5214,10 @@ _LT_EOF 23692 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 23693 ;; 23694 ia64*) 23695- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 23696+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 23697 ;; 23698 *) 23699- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 23700+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 23701 ;; 23702 esac 23703 else 23704@@ -4954,16 +5264,31 @@ _LT_EOF 23705 23706 irix5* | irix6* | nonstopux*) 23707 if test "$GCC" = yes; then 23708- _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' 23709+ _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' 23710 # Try to use the -exported_symbol ld option, if it does not 23711 # work, assume that -exports_file does not work either and 23712 # implicitly export all symbols. 23713- save_LDFLAGS="$LDFLAGS" 23714- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 23715- AC_LINK_IFELSE([AC_LANG_SOURCE([int foo(void) {}])], 23716- _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' 23717- ) 23718- LDFLAGS="$save_LDFLAGS" 23719+ # This should be the same for all languages, so no per-tag cache variable. 23720+ AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], 23721+ [lt_cv_irix_exported_symbol], 23722+ [save_LDFLAGS="$LDFLAGS" 23723+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 23724+ AC_LINK_IFELSE( 23725+ [AC_LANG_SOURCE( 23726+ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], 23727+ [C++], [[int foo (void) { return 0; }]], 23728+ [Fortran 77], [[ 23729+ subroutine foo 23730+ end]], 23731+ [Fortran], [[ 23732+ subroutine foo 23733+ end]])])], 23734+ [lt_cv_irix_exported_symbol=yes], 23735+ [lt_cv_irix_exported_symbol=no]) 23736+ LDFLAGS="$save_LDFLAGS"]) 23737+ if test "$lt_cv_irix_exported_symbol" = yes; then 23738+ _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' 23739+ fi 23740 else 23741 _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' 23742 _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' 23743@@ -5048,7 +5373,7 @@ _LT_EOF 23744 osf4* | osf5*) # as osf3* with the addition of -msym flag 23745 if test "$GCC" = yes; then 23746 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' 23747- _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' 23748+ _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' 23749 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' 23750 else 23751 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' 23752@@ -5067,9 +5392,9 @@ _LT_EOF 23753 _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' 23754 if test "$GCC" = yes; then 23755 wlarc='${wl}' 23756- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 23757+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 23758 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ 23759- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' 23760+ $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' 23761 else 23762 case `$CC -V 2>&1` in 23763 *"Compilers 5.0"*) 23764@@ -5341,8 +5666,6 @@ _LT_TAGDECL([], [inherit_rpath], [0], 23765 to runtime path list]) 23766 _LT_TAGDECL([], [link_all_deplibs], [0], 23767 [Whether libtool must link a program against all its dependency libraries]) 23768-_LT_TAGDECL([], [fix_srcfile_path], [1], 23769- [Fix the shell variable $srcfile for the compiler]) 23770 _LT_TAGDECL([], [always_export_symbols], [0], 23771 [Set to "yes" if exported symbols are required]) 23772 _LT_TAGDECL([], [export_symbols_cmds], [2], 23773@@ -5353,6 +5676,8 @@ _LT_TAGDECL([], [include_expsyms], [1], 23774 [Symbols that must always be exported]) 23775 _LT_TAGDECL([], [prelink_cmds], [2], 23776 [Commands necessary for linking programs (against libraries) with templates]) 23777+_LT_TAGDECL([], [postlink_cmds], [2], 23778+ [Commands necessary for finishing linking programs]) 23779 _LT_TAGDECL([], [file_list_spec], [1], 23780 [Specify filename containing input files]) 23781 dnl FIXME: Not yet implemented 23782@@ -5454,6 +5779,7 @@ CC="$lt_save_CC" 23783 m4_defun([_LT_LANG_CXX_CONFIG], 23784 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl 23785 m4_require([_LT_DECL_EGREP])dnl 23786+m4_require([_LT_PATH_MANIFEST_TOOL])dnl 23787 if test -n "$CXX" && ( test "X$CXX" != "Xno" && 23788 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || 23789 (test "X$CXX" != "Xg++"))) ; then 23790@@ -5515,6 +5841,7 @@ if test "$_lt_caught_CXX_error" != yes; then 23791 23792 # Allow CC to be a program name with arguments. 23793 lt_save_CC=$CC 23794+ lt_save_CFLAGS=$CFLAGS 23795 lt_save_LD=$LD 23796 lt_save_GCC=$GCC 23797 GCC=$GXX 23798@@ -5532,6 +5859,7 @@ if test "$_lt_caught_CXX_error" != yes; then 23799 fi 23800 test -z "${LDCXX+set}" || LD=$LDCXX 23801 CC=${CXX-"c++"} 23802+ CFLAGS=$CXXFLAGS 23803 compiler=$CC 23804 _LT_TAGVAR(compiler, $1)=$CC 23805 _LT_CC_BASENAME([$compiler]) 23806@@ -5695,7 +6023,7 @@ if test "$_lt_caught_CXX_error" != yes; then 23807 _LT_TAGVAR(allow_undefined_flag, $1)='-berok' 23808 # Determine the default libpath from the value encoded in an empty 23809 # executable. 23810- _LT_SYS_MODULE_PATH_AIX 23811+ _LT_SYS_MODULE_PATH_AIX([$1]) 23812 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" 23813 23814 _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" 23815@@ -5707,7 +6035,7 @@ if test "$_lt_caught_CXX_error" != yes; then 23816 else 23817 # Determine the default libpath from the value encoded in an 23818 # empty executable. 23819- _LT_SYS_MODULE_PATH_AIX 23820+ _LT_SYS_MODULE_PATH_AIX([$1]) 23821 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" 23822 # Warning - without using the other run time loading flags, 23823 # -berok will link without error, but may produce a broken library. 23824@@ -5749,29 +6077,75 @@ if test "$_lt_caught_CXX_error" != yes; then 23825 ;; 23826 23827 cygwin* | mingw* | pw32* | cegcc*) 23828- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, 23829- # as there is no search path for DLLs. 23830- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' 23831- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' 23832- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported 23833- _LT_TAGVAR(always_export_symbols, $1)=no 23834- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes 23835- 23836- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 23837- _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' 23838- # If the export-symbols file already is a .def file (1st line 23839- # is EXPORTS), use it as is; otherwise, prepend... 23840- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 23841- cp $export_symbols $output_objdir/$soname.def; 23842- else 23843- echo EXPORTS > $output_objdir/$soname.def; 23844- cat $export_symbols >> $output_objdir/$soname.def; 23845- fi~ 23846- $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' 23847- else 23848- _LT_TAGVAR(ld_shlibs, $1)=no 23849- fi 23850- ;; 23851+ case $GXX,$cc_basename in 23852+ ,cl* | no,cl*) 23853+ # Native MSVC 23854+ # hardcode_libdir_flag_spec is actually meaningless, as there is 23855+ # no search path for DLLs. 23856+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' 23857+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported 23858+ _LT_TAGVAR(always_export_symbols, $1)=yes 23859+ _LT_TAGVAR(file_list_spec, $1)='@' 23860+ # Tell ltmain to make .lib files, not .a files. 23861+ libext=lib 23862+ # Tell ltmain to make .dll files, not .so files. 23863+ shrext_cmds=".dll" 23864+ # FIXME: Setting linknames here is a bad hack. 23865+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' 23866+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 23867+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; 23868+ else 23869+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; 23870+ fi~ 23871+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ 23872+ linknames=' 23873+ # The linker will not automatically build a static lib if we build a DLL. 23874+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' 23875+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes 23876+ # Don't use ranlib 23877+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' 23878+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ 23879+ lt_tool_outputfile="@TOOL_OUTPUT@"~ 23880+ case $lt_outputfile in 23881+ *.exe|*.EXE) ;; 23882+ *) 23883+ lt_outputfile="$lt_outputfile.exe" 23884+ lt_tool_outputfile="$lt_tool_outputfile.exe" 23885+ ;; 23886+ esac~ 23887+ func_to_tool_file "$lt_outputfile"~ 23888+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then 23889+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; 23890+ $RM "$lt_outputfile.manifest"; 23891+ fi' 23892+ ;; 23893+ *) 23894+ # g++ 23895+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, 23896+ # as there is no search path for DLLs. 23897+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' 23898+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' 23899+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported 23900+ _LT_TAGVAR(always_export_symbols, $1)=no 23901+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes 23902+ 23903+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 23904+ _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' 23905+ # If the export-symbols file already is a .def file (1st line 23906+ # is EXPORTS), use it as is; otherwise, prepend... 23907+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 23908+ cp $export_symbols $output_objdir/$soname.def; 23909+ else 23910+ echo EXPORTS > $output_objdir/$soname.def; 23911+ cat $export_symbols >> $output_objdir/$soname.def; 23912+ fi~ 23913+ $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' 23914+ else 23915+ _LT_TAGVAR(ld_shlibs, $1)=no 23916+ fi 23917+ ;; 23918+ esac 23919+ ;; 23920 darwin* | rhapsody*) 23921 _LT_DARWIN_LINKER_FEATURES($1) 23922 ;; 23923@@ -5846,7 +6220,7 @@ if test "$_lt_caught_CXX_error" != yes; then 23924 ;; 23925 *) 23926 if test "$GXX" = yes; then 23927- _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' 23928+ _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' 23929 else 23930 # FIXME: insert proper C++ library support 23931 _LT_TAGVAR(ld_shlibs, $1)=no 23932@@ -5917,10 +6291,10 @@ if test "$_lt_caught_CXX_error" != yes; then 23933 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 23934 ;; 23935 ia64*) 23936- _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' 23937+ _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' 23938 ;; 23939 *) 23940- _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' 23941+ _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' 23942 ;; 23943 esac 23944 fi 23945@@ -5961,9 +6335,9 @@ if test "$_lt_caught_CXX_error" != yes; then 23946 *) 23947 if test "$GXX" = yes; then 23948 if test "$with_gnu_ld" = no; then 23949- _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' 23950+ _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' 23951 else 23952- _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' 23953+ _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' 23954 fi 23955 fi 23956 _LT_TAGVAR(link_all_deplibs, $1)=yes 23957@@ -6033,20 +6407,20 @@ if test "$_lt_caught_CXX_error" != yes; then 23958 _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ 23959 rm -rf $tpldir~ 23960 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ 23961- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' 23962+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' 23963 _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ 23964 rm -rf $tpldir~ 23965 $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ 23966- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ 23967+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ 23968 $RANLIB $oldlib' 23969 _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ 23970 rm -rf $tpldir~ 23971 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ 23972- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' 23973+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' 23974 _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ 23975 rm -rf $tpldir~ 23976 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ 23977- $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' 23978+ $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' 23979 ;; 23980 *) # Version 6 and above use weak symbols 23981 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' 23982@@ -6241,7 +6615,7 @@ if test "$_lt_caught_CXX_error" != yes; then 23983 _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' 23984 ;; 23985 *) 23986- _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' 23987+ _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' 23988 ;; 23989 esac 23990 23991@@ -6287,7 +6661,7 @@ if test "$_lt_caught_CXX_error" != yes; then 23992 23993 solaris*) 23994 case $cc_basename in 23995- CC*) 23996+ CC* | sunCC*) 23997 # Sun C++ 4.2, 5.x and Centerline C++ 23998 _LT_TAGVAR(archive_cmds_need_lc,$1)=yes 23999 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' 24000@@ -6328,9 +6702,9 @@ if test "$_lt_caught_CXX_error" != yes; then 24001 if test "$GXX" = yes && test "$with_gnu_ld" = no; then 24002 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' 24003 if $CC --version | $GREP -v '^2\.7' > /dev/null; then 24004- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' 24005+ _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' 24006 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ 24007- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' 24008+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' 24009 24010 # Commands to make compiler produce verbose output that lists 24011 # what "hidden" libraries, object files and flags are used when 24012@@ -6459,6 +6833,7 @@ if test "$_lt_caught_CXX_error" != yes; then 24013 fi # test -n "$compiler" 24014 24015 CC=$lt_save_CC 24016+ CFLAGS=$lt_save_CFLAGS 24017 LDCXX=$LD 24018 LD=$lt_save_LD 24019 GCC=$lt_save_GCC 24020@@ -6473,6 +6848,29 @@ AC_LANG_POP 24021 ])# _LT_LANG_CXX_CONFIG 24022 24023 24024+# _LT_FUNC_STRIPNAME_CNF 24025+# ---------------------- 24026+# func_stripname_cnf prefix suffix name 24027+# strip PREFIX and SUFFIX off of NAME. 24028+# PREFIX and SUFFIX must not contain globbing or regex special 24029+# characters, hashes, percent signs, but SUFFIX may contain a leading 24030+# dot (in which case that matches only a dot). 24031+# 24032+# This function is identical to the (non-XSI) version of func_stripname, 24033+# except this one can be used by m4 code that may be executed by configure, 24034+# rather than the libtool script. 24035+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl 24036+AC_REQUIRE([_LT_DECL_SED]) 24037+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) 24038+func_stripname_cnf () 24039+{ 24040+ case ${2} in 24041+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; 24042+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; 24043+ esac 24044+} # func_stripname_cnf 24045+])# _LT_FUNC_STRIPNAME_CNF 24046+ 24047 # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) 24048 # --------------------------------- 24049 # Figure out "hidden" library dependencies from verbose 24050@@ -6481,6 +6879,7 @@ AC_LANG_POP 24051 # objects, libraries and library flags. 24052 m4_defun([_LT_SYS_HIDDEN_LIBDEPS], 24053 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl 24054+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl 24055 # Dependencies to place before and after the object being linked: 24056 _LT_TAGVAR(predep_objects, $1)= 24057 _LT_TAGVAR(postdep_objects, $1)= 24058@@ -6531,6 +6930,13 @@ public class foo { 24059 }; 24060 _LT_EOF 24061 ]) 24062+ 24063+_lt_libdeps_save_CFLAGS=$CFLAGS 24064+case "$CC $CFLAGS " in #( 24065+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; 24066+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; 24067+esac 24068+ 24069 dnl Parse the compiler output and extract the necessary 24070 dnl objects, libraries and library flags. 24071 if AC_TRY_EVAL(ac_compile); then 24072@@ -6542,7 +6948,7 @@ if AC_TRY_EVAL(ac_compile); then 24073 pre_test_object_deps_done=no 24074 24075 for p in `eval "$output_verbose_link_cmd"`; do 24076- case $p in 24077+ case ${prev}${p} in 24078 24079 -L* | -R* | -l*) 24080 # Some compilers place space between "-{L,R}" and the path. 24081@@ -6551,13 +6957,22 @@ if AC_TRY_EVAL(ac_compile); then 24082 test $p = "-R"; then 24083 prev=$p 24084 continue 24085- else 24086- prev= 24087 fi 24088 24089+ # Expand the sysroot to ease extracting the directories later. 24090+ if test -z "$prev"; then 24091+ case $p in 24092+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; 24093+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; 24094+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; 24095+ esac 24096+ fi 24097+ case $p in 24098+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; 24099+ esac 24100 if test "$pre_test_object_deps_done" = no; then 24101- case $p in 24102- -L* | -R*) 24103+ case ${prev} in 24104+ -L | -R) 24105 # Internal compiler library paths should come after those 24106 # provided the user. The postdeps already come after the 24107 # user supplied libs so there is no need to process them. 24108@@ -6577,8 +6992,10 @@ if AC_TRY_EVAL(ac_compile); then 24109 _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" 24110 fi 24111 fi 24112+ prev= 24113 ;; 24114 24115+ *.lto.$objext) ;; # Ignore GCC LTO objects 24116 *.$objext) 24117 # This assumes that the test object file only shows up 24118 # once in the compiler output. 24119@@ -6614,6 +7031,7 @@ else 24120 fi 24121 24122 $RM -f confest.$objext 24123+CFLAGS=$_lt_libdeps_save_CFLAGS 24124 24125 # PORTME: override above test on systems where it is broken 24126 m4_if([$1], [CXX], 24127@@ -6650,7 +7068,7 @@ linux*) 24128 24129 solaris*) 24130 case $cc_basename in 24131- CC*) 24132+ CC* | sunCC*) 24133 # The more standards-conforming stlport4 library is 24134 # incompatible with the Cstd library. Avoid specifying 24135 # it if it's in CXXFLAGS. Ignore libCrun as 24136@@ -6763,7 +7181,9 @@ if test "$_lt_disable_F77" != yes; then 24137 # Allow CC to be a program name with arguments. 24138 lt_save_CC="$CC" 24139 lt_save_GCC=$GCC 24140+ lt_save_CFLAGS=$CFLAGS 24141 CC=${F77-"f77"} 24142+ CFLAGS=$FFLAGS 24143 compiler=$CC 24144 _LT_TAGVAR(compiler, $1)=$CC 24145 _LT_CC_BASENAME([$compiler]) 24146@@ -6817,6 +7237,7 @@ if test "$_lt_disable_F77" != yes; then 24147 24148 GCC=$lt_save_GCC 24149 CC="$lt_save_CC" 24150+ CFLAGS="$lt_save_CFLAGS" 24151 fi # test "$_lt_disable_F77" != yes 24152 24153 AC_LANG_POP 24154@@ -6893,7 +7314,9 @@ if test "$_lt_disable_FC" != yes; then 24155 # Allow CC to be a program name with arguments. 24156 lt_save_CC="$CC" 24157 lt_save_GCC=$GCC 24158+ lt_save_CFLAGS=$CFLAGS 24159 CC=${FC-"f95"} 24160+ CFLAGS=$FCFLAGS 24161 compiler=$CC 24162 GCC=$ac_cv_fc_compiler_gnu 24163 24164@@ -6949,7 +7372,8 @@ if test "$_lt_disable_FC" != yes; then 24165 fi # test -n "$compiler" 24166 24167 GCC=$lt_save_GCC 24168- CC="$lt_save_CC" 24169+ CC=$lt_save_CC 24170+ CFLAGS=$lt_save_CFLAGS 24171 fi # test "$_lt_disable_FC" != yes 24172 24173 AC_LANG_POP 24174@@ -6986,10 +7410,12 @@ _LT_COMPILER_BOILERPLATE 24175 _LT_LINKER_BOILERPLATE 24176 24177 # Allow CC to be a program name with arguments. 24178-lt_save_CC="$CC" 24179+lt_save_CC=$CC 24180+lt_save_CFLAGS=$CFLAGS 24181 lt_save_GCC=$GCC 24182 GCC=yes 24183 CC=${GCJ-"gcj"} 24184+CFLAGS=$GCJFLAGS 24185 compiler=$CC 24186 _LT_TAGVAR(compiler, $1)=$CC 24187 _LT_TAGVAR(LD, $1)="$LD" 24188@@ -7020,7 +7446,8 @@ fi 24189 AC_LANG_RESTORE 24190 24191 GCC=$lt_save_GCC 24192-CC="$lt_save_CC" 24193+CC=$lt_save_CC 24194+CFLAGS=$lt_save_CFLAGS 24195 ])# _LT_LANG_GCJ_CONFIG 24196 24197 24198@@ -7055,9 +7482,11 @@ _LT_LINKER_BOILERPLATE 24199 24200 # Allow CC to be a program name with arguments. 24201 lt_save_CC="$CC" 24202+lt_save_CFLAGS=$CFLAGS 24203 lt_save_GCC=$GCC 24204 GCC= 24205 CC=${RC-"windres"} 24206+CFLAGS= 24207 compiler=$CC 24208 _LT_TAGVAR(compiler, $1)=$CC 24209 _LT_CC_BASENAME([$compiler]) 24210@@ -7070,7 +7499,8 @@ fi 24211 24212 GCC=$lt_save_GCC 24213 AC_LANG_RESTORE 24214-CC="$lt_save_CC" 24215+CC=$lt_save_CC 24216+CFLAGS=$lt_save_CFLAGS 24217 ])# _LT_LANG_RC_CONFIG 24218 24219 24220@@ -7129,6 +7559,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) 24221 AC_SUBST([OBJDUMP]) 24222 ]) 24223 24224+# _LT_DECL_DLLTOOL 24225+# ---------------- 24226+# Ensure DLLTOOL variable is set. 24227+m4_defun([_LT_DECL_DLLTOOL], 24228+[AC_CHECK_TOOL(DLLTOOL, dlltool, false) 24229+test -z "$DLLTOOL" && DLLTOOL=dlltool 24230+_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) 24231+AC_SUBST([DLLTOOL]) 24232+]) 24233 24234 # _LT_DECL_SED 24235 # ------------ 24236@@ -7222,8 +7661,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES], 24237 # Try some XSI features 24238 xsi_shell=no 24239 ( _lt_dummy="a/b/c" 24240- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ 24241- = c,a/b,, \ 24242+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ 24243+ = c,a/b,b/c, \ 24244 && eval 'test $(( 1 + 1 )) -eq 2 \ 24245 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 24246 && xsi_shell=yes 24247@@ -7262,206 +7701,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl 24248 ])# _LT_CHECK_SHELL_FEATURES 24249 24250 24251-# _LT_PROG_XSI_SHELLFNS 24252-# --------------------- 24253-# Bourne and XSI compatible variants of some useful shell functions. 24254-m4_defun([_LT_PROG_XSI_SHELLFNS], 24255-[case $xsi_shell in 24256- yes) 24257- cat << \_LT_EOF >> "$cfgfile" 24258- 24259-# func_dirname file append nondir_replacement 24260-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 24261-# otherwise set result to NONDIR_REPLACEMENT. 24262-func_dirname () 24263-{ 24264- case ${1} in 24265- */*) func_dirname_result="${1%/*}${2}" ;; 24266- * ) func_dirname_result="${3}" ;; 24267- esac 24268-} 24269- 24270-# func_basename file 24271-func_basename () 24272-{ 24273- func_basename_result="${1##*/}" 24274-} 24275- 24276-# func_dirname_and_basename file append nondir_replacement 24277-# perform func_basename and func_dirname in a single function 24278-# call: 24279-# dirname: Compute the dirname of FILE. If nonempty, 24280-# add APPEND to the result, otherwise set result 24281-# to NONDIR_REPLACEMENT. 24282-# value returned in "$func_dirname_result" 24283-# basename: Compute filename of FILE. 24284-# value retuned in "$func_basename_result" 24285-# Implementation must be kept synchronized with func_dirname 24286-# and func_basename. For efficiency, we do not delegate to 24287-# those functions but instead duplicate the functionality here. 24288-func_dirname_and_basename () 24289-{ 24290- case ${1} in 24291- */*) func_dirname_result="${1%/*}${2}" ;; 24292- * ) func_dirname_result="${3}" ;; 24293- esac 24294- func_basename_result="${1##*/}" 24295-} 24296- 24297-# func_stripname prefix suffix name 24298-# strip PREFIX and SUFFIX off of NAME. 24299-# PREFIX and SUFFIX must not contain globbing or regex special 24300-# characters, hashes, percent signs, but SUFFIX may contain a leading 24301-# dot (in which case that matches only a dot). 24302-func_stripname () 24303-{ 24304- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are 24305- # positional parameters, so assign one to ordinary parameter first. 24306- func_stripname_result=${3} 24307- func_stripname_result=${func_stripname_result#"${1}"} 24308- func_stripname_result=${func_stripname_result%"${2}"} 24309-} 24310- 24311-# func_opt_split 24312-func_opt_split () 24313-{ 24314- func_opt_split_opt=${1%%=*} 24315- func_opt_split_arg=${1#*=} 24316-} 24317- 24318-# func_lo2o object 24319-func_lo2o () 24320-{ 24321- case ${1} in 24322- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; 24323- *) func_lo2o_result=${1} ;; 24324- esac 24325-} 24326- 24327-# func_xform libobj-or-source 24328-func_xform () 24329-{ 24330- func_xform_result=${1%.*}.lo 24331-} 24332- 24333-# func_arith arithmetic-term... 24334-func_arith () 24335-{ 24336- func_arith_result=$(( $[*] )) 24337-} 24338- 24339-# func_len string 24340-# STRING may not start with a hyphen. 24341-func_len () 24342-{ 24343- func_len_result=${#1} 24344-} 24345+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) 24346+# ------------------------------------------------------ 24347+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and 24348+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. 24349+m4_defun([_LT_PROG_FUNCTION_REPLACE], 24350+[dnl { 24351+sed -e '/^$1 ()$/,/^} # $1 /c\ 24352+$1 ()\ 24353+{\ 24354+m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) 24355+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ 24356+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 24357+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 24358+test 0 -eq $? || _lt_function_replace_fail=: 24359+]) 24360 24361-_LT_EOF 24362- ;; 24363- *) # Bourne compatible functions. 24364- cat << \_LT_EOF >> "$cfgfile" 24365 24366-# func_dirname file append nondir_replacement 24367-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 24368-# otherwise set result to NONDIR_REPLACEMENT. 24369-func_dirname () 24370-{ 24371- # Extract subdirectory from the argument. 24372- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` 24373- if test "X$func_dirname_result" = "X${1}"; then 24374- func_dirname_result="${3}" 24375- else 24376- func_dirname_result="$func_dirname_result${2}" 24377- fi 24378-} 24379+# _LT_PROG_REPLACE_SHELLFNS 24380+# ------------------------- 24381+# Replace existing portable implementations of several shell functions with 24382+# equivalent extended shell implementations where those features are available.. 24383+m4_defun([_LT_PROG_REPLACE_SHELLFNS], 24384+[if test x"$xsi_shell" = xyes; then 24385+ _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl 24386+ case ${1} in 24387+ */*) func_dirname_result="${1%/*}${2}" ;; 24388+ * ) func_dirname_result="${3}" ;; 24389+ esac]) 24390+ 24391+ _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl 24392+ func_basename_result="${1##*/}"]) 24393+ 24394+ _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl 24395+ case ${1} in 24396+ */*) func_dirname_result="${1%/*}${2}" ;; 24397+ * ) func_dirname_result="${3}" ;; 24398+ esac 24399+ func_basename_result="${1##*/}"]) 24400 24401-# func_basename file 24402-func_basename () 24403-{ 24404- func_basename_result=`$ECHO "${1}" | $SED "$basename"` 24405-} 24406+ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl 24407+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are 24408+ # positional parameters, so assign one to ordinary parameter first. 24409+ func_stripname_result=${3} 24410+ func_stripname_result=${func_stripname_result#"${1}"} 24411+ func_stripname_result=${func_stripname_result%"${2}"}]) 24412 24413-dnl func_dirname_and_basename 24414-dnl A portable version of this function is already defined in general.m4sh 24415-dnl so there is no need for it here. 24416+ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl 24417+ func_split_long_opt_name=${1%%=*} 24418+ func_split_long_opt_arg=${1#*=}]) 24419 24420-# func_stripname prefix suffix name 24421-# strip PREFIX and SUFFIX off of NAME. 24422-# PREFIX and SUFFIX must not contain globbing or regex special 24423-# characters, hashes, percent signs, but SUFFIX may contain a leading 24424-# dot (in which case that matches only a dot). 24425-# func_strip_suffix prefix name 24426-func_stripname () 24427-{ 24428- case ${2} in 24429- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; 24430- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; 24431- esac 24432-} 24433+ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl 24434+ func_split_short_opt_arg=${1#??} 24435+ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) 24436 24437-# sed scripts: 24438-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' 24439-my_sed_long_arg='1s/^-[[^=]]*=//' 24440+ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl 24441+ case ${1} in 24442+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;; 24443+ *) func_lo2o_result=${1} ;; 24444+ esac]) 24445 24446-# func_opt_split 24447-func_opt_split () 24448-{ 24449- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` 24450- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` 24451-} 24452+ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) 24453 24454-# func_lo2o object 24455-func_lo2o () 24456-{ 24457- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` 24458-} 24459+ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) 24460 24461-# func_xform libobj-or-source 24462-func_xform () 24463-{ 24464- func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'` 24465-} 24466+ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) 24467+fi 24468 24469-# func_arith arithmetic-term... 24470-func_arith () 24471-{ 24472- func_arith_result=`expr "$[@]"` 24473-} 24474+if test x"$lt_shell_append" = xyes; then 24475+ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) 24476 24477-# func_len string 24478-# STRING may not start with a hyphen. 24479-func_len () 24480-{ 24481- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` 24482-} 24483+ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl 24484+ func_quote_for_eval "${2}" 24485+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ 24486+ eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) 24487 24488-_LT_EOF 24489-esac 24490+ # Save a `func_append' function call where possible by direct use of '+=' 24491+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ 24492+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 24493+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 24494+ test 0 -eq $? || _lt_function_replace_fail=: 24495+else 24496+ # Save a `func_append' function call even when '+=' is not available 24497+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ 24498+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 24499+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 24500+ test 0 -eq $? || _lt_function_replace_fail=: 24501+fi 24502 24503-case $lt_shell_append in 24504- yes) 24505- cat << \_LT_EOF >> "$cfgfile" 24506+if test x"$_lt_function_replace_fail" = x":"; then 24507+ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) 24508+fi 24509+]) 24510 24511-# func_append var value 24512-# Append VALUE to the end of shell variable VAR. 24513-func_append () 24514-{ 24515- eval "$[1]+=\$[2]" 24516-} 24517-_LT_EOF 24518+# _LT_PATH_CONVERSION_FUNCTIONS 24519+# ----------------------------- 24520+# Determine which file name conversion functions should be used by 24521+# func_to_host_file (and, implicitly, by func_to_host_path). These are needed 24522+# for certain cross-compile configurations and native mingw. 24523+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], 24524+[AC_REQUIRE([AC_CANONICAL_HOST])dnl 24525+AC_REQUIRE([AC_CANONICAL_BUILD])dnl 24526+AC_MSG_CHECKING([how to convert $build file names to $host format]) 24527+AC_CACHE_VAL(lt_cv_to_host_file_cmd, 24528+[case $host in 24529+ *-*-mingw* ) 24530+ case $build in 24531+ *-*-mingw* ) # actually msys 24532+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 24533+ ;; 24534+ *-*-cygwin* ) 24535+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 24536+ ;; 24537+ * ) # otherwise, assume *nix 24538+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 24539+ ;; 24540+ esac 24541 ;; 24542- *) 24543- cat << \_LT_EOF >> "$cfgfile" 24544- 24545-# func_append var value 24546-# Append VALUE to the end of shell variable VAR. 24547-func_append () 24548-{ 24549- eval "$[1]=\$$[1]\$[2]" 24550-} 24551- 24552-_LT_EOF 24553+ *-*-cygwin* ) 24554+ case $build in 24555+ *-*-mingw* ) # actually msys 24556+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin 24557+ ;; 24558+ *-*-cygwin* ) 24559+ lt_cv_to_host_file_cmd=func_convert_file_noop 24560+ ;; 24561+ * ) # otherwise, assume *nix 24562+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin 24563+ ;; 24564+ esac 24565 ;; 24566- esac 24567+ * ) # unhandled hosts (and "normal" native builds) 24568+ lt_cv_to_host_file_cmd=func_convert_file_noop 24569+ ;; 24570+esac 24571+]) 24572+to_host_file_cmd=$lt_cv_to_host_file_cmd 24573+AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) 24574+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], 24575+ [0], [convert $build file names to $host format])dnl 24576+ 24577+AC_MSG_CHECKING([how to convert $build file names to toolchain format]) 24578+AC_CACHE_VAL(lt_cv_to_tool_file_cmd, 24579+[#assume ordinary cross tools, or native build. 24580+lt_cv_to_tool_file_cmd=func_convert_file_noop 24581+case $host in 24582+ *-*-mingw* ) 24583+ case $build in 24584+ *-*-mingw* ) # actually msys 24585+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 24586+ ;; 24587+ esac 24588+ ;; 24589+esac 24590 ]) 24591+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 24592+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) 24593+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], 24594+ [0], [convert $build files to toolchain format])dnl 24595+])# _LT_PATH_CONVERSION_FUNCTIONS 24596diff --git a/ltmain.sh b/ltmain.sh 24597index 9503ec85d70..70e856e0659 100644 24598--- a/ltmain.sh 24599+++ b/ltmain.sh 24600@@ -1,10 +1,9 @@ 24601-# Generated from ltmain.m4sh. 24602 24603-# libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a 24604+# libtool (GNU libtool) 2.4 24605 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 24606 24607 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 24608-# 2007, 2008, 2009 Free Software Foundation, Inc. 24609+# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. 24610 # This is free software; see the source for copying conditions. There is NO 24611 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 24612 24613@@ -38,7 +37,6 @@ 24614 # -n, --dry-run display commands without modifying any files 24615 # --features display basic configuration information and exit 24616 # --mode=MODE use operation mode MODE 24617-# --no-finish let install mode avoid finish commands 24618 # --preserve-dup-deps don't remove duplicate dependency libraries 24619 # --quiet, --silent don't print informational messages 24620 # --no-quiet, --no-silent 24621@@ -71,17 +69,19 @@ 24622 # compiler: $LTCC 24623 # compiler flags: $LTCFLAGS 24624 # linker: $LD (gnu? $with_gnu_ld) 24625-# $progname: (GNU libtool 1.3134 2009-11-29) 2.2.7a 24626+# $progname: (GNU libtool) 2.4 24627 # automake: $automake_version 24628 # autoconf: $autoconf_version 24629 # 24630 # Report bugs to <bug-libtool@gnu.org>. 24631+# GNU libtool home page: <http://www.gnu.org/software/libtool/>. 24632+# General help using GNU software: <http://www.gnu.org/gethelp/>. 24633 24634 PROGRAM=libtool 24635 PACKAGE=libtool 24636-VERSION=2.2.7a 24637-TIMESTAMP=" 1.3134 2009-11-29" 24638-package_revision=1.3134 24639+VERSION=2.4 24640+TIMESTAMP="" 24641+package_revision=1.3293 24642 24643 # Be Bourne compatible 24644 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then 24645@@ -106,9 +106,6 @@ _LTECHO_EOF' 24646 } 24647 24648 # NLS nuisances: We save the old values to restore during execute mode. 24649-# Only set LANG and LC_ALL to C if already set. 24650-# These must not be set unconditionally because not all systems understand 24651-# e.g. LANG=C (notably SCO). 24652 lt_user_locale= 24653 lt_safe_locale= 24654 for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES 24655@@ -121,15 +118,13 @@ do 24656 lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" 24657 fi" 24658 done 24659+LC_ALL=C 24660+LANGUAGE=C 24661+export LANGUAGE LC_ALL 24662 24663 $lt_unset CDPATH 24664 24665 24666- 24667- 24668- 24669- 24670- 24671 # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh 24672 # is ksh but when the shell is invoked as "sh" and the current value of 24673 # the _XPG environment variable is not equal to 1 (one), the special 24674@@ -140,7 +135,7 @@ progpath="$0" 24675 24676 24677 : ${CP="cp -f"} 24678-: ${ECHO=$as_echo} 24679+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} 24680 : ${EGREP="/bin/grep -E"} 24681 : ${FGREP="/bin/grep -F"} 24682 : ${GREP="/bin/grep"} 24683@@ -149,7 +144,7 @@ progpath="$0" 24684 : ${MKDIR="mkdir"} 24685 : ${MV="mv -f"} 24686 : ${RM="rm -f"} 24687-: ${SED="/mount/endor/wildenhu/local-x86_64/bin/sed"} 24688+: ${SED="/bin/sed"} 24689 : ${SHELL="${CONFIG_SHELL-/bin/sh}"} 24690 : ${Xsed="$SED -e 1s/^X//"} 24691 24692@@ -169,6 +164,27 @@ IFS=" $lt_nl" 24693 dirname="s,/[^/]*$,," 24694 basename="s,^.*/,," 24695 24696+# func_dirname file append nondir_replacement 24697+# Compute the dirname of FILE. If nonempty, add APPEND to the result, 24698+# otherwise set result to NONDIR_REPLACEMENT. 24699+func_dirname () 24700+{ 24701+ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` 24702+ if test "X$func_dirname_result" = "X${1}"; then 24703+ func_dirname_result="${3}" 24704+ else 24705+ func_dirname_result="$func_dirname_result${2}" 24706+ fi 24707+} # func_dirname may be replaced by extended shell implementation 24708+ 24709+ 24710+# func_basename file 24711+func_basename () 24712+{ 24713+ func_basename_result=`$ECHO "${1}" | $SED "$basename"` 24714+} # func_basename may be replaced by extended shell implementation 24715+ 24716+ 24717 # func_dirname_and_basename file append nondir_replacement 24718 # perform func_basename and func_dirname in a single function 24719 # call: 24720@@ -183,17 +199,31 @@ basename="s,^.*/,," 24721 # those functions but instead duplicate the functionality here. 24722 func_dirname_and_basename () 24723 { 24724- # Extract subdirectory from the argument. 24725- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` 24726- if test "X$func_dirname_result" = "X${1}"; then 24727- func_dirname_result="${3}" 24728- else 24729- func_dirname_result="$func_dirname_result${2}" 24730- fi 24731- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` 24732-} 24733+ # Extract subdirectory from the argument. 24734+ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` 24735+ if test "X$func_dirname_result" = "X${1}"; then 24736+ func_dirname_result="${3}" 24737+ else 24738+ func_dirname_result="$func_dirname_result${2}" 24739+ fi 24740+ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` 24741+} # func_dirname_and_basename may be replaced by extended shell implementation 24742+ 24743+ 24744+# func_stripname prefix suffix name 24745+# strip PREFIX and SUFFIX off of NAME. 24746+# PREFIX and SUFFIX must not contain globbing or regex special 24747+# characters, hashes, percent signs, but SUFFIX may contain a leading 24748+# dot (in which case that matches only a dot). 24749+# func_strip_suffix prefix name 24750+func_stripname () 24751+{ 24752+ case ${2} in 24753+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; 24754+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; 24755+ esac 24756+} # func_stripname may be replaced by extended shell implementation 24757 24758-# Generated shell functions inserted here. 24759 24760 # These SED scripts presuppose an absolute path with a trailing slash. 24761 pathcar='s,^/\([^/]*\).*$,\1,' 24762@@ -376,6 +406,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g' 24763 # Same as above, but do not quote variable references. 24764 double_quote_subst='s/\(["`\\]\)/\\\1/g' 24765 24766+# Sed substitution that turns a string into a regex matching for the 24767+# string literally. 24768+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' 24769+ 24770+# Sed substitution that converts a w32 file name or path 24771+# which contains forward slashes, into one that contains 24772+# (escaped) backslashes. A very naive implementation. 24773+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' 24774+ 24775 # Re-`\' parameter expansions in output of double_quote_subst that were 24776 # `\'-ed in input to the same. If an odd number of `\' preceded a '$' 24777 # in input to double_quote_subst, that '$' was protected from expansion. 24778@@ -404,7 +443,7 @@ opt_warning=: 24779 # name if it has been set yet. 24780 func_echo () 24781 { 24782- $ECHO "$progname${mode+: }$mode: $*" 24783+ $ECHO "$progname: ${opt_mode+$opt_mode: }$*" 24784 } 24785 24786 # func_verbose arg... 24787@@ -430,14 +469,14 @@ func_echo_all () 24788 # Echo program name prefixed message to standard error. 24789 func_error () 24790 { 24791- $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 24792+ $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 24793 } 24794 24795 # func_warning arg... 24796 # Echo program name prefixed warning message to standard error. 24797 func_warning () 24798 { 24799- $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 24800+ $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 24801 24802 # bash bug again: 24803 : 24804@@ -656,19 +695,35 @@ func_show_eval_locale () 24805 fi 24806 } 24807 24808- 24809- 24810+# func_tr_sh 24811+# Turn $1 into a string suitable for a shell variable name. 24812+# Result is stored in $func_tr_sh_result. All characters 24813+# not in the set a-zA-Z0-9_ are replaced with '_'. Further, 24814+# if $1 begins with a digit, a '_' is prepended as well. 24815+func_tr_sh () 24816+{ 24817+ case $1 in 24818+ [0-9]* | *[!a-zA-Z0-9_]*) 24819+ func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` 24820+ ;; 24821+ * ) 24822+ func_tr_sh_result=$1 24823+ ;; 24824+ esac 24825+} 24826 24827 24828 # func_version 24829 # Echo version message to standard output and exit. 24830 func_version () 24831 { 24832+ $opt_debug 24833+ 24834 $SED -n '/(C)/!b go 24835 :more 24836 /\./!{ 24837 N 24838- s/\n# // 24839+ s/\n# / / 24840 b more 24841 } 24842 :go 24843@@ -685,7 +740,9 @@ func_version () 24844 # Echo short help message to standard output and exit. 24845 func_usage () 24846 { 24847- $SED -n '/^# Usage:/,/^# *-h/ { 24848+ $opt_debug 24849+ 24850+ $SED -n '/^# Usage:/,/^# *.*--help/ { 24851 s/^# // 24852 s/^# *$// 24853 s/\$progname/'$progname'/ 24854@@ -701,7 +758,10 @@ func_usage () 24855 # unless 'noexit' is passed as argument. 24856 func_help () 24857 { 24858+ $opt_debug 24859+ 24860 $SED -n '/^# Usage:/,/# Report bugs to/ { 24861+ :print 24862 s/^# // 24863 s/^# *$// 24864 s*\$progname*'$progname'* 24865@@ -714,7 +774,11 @@ func_help () 24866 s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ 24867 s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ 24868 p 24869- }' < "$progpath" 24870+ d 24871+ } 24872+ /^# .* home page:/b print 24873+ /^# General help using/b print 24874+ ' < "$progpath" 24875 ret=$? 24876 if test -z "$1"; then 24877 exit $ret 24878@@ -726,12 +790,39 @@ func_help () 24879 # exit_cmd. 24880 func_missing_arg () 24881 { 24882- func_error "missing argument for $1" 24883+ $opt_debug 24884+ 24885+ func_error "missing argument for $1." 24886 exit_cmd=exit 24887 } 24888 24889-exit_cmd=: 24890 24891+# func_split_short_opt shortopt 24892+# Set func_split_short_opt_name and func_split_short_opt_arg shell 24893+# variables after splitting SHORTOPT after the 2nd character. 24894+func_split_short_opt () 24895+{ 24896+ my_sed_short_opt='1s/^\(..\).*$/\1/;q' 24897+ my_sed_short_rest='1s/^..\(.*\)$/\1/;q' 24898+ 24899+ func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` 24900+ func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` 24901+} # func_split_short_opt may be replaced by extended shell implementation 24902+ 24903+ 24904+# func_split_long_opt longopt 24905+# Set func_split_long_opt_name and func_split_long_opt_arg shell 24906+# variables after splitting LONGOPT at the `=' sign. 24907+func_split_long_opt () 24908+{ 24909+ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' 24910+ my_sed_long_arg='1s/^--[^=]*=//' 24911+ 24912+ func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` 24913+ func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` 24914+} # func_split_long_opt may be replaced by extended shell implementation 24915+ 24916+exit_cmd=: 24917 24918 24919 24920@@ -741,26 +832,64 @@ magic="%%%MAGIC variable%%%" 24921 magic_exe="%%%MAGIC EXE variable%%%" 24922 24923 # Global variables. 24924-# $mode is unset 24925 nonopt= 24926-execute_dlfiles= 24927 preserve_args= 24928 lo2o="s/\\.lo\$/.${objext}/" 24929 o2lo="s/\\.${objext}\$/.lo/" 24930 extracted_archives= 24931 extracted_serial=0 24932 24933-opt_dry_run=false 24934-opt_finish=: 24935-opt_duplicate_deps=false 24936-opt_silent=false 24937-opt_debug=: 24938- 24939 # If this variable is set in any of the actions, the command in it 24940 # will be execed at the end. This prevents here-documents from being 24941 # left over by shells. 24942 exec_cmd= 24943 24944+# func_append var value 24945+# Append VALUE to the end of shell variable VAR. 24946+func_append () 24947+{ 24948+ eval "${1}=\$${1}\${2}" 24949+} # func_append may be replaced by extended shell implementation 24950+ 24951+# func_append_quoted var value 24952+# Quote VALUE and append to the end of shell variable VAR, separated 24953+# by a space. 24954+func_append_quoted () 24955+{ 24956+ func_quote_for_eval "${2}" 24957+ eval "${1}=\$${1}\\ \$func_quote_for_eval_result" 24958+} # func_append_quoted may be replaced by extended shell implementation 24959+ 24960+ 24961+# func_arith arithmetic-term... 24962+func_arith () 24963+{ 24964+ func_arith_result=`expr "${@}"` 24965+} # func_arith may be replaced by extended shell implementation 24966+ 24967+ 24968+# func_len string 24969+# STRING may not start with a hyphen. 24970+func_len () 24971+{ 24972+ func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` 24973+} # func_len may be replaced by extended shell implementation 24974+ 24975+ 24976+# func_lo2o object 24977+func_lo2o () 24978+{ 24979+ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` 24980+} # func_lo2o may be replaced by extended shell implementation 24981+ 24982+ 24983+# func_xform libobj-or-source 24984+func_xform () 24985+{ 24986+ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` 24987+} # func_xform may be replaced by extended shell implementation 24988+ 24989+ 24990 # func_fatal_configuration arg... 24991 # Echo program name prefixed message to standard error, followed by 24992 # a configuration failure hint, and exit. 24993@@ -850,130 +979,204 @@ func_enable_tag () 24994 esac 24995 } 24996 24997-# Parse options once, thoroughly. This comes as soon as possible in 24998-# the script to make things like `libtool --version' happen quickly. 24999+# func_check_version_match 25000+# Ensure that we are using m4 macros, and libtool script from the same 25001+# release of libtool. 25002+func_check_version_match () 25003 { 25004+ if test "$package_revision" != "$macro_revision"; then 25005+ if test "$VERSION" != "$macro_version"; then 25006+ if test -z "$macro_version"; then 25007+ cat >&2 <<_LT_EOF 25008+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the 25009+$progname: definition of this LT_INIT comes from an older release. 25010+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION 25011+$progname: and run autoconf again. 25012+_LT_EOF 25013+ else 25014+ cat >&2 <<_LT_EOF 25015+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the 25016+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. 25017+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION 25018+$progname: and run autoconf again. 25019+_LT_EOF 25020+ fi 25021+ else 25022+ cat >&2 <<_LT_EOF 25023+$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, 25024+$progname: but the definition of this LT_INIT comes from revision $macro_revision. 25025+$progname: You should recreate aclocal.m4 with macros from revision $package_revision 25026+$progname: of $PACKAGE $VERSION and run autoconf again. 25027+_LT_EOF 25028+ fi 25029 25030- # Shorthand for --mode=foo, only valid as the first argument 25031- case $1 in 25032- clean|clea|cle|cl) 25033- shift; set dummy --mode clean ${1+"$@"}; shift 25034- ;; 25035- compile|compil|compi|comp|com|co|c) 25036- shift; set dummy --mode compile ${1+"$@"}; shift 25037- ;; 25038- execute|execut|execu|exec|exe|ex|e) 25039- shift; set dummy --mode execute ${1+"$@"}; shift 25040- ;; 25041- finish|finis|fini|fin|fi|f) 25042- shift; set dummy --mode finish ${1+"$@"}; shift 25043- ;; 25044- install|instal|insta|inst|ins|in|i) 25045- shift; set dummy --mode install ${1+"$@"}; shift 25046- ;; 25047- link|lin|li|l) 25048- shift; set dummy --mode link ${1+"$@"}; shift 25049- ;; 25050- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) 25051- shift; set dummy --mode uninstall ${1+"$@"}; shift 25052- ;; 25053- esac 25054+ exit $EXIT_MISMATCH 25055+ fi 25056+} 25057+ 25058+ 25059+# Shorthand for --mode=foo, only valid as the first argument 25060+case $1 in 25061+clean|clea|cle|cl) 25062+ shift; set dummy --mode clean ${1+"$@"}; shift 25063+ ;; 25064+compile|compil|compi|comp|com|co|c) 25065+ shift; set dummy --mode compile ${1+"$@"}; shift 25066+ ;; 25067+execute|execut|execu|exec|exe|ex|e) 25068+ shift; set dummy --mode execute ${1+"$@"}; shift 25069+ ;; 25070+finish|finis|fini|fin|fi|f) 25071+ shift; set dummy --mode finish ${1+"$@"}; shift 25072+ ;; 25073+install|instal|insta|inst|ins|in|i) 25074+ shift; set dummy --mode install ${1+"$@"}; shift 25075+ ;; 25076+link|lin|li|l) 25077+ shift; set dummy --mode link ${1+"$@"}; shift 25078+ ;; 25079+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) 25080+ shift; set dummy --mode uninstall ${1+"$@"}; shift 25081+ ;; 25082+esac 25083 25084- # Parse non-mode specific arguments: 25085- while test "$#" -gt 0; do 25086+ 25087+ 25088+# Option defaults: 25089+opt_debug=: 25090+opt_dry_run=false 25091+opt_config=false 25092+opt_preserve_dup_deps=false 25093+opt_features=false 25094+opt_finish=false 25095+opt_help=false 25096+opt_help_all=false 25097+opt_silent=: 25098+opt_verbose=: 25099+opt_silent=false 25100+opt_verbose=false 25101+ 25102+ 25103+# Parse options once, thoroughly. This comes as soon as possible in the 25104+# script to make things like `--version' happen as quickly as we can. 25105+{ 25106+ # this just eases exit handling 25107+ while test $# -gt 0; do 25108 opt="$1" 25109 shift 25110- 25111 case $opt in 25112- --config) func_config ;; 25113- 25114- --debug) preserve_args="$preserve_args $opt" 25115+ --debug|-x) opt_debug='set -x' 25116 func_echo "enabling shell trace mode" 25117- opt_debug='set -x' 25118 $opt_debug 25119 ;; 25120- 25121- -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break 25122- execute_dlfiles="$execute_dlfiles $1" 25123- shift 25124+ --dry-run|--dryrun|-n) 25125+ opt_dry_run=: 25126 ;; 25127- 25128- --dry-run | -n) opt_dry_run=: ;; 25129- --features) func_features ;; 25130- --finish) mode="finish" ;; 25131- --no-finish) opt_finish=false ;; 25132- 25133- --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break 25134- case $1 in 25135- # Valid mode arguments: 25136- clean) ;; 25137- compile) ;; 25138- execute) ;; 25139- finish) ;; 25140- install) ;; 25141- link) ;; 25142- relink) ;; 25143- uninstall) ;; 25144- 25145- # Catch anything else as an error 25146- *) func_error "invalid argument for $opt" 25147- exit_cmd=exit 25148- break 25149- ;; 25150- esac 25151- 25152- mode="$1" 25153+ --config) 25154+ opt_config=: 25155+func_config 25156+ ;; 25157+ --dlopen|-dlopen) 25158+ optarg="$1" 25159+ opt_dlopen="${opt_dlopen+$opt_dlopen 25160+}$optarg" 25161 shift 25162 ;; 25163- 25164 --preserve-dup-deps) 25165- opt_duplicate_deps=: ;; 25166- 25167- --quiet|--silent) preserve_args="$preserve_args $opt" 25168- opt_silent=: 25169- opt_verbose=false 25170+ opt_preserve_dup_deps=: 25171 ;; 25172- 25173- --no-quiet|--no-silent) 25174- preserve_args="$preserve_args $opt" 25175- opt_silent=false 25176+ --features) 25177+ opt_features=: 25178+func_features 25179 ;; 25180- 25181- --verbose| -v) preserve_args="$preserve_args $opt" 25182+ --finish) 25183+ opt_finish=: 25184+set dummy --mode finish ${1+"$@"}; shift 25185+ ;; 25186+ --help) 25187+ opt_help=: 25188+ ;; 25189+ --help-all) 25190+ opt_help_all=: 25191+opt_help=': help-all' 25192+ ;; 25193+ --mode) 25194+ test $# = 0 && func_missing_arg $opt && break 25195+ optarg="$1" 25196+ opt_mode="$optarg" 25197+case $optarg in 25198+ # Valid mode arguments: 25199+ clean|compile|execute|finish|install|link|relink|uninstall) ;; 25200+ 25201+ # Catch anything else as an error 25202+ *) func_error "invalid argument for $opt" 25203+ exit_cmd=exit 25204+ break 25205+ ;; 25206+esac 25207+ shift 25208+ ;; 25209+ --no-silent|--no-quiet) 25210 opt_silent=false 25211- opt_verbose=: 25212+func_append preserve_args " $opt" 25213 ;; 25214- 25215- --no-verbose) preserve_args="$preserve_args $opt" 25216+ --no-verbose) 25217 opt_verbose=false 25218+func_append preserve_args " $opt" 25219 ;; 25220- 25221- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break 25222- preserve_args="$preserve_args $opt $1" 25223- func_enable_tag "$1" # tagname is set here 25224+ --silent|--quiet) 25225+ opt_silent=: 25226+func_append preserve_args " $opt" 25227+ opt_verbose=false 25228+ ;; 25229+ --verbose|-v) 25230+ opt_verbose=: 25231+func_append preserve_args " $opt" 25232+opt_silent=false 25233+ ;; 25234+ --tag) 25235+ test $# = 0 && func_missing_arg $opt && break 25236+ optarg="$1" 25237+ opt_tag="$optarg" 25238+func_append preserve_args " $opt $optarg" 25239+func_enable_tag "$optarg" 25240 shift 25241 ;; 25242 25243+ -\?|-h) func_usage ;; 25244+ --help) func_help ;; 25245+ --version) func_version ;; 25246+ 25247 # Separate optargs to long options: 25248- -dlopen=*|--mode=*|--tag=*) 25249- func_opt_split "$opt" 25250- set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} 25251+ --*=*) 25252+ func_split_long_opt "$opt" 25253+ set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} 25254 shift 25255 ;; 25256 25257- -\?|-h) func_usage ;; 25258- --help) opt_help=: ;; 25259- --help-all) opt_help=': help-all' ;; 25260- --version) func_version ;; 25261- 25262- -*) func_fatal_help "unrecognized option \`$opt'" ;; 25263- 25264- *) nonopt="$opt" 25265- break 25266+ # Separate non-argument short options: 25267+ -\?*|-h*|-n*|-v*) 25268+ func_split_short_opt "$opt" 25269+ set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} 25270+ shift 25271 ;; 25272+ 25273+ --) break ;; 25274+ -*) func_fatal_help "unrecognized option \`$opt'" ;; 25275+ *) set dummy "$opt" ${1+"$@"}; shift; break ;; 25276 esac 25277 done 25278 25279+ # Validate options: 25280+ 25281+ # save first non-option argument 25282+ if test "$#" -gt 0; then 25283+ nonopt="$opt" 25284+ shift 25285+ fi 25286+ 25287+ # preserve --debug 25288+ test "$opt_debug" = : || func_append preserve_args " --debug" 25289 25290 case $host in 25291 *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* ) 25292@@ -981,82 +1184,44 @@ func_enable_tag () 25293 opt_duplicate_compiler_generated_deps=: 25294 ;; 25295 *) 25296- opt_duplicate_compiler_generated_deps=$opt_duplicate_deps 25297+ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps 25298 ;; 25299 esac 25300 25301- # Having warned about all mis-specified options, bail out if 25302- # anything was wrong. 25303- $exit_cmd $EXIT_FAILURE 25304-} 25305+ $opt_help || { 25306+ # Sanity checks first: 25307+ func_check_version_match 25308 25309-# func_check_version_match 25310-# Ensure that we are using m4 macros, and libtool script from the same 25311-# release of libtool. 25312-func_check_version_match () 25313-{ 25314- if test "$package_revision" != "$macro_revision"; then 25315- if test "$VERSION" != "$macro_version"; then 25316- if test -z "$macro_version"; then 25317- cat >&2 <<_LT_EOF 25318-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the 25319-$progname: definition of this LT_INIT comes from an older release. 25320-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION 25321-$progname: and run autoconf again. 25322-_LT_EOF 25323- else 25324- cat >&2 <<_LT_EOF 25325-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the 25326-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. 25327-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION 25328-$progname: and run autoconf again. 25329-_LT_EOF 25330- fi 25331- else 25332- cat >&2 <<_LT_EOF 25333-$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, 25334-$progname: but the definition of this LT_INIT comes from revision $macro_revision. 25335-$progname: You should recreate aclocal.m4 with macros from revision $package_revision 25336-$progname: of $PACKAGE $VERSION and run autoconf again. 25337-_LT_EOF 25338+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then 25339+ func_fatal_configuration "not configured to build any kind of library" 25340 fi 25341 25342- exit $EXIT_MISMATCH 25343- fi 25344-} 25345- 25346+ # Darwin sucks 25347+ eval std_shrext=\"$shrext_cmds\" 25348 25349-## ----------- ## 25350-## Main. ## 25351-## ----------- ## 25352- 25353-$opt_help || { 25354- # Sanity checks first: 25355- func_check_version_match 25356- 25357- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then 25358- func_fatal_configuration "not configured to build any kind of library" 25359- fi 25360+ # Only execute mode is allowed to have -dlopen flags. 25361+ if test -n "$opt_dlopen" && test "$opt_mode" != execute; then 25362+ func_error "unrecognized option \`-dlopen'" 25363+ $ECHO "$help" 1>&2 25364+ exit $EXIT_FAILURE 25365+ fi 25366 25367- test -z "$mode" && func_fatal_error "error: you must specify a MODE." 25368+ # Change the help message to a mode-specific one. 25369+ generic_help="$help" 25370+ help="Try \`$progname --help --mode=$opt_mode' for more information." 25371+ } 25372 25373 25374- # Darwin sucks 25375- eval "std_shrext=\"$shrext_cmds\"" 25376+ # Bail if the options were screwed 25377+ $exit_cmd $EXIT_FAILURE 25378+} 25379 25380 25381- # Only execute mode is allowed to have -dlopen flags. 25382- if test -n "$execute_dlfiles" && test "$mode" != execute; then 25383- func_error "unrecognized option \`-dlopen'" 25384- $ECHO "$help" 1>&2 25385- exit $EXIT_FAILURE 25386- fi 25387 25388- # Change the help message to a mode-specific one. 25389- generic_help="$help" 25390- help="Try \`$progname --help --mode=$mode' for more information." 25391-} 25392 25393+## ----------- ## 25394+## Main. ## 25395+## ----------- ## 25396 25397 # func_lalib_p file 25398 # True iff FILE is a libtool `.la' library or `.lo' object file. 25399@@ -1121,12 +1286,9 @@ func_ltwrapper_executable_p () 25400 # temporary ltwrapper_script. 25401 func_ltwrapper_scriptname () 25402 { 25403- func_ltwrapper_scriptname_result="" 25404- if func_ltwrapper_executable_p "$1"; then 25405- func_dirname_and_basename "$1" "" "." 25406- func_stripname '' '.exe' "$func_basename_result" 25407- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" 25408- fi 25409+ func_dirname_and_basename "$1" "" "." 25410+ func_stripname '' '.exe' "$func_basename_result" 25411+ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" 25412 } 25413 25414 # func_ltwrapper_p file 25415@@ -1149,7 +1311,7 @@ func_execute_cmds () 25416 save_ifs=$IFS; IFS='~' 25417 for cmd in $1; do 25418 IFS=$save_ifs 25419- eval "cmd=\"$cmd\"" 25420+ eval cmd=\"$cmd\" 25421 func_show_eval "$cmd" "${2-:}" 25422 done 25423 IFS=$save_ifs 25424@@ -1172,6 +1334,37 @@ func_source () 25425 } 25426 25427 25428+# func_resolve_sysroot PATH 25429+# Replace a leading = in PATH with a sysroot. Store the result into 25430+# func_resolve_sysroot_result 25431+func_resolve_sysroot () 25432+{ 25433+ func_resolve_sysroot_result=$1 25434+ case $func_resolve_sysroot_result in 25435+ =*) 25436+ func_stripname '=' '' "$func_resolve_sysroot_result" 25437+ func_resolve_sysroot_result=$lt_sysroot$func_stripname_result 25438+ ;; 25439+ esac 25440+} 25441+ 25442+# func_replace_sysroot PATH 25443+# If PATH begins with the sysroot, replace it with = and 25444+# store the result into func_replace_sysroot_result. 25445+func_replace_sysroot () 25446+{ 25447+ case "$lt_sysroot:$1" in 25448+ ?*:"$lt_sysroot"*) 25449+ func_stripname "$lt_sysroot" '' "$1" 25450+ func_replace_sysroot_result="=$func_stripname_result" 25451+ ;; 25452+ *) 25453+ # Including no sysroot. 25454+ func_replace_sysroot_result=$1 25455+ ;; 25456+ esac 25457+} 25458+ 25459 # func_infer_tag arg 25460 # Infer tagged configuration to use if any are available and 25461 # if one wasn't chosen via the "--tag" command line option. 25462@@ -1184,8 +1377,7 @@ func_infer_tag () 25463 if test -n "$available_tags" && test -z "$tagname"; then 25464 CC_quoted= 25465 for arg in $CC; do 25466- func_quote_for_eval "$arg" 25467- CC_quoted="$CC_quoted $func_quote_for_eval_result" 25468+ func_append_quoted CC_quoted "$arg" 25469 done 25470 CC_expanded=`func_echo_all $CC` 25471 CC_quoted_expanded=`func_echo_all $CC_quoted` 25472@@ -1204,8 +1396,7 @@ func_infer_tag () 25473 CC_quoted= 25474 for arg in $CC; do 25475 # Double-quote args containing other shell metacharacters. 25476- func_quote_for_eval "$arg" 25477- CC_quoted="$CC_quoted $func_quote_for_eval_result" 25478+ func_append_quoted CC_quoted "$arg" 25479 done 25480 CC_expanded=`func_echo_all $CC` 25481 CC_quoted_expanded=`func_echo_all $CC_quoted` 25482@@ -1274,6 +1465,486 @@ EOF 25483 } 25484 } 25485 25486+ 25487+################################################## 25488+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS # 25489+################################################## 25490+ 25491+# func_convert_core_file_wine_to_w32 ARG 25492+# Helper function used by file name conversion functions when $build is *nix, 25493+# and $host is mingw, cygwin, or some other w32 environment. Relies on a 25494+# correctly configured wine environment available, with the winepath program 25495+# in $build's $PATH. 25496+# 25497+# ARG is the $build file name to be converted to w32 format. 25498+# Result is available in $func_convert_core_file_wine_to_w32_result, and will 25499+# be empty on error (or when ARG is empty) 25500+func_convert_core_file_wine_to_w32 () 25501+{ 25502+ $opt_debug 25503+ func_convert_core_file_wine_to_w32_result="$1" 25504+ if test -n "$1"; then 25505+ # Unfortunately, winepath does not exit with a non-zero error code, so we 25506+ # are forced to check the contents of stdout. On the other hand, if the 25507+ # command is not found, the shell will set an exit code of 127 and print 25508+ # *an error message* to stdout. So we must check for both error code of 25509+ # zero AND non-empty stdout, which explains the odd construction: 25510+ func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null` 25511+ if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then 25512+ func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | 25513+ $SED -e "$lt_sed_naive_backslashify"` 25514+ else 25515+ func_convert_core_file_wine_to_w32_result= 25516+ fi 25517+ fi 25518+} 25519+# end: func_convert_core_file_wine_to_w32 25520+ 25521+ 25522+# func_convert_core_path_wine_to_w32 ARG 25523+# Helper function used by path conversion functions when $build is *nix, and 25524+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly 25525+# configured wine environment available, with the winepath program in $build's 25526+# $PATH. Assumes ARG has no leading or trailing path separator characters. 25527+# 25528+# ARG is path to be converted from $build format to win32. 25529+# Result is available in $func_convert_core_path_wine_to_w32_result. 25530+# Unconvertible file (directory) names in ARG are skipped; if no directory names 25531+# are convertible, then the result may be empty. 25532+func_convert_core_path_wine_to_w32 () 25533+{ 25534+ $opt_debug 25535+ # unfortunately, winepath doesn't convert paths, only file names 25536+ func_convert_core_path_wine_to_w32_result="" 25537+ if test -n "$1"; then 25538+ oldIFS=$IFS 25539+ IFS=: 25540+ for func_convert_core_path_wine_to_w32_f in $1; do 25541+ IFS=$oldIFS 25542+ func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" 25543+ if test -n "$func_convert_core_file_wine_to_w32_result" ; then 25544+ if test -z "$func_convert_core_path_wine_to_w32_result"; then 25545+ func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" 25546+ else 25547+ func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" 25548+ fi 25549+ fi 25550+ done 25551+ IFS=$oldIFS 25552+ fi 25553+} 25554+# end: func_convert_core_path_wine_to_w32 25555+ 25556+ 25557+# func_cygpath ARGS... 25558+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when 25559+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) 25560+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or 25561+# (2), returns the Cygwin file name or path in func_cygpath_result (input 25562+# file name or path is assumed to be in w32 format, as previously converted 25563+# from $build's *nix or MSYS format). In case (3), returns the w32 file name 25564+# or path in func_cygpath_result (input file name or path is assumed to be in 25565+# Cygwin format). Returns an empty string on error. 25566+# 25567+# ARGS are passed to cygpath, with the last one being the file name or path to 25568+# be converted. 25569+# 25570+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH 25571+# environment variable; do not put it in $PATH. 25572+func_cygpath () 25573+{ 25574+ $opt_debug 25575+ if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then 25576+ func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` 25577+ if test "$?" -ne 0; then 25578+ # on failure, ensure result is empty 25579+ func_cygpath_result= 25580+ fi 25581+ else 25582+ func_cygpath_result= 25583+ func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" 25584+ fi 25585+} 25586+#end: func_cygpath 25587+ 25588+ 25589+# func_convert_core_msys_to_w32 ARG 25590+# Convert file name or path ARG from MSYS format to w32 format. Return 25591+# result in func_convert_core_msys_to_w32_result. 25592+func_convert_core_msys_to_w32 () 25593+{ 25594+ $opt_debug 25595+ # awkward: cmd appends spaces to result 25596+ func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | 25597+ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` 25598+} 25599+#end: func_convert_core_msys_to_w32 25600+ 25601+ 25602+# func_convert_file_check ARG1 ARG2 25603+# Verify that ARG1 (a file name in $build format) was converted to $host 25604+# format in ARG2. Otherwise, emit an error message, but continue (resetting 25605+# func_to_host_file_result to ARG1). 25606+func_convert_file_check () 25607+{ 25608+ $opt_debug 25609+ if test -z "$2" && test -n "$1" ; then 25610+ func_error "Could not determine host file name corresponding to" 25611+ func_error " \`$1'" 25612+ func_error "Continuing, but uninstalled executables may not work." 25613+ # Fallback: 25614+ func_to_host_file_result="$1" 25615+ fi 25616+} 25617+# end func_convert_file_check 25618+ 25619+ 25620+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH 25621+# Verify that FROM_PATH (a path in $build format) was converted to $host 25622+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting 25623+# func_to_host_file_result to a simplistic fallback value (see below). 25624+func_convert_path_check () 25625+{ 25626+ $opt_debug 25627+ if test -z "$4" && test -n "$3"; then 25628+ func_error "Could not determine the host path corresponding to" 25629+ func_error " \`$3'" 25630+ func_error "Continuing, but uninstalled executables may not work." 25631+ # Fallback. This is a deliberately simplistic "conversion" and 25632+ # should not be "improved". See libtool.info. 25633+ if test "x$1" != "x$2"; then 25634+ lt_replace_pathsep_chars="s|$1|$2|g" 25635+ func_to_host_path_result=`echo "$3" | 25636+ $SED -e "$lt_replace_pathsep_chars"` 25637+ else 25638+ func_to_host_path_result="$3" 25639+ fi 25640+ fi 25641+} 25642+# end func_convert_path_check 25643+ 25644+ 25645+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG 25646+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT 25647+# and appending REPL if ORIG matches BACKPAT. 25648+func_convert_path_front_back_pathsep () 25649+{ 25650+ $opt_debug 25651+ case $4 in 25652+ $1 ) func_to_host_path_result="$3$func_to_host_path_result" 25653+ ;; 25654+ esac 25655+ case $4 in 25656+ $2 ) func_append func_to_host_path_result "$3" 25657+ ;; 25658+ esac 25659+} 25660+# end func_convert_path_front_back_pathsep 25661+ 25662+ 25663+################################################## 25664+# $build to $host FILE NAME CONVERSION FUNCTIONS # 25665+################################################## 25666+# invoked via `$to_host_file_cmd ARG' 25667+# 25668+# In each case, ARG is the path to be converted from $build to $host format. 25669+# Result will be available in $func_to_host_file_result. 25670+ 25671+ 25672+# func_to_host_file ARG 25673+# Converts the file name ARG from $build format to $host format. Return result 25674+# in func_to_host_file_result. 25675+func_to_host_file () 25676+{ 25677+ $opt_debug 25678+ $to_host_file_cmd "$1" 25679+} 25680+# end func_to_host_file 25681+ 25682+ 25683+# func_to_tool_file ARG LAZY 25684+# converts the file name ARG from $build format to toolchain format. Return 25685+# result in func_to_tool_file_result. If the conversion in use is listed 25686+# in (the comma separated) LAZY, no conversion takes place. 25687+func_to_tool_file () 25688+{ 25689+ $opt_debug 25690+ case ,$2, in 25691+ *,"$to_tool_file_cmd",*) 25692+ func_to_tool_file_result=$1 25693+ ;; 25694+ *) 25695+ $to_tool_file_cmd "$1" 25696+ func_to_tool_file_result=$func_to_host_file_result 25697+ ;; 25698+ esac 25699+} 25700+# end func_to_tool_file 25701+ 25702+ 25703+# func_convert_file_noop ARG 25704+# Copy ARG to func_to_host_file_result. 25705+func_convert_file_noop () 25706+{ 25707+ func_to_host_file_result="$1" 25708+} 25709+# end func_convert_file_noop 25710+ 25711+ 25712+# func_convert_file_msys_to_w32 ARG 25713+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic 25714+# conversion to w32 is not available inside the cwrapper. Returns result in 25715+# func_to_host_file_result. 25716+func_convert_file_msys_to_w32 () 25717+{ 25718+ $opt_debug 25719+ func_to_host_file_result="$1" 25720+ if test -n "$1"; then 25721+ func_convert_core_msys_to_w32 "$1" 25722+ func_to_host_file_result="$func_convert_core_msys_to_w32_result" 25723+ fi 25724+ func_convert_file_check "$1" "$func_to_host_file_result" 25725+} 25726+# end func_convert_file_msys_to_w32 25727+ 25728+ 25729+# func_convert_file_cygwin_to_w32 ARG 25730+# Convert file name ARG from Cygwin to w32 format. Returns result in 25731+# func_to_host_file_result. 25732+func_convert_file_cygwin_to_w32 () 25733+{ 25734+ $opt_debug 25735+ func_to_host_file_result="$1" 25736+ if test -n "$1"; then 25737+ # because $build is cygwin, we call "the" cygpath in $PATH; no need to use 25738+ # LT_CYGPATH in this case. 25739+ func_to_host_file_result=`cygpath -m "$1"` 25740+ fi 25741+ func_convert_file_check "$1" "$func_to_host_file_result" 25742+} 25743+# end func_convert_file_cygwin_to_w32 25744+ 25745+ 25746+# func_convert_file_nix_to_w32 ARG 25747+# Convert file name ARG from *nix to w32 format. Requires a wine environment 25748+# and a working winepath. Returns result in func_to_host_file_result. 25749+func_convert_file_nix_to_w32 () 25750+{ 25751+ $opt_debug 25752+ func_to_host_file_result="$1" 25753+ if test -n "$1"; then 25754+ func_convert_core_file_wine_to_w32 "$1" 25755+ func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" 25756+ fi 25757+ func_convert_file_check "$1" "$func_to_host_file_result" 25758+} 25759+# end func_convert_file_nix_to_w32 25760+ 25761+ 25762+# func_convert_file_msys_to_cygwin ARG 25763+# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. 25764+# Returns result in func_to_host_file_result. 25765+func_convert_file_msys_to_cygwin () 25766+{ 25767+ $opt_debug 25768+ func_to_host_file_result="$1" 25769+ if test -n "$1"; then 25770+ func_convert_core_msys_to_w32 "$1" 25771+ func_cygpath -u "$func_convert_core_msys_to_w32_result" 25772+ func_to_host_file_result="$func_cygpath_result" 25773+ fi 25774+ func_convert_file_check "$1" "$func_to_host_file_result" 25775+} 25776+# end func_convert_file_msys_to_cygwin 25777+ 25778+ 25779+# func_convert_file_nix_to_cygwin ARG 25780+# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed 25781+# in a wine environment, working winepath, and LT_CYGPATH set. Returns result 25782+# in func_to_host_file_result. 25783+func_convert_file_nix_to_cygwin () 25784+{ 25785+ $opt_debug 25786+ func_to_host_file_result="$1" 25787+ if test -n "$1"; then 25788+ # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. 25789+ func_convert_core_file_wine_to_w32 "$1" 25790+ func_cygpath -u "$func_convert_core_file_wine_to_w32_result" 25791+ func_to_host_file_result="$func_cygpath_result" 25792+ fi 25793+ func_convert_file_check "$1" "$func_to_host_file_result" 25794+} 25795+# end func_convert_file_nix_to_cygwin 25796+ 25797+ 25798+############################################# 25799+# $build to $host PATH CONVERSION FUNCTIONS # 25800+############################################# 25801+# invoked via `$to_host_path_cmd ARG' 25802+# 25803+# In each case, ARG is the path to be converted from $build to $host format. 25804+# The result will be available in $func_to_host_path_result. 25805+# 25806+# Path separators are also converted from $build format to $host format. If 25807+# ARG begins or ends with a path separator character, it is preserved (but 25808+# converted to $host format) on output. 25809+# 25810+# All path conversion functions are named using the following convention: 25811+# file name conversion function : func_convert_file_X_to_Y () 25812+# path conversion function : func_convert_path_X_to_Y () 25813+# where, for any given $build/$host combination the 'X_to_Y' value is the 25814+# same. If conversion functions are added for new $build/$host combinations, 25815+# the two new functions must follow this pattern, or func_init_to_host_path_cmd 25816+# will break. 25817+ 25818+ 25819+# func_init_to_host_path_cmd 25820+# Ensures that function "pointer" variable $to_host_path_cmd is set to the 25821+# appropriate value, based on the value of $to_host_file_cmd. 25822+to_host_path_cmd= 25823+func_init_to_host_path_cmd () 25824+{ 25825+ $opt_debug 25826+ if test -z "$to_host_path_cmd"; then 25827+ func_stripname 'func_convert_file_' '' "$to_host_file_cmd" 25828+ to_host_path_cmd="func_convert_path_${func_stripname_result}" 25829+ fi 25830+} 25831+ 25832+ 25833+# func_to_host_path ARG 25834+# Converts the path ARG from $build format to $host format. Return result 25835+# in func_to_host_path_result. 25836+func_to_host_path () 25837+{ 25838+ $opt_debug 25839+ func_init_to_host_path_cmd 25840+ $to_host_path_cmd "$1" 25841+} 25842+# end func_to_host_path 25843+ 25844+ 25845+# func_convert_path_noop ARG 25846+# Copy ARG to func_to_host_path_result. 25847+func_convert_path_noop () 25848+{ 25849+ func_to_host_path_result="$1" 25850+} 25851+# end func_convert_path_noop 25852+ 25853+ 25854+# func_convert_path_msys_to_w32 ARG 25855+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic 25856+# conversion to w32 is not available inside the cwrapper. Returns result in 25857+# func_to_host_path_result. 25858+func_convert_path_msys_to_w32 () 25859+{ 25860+ $opt_debug 25861+ func_to_host_path_result="$1" 25862+ if test -n "$1"; then 25863+ # Remove leading and trailing path separator characters from ARG. MSYS 25864+ # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; 25865+ # and winepath ignores them completely. 25866+ func_stripname : : "$1" 25867+ func_to_host_path_tmp1=$func_stripname_result 25868+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" 25869+ func_to_host_path_result="$func_convert_core_msys_to_w32_result" 25870+ func_convert_path_check : ";" \ 25871+ "$func_to_host_path_tmp1" "$func_to_host_path_result" 25872+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" 25873+ fi 25874+} 25875+# end func_convert_path_msys_to_w32 25876+ 25877+ 25878+# func_convert_path_cygwin_to_w32 ARG 25879+# Convert path ARG from Cygwin to w32 format. Returns result in 25880+# func_to_host_file_result. 25881+func_convert_path_cygwin_to_w32 () 25882+{ 25883+ $opt_debug 25884+ func_to_host_path_result="$1" 25885+ if test -n "$1"; then 25886+ # See func_convert_path_msys_to_w32: 25887+ func_stripname : : "$1" 25888+ func_to_host_path_tmp1=$func_stripname_result 25889+ func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` 25890+ func_convert_path_check : ";" \ 25891+ "$func_to_host_path_tmp1" "$func_to_host_path_result" 25892+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" 25893+ fi 25894+} 25895+# end func_convert_path_cygwin_to_w32 25896+ 25897+ 25898+# func_convert_path_nix_to_w32 ARG 25899+# Convert path ARG from *nix to w32 format. Requires a wine environment and 25900+# a working winepath. Returns result in func_to_host_file_result. 25901+func_convert_path_nix_to_w32 () 25902+{ 25903+ $opt_debug 25904+ func_to_host_path_result="$1" 25905+ if test -n "$1"; then 25906+ # See func_convert_path_msys_to_w32: 25907+ func_stripname : : "$1" 25908+ func_to_host_path_tmp1=$func_stripname_result 25909+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" 25910+ func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" 25911+ func_convert_path_check : ";" \ 25912+ "$func_to_host_path_tmp1" "$func_to_host_path_result" 25913+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" 25914+ fi 25915+} 25916+# end func_convert_path_nix_to_w32 25917+ 25918+ 25919+# func_convert_path_msys_to_cygwin ARG 25920+# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. 25921+# Returns result in func_to_host_file_result. 25922+func_convert_path_msys_to_cygwin () 25923+{ 25924+ $opt_debug 25925+ func_to_host_path_result="$1" 25926+ if test -n "$1"; then 25927+ # See func_convert_path_msys_to_w32: 25928+ func_stripname : : "$1" 25929+ func_to_host_path_tmp1=$func_stripname_result 25930+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" 25931+ func_cygpath -u -p "$func_convert_core_msys_to_w32_result" 25932+ func_to_host_path_result="$func_cygpath_result" 25933+ func_convert_path_check : : \ 25934+ "$func_to_host_path_tmp1" "$func_to_host_path_result" 25935+ func_convert_path_front_back_pathsep ":*" "*:" : "$1" 25936+ fi 25937+} 25938+# end func_convert_path_msys_to_cygwin 25939+ 25940+ 25941+# func_convert_path_nix_to_cygwin ARG 25942+# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a 25943+# a wine environment, working winepath, and LT_CYGPATH set. Returns result in 25944+# func_to_host_file_result. 25945+func_convert_path_nix_to_cygwin () 25946+{ 25947+ $opt_debug 25948+ func_to_host_path_result="$1" 25949+ if test -n "$1"; then 25950+ # Remove leading and trailing path separator characters from 25951+ # ARG. msys behavior is inconsistent here, cygpath turns them 25952+ # into '.;' and ';.', and winepath ignores them completely. 25953+ func_stripname : : "$1" 25954+ func_to_host_path_tmp1=$func_stripname_result 25955+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" 25956+ func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" 25957+ func_to_host_path_result="$func_cygpath_result" 25958+ func_convert_path_check : : \ 25959+ "$func_to_host_path_tmp1" "$func_to_host_path_result" 25960+ func_convert_path_front_back_pathsep ":*" "*:" : "$1" 25961+ fi 25962+} 25963+# end func_convert_path_nix_to_cygwin 25964+ 25965+ 25966 # func_mode_compile arg... 25967 func_mode_compile () 25968 { 25969@@ -1314,12 +1985,12 @@ func_mode_compile () 25970 ;; 25971 25972 -pie | -fpie | -fPIE) 25973- pie_flag="$pie_flag $arg" 25974+ func_append pie_flag " $arg" 25975 continue 25976 ;; 25977 25978 -shared | -static | -prefer-pic | -prefer-non-pic) 25979- later="$later $arg" 25980+ func_append later " $arg" 25981 continue 25982 ;; 25983 25984@@ -1340,15 +2011,14 @@ func_mode_compile () 25985 save_ifs="$IFS"; IFS=',' 25986 for arg in $args; do 25987 IFS="$save_ifs" 25988- func_quote_for_eval "$arg" 25989- lastarg="$lastarg $func_quote_for_eval_result" 25990+ func_append_quoted lastarg "$arg" 25991 done 25992 IFS="$save_ifs" 25993 func_stripname ' ' '' "$lastarg" 25994 lastarg=$func_stripname_result 25995 25996 # Add the arguments to base_compile. 25997- base_compile="$base_compile $lastarg" 25998+ func_append base_compile " $lastarg" 25999 continue 26000 ;; 26001 26002@@ -1364,8 +2034,7 @@ func_mode_compile () 26003 esac # case $arg_mode 26004 26005 # Aesthetically quote the previous argument. 26006- func_quote_for_eval "$lastarg" 26007- base_compile="$base_compile $func_quote_for_eval_result" 26008+ func_append_quoted base_compile "$lastarg" 26009 done # for arg 26010 26011 case $arg_mode in 26012@@ -1496,17 +2165,16 @@ compiler." 26013 $opt_dry_run || $RM $removelist 26014 exit $EXIT_FAILURE 26015 fi 26016- removelist="$removelist $output_obj" 26017+ func_append removelist " $output_obj" 26018 $ECHO "$srcfile" > "$lockfile" 26019 fi 26020 26021 $opt_dry_run || $RM $removelist 26022- removelist="$removelist $lockfile" 26023+ func_append removelist " $lockfile" 26024 trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 26025 26026- if test -n "$fix_srcfile_path"; then 26027- eval "srcfile=\"$fix_srcfile_path\"" 26028- fi 26029+ func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 26030+ srcfile=$func_to_tool_file_result 26031 func_quote_for_eval "$srcfile" 26032 qsrcfile=$func_quote_for_eval_result 26033 26034@@ -1526,7 +2194,7 @@ compiler." 26035 26036 if test -z "$output_obj"; then 26037 # Place PIC objects in $objdir 26038- command="$command -o $lobj" 26039+ func_append command " -o $lobj" 26040 fi 26041 26042 func_show_eval_locale "$command" \ 26043@@ -1573,11 +2241,11 @@ compiler." 26044 command="$base_compile $qsrcfile $pic_flag" 26045 fi 26046 if test "$compiler_c_o" = yes; then 26047- command="$command -o $obj" 26048+ func_append command " -o $obj" 26049 fi 26050 26051 # Suppress compiler output if we already did a PIC compilation. 26052- command="$command$suppress_output" 26053+ func_append command "$suppress_output" 26054 func_show_eval_locale "$command" \ 26055 '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 26056 26057@@ -1622,13 +2290,13 @@ compiler." 26058 } 26059 26060 $opt_help || { 26061- test "$mode" = compile && func_mode_compile ${1+"$@"} 26062+ test "$opt_mode" = compile && func_mode_compile ${1+"$@"} 26063 } 26064 26065 func_mode_help () 26066 { 26067 # We need to display help for each of the modes. 26068- case $mode in 26069+ case $opt_mode in 26070 "") 26071 # Generic help is extracted from the usage comments 26072 # at the start of this file. 26073@@ -1659,8 +2327,8 @@ This mode accepts the following additional options: 26074 26075 -o OUTPUT-FILE set the output file name to OUTPUT-FILE 26076 -no-suppress do not suppress compiler output for multiple passes 26077- -prefer-pic try to building PIC objects only 26078- -prefer-non-pic try to building non-PIC objects only 26079+ -prefer-pic try to build PIC objects only 26080+ -prefer-non-pic try to build non-PIC objects only 26081 -shared do not build a \`.o' file suitable for static linking 26082 -static only build a \`.o' file suitable for static linking 26083 -Wc,FLAG pass FLAG directly to the compiler 26084@@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted using RM." 26085 ;; 26086 26087 *) 26088- func_fatal_help "invalid operation mode \`$mode'" 26089+ func_fatal_help "invalid operation mode \`$opt_mode'" 26090 ;; 26091 esac 26092 26093@@ -1819,13 +2487,13 @@ if $opt_help; then 26094 else 26095 { 26096 func_help noexit 26097- for mode in compile link execute install finish uninstall clean; do 26098+ for opt_mode in compile link execute install finish uninstall clean; do 26099 func_mode_help 26100 done 26101 } | sed -n '1p; 2,$s/^Usage:/ or: /p' 26102 { 26103 func_help noexit 26104- for mode in compile link execute install finish uninstall clean; do 26105+ for opt_mode in compile link execute install finish uninstall clean; do 26106 echo 26107 func_mode_help 26108 done 26109@@ -1854,13 +2522,16 @@ func_mode_execute () 26110 func_fatal_help "you must specify a COMMAND" 26111 26112 # Handle -dlopen flags immediately. 26113- for file in $execute_dlfiles; do 26114+ for file in $opt_dlopen; do 26115 test -f "$file" \ 26116 || func_fatal_help "\`$file' is not a file" 26117 26118 dir= 26119 case $file in 26120 *.la) 26121+ func_resolve_sysroot "$file" 26122+ file=$func_resolve_sysroot_result 26123+ 26124 # Check to see that this really is a libtool archive. 26125 func_lalib_unsafe_p "$file" \ 26126 || func_fatal_help "\`$lib' is not a valid libtool archive" 26127@@ -1882,7 +2553,7 @@ func_mode_execute () 26128 dir="$func_dirname_result" 26129 26130 if test -f "$dir/$objdir/$dlname"; then 26131- dir="$dir/$objdir" 26132+ func_append dir "/$objdir" 26133 else 26134 if test ! -f "$dir/$dlname"; then 26135 func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 26136@@ -1907,10 +2578,10 @@ func_mode_execute () 26137 test -n "$absdir" && dir="$absdir" 26138 26139 # Now add the directory to shlibpath_var. 26140- if eval test -z \"\$$shlibpath_var\"; then 26141- eval $shlibpath_var=\$dir 26142+ if eval "test -z \"\$$shlibpath_var\""; then 26143+ eval "$shlibpath_var=\"\$dir\"" 26144 else 26145- eval $shlibpath_var=\$dir:\$$shlibpath_var 26146+ eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" 26147 fi 26148 done 26149 26150@@ -1939,8 +2610,7 @@ func_mode_execute () 26151 ;; 26152 esac 26153 # Quote arguments (to preserve shell metacharacters). 26154- func_quote_for_eval "$file" 26155- args="$args $func_quote_for_eval_result" 26156+ func_append_quoted args "$file" 26157 done 26158 26159 if test "X$opt_dry_run" = Xfalse; then 26160@@ -1972,22 +2642,59 @@ func_mode_execute () 26161 fi 26162 } 26163 26164-test "$mode" = execute && func_mode_execute ${1+"$@"} 26165+test "$opt_mode" = execute && func_mode_execute ${1+"$@"} 26166 26167 26168 # func_mode_finish arg... 26169 func_mode_finish () 26170 { 26171 $opt_debug 26172- libdirs="$nonopt" 26173+ libs= 26174+ libdirs= 26175 admincmds= 26176 26177- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then 26178- for dir 26179- do 26180- libdirs="$libdirs $dir" 26181- done 26182+ for opt in "$nonopt" ${1+"$@"} 26183+ do 26184+ if test -d "$opt"; then 26185+ func_append libdirs " $opt" 26186 26187+ elif test -f "$opt"; then 26188+ if func_lalib_unsafe_p "$opt"; then 26189+ func_append libs " $opt" 26190+ else 26191+ func_warning "\`$opt' is not a valid libtool archive" 26192+ fi 26193+ 26194+ else 26195+ func_fatal_error "invalid argument \`$opt'" 26196+ fi 26197+ done 26198+ 26199+ if test -n "$libs"; then 26200+ if test -n "$lt_sysroot"; then 26201+ sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` 26202+ sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" 26203+ else 26204+ sysroot_cmd= 26205+ fi 26206+ 26207+ # Remove sysroot references 26208+ if $opt_dry_run; then 26209+ for lib in $libs; do 26210+ echo "removing references to $lt_sysroot and \`=' prefixes from $lib" 26211+ done 26212+ else 26213+ tmpdir=`func_mktempdir` 26214+ for lib in $libs; do 26215+ sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ 26216+ > $tmpdir/tmp-la 26217+ mv -f $tmpdir/tmp-la $lib 26218+ done 26219+ ${RM}r "$tmpdir" 26220+ fi 26221+ fi 26222+ 26223+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then 26224 for libdir in $libdirs; do 26225 if test -n "$finish_cmds"; then 26226 # Do each command in the finish commands. 26227@@ -1997,7 +2704,7 @@ func_mode_finish () 26228 if test -n "$finish_eval"; then 26229 # Do the single finish_eval. 26230 eval cmds=\"$finish_eval\" 26231- $opt_dry_run || eval "$cmds" || admincmds="$admincmds 26232+ $opt_dry_run || eval "$cmds" || func_append admincmds " 26233 $cmds" 26234 fi 26235 done 26236@@ -2006,53 +2713,55 @@ func_mode_finish () 26237 # Exit here if they wanted silent mode. 26238 $opt_silent && exit $EXIT_SUCCESS 26239 26240- echo "----------------------------------------------------------------------" 26241- echo "Libraries have been installed in:" 26242- for libdir in $libdirs; do 26243- $ECHO " $libdir" 26244- done 26245- echo 26246- echo "If you ever happen to want to link against installed libraries" 26247- echo "in a given directory, LIBDIR, you must either use libtool, and" 26248- echo "specify the full pathname of the library, or use the \`-LLIBDIR'" 26249- echo "flag during linking and do at least one of the following:" 26250- if test -n "$shlibpath_var"; then 26251- echo " - add LIBDIR to the \`$shlibpath_var' environment variable" 26252- echo " during execution" 26253- fi 26254- if test -n "$runpath_var"; then 26255- echo " - add LIBDIR to the \`$runpath_var' environment variable" 26256- echo " during linking" 26257- fi 26258- if test -n "$hardcode_libdir_flag_spec"; then 26259- libdir=LIBDIR 26260- eval "flag=\"$hardcode_libdir_flag_spec\"" 26261+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then 26262+ echo "----------------------------------------------------------------------" 26263+ echo "Libraries have been installed in:" 26264+ for libdir in $libdirs; do 26265+ $ECHO " $libdir" 26266+ done 26267+ echo 26268+ echo "If you ever happen to want to link against installed libraries" 26269+ echo "in a given directory, LIBDIR, you must either use libtool, and" 26270+ echo "specify the full pathname of the library, or use the \`-LLIBDIR'" 26271+ echo "flag during linking and do at least one of the following:" 26272+ if test -n "$shlibpath_var"; then 26273+ echo " - add LIBDIR to the \`$shlibpath_var' environment variable" 26274+ echo " during execution" 26275+ fi 26276+ if test -n "$runpath_var"; then 26277+ echo " - add LIBDIR to the \`$runpath_var' environment variable" 26278+ echo " during linking" 26279+ fi 26280+ if test -n "$hardcode_libdir_flag_spec"; then 26281+ libdir=LIBDIR 26282+ eval flag=\"$hardcode_libdir_flag_spec\" 26283 26284- $ECHO " - use the \`$flag' linker flag" 26285- fi 26286- if test -n "$admincmds"; then 26287- $ECHO " - have your system administrator run these commands:$admincmds" 26288- fi 26289- if test -f /etc/ld.so.conf; then 26290- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" 26291- fi 26292- echo 26293+ $ECHO " - use the \`$flag' linker flag" 26294+ fi 26295+ if test -n "$admincmds"; then 26296+ $ECHO " - have your system administrator run these commands:$admincmds" 26297+ fi 26298+ if test -f /etc/ld.so.conf; then 26299+ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" 26300+ fi 26301+ echo 26302 26303- echo "See any operating system documentation about shared libraries for" 26304- case $host in 26305- solaris2.[6789]|solaris2.1[0-9]) 26306- echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" 26307- echo "pages." 26308- ;; 26309- *) 26310- echo "more information, such as the ld(1) and ld.so(8) manual pages." 26311- ;; 26312- esac 26313- echo "----------------------------------------------------------------------" 26314+ echo "See any operating system documentation about shared libraries for" 26315+ case $host in 26316+ solaris2.[6789]|solaris2.1[0-9]) 26317+ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" 26318+ echo "pages." 26319+ ;; 26320+ *) 26321+ echo "more information, such as the ld(1) and ld.so(8) manual pages." 26322+ ;; 26323+ esac 26324+ echo "----------------------------------------------------------------------" 26325+ fi 26326 exit $EXIT_SUCCESS 26327 } 26328 26329-test "$mode" = finish && func_mode_finish ${1+"$@"} 26330+test "$opt_mode" = finish && func_mode_finish ${1+"$@"} 26331 26332 26333 # func_mode_install arg... 26334@@ -2077,7 +2786,7 @@ func_mode_install () 26335 # The real first argument should be the name of the installation program. 26336 # Aesthetically quote it. 26337 func_quote_for_eval "$arg" 26338- install_prog="$install_prog$func_quote_for_eval_result" 26339+ func_append install_prog "$func_quote_for_eval_result" 26340 install_shared_prog=$install_prog 26341 case " $install_prog " in 26342 *[\\\ /]cp\ *) install_cp=: ;; 26343@@ -2097,7 +2806,7 @@ func_mode_install () 26344 do 26345 arg2= 26346 if test -n "$dest"; then 26347- files="$files $dest" 26348+ func_append files " $dest" 26349 dest=$arg 26350 continue 26351 fi 26352@@ -2135,11 +2844,11 @@ func_mode_install () 26353 26354 # Aesthetically quote the argument. 26355 func_quote_for_eval "$arg" 26356- install_prog="$install_prog $func_quote_for_eval_result" 26357+ func_append install_prog " $func_quote_for_eval_result" 26358 if test -n "$arg2"; then 26359 func_quote_for_eval "$arg2" 26360 fi 26361- install_shared_prog="$install_shared_prog $func_quote_for_eval_result" 26362+ func_append install_shared_prog " $func_quote_for_eval_result" 26363 done 26364 26365 test -z "$install_prog" && \ 26366@@ -2151,7 +2860,7 @@ func_mode_install () 26367 if test -n "$install_override_mode" && $no_mode; then 26368 if $install_cp; then :; else 26369 func_quote_for_eval "$install_override_mode" 26370- install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result" 26371+ func_append install_shared_prog " -m $func_quote_for_eval_result" 26372 fi 26373 fi 26374 26375@@ -2209,10 +2918,13 @@ func_mode_install () 26376 case $file in 26377 *.$libext) 26378 # Do the static libraries later. 26379- staticlibs="$staticlibs $file" 26380+ func_append staticlibs " $file" 26381 ;; 26382 26383 *.la) 26384+ func_resolve_sysroot "$file" 26385+ file=$func_resolve_sysroot_result 26386+ 26387 # Check to see that this really is a libtool archive. 26388 func_lalib_unsafe_p "$file" \ 26389 || func_fatal_help "\`$file' is not a valid libtool archive" 26390@@ -2226,23 +2938,30 @@ func_mode_install () 26391 if test "X$destdir" = "X$libdir"; then 26392 case "$current_libdirs " in 26393 *" $libdir "*) ;; 26394- *) current_libdirs="$current_libdirs $libdir" ;; 26395+ *) func_append current_libdirs " $libdir" ;; 26396 esac 26397 else 26398 # Note the libdir as a future libdir. 26399 case "$future_libdirs " in 26400 *" $libdir "*) ;; 26401- *) future_libdirs="$future_libdirs $libdir" ;; 26402+ *) func_append future_libdirs " $libdir" ;; 26403 esac 26404 fi 26405 26406 func_dirname "$file" "/" "" 26407 dir="$func_dirname_result" 26408- dir="$dir$objdir" 26409+ func_append dir "$objdir" 26410 26411 if test -n "$relink_command"; then 26412+ # Strip any trailing slash from the destination. 26413+ func_stripname '' '/' "$libdir" 26414+ destlibdir=$func_stripname_result 26415+ 26416+ func_stripname '' '/' "$destdir" 26417+ s_destdir=$func_stripname_result 26418+ 26419 # Determine the prefix the user has applied to our future dir. 26420- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` 26421+ inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"` 26422 26423 # Don't allow the user to place us outside of our expected 26424 # location b/c this prevents finding dependent libraries that 26425@@ -2315,7 +3034,7 @@ func_mode_install () 26426 func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' 26427 26428 # Maybe install the static library, too. 26429- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" 26430+ test -n "$old_library" && func_append staticlibs " $dir/$old_library" 26431 ;; 26432 26433 *.lo) 26434@@ -2503,7 +3222,7 @@ func_mode_install () 26435 test -n "$future_libdirs" && \ 26436 func_warning "remember to run \`$progname --finish$future_libdirs'" 26437 26438- if test -n "$current_libdirs" && $opt_finish; then 26439+ if test -n "$current_libdirs"; then 26440 # Maybe just do a dry run. 26441 $opt_dry_run && current_libdirs=" -n$current_libdirs" 26442 exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' 26443@@ -2512,7 +3231,7 @@ func_mode_install () 26444 fi 26445 } 26446 26447-test "$mode" = install && func_mode_install ${1+"$@"} 26448+test "$opt_mode" = install && func_mode_install ${1+"$@"} 26449 26450 26451 # func_generate_dlsyms outputname originator pic_p 26452@@ -2559,6 +3278,18 @@ extern \"C\" { 26453 #pragma GCC diagnostic ignored \"-Wstrict-prototypes\" 26454 #endif 26455 26456+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ 26457+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) 26458+/* DATA imports from DLLs on WIN32 con't be const, because runtime 26459+ relocations are performed -- see ld's documentation on pseudo-relocs. */ 26460+# define LT_DLSYM_CONST 26461+#elif defined(__osf__) 26462+/* This system does not cope well with relocations in const data. */ 26463+# define LT_DLSYM_CONST 26464+#else 26465+# define LT_DLSYM_CONST const 26466+#endif 26467+ 26468 /* External symbol declarations for the compiler. */\ 26469 " 26470 26471@@ -2570,21 +3301,22 @@ extern \"C\" { 26472 # Add our own program objects to the symbol list. 26473 progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` 26474 for progfile in $progfiles; do 26475- func_verbose "extracting global C symbols from \`$progfile'" 26476- $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" 26477+ func_to_tool_file "$progfile" func_convert_file_msys_to_w32 26478+ func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" 26479+ $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" 26480 done 26481 26482 if test -n "$exclude_expsyms"; then 26483 $opt_dry_run || { 26484- $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T 26485- $MV "$nlist"T "$nlist" 26486+ eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' 26487+ eval '$MV "$nlist"T "$nlist"' 26488 } 26489 fi 26490 26491 if test -n "$export_symbols_regex"; then 26492 $opt_dry_run || { 26493- $EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T 26494- $MV "$nlist"T "$nlist" 26495+ eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' 26496+ eval '$MV "$nlist"T "$nlist"' 26497 } 26498 fi 26499 26500@@ -2593,23 +3325,23 @@ extern \"C\" { 26501 export_symbols="$output_objdir/$outputname.exp" 26502 $opt_dry_run || { 26503 $RM $export_symbols 26504- ${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' < "$nlist" > "$export_symbols" 26505+ eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' 26506 case $host in 26507 *cygwin* | *mingw* | *cegcc* ) 26508- echo EXPORTS > "$output_objdir/$outputname.def" 26509- cat "$export_symbols" >> "$output_objdir/$outputname.def" 26510+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' 26511+ eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' 26512 ;; 26513 esac 26514 } 26515 else 26516 $opt_dry_run || { 26517- ${SED} -e 's/\([].[*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/' < "$export_symbols" > "$output_objdir/$outputname.exp" 26518- $GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T 26519- $MV "$nlist"T "$nlist" 26520+ eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' 26521+ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' 26522+ eval '$MV "$nlist"T "$nlist"' 26523 case $host in 26524 *cygwin* | *mingw* | *cegcc* ) 26525- echo EXPORTS > "$output_objdir/$outputname.def" 26526- cat "$nlist" >> "$output_objdir/$outputname.def" 26527+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' 26528+ eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' 26529 ;; 26530 esac 26531 } 26532@@ -2620,10 +3352,52 @@ extern \"C\" { 26533 func_verbose "extracting global C symbols from \`$dlprefile'" 26534 func_basename "$dlprefile" 26535 name="$func_basename_result" 26536- $opt_dry_run || { 26537- $ECHO ": $name " >> "$nlist" 26538- eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" 26539- } 26540+ case $host in 26541+ *cygwin* | *mingw* | *cegcc* ) 26542+ # if an import library, we need to obtain dlname 26543+ if func_win32_import_lib_p "$dlprefile"; then 26544+ func_tr_sh "$dlprefile" 26545+ eval "curr_lafile=\$libfile_$func_tr_sh_result" 26546+ dlprefile_dlbasename="" 26547+ if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then 26548+ # Use subshell, to avoid clobbering current variable values 26549+ dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` 26550+ if test -n "$dlprefile_dlname" ; then 26551+ func_basename "$dlprefile_dlname" 26552+ dlprefile_dlbasename="$func_basename_result" 26553+ else 26554+ # no lafile. user explicitly requested -dlpreopen <import library>. 26555+ $sharedlib_from_linklib_cmd "$dlprefile" 26556+ dlprefile_dlbasename=$sharedlib_from_linklib_result 26557+ fi 26558+ fi 26559+ $opt_dry_run || { 26560+ if test -n "$dlprefile_dlbasename" ; then 26561+ eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' 26562+ else 26563+ func_warning "Could not compute DLL name from $name" 26564+ eval '$ECHO ": $name " >> "$nlist"' 26565+ fi 26566+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 26567+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | 26568+ $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" 26569+ } 26570+ else # not an import lib 26571+ $opt_dry_run || { 26572+ eval '$ECHO ": $name " >> "$nlist"' 26573+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 26574+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" 26575+ } 26576+ fi 26577+ ;; 26578+ *) 26579+ $opt_dry_run || { 26580+ eval '$ECHO ": $name " >> "$nlist"' 26581+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 26582+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" 26583+ } 26584+ ;; 26585+ esac 26586 done 26587 26588 $opt_dry_run || { 26589@@ -2661,26 +3435,9 @@ typedef struct { 26590 const char *name; 26591 void *address; 26592 } lt_dlsymlist; 26593-" 26594- case $host in 26595- *cygwin* | *mingw* | *cegcc* ) 26596- echo >> "$output_objdir/$my_dlsyms" "\ 26597-/* DATA imports from DLLs on WIN32 con't be const, because 26598- runtime relocations are performed -- see ld's documentation 26599- on pseudo-relocs. */" 26600- lt_dlsym_const= ;; 26601- *osf5*) 26602- echo >> "$output_objdir/$my_dlsyms" "\ 26603-/* This system does not cope well with relocations in const data */" 26604- lt_dlsym_const= ;; 26605- *) 26606- lt_dlsym_const=const ;; 26607- esac 26608- 26609- echo >> "$output_objdir/$my_dlsyms" "\ 26610-extern $lt_dlsym_const lt_dlsymlist 26611+extern LT_DLSYM_CONST lt_dlsymlist 26612 lt_${my_prefix}_LTX_preloaded_symbols[]; 26613-$lt_dlsym_const lt_dlsymlist 26614+LT_DLSYM_CONST lt_dlsymlist 26615 lt_${my_prefix}_LTX_preloaded_symbols[] = 26616 {\ 26617 { \"$my_originator\", (void *) 0 }," 26618@@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() { 26619 for arg in $LTCFLAGS; do 26620 case $arg in 26621 -pie | -fpie | -fPIE) ;; 26622- *) symtab_cflags="$symtab_cflags $arg" ;; 26623+ *) func_append symtab_cflags " $arg" ;; 26624 esac 26625 done 26626 26627@@ -2796,9 +3553,11 @@ func_win32_libid () 26628 win32_libid_type="x86 archive import" 26629 ;; 26630 *ar\ archive*) # could be an import, or static 26631- if $OBJDUMP -f "$1" | $SED -e '10q' 2>/dev/null | 26632- $EGREP 'file format (pe-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then 26633- win32_nmres=`$NM -f posix -A "$1" | 26634+ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. 26635+ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | 26636+ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then 26637+ func_to_tool_file "$1" func_convert_file_msys_to_w32 26638+ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | 26639 $SED -n -e ' 26640 1,100{ 26641 / I /{ 26642@@ -2827,6 +3586,131 @@ func_win32_libid () 26643 $ECHO "$win32_libid_type" 26644 } 26645 26646+# func_cygming_dll_for_implib ARG 26647+# 26648+# Platform-specific function to extract the 26649+# name of the DLL associated with the specified 26650+# import library ARG. 26651+# Invoked by eval'ing the libtool variable 26652+# $sharedlib_from_linklib_cmd 26653+# Result is available in the variable 26654+# $sharedlib_from_linklib_result 26655+func_cygming_dll_for_implib () 26656+{ 26657+ $opt_debug 26658+ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` 26659+} 26660+ 26661+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs 26662+# 26663+# The is the core of a fallback implementation of a 26664+# platform-specific function to extract the name of the 26665+# DLL associated with the specified import library LIBNAME. 26666+# 26667+# SECTION_NAME is either .idata$6 or .idata$7, depending 26668+# on the platform and compiler that created the implib. 26669+# 26670+# Echos the name of the DLL associated with the 26671+# specified import library. 26672+func_cygming_dll_for_implib_fallback_core () 26673+{ 26674+ $opt_debug 26675+ match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` 26676+ $OBJDUMP -s --section "$1" "$2" 2>/dev/null | 26677+ $SED '/^Contents of section '"$match_literal"':/{ 26678+ # Place marker at beginning of archive member dllname section 26679+ s/.*/====MARK====/ 26680+ p 26681+ d 26682+ } 26683+ # These lines can sometimes be longer than 43 characters, but 26684+ # are always uninteresting 26685+ /:[ ]*file format pe[i]\{,1\}-/d 26686+ /^In archive [^:]*:/d 26687+ # Ensure marker is printed 26688+ /^====MARK====/p 26689+ # Remove all lines with less than 43 characters 26690+ /^.\{43\}/!d 26691+ # From remaining lines, remove first 43 characters 26692+ s/^.\{43\}//' | 26693+ $SED -n ' 26694+ # Join marker and all lines until next marker into a single line 26695+ /^====MARK====/ b para 26696+ H 26697+ $ b para 26698+ b 26699+ :para 26700+ x 26701+ s/\n//g 26702+ # Remove the marker 26703+ s/^====MARK====// 26704+ # Remove trailing dots and whitespace 26705+ s/[\. \t]*$// 26706+ # Print 26707+ /./p' | 26708+ # we now have a list, one entry per line, of the stringified 26709+ # contents of the appropriate section of all members of the 26710+ # archive which possess that section. Heuristic: eliminate 26711+ # all those which have a first or second character that is 26712+ # a '.' (that is, objdump's representation of an unprintable 26713+ # character.) This should work for all archives with less than 26714+ # 0x302f exports -- but will fail for DLLs whose name actually 26715+ # begins with a literal '.' or a single character followed by 26716+ # a '.'. 26717+ # 26718+ # Of those that remain, print the first one. 26719+ $SED -e '/^\./d;/^.\./d;q' 26720+} 26721+ 26722+# func_cygming_gnu_implib_p ARG 26723+# This predicate returns with zero status (TRUE) if 26724+# ARG is a GNU/binutils-style import library. Returns 26725+# with nonzero status (FALSE) otherwise. 26726+func_cygming_gnu_implib_p () 26727+{ 26728+ $opt_debug 26729+ func_to_tool_file "$1" func_convert_file_msys_to_w32 26730+ 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)$'` 26731+ test -n "$func_cygming_gnu_implib_tmp" 26732+} 26733+ 26734+# func_cygming_ms_implib_p ARG 26735+# This predicate returns with zero status (TRUE) if 26736+# ARG is an MS-style import library. Returns 26737+# with nonzero status (FALSE) otherwise. 26738+func_cygming_ms_implib_p () 26739+{ 26740+ $opt_debug 26741+ func_to_tool_file "$1" func_convert_file_msys_to_w32 26742+ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` 26743+ test -n "$func_cygming_ms_implib_tmp" 26744+} 26745+ 26746+# func_cygming_dll_for_implib_fallback ARG 26747+# Platform-specific function to extract the 26748+# name of the DLL associated with the specified 26749+# import library ARG. 26750+# 26751+# This fallback implementation is for use when $DLLTOOL 26752+# does not support the --identify-strict option. 26753+# Invoked by eval'ing the libtool variable 26754+# $sharedlib_from_linklib_cmd 26755+# Result is available in the variable 26756+# $sharedlib_from_linklib_result 26757+func_cygming_dll_for_implib_fallback () 26758+{ 26759+ $opt_debug 26760+ if func_cygming_gnu_implib_p "$1" ; then 26761+ # binutils import library 26762+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` 26763+ elif func_cygming_ms_implib_p "$1" ; then 26764+ # ms-generated import library 26765+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` 26766+ else 26767+ # unknown 26768+ sharedlib_from_linklib_result="" 26769+ fi 26770+} 26771 26772 26773 # func_extract_an_archive dir oldlib 26774@@ -2917,7 +3801,7 @@ func_extract_archives () 26775 darwin_file= 26776 darwin_files= 26777 for darwin_file in $darwin_filelist; do 26778- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` 26779+ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` 26780 $LIPO -create -output "$darwin_file" $darwin_files 26781 done # $darwin_filelist 26782 $RM -rf unfat-$$ 26783@@ -2932,7 +3816,7 @@ func_extract_archives () 26784 func_extract_an_archive "$my_xdir" "$my_xabs" 26785 ;; 26786 esac 26787- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` 26788+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` 26789 done 26790 26791 func_extract_archives_result="$my_oldobjs" 26792@@ -3014,7 +3898,110 @@ func_fallback_echo () 26793 _LTECHO_EOF' 26794 } 26795 ECHO=\"$qECHO\" 26796- fi\ 26797+ fi 26798+ 26799+# Very basic option parsing. These options are (a) specific to 26800+# the libtool wrapper, (b) are identical between the wrapper 26801+# /script/ and the wrapper /executable/ which is used only on 26802+# windows platforms, and (c) all begin with the string "--lt-" 26803+# (application programs are unlikely to have options which match 26804+# this pattern). 26805+# 26806+# There are only two supported options: --lt-debug and 26807+# --lt-dump-script. There is, deliberately, no --lt-help. 26808+# 26809+# The first argument to this parsing function should be the 26810+# script's $0 value, followed by "$@". 26811+lt_option_debug= 26812+func_parse_lt_options () 26813+{ 26814+ lt_script_arg0=\$0 26815+ shift 26816+ for lt_opt 26817+ do 26818+ case \"\$lt_opt\" in 26819+ --lt-debug) lt_option_debug=1 ;; 26820+ --lt-dump-script) 26821+ lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` 26822+ test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. 26823+ lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` 26824+ cat \"\$lt_dump_D/\$lt_dump_F\" 26825+ exit 0 26826+ ;; 26827+ --lt-*) 26828+ \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 26829+ exit 1 26830+ ;; 26831+ esac 26832+ done 26833+ 26834+ # Print the debug banner immediately: 26835+ if test -n \"\$lt_option_debug\"; then 26836+ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 26837+ fi 26838+} 26839+ 26840+# Used when --lt-debug. Prints its arguments to stdout 26841+# (redirection is the responsibility of the caller) 26842+func_lt_dump_args () 26843+{ 26844+ lt_dump_args_N=1; 26845+ for lt_arg 26846+ do 26847+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" 26848+ lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` 26849+ done 26850+} 26851+ 26852+# Core function for launching the target application 26853+func_exec_program_core () 26854+{ 26855+" 26856+ case $host in 26857+ # Backslashes separate directories on plain windows 26858+ *-*-mingw | *-*-os2* | *-cegcc*) 26859+ $ECHO "\ 26860+ if test -n \"\$lt_option_debug\"; then 26861+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 26862+ func_lt_dump_args \${1+\"\$@\"} 1>&2 26863+ fi 26864+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} 26865+" 26866+ ;; 26867+ 26868+ *) 26869+ $ECHO "\ 26870+ if test -n \"\$lt_option_debug\"; then 26871+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 26872+ func_lt_dump_args \${1+\"\$@\"} 1>&2 26873+ fi 26874+ exec \"\$progdir/\$program\" \${1+\"\$@\"} 26875+" 26876+ ;; 26877+ esac 26878+ $ECHO "\ 26879+ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 26880+ exit 1 26881+} 26882+ 26883+# A function to encapsulate launching the target application 26884+# Strips options in the --lt-* namespace from \$@ and 26885+# launches target application with the remaining arguments. 26886+func_exec_program () 26887+{ 26888+ for lt_wr_arg 26889+ do 26890+ case \$lt_wr_arg in 26891+ --lt-*) ;; 26892+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; 26893+ esac 26894+ shift 26895+ done 26896+ func_exec_program_core \${1+\"\$@\"} 26897+} 26898+ 26899+ # Parse options 26900+ func_parse_lt_options \"\$0\" \${1+\"\$@\"} 26901 26902 # Find the directory that this script lives in. 26903 thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` 26904@@ -3078,7 +4065,7 @@ _LTECHO_EOF' 26905 26906 # relink executable if necessary 26907 if test -n \"\$relink_command\"; then 26908- if relink_command_output=\`eval \"\$relink_command\" 2>&1\`; then : 26909+ if relink_command_output=\`eval \$relink_command 2>&1\`; then : 26910 else 26911 $ECHO \"\$relink_command_output\" >&2 26912 $RM \"\$progdir/\$file\" 26913@@ -3102,6 +4089,18 @@ _LTECHO_EOF' 26914 26915 if test -f \"\$progdir/\$program\"; then" 26916 26917+ # fixup the dll searchpath if we need to. 26918+ # 26919+ # Fix the DLL searchpath if we need to. Do this before prepending 26920+ # to shlibpath, because on Windows, both are PATH and uninstalled 26921+ # libraries must come first. 26922+ if test -n "$dllsearchpath"; then 26923+ $ECHO "\ 26924+ # Add the dll search path components to the executable PATH 26925+ PATH=$dllsearchpath:\$PATH 26926+" 26927+ fi 26928+ 26929 # Export our shlibpath_var if we have one. 26930 if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then 26931 $ECHO "\ 26932@@ -3116,35 +4115,10 @@ _LTECHO_EOF' 26933 " 26934 fi 26935 26936- # fixup the dll searchpath if we need to. 26937- if test -n "$dllsearchpath"; then 26938- $ECHO "\ 26939- # Add the dll search path components to the executable PATH 26940- PATH=$dllsearchpath:\$PATH 26941-" 26942- fi 26943- 26944 $ECHO "\ 26945 if test \"\$libtool_execute_magic\" != \"$magic\"; then 26946 # Run the actual program with our arguments. 26947-" 26948- case $host in 26949- # Backslashes separate directories on plain windows 26950- *-*-mingw | *-*-os2* | *-cegcc*) 26951- $ECHO "\ 26952- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} 26953-" 26954- ;; 26955- 26956- *) 26957- $ECHO "\ 26958- exec \"\$progdir/\$program\" \${1+\"\$@\"} 26959-" 26960- ;; 26961- esac 26962- $ECHO "\ 26963- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 26964- exit 1 26965+ func_exec_program \${1+\"\$@\"} 26966 fi 26967 else 26968 # The program doesn't exist. 26969@@ -3158,166 +4132,6 @@ fi\ 26970 } 26971 26972 26973-# func_to_host_path arg 26974-# 26975-# Convert paths to host format when used with build tools. 26976-# Intended for use with "native" mingw (where libtool itself 26977-# is running under the msys shell), or in the following cross- 26978-# build environments: 26979-# $build $host 26980-# mingw (msys) mingw [e.g. native] 26981-# cygwin mingw 26982-# *nix + wine mingw 26983-# where wine is equipped with the `winepath' executable. 26984-# In the native mingw case, the (msys) shell automatically 26985-# converts paths for any non-msys applications it launches, 26986-# but that facility isn't available from inside the cwrapper. 26987-# Similar accommodations are necessary for $host mingw and 26988-# $build cygwin. Calling this function does no harm for other 26989-# $host/$build combinations not listed above. 26990-# 26991-# ARG is the path (on $build) that should be converted to 26992-# the proper representation for $host. The result is stored 26993-# in $func_to_host_path_result. 26994-func_to_host_path () 26995-{ 26996- func_to_host_path_result="$1" 26997- if test -n "$1"; then 26998- case $host in 26999- *mingw* ) 27000- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' 27001- case $build in 27002- *mingw* ) # actually, msys 27003- # awkward: cmd appends spaces to result 27004- func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null | 27005- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` 27006- ;; 27007- *cygwin* ) 27008- func_to_host_path_result=`cygpath -w "$1" | 27009- $SED -e "$lt_sed_naive_backslashify"` 27010- ;; 27011- * ) 27012- # Unfortunately, winepath does not exit with a non-zero 27013- # error code, so we are forced to check the contents of 27014- # stdout. On the other hand, if the command is not 27015- # found, the shell will set an exit code of 127 and print 27016- # *an error message* to stdout. So we must check for both 27017- # error code of zero AND non-empty stdout, which explains 27018- # the odd construction: 27019- func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` 27020- if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then 27021- func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" | 27022- $SED -e "$lt_sed_naive_backslashify"` 27023- else 27024- # Allow warning below. 27025- func_to_host_path_result= 27026- fi 27027- ;; 27028- esac 27029- if test -z "$func_to_host_path_result" ; then 27030- func_error "Could not determine host path corresponding to" 27031- func_error " \`$1'" 27032- func_error "Continuing, but uninstalled executables may not work." 27033- # Fallback: 27034- func_to_host_path_result="$1" 27035- fi 27036- ;; 27037- esac 27038- fi 27039-} 27040-# end: func_to_host_path 27041- 27042-# func_to_host_pathlist arg 27043-# 27044-# Convert pathlists to host format when used with build tools. 27045-# See func_to_host_path(), above. This function supports the 27046-# following $build/$host combinations (but does no harm for 27047-# combinations not listed here): 27048-# $build $host 27049-# mingw (msys) mingw [e.g. native] 27050-# cygwin mingw 27051-# *nix + wine mingw 27052-# 27053-# Path separators are also converted from $build format to 27054-# $host format. If ARG begins or ends with a path separator 27055-# character, it is preserved (but converted to $host format) 27056-# on output. 27057-# 27058-# ARG is a pathlist (on $build) that should be converted to 27059-# the proper representation on $host. The result is stored 27060-# in $func_to_host_pathlist_result. 27061-func_to_host_pathlist () 27062-{ 27063- func_to_host_pathlist_result="$1" 27064- if test -n "$1"; then 27065- case $host in 27066- *mingw* ) 27067- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' 27068- # Remove leading and trailing path separator characters from 27069- # ARG. msys behavior is inconsistent here, cygpath turns them 27070- # into '.;' and ';.', and winepath ignores them completely. 27071- func_stripname : : "$1" 27072- func_to_host_pathlist_tmp1=$func_stripname_result 27073- case $build in 27074- *mingw* ) # Actually, msys. 27075- # Awkward: cmd appends spaces to result. 27076- func_to_host_pathlist_result=` 27077- ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null | 27078- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` 27079- ;; 27080- *cygwin* ) 27081- func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" | 27082- $SED -e "$lt_sed_naive_backslashify"` 27083- ;; 27084- * ) 27085- # unfortunately, winepath doesn't convert pathlists 27086- func_to_host_pathlist_result="" 27087- func_to_host_pathlist_oldIFS=$IFS 27088- IFS=: 27089- for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do 27090- IFS=$func_to_host_pathlist_oldIFS 27091- if test -n "$func_to_host_pathlist_f" ; then 27092- func_to_host_path "$func_to_host_pathlist_f" 27093- if test -n "$func_to_host_path_result" ; then 27094- if test -z "$func_to_host_pathlist_result" ; then 27095- func_to_host_pathlist_result="$func_to_host_path_result" 27096- else 27097- func_append func_to_host_pathlist_result ";$func_to_host_path_result" 27098- fi 27099- fi 27100- fi 27101- done 27102- IFS=$func_to_host_pathlist_oldIFS 27103- ;; 27104- esac 27105- if test -z "$func_to_host_pathlist_result"; then 27106- func_error "Could not determine the host path(s) corresponding to" 27107- func_error " \`$1'" 27108- func_error "Continuing, but uninstalled executables may not work." 27109- # Fallback. This may break if $1 contains DOS-style drive 27110- # specifications. The fix is not to complicate the expression 27111- # below, but for the user to provide a working wine installation 27112- # with winepath so that path translation in the cross-to-mingw 27113- # case works properly. 27114- lt_replace_pathsep_nix_to_dos="s|:|;|g" 27115- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ 27116- $SED -e "$lt_replace_pathsep_nix_to_dos"` 27117- fi 27118- # Now, add the leading and trailing path separators back 27119- case "$1" in 27120- :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" 27121- ;; 27122- esac 27123- case "$1" in 27124- *: ) func_append func_to_host_pathlist_result ";" 27125- ;; 27126- esac 27127- ;; 27128- esac 27129- fi 27130-} 27131-# end: func_to_host_pathlist 27132- 27133 # func_emit_cwrapperexe_src 27134 # emit the source code for a wrapper executable on stdout 27135 # Must ONLY be called from within func_mode_link because 27136@@ -3334,10 +4148,6 @@ func_emit_cwrapperexe_src () 27137 27138 This wrapper executable should never be moved out of the build directory. 27139 If it is, it will not operate correctly. 27140- 27141- Currently, it simply execs the wrapper *script* "$SHELL $output", 27142- but could eventually absorb all of the scripts functionality and 27143- exec $objdir/$outputname directly. 27144 */ 27145 EOF 27146 cat <<"EOF" 27147@@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, int); 27148 if (stale) { free ((void *) stale); stale = 0; } \ 27149 } while (0) 27150 27151-#undef LTWRAPPER_DEBUGPRINTF 27152-#if defined LT_DEBUGWRAPPER 27153-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args 27154-static void 27155-ltwrapper_debugprintf (const char *fmt, ...) 27156-{ 27157- va_list args; 27158- va_start (args, fmt); 27159- (void) vfprintf (stderr, fmt, args); 27160- va_end (args); 27161-} 27162+#if defined(LT_DEBUGWRAPPER) 27163+static int lt_debug = 1; 27164 #else 27165-# define LTWRAPPER_DEBUGPRINTF(args) 27166+static int lt_debug = 0; 27167 #endif 27168 27169-const char *program_name = NULL; 27170+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ 27171 27172 void *xmalloc (size_t num); 27173 char *xstrdup (const char *string); 27174@@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathspec); 27175 int make_executable (const char *path); 27176 int check_executable (const char *path); 27177 char *strendzap (char *str, const char *pat); 27178-void lt_fatal (const char *message, ...); 27179+void lt_debugprintf (const char *file, int line, const char *fmt, ...); 27180+void lt_fatal (const char *file, int line, const char *message, ...); 27181+static const char *nonnull (const char *s); 27182+static const char *nonempty (const char *s); 27183 void lt_setenv (const char *name, const char *value); 27184 char *lt_extend_str (const char *orig_value, const char *add, int to_end); 27185 void lt_update_exe_path (const char *name, const char *value); 27186@@ -3497,14 +4301,14 @@ void lt_dump_script (FILE *f); 27187 EOF 27188 27189 cat <<EOF 27190-const char * MAGIC_EXE = "$magic_exe"; 27191+volatile const char * MAGIC_EXE = "$magic_exe"; 27192 const char * LIB_PATH_VARNAME = "$shlibpath_var"; 27193 EOF 27194 27195 if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then 27196- func_to_host_pathlist "$temp_rpath" 27197+ func_to_host_path "$temp_rpath" 27198 cat <<EOF 27199-const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result"; 27200+const char * LIB_PATH_VALUE = "$func_to_host_path_result"; 27201 EOF 27202 else 27203 cat <<"EOF" 27204@@ -3513,10 +4317,10 @@ EOF 27205 fi 27206 27207 if test -n "$dllsearchpath"; then 27208- func_to_host_pathlist "$dllsearchpath:" 27209+ func_to_host_path "$dllsearchpath:" 27210 cat <<EOF 27211 const char * EXE_PATH_VARNAME = "PATH"; 27212-const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result"; 27213+const char * EXE_PATH_VALUE = "$func_to_host_path_result"; 27214 EOF 27215 else 27216 cat <<"EOF" 27217@@ -3539,12 +4343,10 @@ EOF 27218 cat <<"EOF" 27219 27220 #define LTWRAPPER_OPTION_PREFIX "--lt-" 27221-#define LTWRAPPER_OPTION_PREFIX_LENGTH 5 27222 27223-static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH; 27224 static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX; 27225- 27226 static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script"; 27227+static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug"; 27228 27229 int 27230 main (int argc, char *argv[]) 27231@@ -3561,10 +4363,13 @@ main (int argc, char *argv[]) 27232 int i; 27233 27234 program_name = (char *) xstrdup (base_name (argv[0])); 27235- LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0])); 27236- LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name)); 27237+ newargz = XMALLOC (char *, argc + 1); 27238 27239- /* very simple arg parsing; don't want to rely on getopt */ 27240+ /* very simple arg parsing; don't want to rely on getopt 27241+ * also, copy all non cwrapper options to newargz, except 27242+ * argz[0], which is handled differently 27243+ */ 27244+ newargc=0; 27245 for (i = 1; i < argc; i++) 27246 { 27247 if (strcmp (argv[i], dumpscript_opt) == 0) 27248@@ -3581,21 +4386,54 @@ EOF 27249 lt_dump_script (stdout); 27250 return 0; 27251 } 27252+ if (strcmp (argv[i], debug_opt) == 0) 27253+ { 27254+ lt_debug = 1; 27255+ continue; 27256+ } 27257+ if (strcmp (argv[i], ltwrapper_option_prefix) == 0) 27258+ { 27259+ /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX 27260+ namespace, but it is not one of the ones we know about and 27261+ have already dealt with, above (inluding dump-script), then 27262+ report an error. Otherwise, targets might begin to believe 27263+ they are allowed to use options in the LTWRAPPER_OPTION_PREFIX 27264+ namespace. The first time any user complains about this, we'll 27265+ need to make LTWRAPPER_OPTION_PREFIX a configure-time option 27266+ or a configure.ac-settable value. 27267+ */ 27268+ lt_fatal (__FILE__, __LINE__, 27269+ "unrecognized %s option: '%s'", 27270+ ltwrapper_option_prefix, argv[i]); 27271+ } 27272+ /* otherwise ... */ 27273+ newargz[++newargc] = xstrdup (argv[i]); 27274 } 27275+ newargz[++newargc] = NULL; 27276+ 27277+EOF 27278+ cat <<EOF 27279+ /* The GNU banner must be the first non-error debug message */ 27280+ lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n"); 27281+EOF 27282+ cat <<"EOF" 27283+ lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]); 27284+ lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name); 27285 27286- newargz = XMALLOC (char *, argc + 1); 27287 tmp_pathspec = find_executable (argv[0]); 27288 if (tmp_pathspec == NULL) 27289- lt_fatal ("Couldn't find %s", argv[0]); 27290- LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n", 27291- tmp_pathspec)); 27292+ lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]); 27293+ lt_debugprintf (__FILE__, __LINE__, 27294+ "(main) found exe (before symlink chase) at: %s\n", 27295+ tmp_pathspec); 27296 27297 actual_cwrapper_path = chase_symlinks (tmp_pathspec); 27298- LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n", 27299- actual_cwrapper_path)); 27300+ lt_debugprintf (__FILE__, __LINE__, 27301+ "(main) found exe (after symlink chase) at: %s\n", 27302+ actual_cwrapper_path); 27303 XFREE (tmp_pathspec); 27304 27305- actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path)); 27306+ actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path)); 27307 strendzap (actual_cwrapper_path, actual_cwrapper_name); 27308 27309 /* wrapper name transforms */ 27310@@ -3613,8 +4451,9 @@ EOF 27311 target_name = tmp_pathspec; 27312 tmp_pathspec = 0; 27313 27314- LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n", 27315- target_name)); 27316+ lt_debugprintf (__FILE__, __LINE__, 27317+ "(main) libtool target name: %s\n", 27318+ target_name); 27319 EOF 27320 27321 cat <<EOF 27322@@ -3664,35 +4503,19 @@ EOF 27323 27324 lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */ 27325 lt_setenv ("DUALCASE", "1"); /* for MSK sh */ 27326- lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE); 27327+ /* Update the DLL searchpath. EXE_PATH_VALUE ($dllsearchpath) must 27328+ be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath) 27329+ because on Windows, both *_VARNAMEs are PATH but uninstalled 27330+ libraries must come first. */ 27331 lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE); 27332+ lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE); 27333 27334- newargc=0; 27335- for (i = 1; i < argc; i++) 27336- { 27337- if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0) 27338- { 27339- /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX 27340- namespace, but it is not one of the ones we know about and 27341- have already dealt with, above (inluding dump-script), then 27342- report an error. Otherwise, targets might begin to believe 27343- they are allowed to use options in the LTWRAPPER_OPTION_PREFIX 27344- namespace. The first time any user complains about this, we'll 27345- need to make LTWRAPPER_OPTION_PREFIX a configure-time option 27346- or a configure.ac-settable value. 27347- */ 27348- lt_fatal ("Unrecognized option in %s namespace: '%s'", 27349- ltwrapper_option_prefix, argv[i]); 27350- } 27351- /* otherwise ... */ 27352- newargz[++newargc] = xstrdup (argv[i]); 27353- } 27354- newargz[++newargc] = NULL; 27355- 27356- LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>"))); 27357+ lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n", 27358+ nonnull (lt_argv_zero)); 27359 for (i = 0; i < newargc; i++) 27360 { 27361- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>"))); 27362+ lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n", 27363+ i, nonnull (newargz[i])); 27364 } 27365 27366 EOF 27367@@ -3706,7 +4529,9 @@ EOF 27368 if (rval == -1) 27369 { 27370 /* failed to start process */ 27371- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno)); 27372+ lt_debugprintf (__FILE__, __LINE__, 27373+ "(main) failed to launch target \"%s\": %s\n", 27374+ lt_argv_zero, nonnull (strerror (errno))); 27375 return 127; 27376 } 27377 return rval; 27378@@ -3728,7 +4553,7 @@ xmalloc (size_t num) 27379 { 27380 void *p = (void *) malloc (num); 27381 if (!p) 27382- lt_fatal ("Memory exhausted"); 27383+ lt_fatal (__FILE__, __LINE__, "memory exhausted"); 27384 27385 return p; 27386 } 27387@@ -3762,8 +4587,8 @@ check_executable (const char *path) 27388 { 27389 struct stat st; 27390 27391- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", 27392- path ? (*path ? path : "EMPTY!") : "NULL!")); 27393+ lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n", 27394+ nonempty (path)); 27395 if ((!path) || (!*path)) 27396 return 0; 27397 27398@@ -3780,8 +4605,8 @@ make_executable (const char *path) 27399 int rval = 0; 27400 struct stat st; 27401 27402- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", 27403- path ? (*path ? path : "EMPTY!") : "NULL!")); 27404+ lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", 27405+ nonempty (path)); 27406 if ((!path) || (!*path)) 27407 return 0; 27408 27409@@ -3807,8 +4632,8 @@ find_executable (const char *wrapper) 27410 int tmp_len; 27411 char *concat_name; 27412 27413- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", 27414- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); 27415+ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", 27416+ nonempty (wrapper)); 27417 27418 if ((wrapper == NULL) || (*wrapper == '\0')) 27419 return NULL; 27420@@ -3861,7 +4686,8 @@ find_executable (const char *wrapper) 27421 { 27422 /* empty path: current directory */ 27423 if (getcwd (tmp, LT_PATHMAX) == NULL) 27424- lt_fatal ("getcwd failed"); 27425+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", 27426+ nonnull (strerror (errno))); 27427 tmp_len = strlen (tmp); 27428 concat_name = 27429 XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); 27430@@ -3886,7 +4712,8 @@ find_executable (const char *wrapper) 27431 } 27432 /* Relative path | not found in path: prepend cwd */ 27433 if (getcwd (tmp, LT_PATHMAX) == NULL) 27434- lt_fatal ("getcwd failed"); 27435+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", 27436+ nonnull (strerror (errno))); 27437 tmp_len = strlen (tmp); 27438 concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); 27439 memcpy (concat_name, tmp, tmp_len); 27440@@ -3912,8 +4739,9 @@ chase_symlinks (const char *pathspec) 27441 int has_symlinks = 0; 27442 while (strlen (tmp_pathspec) && !has_symlinks) 27443 { 27444- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", 27445- tmp_pathspec)); 27446+ lt_debugprintf (__FILE__, __LINE__, 27447+ "checking path component for symlinks: %s\n", 27448+ tmp_pathspec); 27449 if (lstat (tmp_pathspec, &s) == 0) 27450 { 27451 if (S_ISLNK (s.st_mode) != 0) 27452@@ -3935,8 +4763,9 @@ chase_symlinks (const char *pathspec) 27453 } 27454 else 27455 { 27456- char *errstr = strerror (errno); 27457- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); 27458+ lt_fatal (__FILE__, __LINE__, 27459+ "error accessing file \"%s\": %s", 27460+ tmp_pathspec, nonnull (strerror (errno))); 27461 } 27462 } 27463 XFREE (tmp_pathspec); 27464@@ -3949,7 +4778,8 @@ chase_symlinks (const char *pathspec) 27465 tmp_pathspec = realpath (pathspec, buf); 27466 if (tmp_pathspec == 0) 27467 { 27468- lt_fatal ("Could not follow symlinks for %s", pathspec); 27469+ lt_fatal (__FILE__, __LINE__, 27470+ "could not follow symlinks for %s", pathspec); 27471 } 27472 return xstrdup (tmp_pathspec); 27473 #endif 27474@@ -3975,11 +4805,25 @@ strendzap (char *str, const char *pat) 27475 return str; 27476 } 27477 27478+void 27479+lt_debugprintf (const char *file, int line, const char *fmt, ...) 27480+{ 27481+ va_list args; 27482+ if (lt_debug) 27483+ { 27484+ (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); 27485+ va_start (args, fmt); 27486+ (void) vfprintf (stderr, fmt, args); 27487+ va_end (args); 27488+ } 27489+} 27490+ 27491 static void 27492-lt_error_core (int exit_status, const char *mode, 27493+lt_error_core (int exit_status, const char *file, 27494+ int line, const char *mode, 27495 const char *message, va_list ap) 27496 { 27497- fprintf (stderr, "%s: %s: ", program_name, mode); 27498+ fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); 27499 vfprintf (stderr, message, ap); 27500 fprintf (stderr, ".\n"); 27501 27502@@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const char *mode, 27503 } 27504 27505 void 27506-lt_fatal (const char *message, ...) 27507+lt_fatal (const char *file, int line, const char *message, ...) 27508 { 27509 va_list ap; 27510 va_start (ap, message); 27511- lt_error_core (EXIT_FAILURE, "FATAL", message, ap); 27512+ lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); 27513 va_end (ap); 27514 } 27515 27516+static const char * 27517+nonnull (const char *s) 27518+{ 27519+ return s ? s : "(null)"; 27520+} 27521+ 27522+static const char * 27523+nonempty (const char *s) 27524+{ 27525+ return (s && !*s) ? "(empty)" : nonnull (s); 27526+} 27527+ 27528 void 27529 lt_setenv (const char *name, const char *value) 27530 { 27531- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", 27532- (name ? name : "<NULL>"), 27533- (value ? value : "<NULL>"))); 27534+ lt_debugprintf (__FILE__, __LINE__, 27535+ "(lt_setenv) setting '%s' to '%s'\n", 27536+ nonnull (name), nonnull (value)); 27537 { 27538 #ifdef HAVE_SETENV 27539 /* always make a copy, for consistency with !HAVE_SETENV */ 27540@@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, const char *add, int to_end) 27541 void 27542 lt_update_exe_path (const char *name, const char *value) 27543 { 27544- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", 27545- (name ? name : "<NULL>"), 27546- (value ? value : "<NULL>"))); 27547+ lt_debugprintf (__FILE__, __LINE__, 27548+ "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", 27549+ nonnull (name), nonnull (value)); 27550 27551 if (name && *name && value && *value) 27552 { 27553@@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, const char *value) 27554 void 27555 lt_update_lib_path (const char *name, const char *value) 27556 { 27557- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", 27558- (name ? name : "<NULL>"), 27559- (value ? value : "<NULL>"))); 27560+ lt_debugprintf (__FILE__, __LINE__, 27561+ "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", 27562+ nonnull (name), nonnull (value)); 27563 27564 if (name && *name && value && *value) 27565 { 27566@@ -4222,7 +5078,7 @@ EOF 27567 func_win32_import_lib_p () 27568 { 27569 $opt_debug 27570- case `eval "$file_magic_cmd \"\$1\" 2>/dev/null" | $SED -e 10q` in 27571+ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in 27572 *import*) : ;; 27573 *) false ;; 27574 esac 27575@@ -4401,9 +5257,9 @@ func_mode_link () 27576 ;; 27577 *) 27578 if test "$prev" = dlfiles; then 27579- dlfiles="$dlfiles $arg" 27580+ func_append dlfiles " $arg" 27581 else 27582- dlprefiles="$dlprefiles $arg" 27583+ func_append dlprefiles " $arg" 27584 fi 27585 prev= 27586 continue 27587@@ -4427,7 +5283,7 @@ func_mode_link () 27588 *-*-darwin*) 27589 case "$deplibs " in 27590 *" $qarg.ltframework "*) ;; 27591- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later 27592+ *) func_append deplibs " $qarg.ltframework" # this is fixed later 27593 ;; 27594 esac 27595 ;; 27596@@ -4446,7 +5302,7 @@ func_mode_link () 27597 moreargs= 27598 for fil in `cat "$save_arg"` 27599 do 27600-# moreargs="$moreargs $fil" 27601+# func_append moreargs " $fil" 27602 arg=$fil 27603 # A libtool-controlled object. 27604 27605@@ -4475,7 +5331,7 @@ func_mode_link () 27606 27607 if test "$prev" = dlfiles; then 27608 if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then 27609- dlfiles="$dlfiles $pic_object" 27610+ func_append dlfiles " $pic_object" 27611 prev= 27612 continue 27613 else 27614@@ -4487,7 +5343,7 @@ func_mode_link () 27615 # CHECK ME: I think I busted this. -Ossama 27616 if test "$prev" = dlprefiles; then 27617 # Preload the old-style object. 27618- dlprefiles="$dlprefiles $pic_object" 27619+ func_append dlprefiles " $pic_object" 27620 prev= 27621 fi 27622 27623@@ -4557,12 +5413,12 @@ func_mode_link () 27624 if test "$prev" = rpath; then 27625 case "$rpath " in 27626 *" $arg "*) ;; 27627- *) rpath="$rpath $arg" ;; 27628+ *) func_append rpath " $arg" ;; 27629 esac 27630 else 27631 case "$xrpath " in 27632 *" $arg "*) ;; 27633- *) xrpath="$xrpath $arg" ;; 27634+ *) func_append xrpath " $arg" ;; 27635 esac 27636 fi 27637 prev= 27638@@ -4574,28 +5430,28 @@ func_mode_link () 27639 continue 27640 ;; 27641 weak) 27642- weak_libs="$weak_libs $arg" 27643+ func_append weak_libs " $arg" 27644 prev= 27645 continue 27646 ;; 27647 xcclinker) 27648- linker_flags="$linker_flags $qarg" 27649- compiler_flags="$compiler_flags $qarg" 27650+ func_append linker_flags " $qarg" 27651+ func_append compiler_flags " $qarg" 27652 prev= 27653 func_append compile_command " $qarg" 27654 func_append finalize_command " $qarg" 27655 continue 27656 ;; 27657 xcompiler) 27658- compiler_flags="$compiler_flags $qarg" 27659+ func_append compiler_flags " $qarg" 27660 prev= 27661 func_append compile_command " $qarg" 27662 func_append finalize_command " $qarg" 27663 continue 27664 ;; 27665 xlinker) 27666- linker_flags="$linker_flags $qarg" 27667- compiler_flags="$compiler_flags $wl$qarg" 27668+ func_append linker_flags " $qarg" 27669+ func_append compiler_flags " $wl$qarg" 27670 prev= 27671 func_append compile_command " $wl$qarg" 27672 func_append finalize_command " $wl$qarg" 27673@@ -4686,15 +5542,16 @@ func_mode_link () 27674 ;; 27675 27676 -L*) 27677- func_stripname '-L' '' "$arg" 27678- dir=$func_stripname_result 27679- if test -z "$dir"; then 27680+ func_stripname "-L" '' "$arg" 27681+ if test -z "$func_stripname_result"; then 27682 if test "$#" -gt 0; then 27683 func_fatal_error "require no space between \`-L' and \`$1'" 27684 else 27685 func_fatal_error "need path for \`-L' option" 27686 fi 27687 fi 27688+ func_resolve_sysroot "$func_stripname_result" 27689+ dir=$func_resolve_sysroot_result 27690 # We need an absolute path. 27691 case $dir in 27692 [\\/]* | [A-Za-z]:[\\/]*) ;; 27693@@ -4706,10 +5563,16 @@ func_mode_link () 27694 ;; 27695 esac 27696 case "$deplibs " in 27697- *" -L$dir "*) ;; 27698+ *" -L$dir "* | *" $arg "*) 27699+ # Will only happen for absolute or sysroot arguments 27700+ ;; 27701 *) 27702- deplibs="$deplibs -L$dir" 27703- lib_search_path="$lib_search_path $dir" 27704+ # Preserve sysroot, but never include relative directories 27705+ case $dir in 27706+ [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; 27707+ *) func_append deplibs " -L$dir" ;; 27708+ esac 27709+ func_append lib_search_path " $dir" 27710 ;; 27711 esac 27712 case $host in 27713@@ -4718,12 +5581,12 @@ func_mode_link () 27714 case :$dllsearchpath: in 27715 *":$dir:"*) ;; 27716 ::) dllsearchpath=$dir;; 27717- *) dllsearchpath="$dllsearchpath:$dir";; 27718+ *) func_append dllsearchpath ":$dir";; 27719 esac 27720 case :$dllsearchpath: in 27721 *":$testbindir:"*) ;; 27722 ::) dllsearchpath=$testbindir;; 27723- *) dllsearchpath="$dllsearchpath:$testbindir";; 27724+ *) func_append dllsearchpath ":$testbindir";; 27725 esac 27726 ;; 27727 esac 27728@@ -4747,7 +5610,7 @@ func_mode_link () 27729 ;; 27730 *-*-rhapsody* | *-*-darwin1.[012]) 27731 # Rhapsody C and math libraries are in the System framework 27732- deplibs="$deplibs System.ltframework" 27733+ func_append deplibs " System.ltframework" 27734 continue 27735 ;; 27736 *-*-sco3.2v5* | *-*-sco5v6*) 27737@@ -4758,9 +5621,6 @@ func_mode_link () 27738 # Compiler inserts libc in the correct place for threads to work 27739 test "X$arg" = "X-lc" && continue 27740 ;; 27741- *-*-linux*) 27742- test "X$arg" = "X-lc" && continue 27743- ;; 27744 esac 27745 elif test "X$arg" = "X-lc_r"; then 27746 case $host in 27747@@ -4770,7 +5630,7 @@ func_mode_link () 27748 ;; 27749 esac 27750 fi 27751- deplibs="$deplibs $arg" 27752+ func_append deplibs " $arg" 27753 continue 27754 ;; 27755 27756@@ -4782,8 +5642,8 @@ func_mode_link () 27757 # Tru64 UNIX uses -model [arg] to determine the layout of C++ 27758 # classes, name mangling, and exception handling. 27759 # Darwin uses the -arch flag to determine output architecture. 27760- -model|-arch|-isysroot) 27761- compiler_flags="$compiler_flags $arg" 27762+ -model|-arch|-isysroot|--sysroot) 27763+ func_append compiler_flags " $arg" 27764 func_append compile_command " $arg" 27765 func_append finalize_command " $arg" 27766 prev=xcompiler 27767@@ -4791,12 +5651,12 @@ func_mode_link () 27768 ;; 27769 27770 -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) 27771- compiler_flags="$compiler_flags $arg" 27772+ func_append compiler_flags " $arg" 27773 func_append compile_command " $arg" 27774 func_append finalize_command " $arg" 27775 case "$new_inherited_linker_flags " in 27776 *" $arg "*) ;; 27777- * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; 27778+ * ) func_append new_inherited_linker_flags " $arg" ;; 27779 esac 27780 continue 27781 ;; 27782@@ -4863,13 +5723,17 @@ func_mode_link () 27783 # We need an absolute path. 27784 case $dir in 27785 [\\/]* | [A-Za-z]:[\\/]*) ;; 27786+ =*) 27787+ func_stripname '=' '' "$dir" 27788+ dir=$lt_sysroot$func_stripname_result 27789+ ;; 27790 *) 27791 func_fatal_error "only absolute run-paths are allowed" 27792 ;; 27793 esac 27794 case "$xrpath " in 27795 *" $dir "*) ;; 27796- *) xrpath="$xrpath $dir" ;; 27797+ *) func_append xrpath " $dir" ;; 27798 esac 27799 continue 27800 ;; 27801@@ -4922,8 +5786,8 @@ func_mode_link () 27802 for flag in $args; do 27803 IFS="$save_ifs" 27804 func_quote_for_eval "$flag" 27805- arg="$arg $func_quote_for_eval_result" 27806- compiler_flags="$compiler_flags $func_quote_for_eval_result" 27807+ func_append arg " $func_quote_for_eval_result" 27808+ func_append compiler_flags " $func_quote_for_eval_result" 27809 done 27810 IFS="$save_ifs" 27811 func_stripname ' ' '' "$arg" 27812@@ -4938,9 +5802,9 @@ func_mode_link () 27813 for flag in $args; do 27814 IFS="$save_ifs" 27815 func_quote_for_eval "$flag" 27816- arg="$arg $wl$func_quote_for_eval_result" 27817- compiler_flags="$compiler_flags $wl$func_quote_for_eval_result" 27818- linker_flags="$linker_flags $func_quote_for_eval_result" 27819+ func_append arg " $wl$func_quote_for_eval_result" 27820+ func_append compiler_flags " $wl$func_quote_for_eval_result" 27821+ func_append linker_flags " $func_quote_for_eval_result" 27822 done 27823 IFS="$save_ifs" 27824 func_stripname ' ' '' "$arg" 27825@@ -4968,24 +5832,27 @@ func_mode_link () 27826 arg="$func_quote_for_eval_result" 27827 ;; 27828 27829- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler 27830- # -r[0-9][0-9]* specifies the processor on the SGI compiler 27831- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler 27832- # +DA*, +DD* enable 64-bit mode on the HP compiler 27833- # -q* pass through compiler args for the IBM compiler 27834- # -m*, -t[45]*, -txscale* pass through architecture-specific 27835- # compiler args for GCC 27836- # -F/path gives path to uninstalled frameworks, gcc on darwin 27837- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC 27838- # @file GCC response files 27839- # -tp=* Portland pgcc target processor selection 27840+ # Flags to be passed through unchanged, with rationale: 27841+ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler 27842+ # -r[0-9][0-9]* specify processor for the SGI compiler 27843+ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler 27844+ # +DA*, +DD* enable 64-bit mode for the HP compiler 27845+ # -q* compiler args for the IBM compiler 27846+ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC 27847+ # -F/path path to uninstalled frameworks, gcc on darwin 27848+ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC 27849+ # @file GCC response files 27850+ # -tp=* Portland pgcc target processor selection 27851+ # --sysroot=* for sysroot support 27852+ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization 27853 -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ 27854- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) 27855+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ 27856+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin) 27857 func_quote_for_eval "$arg" 27858 arg="$func_quote_for_eval_result" 27859 func_append compile_command " $arg" 27860 func_append finalize_command " $arg" 27861- compiler_flags="$compiler_flags $arg" 27862+ func_append compiler_flags " $arg" 27863 continue 27864 ;; 27865 27866@@ -4997,7 +5864,7 @@ func_mode_link () 27867 27868 *.$objext) 27869 # A standard object. 27870- objs="$objs $arg" 27871+ func_append objs " $arg" 27872 ;; 27873 27874 *.lo) 27875@@ -5028,7 +5895,7 @@ func_mode_link () 27876 27877 if test "$prev" = dlfiles; then 27878 if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then 27879- dlfiles="$dlfiles $pic_object" 27880+ func_append dlfiles " $pic_object" 27881 prev= 27882 continue 27883 else 27884@@ -5040,7 +5907,7 @@ func_mode_link () 27885 # CHECK ME: I think I busted this. -Ossama 27886 if test "$prev" = dlprefiles; then 27887 # Preload the old-style object. 27888- dlprefiles="$dlprefiles $pic_object" 27889+ func_append dlprefiles " $pic_object" 27890 prev= 27891 fi 27892 27893@@ -5085,24 +5952,25 @@ func_mode_link () 27894 27895 *.$libext) 27896 # An archive. 27897- deplibs="$deplibs $arg" 27898- old_deplibs="$old_deplibs $arg" 27899+ func_append deplibs " $arg" 27900+ func_append old_deplibs " $arg" 27901 continue 27902 ;; 27903 27904 *.la) 27905 # A libtool-controlled library. 27906 27907+ func_resolve_sysroot "$arg" 27908 if test "$prev" = dlfiles; then 27909 # This library was specified with -dlopen. 27910- dlfiles="$dlfiles $arg" 27911+ func_append dlfiles " $func_resolve_sysroot_result" 27912 prev= 27913 elif test "$prev" = dlprefiles; then 27914 # The library was specified with -dlpreopen. 27915- dlprefiles="$dlprefiles $arg" 27916+ func_append dlprefiles " $func_resolve_sysroot_result" 27917 prev= 27918 else 27919- deplibs="$deplibs $arg" 27920+ func_append deplibs " $func_resolve_sysroot_result" 27921 fi 27922 continue 27923 ;; 27924@@ -5127,7 +5995,7 @@ func_mode_link () 27925 func_fatal_help "the \`$prevarg' option requires an argument" 27926 27927 if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then 27928- eval "arg=\"$export_dynamic_flag_spec\"" 27929+ eval arg=\"$export_dynamic_flag_spec\" 27930 func_append compile_command " $arg" 27931 func_append finalize_command " $arg" 27932 fi 27933@@ -5144,11 +6012,13 @@ func_mode_link () 27934 else 27935 shlib_search_path= 27936 fi 27937- eval "sys_lib_search_path=\"$sys_lib_search_path_spec\"" 27938- eval "sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"" 27939+ eval sys_lib_search_path=\"$sys_lib_search_path_spec\" 27940+ eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" 27941 27942 func_dirname "$output" "/" "" 27943 output_objdir="$func_dirname_result$objdir" 27944+ func_to_tool_file "$output_objdir/" 27945+ tool_output_objdir=$func_to_tool_file_result 27946 # Create the object directory. 27947 func_mkdir_p "$output_objdir" 27948 27949@@ -5169,12 +6039,12 @@ func_mode_link () 27950 # Find all interdependent deplibs by searching for libraries 27951 # that are linked more than once (e.g. -la -lb -la) 27952 for deplib in $deplibs; do 27953- if $opt_duplicate_deps ; then 27954+ if $opt_preserve_dup_deps ; then 27955 case "$libs " in 27956- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; 27957+ *" $deplib "*) func_append specialdeplibs " $deplib" ;; 27958 esac 27959 fi 27960- libs="$libs $deplib" 27961+ func_append libs " $deplib" 27962 done 27963 27964 if test "$linkmode" = lib; then 27965@@ -5187,9 +6057,9 @@ func_mode_link () 27966 if $opt_duplicate_compiler_generated_deps; then 27967 for pre_post_dep in $predeps $postdeps; do 27968 case "$pre_post_deps " in 27969- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; 27970+ *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; 27971 esac 27972- pre_post_deps="$pre_post_deps $pre_post_dep" 27973+ func_append pre_post_deps " $pre_post_dep" 27974 done 27975 fi 27976 pre_post_deps= 27977@@ -5256,8 +6126,9 @@ func_mode_link () 27978 for lib in $dlprefiles; do 27979 # Ignore non-libtool-libs 27980 dependency_libs= 27981+ func_resolve_sysroot "$lib" 27982 case $lib in 27983- *.la) func_source "$lib" ;; 27984+ *.la) func_source "$func_resolve_sysroot_result" ;; 27985 esac 27986 27987 # Collect preopened libtool deplibs, except any this library 27988@@ -5267,7 +6138,7 @@ func_mode_link () 27989 deplib_base=$func_basename_result 27990 case " $weak_libs " in 27991 *" $deplib_base "*) ;; 27992- *) deplibs="$deplibs $deplib" ;; 27993+ *) func_append deplibs " $deplib" ;; 27994 esac 27995 done 27996 done 27997@@ -5288,11 +6159,11 @@ func_mode_link () 27998 compile_deplibs="$deplib $compile_deplibs" 27999 finalize_deplibs="$deplib $finalize_deplibs" 28000 else 28001- compiler_flags="$compiler_flags $deplib" 28002+ func_append compiler_flags " $deplib" 28003 if test "$linkmode" = lib ; then 28004 case "$new_inherited_linker_flags " in 28005 *" $deplib "*) ;; 28006- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; 28007+ * ) func_append new_inherited_linker_flags " $deplib" ;; 28008 esac 28009 fi 28010 fi 28011@@ -5377,7 +6248,7 @@ func_mode_link () 28012 if test "$linkmode" = lib ; then 28013 case "$new_inherited_linker_flags " in 28014 *" $deplib "*) ;; 28015- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; 28016+ * ) func_append new_inherited_linker_flags " $deplib" ;; 28017 esac 28018 fi 28019 fi 28020@@ -5390,7 +6261,8 @@ func_mode_link () 28021 test "$pass" = conv && continue 28022 newdependency_libs="$deplib $newdependency_libs" 28023 func_stripname '-L' '' "$deplib" 28024- newlib_search_path="$newlib_search_path $func_stripname_result" 28025+ func_resolve_sysroot "$func_stripname_result" 28026+ func_append newlib_search_path " $func_resolve_sysroot_result" 28027 ;; 28028 prog) 28029 if test "$pass" = conv; then 28030@@ -5404,7 +6276,8 @@ func_mode_link () 28031 finalize_deplibs="$deplib $finalize_deplibs" 28032 fi 28033 func_stripname '-L' '' "$deplib" 28034- newlib_search_path="$newlib_search_path $func_stripname_result" 28035+ func_resolve_sysroot "$func_stripname_result" 28036+ func_append newlib_search_path " $func_resolve_sysroot_result" 28037 ;; 28038 *) 28039 func_warning "\`-L' is ignored for archives/objects" 28040@@ -5415,17 +6288,21 @@ func_mode_link () 28041 -R*) 28042 if test "$pass" = link; then 28043 func_stripname '-R' '' "$deplib" 28044- dir=$func_stripname_result 28045+ func_resolve_sysroot "$func_stripname_result" 28046+ dir=$func_resolve_sysroot_result 28047 # Make sure the xrpath contains only unique directories. 28048 case "$xrpath " in 28049 *" $dir "*) ;; 28050- *) xrpath="$xrpath $dir" ;; 28051+ *) func_append xrpath " $dir" ;; 28052 esac 28053 fi 28054 deplibs="$deplib $deplibs" 28055 continue 28056 ;; 28057- *.la) lib="$deplib" ;; 28058+ *.la) 28059+ func_resolve_sysroot "$deplib" 28060+ lib=$func_resolve_sysroot_result 28061+ ;; 28062 *.$libext) 28063 if test "$pass" = conv; then 28064 deplibs="$deplib $deplibs" 28065@@ -5488,11 +6365,11 @@ func_mode_link () 28066 if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then 28067 # If there is no dlopen support or we're linking statically, 28068 # we need to preload. 28069- newdlprefiles="$newdlprefiles $deplib" 28070+ func_append newdlprefiles " $deplib" 28071 compile_deplibs="$deplib $compile_deplibs" 28072 finalize_deplibs="$deplib $finalize_deplibs" 28073 else 28074- newdlfiles="$newdlfiles $deplib" 28075+ func_append newdlfiles " $deplib" 28076 fi 28077 fi 28078 continue 28079@@ -5538,7 +6415,7 @@ func_mode_link () 28080 for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do 28081 case " $new_inherited_linker_flags " in 28082 *" $tmp_inherited_linker_flag "*) ;; 28083- *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";; 28084+ *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; 28085 esac 28086 done 28087 fi 28088@@ -5546,8 +6423,8 @@ func_mode_link () 28089 if test "$linkmode,$pass" = "lib,link" || 28090 test "$linkmode,$pass" = "prog,scan" || 28091 { test "$linkmode" != prog && test "$linkmode" != lib; }; then 28092- test -n "$dlopen" && dlfiles="$dlfiles $dlopen" 28093- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" 28094+ test -n "$dlopen" && func_append dlfiles " $dlopen" 28095+ test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" 28096 fi 28097 28098 if test "$pass" = conv; then 28099@@ -5558,20 +6435,20 @@ func_mode_link () 28100 func_fatal_error "cannot find name of link library for \`$lib'" 28101 fi 28102 # It is a libtool convenience library, so add in its objects. 28103- convenience="$convenience $ladir/$objdir/$old_library" 28104- old_convenience="$old_convenience $ladir/$objdir/$old_library" 28105+ func_append convenience " $ladir/$objdir/$old_library" 28106+ func_append old_convenience " $ladir/$objdir/$old_library" 28107 elif test "$linkmode" != prog && test "$linkmode" != lib; then 28108 func_fatal_error "\`$lib' is not a convenience library" 28109 fi 28110 tmp_libs= 28111 for deplib in $dependency_libs; do 28112 deplibs="$deplib $deplibs" 28113- if $opt_duplicate_deps ; then 28114+ if $opt_preserve_dup_deps ; then 28115 case "$tmp_libs " in 28116- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; 28117+ *" $deplib "*) func_append specialdeplibs " $deplib" ;; 28118 esac 28119 fi 28120- tmp_libs="$tmp_libs $deplib" 28121+ func_append tmp_libs " $deplib" 28122 done 28123 continue 28124 fi # $pass = conv 28125@@ -5579,9 +6456,15 @@ func_mode_link () 28126 28127 # Get the name of the library we link against. 28128 linklib= 28129- for l in $old_library $library_names; do 28130- linklib="$l" 28131- done 28132+ if test -n "$old_library" && 28133+ { test "$prefer_static_libs" = yes || 28134+ test "$prefer_static_libs,$installed" = "built,no"; }; then 28135+ linklib=$old_library 28136+ else 28137+ for l in $old_library $library_names; do 28138+ linklib="$l" 28139+ done 28140+ fi 28141 if test -z "$linklib"; then 28142 func_fatal_error "cannot find name of link library for \`$lib'" 28143 fi 28144@@ -5598,9 +6481,9 @@ func_mode_link () 28145 # statically, we need to preload. We also need to preload any 28146 # dependent libraries so libltdl's deplib preloader doesn't 28147 # bomb out in the load deplibs phase. 28148- dlprefiles="$dlprefiles $lib $dependency_libs" 28149+ func_append dlprefiles " $lib $dependency_libs" 28150 else 28151- newdlfiles="$newdlfiles $lib" 28152+ func_append newdlfiles " $lib" 28153 fi 28154 continue 28155 fi # $pass = dlopen 28156@@ -5622,14 +6505,14 @@ func_mode_link () 28157 28158 # Find the relevant object directory and library name. 28159 if test "X$installed" = Xyes; then 28160- if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then 28161+ if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then 28162 func_warning "library \`$lib' was moved." 28163 dir="$ladir" 28164 absdir="$abs_ladir" 28165 libdir="$abs_ladir" 28166 else 28167- dir="$libdir" 28168- absdir="$libdir" 28169+ dir="$lt_sysroot$libdir" 28170+ absdir="$lt_sysroot$libdir" 28171 fi 28172 test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes 28173 else 28174@@ -5637,12 +6520,12 @@ func_mode_link () 28175 dir="$ladir" 28176 absdir="$abs_ladir" 28177 # Remove this search path later 28178- notinst_path="$notinst_path $abs_ladir" 28179+ func_append notinst_path " $abs_ladir" 28180 else 28181 dir="$ladir/$objdir" 28182 absdir="$abs_ladir/$objdir" 28183 # Remove this search path later 28184- notinst_path="$notinst_path $abs_ladir" 28185+ func_append notinst_path " $abs_ladir" 28186 fi 28187 fi # $installed = yes 28188 func_stripname 'lib' '.la' "$laname" 28189@@ -5653,20 +6536,46 @@ func_mode_link () 28190 if test -z "$libdir" && test "$linkmode" = prog; then 28191 func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" 28192 fi 28193- # Prefer using a static library (so that no silly _DYNAMIC symbols 28194- # are required to link). 28195- if test -n "$old_library"; then 28196- newdlprefiles="$newdlprefiles $dir/$old_library" 28197- # Keep a list of preopened convenience libraries to check 28198- # that they are being used correctly in the link pass. 28199- test -z "$libdir" && \ 28200- dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library" 28201- # Otherwise, use the dlname, so that lt_dlopen finds it. 28202- elif test -n "$dlname"; then 28203- newdlprefiles="$newdlprefiles $dir/$dlname" 28204- else 28205- newdlprefiles="$newdlprefiles $dir/$linklib" 28206- fi 28207+ case "$host" in 28208+ # special handling for platforms with PE-DLLs. 28209+ *cygwin* | *mingw* | *cegcc* ) 28210+ # Linker will automatically link against shared library if both 28211+ # static and shared are present. Therefore, ensure we extract 28212+ # symbols from the import library if a shared library is present 28213+ # (otherwise, the dlopen module name will be incorrect). We do 28214+ # this by putting the import library name into $newdlprefiles. 28215+ # We recover the dlopen module name by 'saving' the la file 28216+ # name in a special purpose variable, and (later) extracting the 28217+ # dlname from the la file. 28218+ if test -n "$dlname"; then 28219+ func_tr_sh "$dir/$linklib" 28220+ eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" 28221+ func_append newdlprefiles " $dir/$linklib" 28222+ else 28223+ func_append newdlprefiles " $dir/$old_library" 28224+ # Keep a list of preopened convenience libraries to check 28225+ # that they are being used correctly in the link pass. 28226+ test -z "$libdir" && \ 28227+ func_append dlpreconveniencelibs " $dir/$old_library" 28228+ fi 28229+ ;; 28230+ * ) 28231+ # Prefer using a static library (so that no silly _DYNAMIC symbols 28232+ # are required to link). 28233+ if test -n "$old_library"; then 28234+ func_append newdlprefiles " $dir/$old_library" 28235+ # Keep a list of preopened convenience libraries to check 28236+ # that they are being used correctly in the link pass. 28237+ test -z "$libdir" && \ 28238+ func_append dlpreconveniencelibs " $dir/$old_library" 28239+ # Otherwise, use the dlname, so that lt_dlopen finds it. 28240+ elif test -n "$dlname"; then 28241+ func_append newdlprefiles " $dir/$dlname" 28242+ else 28243+ func_append newdlprefiles " $dir/$linklib" 28244+ fi 28245+ ;; 28246+ esac 28247 fi # $pass = dlpreopen 28248 28249 if test -z "$libdir"; then 28250@@ -5684,7 +6593,7 @@ func_mode_link () 28251 28252 28253 if test "$linkmode" = prog && test "$pass" != link; then 28254- newlib_search_path="$newlib_search_path $ladir" 28255+ func_append newlib_search_path " $ladir" 28256 deplibs="$lib $deplibs" 28257 28258 linkalldeplibs=no 28259@@ -5697,7 +6606,8 @@ func_mode_link () 28260 for deplib in $dependency_libs; do 28261 case $deplib in 28262 -L*) func_stripname '-L' '' "$deplib" 28263- newlib_search_path="$newlib_search_path $func_stripname_result" 28264+ func_resolve_sysroot "$func_stripname_result" 28265+ func_append newlib_search_path " $func_resolve_sysroot_result" 28266 ;; 28267 esac 28268 # Need to link against all dependency_libs? 28269@@ -5708,12 +6618,12 @@ func_mode_link () 28270 # or/and link against static libraries 28271 newdependency_libs="$deplib $newdependency_libs" 28272 fi 28273- if $opt_duplicate_deps ; then 28274+ if $opt_preserve_dup_deps ; then 28275 case "$tmp_libs " in 28276- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; 28277+ *" $deplib "*) func_append specialdeplibs " $deplib" ;; 28278 esac 28279 fi 28280- tmp_libs="$tmp_libs $deplib" 28281+ func_append tmp_libs " $deplib" 28282 done # for deplib 28283 continue 28284 fi # $linkmode = prog... 28285@@ -5728,7 +6638,7 @@ func_mode_link () 28286 # Make sure the rpath contains only unique directories. 28287 case "$temp_rpath:" in 28288 *"$absdir:"*) ;; 28289- *) temp_rpath="$temp_rpath$absdir:" ;; 28290+ *) func_append temp_rpath "$absdir:" ;; 28291 esac 28292 fi 28293 28294@@ -5740,7 +6650,7 @@ func_mode_link () 28295 *) 28296 case "$compile_rpath " in 28297 *" $absdir "*) ;; 28298- *) compile_rpath="$compile_rpath $absdir" 28299+ *) func_append compile_rpath " $absdir" ;; 28300 esac 28301 ;; 28302 esac 28303@@ -5749,7 +6659,7 @@ func_mode_link () 28304 *) 28305 case "$finalize_rpath " in 28306 *" $libdir "*) ;; 28307- *) finalize_rpath="$finalize_rpath $libdir" 28308+ *) func_append finalize_rpath " $libdir" ;; 28309 esac 28310 ;; 28311 esac 28312@@ -5774,12 +6684,12 @@ func_mode_link () 28313 case $host in 28314 *cygwin* | *mingw* | *cegcc*) 28315 # No point in relinking DLLs because paths are not encoded 28316- notinst_deplibs="$notinst_deplibs $lib" 28317+ func_append notinst_deplibs " $lib" 28318 need_relink=no 28319 ;; 28320 *) 28321 if test "$installed" = no; then 28322- notinst_deplibs="$notinst_deplibs $lib" 28323+ func_append notinst_deplibs " $lib" 28324 need_relink=yes 28325 fi 28326 ;; 28327@@ -5814,7 +6724,7 @@ func_mode_link () 28328 *) 28329 case "$compile_rpath " in 28330 *" $absdir "*) ;; 28331- *) compile_rpath="$compile_rpath $absdir" 28332+ *) func_append compile_rpath " $absdir" ;; 28333 esac 28334 ;; 28335 esac 28336@@ -5823,7 +6733,7 @@ func_mode_link () 28337 *) 28338 case "$finalize_rpath " in 28339 *" $libdir "*) ;; 28340- *) finalize_rpath="$finalize_rpath $libdir" 28341+ *) func_append finalize_rpath " $libdir" ;; 28342 esac 28343 ;; 28344 esac 28345@@ -5835,7 +6745,7 @@ func_mode_link () 28346 shift 28347 realname="$1" 28348 shift 28349- eval "libname=\"$libname_spec\"" 28350+ libname=`eval "\\$ECHO \"$libname_spec\""` 28351 # use dlname if we got it. it's perfectly good, no? 28352 if test -n "$dlname"; then 28353 soname="$dlname" 28354@@ -5848,7 +6758,7 @@ func_mode_link () 28355 versuffix="-$major" 28356 ;; 28357 esac 28358- eval "soname=\"$soname_spec\"" 28359+ eval soname=\"$soname_spec\" 28360 else 28361 soname="$realname" 28362 fi 28363@@ -5877,7 +6787,7 @@ func_mode_link () 28364 linklib=$newlib 28365 fi # test -n "$old_archive_from_expsyms_cmds" 28366 28367- if test "$linkmode" = prog || test "$mode" != relink; then 28368+ if test "$linkmode" = prog || test "$opt_mode" != relink; then 28369 add_shlibpath= 28370 add_dir= 28371 add= 28372@@ -5933,7 +6843,7 @@ func_mode_link () 28373 if test -n "$inst_prefix_dir"; then 28374 case $libdir in 28375 [\\/]*) 28376- add_dir="$add_dir -L$inst_prefix_dir$libdir" 28377+ func_append add_dir " -L$inst_prefix_dir$libdir" 28378 ;; 28379 esac 28380 fi 28381@@ -5955,7 +6865,7 @@ func_mode_link () 28382 if test -n "$add_shlibpath"; then 28383 case :$compile_shlibpath: in 28384 *":$add_shlibpath:"*) ;; 28385- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; 28386+ *) func_append compile_shlibpath "$add_shlibpath:" ;; 28387 esac 28388 fi 28389 if test "$linkmode" = prog; then 28390@@ -5969,13 +6879,13 @@ func_mode_link () 28391 test "$hardcode_shlibpath_var" = yes; then 28392 case :$finalize_shlibpath: in 28393 *":$libdir:"*) ;; 28394- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; 28395+ *) func_append finalize_shlibpath "$libdir:" ;; 28396 esac 28397 fi 28398 fi 28399 fi 28400 28401- if test "$linkmode" = prog || test "$mode" = relink; then 28402+ if test "$linkmode" = prog || test "$opt_mode" = relink; then 28403 add_shlibpath= 28404 add_dir= 28405 add= 28406@@ -5989,7 +6899,7 @@ func_mode_link () 28407 elif test "$hardcode_shlibpath_var" = yes; then 28408 case :$finalize_shlibpath: in 28409 *":$libdir:"*) ;; 28410- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; 28411+ *) func_append finalize_shlibpath "$libdir:" ;; 28412 esac 28413 add="-l$name" 28414 elif test "$hardcode_automatic" = yes; then 28415@@ -6001,12 +6911,12 @@ func_mode_link () 28416 fi 28417 else 28418 # We cannot seem to hardcode it, guess we'll fake it. 28419- add_dir="-L$libdir" 28420+ add_dir="-L$lt_sysroot$libdir" 28421 # Try looking first in the location we're being installed to. 28422 if test -n "$inst_prefix_dir"; then 28423 case $libdir in 28424 [\\/]*) 28425- add_dir="$add_dir -L$inst_prefix_dir$libdir" 28426+ func_append add_dir " -L$inst_prefix_dir$libdir" 28427 ;; 28428 esac 28429 fi 28430@@ -6083,27 +6993,33 @@ func_mode_link () 28431 temp_xrpath=$func_stripname_result 28432 case " $xrpath " in 28433 *" $temp_xrpath "*) ;; 28434- *) xrpath="$xrpath $temp_xrpath";; 28435+ *) func_append xrpath " $temp_xrpath";; 28436 esac;; 28437- *) temp_deplibs="$temp_deplibs $libdir";; 28438+ *) func_append temp_deplibs " $libdir";; 28439 esac 28440 done 28441 dependency_libs="$temp_deplibs" 28442 fi 28443 28444- newlib_search_path="$newlib_search_path $absdir" 28445+ func_append newlib_search_path " $absdir" 28446 # Link against this library 28447 test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" 28448 # ... and its dependency_libs 28449 tmp_libs= 28450 for deplib in $dependency_libs; do 28451 newdependency_libs="$deplib $newdependency_libs" 28452- if $opt_duplicate_deps ; then 28453+ case $deplib in 28454+ -L*) func_stripname '-L' '' "$deplib" 28455+ func_resolve_sysroot "$func_stripname_result";; 28456+ *) func_resolve_sysroot "$deplib" ;; 28457+ esac 28458+ if $opt_preserve_dup_deps ; then 28459 case "$tmp_libs " in 28460- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; 28461+ *" $func_resolve_sysroot_result "*) 28462+ func_append specialdeplibs " $func_resolve_sysroot_result" ;; 28463 esac 28464 fi 28465- tmp_libs="$tmp_libs $deplib" 28466+ func_append tmp_libs " $func_resolve_sysroot_result" 28467 done 28468 28469 if test "$link_all_deplibs" != no; then 28470@@ -6113,8 +7029,10 @@ func_mode_link () 28471 case $deplib in 28472 -L*) path="$deplib" ;; 28473 *.la) 28474+ func_resolve_sysroot "$deplib" 28475+ deplib=$func_resolve_sysroot_result 28476 func_dirname "$deplib" "" "." 28477- dir="$func_dirname_result" 28478+ dir=$func_dirname_result 28479 # We need an absolute path. 28480 case $dir in 28481 [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; 28482@@ -6130,7 +7048,7 @@ func_mode_link () 28483 case $host in 28484 *-*-darwin*) 28485 depdepl= 28486- deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` 28487+ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` 28488 if test -n "$deplibrary_names" ; then 28489 for tmp in $deplibrary_names ; do 28490 depdepl=$tmp 28491@@ -6141,8 +7059,8 @@ func_mode_link () 28492 if test -z "$darwin_install_name"; then 28493 darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` 28494 fi 28495- compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" 28496- linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}" 28497+ func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" 28498+ func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" 28499 path= 28500 fi 28501 fi 28502@@ -6152,7 +7070,7 @@ func_mode_link () 28503 ;; 28504 esac 28505 else 28506- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` 28507+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` 28508 test -z "$libdir" && \ 28509 func_fatal_error "\`$deplib' is not a valid libtool archive" 28510 test "$absdir" != "$libdir" && \ 28511@@ -6192,7 +7110,7 @@ func_mode_link () 28512 for dir in $newlib_search_path; do 28513 case "$lib_search_path " in 28514 *" $dir "*) ;; 28515- *) lib_search_path="$lib_search_path $dir" ;; 28516+ *) func_append lib_search_path " $dir" ;; 28517 esac 28518 done 28519 newlib_search_path= 28520@@ -6205,7 +7123,7 @@ func_mode_link () 28521 fi 28522 for var in $vars dependency_libs; do 28523 # Add libraries to $var in reverse order 28524- eval tmp_libs=\$$var 28525+ eval tmp_libs=\"\$$var\" 28526 new_libs= 28527 for deplib in $tmp_libs; do 28528 # FIXME: Pedantically, this is the right thing to do, so 28529@@ -6250,13 +7168,13 @@ func_mode_link () 28530 -L*) 28531 case " $tmp_libs " in 28532 *" $deplib "*) ;; 28533- *) tmp_libs="$tmp_libs $deplib" ;; 28534+ *) func_append tmp_libs " $deplib" ;; 28535 esac 28536 ;; 28537- *) tmp_libs="$tmp_libs $deplib" ;; 28538+ *) func_append tmp_libs " $deplib" ;; 28539 esac 28540 done 28541- eval $var=\$tmp_libs 28542+ eval $var=\"$tmp_libs\" 28543 done # for var 28544 fi 28545 # Last step: remove runtime libs from dependency_libs 28546@@ -6269,7 +7187,7 @@ func_mode_link () 28547 ;; 28548 esac 28549 if test -n "$i" ; then 28550- tmp_libs="$tmp_libs $i" 28551+ func_append tmp_libs " $i" 28552 fi 28553 done 28554 dependency_libs=$tmp_libs 28555@@ -6310,7 +7228,7 @@ func_mode_link () 28556 # Now set the variables for building old libraries. 28557 build_libtool_libs=no 28558 oldlibs="$output" 28559- objs="$objs$old_deplibs" 28560+ func_append objs "$old_deplibs" 28561 ;; 28562 28563 lib) 28564@@ -6319,8 +7237,8 @@ func_mode_link () 28565 lib*) 28566 func_stripname 'lib' '.la' "$outputname" 28567 name=$func_stripname_result 28568- eval "shared_ext=\"$shrext_cmds\"" 28569- eval "libname=\"$libname_spec\"" 28570+ eval shared_ext=\"$shrext_cmds\" 28571+ eval libname=\"$libname_spec\" 28572 ;; 28573 *) 28574 test "$module" = no && \ 28575@@ -6330,8 +7248,8 @@ func_mode_link () 28576 # Add the "lib" prefix for modules if required 28577 func_stripname '' '.la' "$outputname" 28578 name=$func_stripname_result 28579- eval "shared_ext=\"$shrext_cmds\"" 28580- eval "libname=\"$libname_spec\"" 28581+ eval shared_ext=\"$shrext_cmds\" 28582+ eval libname=\"$libname_spec\" 28583 else 28584 func_stripname '' '.la' "$outputname" 28585 libname=$func_stripname_result 28586@@ -6346,7 +7264,7 @@ func_mode_link () 28587 echo 28588 $ECHO "*** Warning: Linking the shared library $output against the non-libtool" 28589 $ECHO "*** objects $objs is not portable!" 28590- libobjs="$libobjs $objs" 28591+ func_append libobjs " $objs" 28592 fi 28593 fi 28594 28595@@ -6544,7 +7462,7 @@ func_mode_link () 28596 done 28597 28598 # Make executables depend on our current version. 28599- verstring="$verstring:${current}.0" 28600+ func_append verstring ":${current}.0" 28601 ;; 28602 28603 qnx) 28604@@ -6612,10 +7530,10 @@ func_mode_link () 28605 fi 28606 28607 func_generate_dlsyms "$libname" "$libname" "yes" 28608- libobjs="$libobjs $symfileobj" 28609+ func_append libobjs " $symfileobj" 28610 test "X$libobjs" = "X " && libobjs= 28611 28612- if test "$mode" != relink; then 28613+ if test "$opt_mode" != relink; then 28614 # Remove our outputs, but don't remove object files since they 28615 # may have been created when compiling PIC objects. 28616 removelist= 28617@@ -6631,7 +7549,7 @@ func_mode_link () 28618 continue 28619 fi 28620 fi 28621- removelist="$removelist $p" 28622+ func_append removelist " $p" 28623 ;; 28624 *) ;; 28625 esac 28626@@ -6642,7 +7560,7 @@ func_mode_link () 28627 28628 # Now set the variables for building old libraries. 28629 if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then 28630- oldlibs="$oldlibs $output_objdir/$libname.$libext" 28631+ func_append oldlibs " $output_objdir/$libname.$libext" 28632 28633 # Transform .lo files to .o files. 28634 oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` 28635@@ -6659,10 +7577,11 @@ func_mode_link () 28636 # If the user specified any rpath flags, then add them. 28637 temp_xrpath= 28638 for libdir in $xrpath; do 28639- temp_xrpath="$temp_xrpath -R$libdir" 28640+ func_replace_sysroot "$libdir" 28641+ func_append temp_xrpath " -R$func_replace_sysroot_result" 28642 case "$finalize_rpath " in 28643 *" $libdir "*) ;; 28644- *) finalize_rpath="$finalize_rpath $libdir" ;; 28645+ *) func_append finalize_rpath " $libdir" ;; 28646 esac 28647 done 28648 if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then 28649@@ -6676,7 +7595,7 @@ func_mode_link () 28650 for lib in $old_dlfiles; do 28651 case " $dlprefiles $dlfiles " in 28652 *" $lib "*) ;; 28653- *) dlfiles="$dlfiles $lib" ;; 28654+ *) func_append dlfiles " $lib" ;; 28655 esac 28656 done 28657 28658@@ -6686,7 +7605,7 @@ func_mode_link () 28659 for lib in $old_dlprefiles; do 28660 case "$dlprefiles " in 28661 *" $lib "*) ;; 28662- *) dlprefiles="$dlprefiles $lib" ;; 28663+ *) func_append dlprefiles " $lib" ;; 28664 esac 28665 done 28666 28667@@ -6698,7 +7617,7 @@ func_mode_link () 28668 ;; 28669 *-*-rhapsody* | *-*-darwin1.[012]) 28670 # Rhapsody C library is in the System framework 28671- deplibs="$deplibs System.ltframework" 28672+ func_append deplibs " System.ltframework" 28673 ;; 28674 *-*-netbsd*) 28675 # Don't link with libc until the a.out ld.so is fixed. 28676@@ -6715,7 +7634,7 @@ func_mode_link () 28677 *) 28678 # Add libc to deplibs on all other systems if necessary. 28679 if test "$build_libtool_need_lc" = "yes"; then 28680- deplibs="$deplibs -lc" 28681+ func_append deplibs " -lc" 28682 fi 28683 ;; 28684 esac 28685@@ -6764,18 +7683,18 @@ EOF 28686 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then 28687 case " $predeps $postdeps " in 28688 *" $i "*) 28689- newdeplibs="$newdeplibs $i" 28690+ func_append newdeplibs " $i" 28691 i="" 28692 ;; 28693 esac 28694 fi 28695 if test -n "$i" ; then 28696- eval "libname=\"$libname_spec\"" 28697- eval "deplib_matches=\"$library_names_spec\"" 28698+ libname=`eval "\\$ECHO \"$libname_spec\""` 28699+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` 28700 set dummy $deplib_matches; shift 28701 deplib_match=$1 28702 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then 28703- newdeplibs="$newdeplibs $i" 28704+ func_append newdeplibs " $i" 28705 else 28706 droppeddeps=yes 28707 echo 28708@@ -6789,7 +7708,7 @@ EOF 28709 fi 28710 ;; 28711 *) 28712- newdeplibs="$newdeplibs $i" 28713+ func_append newdeplibs " $i" 28714 ;; 28715 esac 28716 done 28717@@ -6807,18 +7726,18 @@ EOF 28718 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then 28719 case " $predeps $postdeps " in 28720 *" $i "*) 28721- newdeplibs="$newdeplibs $i" 28722+ func_append newdeplibs " $i" 28723 i="" 28724 ;; 28725 esac 28726 fi 28727 if test -n "$i" ; then 28728- eval "libname=\"$libname_spec\"" 28729- eval "deplib_matches=\"$library_names_spec\"" 28730+ libname=`eval "\\$ECHO \"$libname_spec\""` 28731+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` 28732 set dummy $deplib_matches; shift 28733 deplib_match=$1 28734 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then 28735- newdeplibs="$newdeplibs $i" 28736+ func_append newdeplibs " $i" 28737 else 28738 droppeddeps=yes 28739 echo 28740@@ -6840,7 +7759,7 @@ EOF 28741 fi 28742 ;; 28743 *) 28744- newdeplibs="$newdeplibs $i" 28745+ func_append newdeplibs " $i" 28746 ;; 28747 esac 28748 done 28749@@ -6857,15 +7776,27 @@ EOF 28750 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then 28751 case " $predeps $postdeps " in 28752 *" $a_deplib "*) 28753- newdeplibs="$newdeplibs $a_deplib" 28754+ func_append newdeplibs " $a_deplib" 28755 a_deplib="" 28756 ;; 28757 esac 28758 fi 28759 if test -n "$a_deplib" ; then 28760- eval "libname=\"$libname_spec\"" 28761+ libname=`eval "\\$ECHO \"$libname_spec\""` 28762+ if test -n "$file_magic_glob"; then 28763+ libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` 28764+ else 28765+ libnameglob=$libname 28766+ fi 28767+ test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` 28768 for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do 28769- potential_libs=`ls $i/$libname[.-]* 2>/dev/null` 28770+ if test "$want_nocaseglob" = yes; then 28771+ shopt -s nocaseglob 28772+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` 28773+ $nocaseglob 28774+ else 28775+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` 28776+ fi 28777 for potent_lib in $potential_libs; do 28778 # Follow soft links. 28779 if ls -lLd "$potent_lib" 2>/dev/null | 28780@@ -6885,10 +7816,10 @@ EOF 28781 *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; 28782 esac 28783 done 28784- if eval "$file_magic_cmd \"\$potlib\"" 2>/dev/null | 28785+ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | 28786 $SED -e 10q | 28787 $EGREP "$file_magic_regex" > /dev/null; then 28788- newdeplibs="$newdeplibs $a_deplib" 28789+ func_append newdeplibs " $a_deplib" 28790 a_deplib="" 28791 break 2 28792 fi 28793@@ -6913,7 +7844,7 @@ EOF 28794 ;; 28795 *) 28796 # Add a -L argument. 28797- newdeplibs="$newdeplibs $a_deplib" 28798+ func_append newdeplibs " $a_deplib" 28799 ;; 28800 esac 28801 done # Gone through all deplibs. 28802@@ -6929,20 +7860,20 @@ EOF 28803 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then 28804 case " $predeps $postdeps " in 28805 *" $a_deplib "*) 28806- newdeplibs="$newdeplibs $a_deplib" 28807+ func_append newdeplibs " $a_deplib" 28808 a_deplib="" 28809 ;; 28810 esac 28811 fi 28812 if test -n "$a_deplib" ; then 28813- eval "libname=\"$libname_spec\"" 28814+ libname=`eval "\\$ECHO \"$libname_spec\""` 28815 for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do 28816 potential_libs=`ls $i/$libname[.-]* 2>/dev/null` 28817 for potent_lib in $potential_libs; do 28818 potlib="$potent_lib" # see symlink-check above in file_magic test 28819 if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ 28820 $EGREP "$match_pattern_regex" > /dev/null; then 28821- newdeplibs="$newdeplibs $a_deplib" 28822+ func_append newdeplibs " $a_deplib" 28823 a_deplib="" 28824 break 2 28825 fi 28826@@ -6967,7 +7898,7 @@ EOF 28827 ;; 28828 *) 28829 # Add a -L argument. 28830- newdeplibs="$newdeplibs $a_deplib" 28831+ func_append newdeplibs " $a_deplib" 28832 ;; 28833 esac 28834 done # Gone through all deplibs. 28835@@ -7071,7 +8002,7 @@ EOF 28836 *) 28837 case " $deplibs " in 28838 *" -L$path/$objdir "*) 28839- new_libs="$new_libs -L$path/$objdir" ;; 28840+ func_append new_libs " -L$path/$objdir" ;; 28841 esac 28842 ;; 28843 esac 28844@@ -7081,10 +8012,10 @@ EOF 28845 -L*) 28846 case " $new_libs " in 28847 *" $deplib "*) ;; 28848- *) new_libs="$new_libs $deplib" ;; 28849+ *) func_append new_libs " $deplib" ;; 28850 esac 28851 ;; 28852- *) new_libs="$new_libs $deplib" ;; 28853+ *) func_append new_libs " $deplib" ;; 28854 esac 28855 done 28856 deplibs="$new_libs" 28857@@ -7101,10 +8032,12 @@ EOF 28858 hardcode_libdirs= 28859 dep_rpath= 28860 rpath="$finalize_rpath" 28861- test "$mode" != relink && rpath="$compile_rpath$rpath" 28862+ test "$opt_mode" != relink && rpath="$compile_rpath$rpath" 28863 for libdir in $rpath; do 28864 if test -n "$hardcode_libdir_flag_spec"; then 28865 if test -n "$hardcode_libdir_separator"; then 28866+ func_replace_sysroot "$libdir" 28867+ libdir=$func_replace_sysroot_result 28868 if test -z "$hardcode_libdirs"; then 28869 hardcode_libdirs="$libdir" 28870 else 28871@@ -7113,18 +8046,18 @@ EOF 28872 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) 28873 ;; 28874 *) 28875- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" 28876+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" 28877 ;; 28878 esac 28879 fi 28880 else 28881- eval "flag=\"$hardcode_libdir_flag_spec\"" 28882- dep_rpath="$dep_rpath $flag" 28883+ eval flag=\"$hardcode_libdir_flag_spec\" 28884+ func_append dep_rpath " $flag" 28885 fi 28886 elif test -n "$runpath_var"; then 28887 case "$perm_rpath " in 28888 *" $libdir "*) ;; 28889- *) perm_rpath="$perm_rpath $libdir" ;; 28890+ *) func_apped perm_rpath " $libdir" ;; 28891 esac 28892 fi 28893 done 28894@@ -7133,40 +8066,38 @@ EOF 28895 test -n "$hardcode_libdirs"; then 28896 libdir="$hardcode_libdirs" 28897 if test -n "$hardcode_libdir_flag_spec_ld"; then 28898- eval "dep_rpath=\"$hardcode_libdir_flag_spec_ld\"" 28899+ eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" 28900 else 28901- eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" 28902+ eval dep_rpath=\"$hardcode_libdir_flag_spec\" 28903 fi 28904 fi 28905 if test -n "$runpath_var" && test -n "$perm_rpath"; then 28906 # We should set the runpath_var. 28907 rpath= 28908 for dir in $perm_rpath; do 28909- rpath="$rpath$dir:" 28910+ func_append rpath "$dir:" 28911 done 28912- eval $runpath_var=\$rpath\$$runpath_var 28913- export $runpath_var 28914+ eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" 28915 fi 28916 test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" 28917 fi 28918 28919 shlibpath="$finalize_shlibpath" 28920- test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" 28921+ test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" 28922 if test -n "$shlibpath"; then 28923- eval $shlibpath_var=\$shlibpath\$$shlibpath_var 28924- export $shlibpath_var 28925+ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" 28926 fi 28927 28928 # Get the real and link names of the library. 28929- eval "shared_ext=\"$shrext_cmds\"" 28930- eval "library_names=\"$library_names_spec\"" 28931+ eval shared_ext=\"$shrext_cmds\" 28932+ eval library_names=\"$library_names_spec\" 28933 set dummy $library_names 28934 shift 28935 realname="$1" 28936 shift 28937 28938 if test -n "$soname_spec"; then 28939- eval "soname=\"$soname_spec\"" 28940+ eval soname=\"$soname_spec\" 28941 else 28942 soname="$realname" 28943 fi 28944@@ -7178,7 +8109,7 @@ EOF 28945 linknames= 28946 for link 28947 do 28948- linknames="$linknames $link" 28949+ func_append linknames " $link" 28950 done 28951 28952 # Use standard objects if they are pic 28953@@ -7189,7 +8120,7 @@ EOF 28954 if test -n "$export_symbols" && test -n "$include_expsyms"; then 28955 $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" 28956 export_symbols="$output_objdir/$libname.uexp" 28957- delfiles="$delfiles $export_symbols" 28958+ func_append delfiles " $export_symbols" 28959 fi 28960 28961 orig_export_symbols= 28962@@ -7220,13 +8151,45 @@ EOF 28963 $opt_dry_run || $RM $export_symbols 28964 cmds=$export_symbols_cmds 28965 save_ifs="$IFS"; IFS='~' 28966- for cmd in $cmds; do 28967+ for cmd1 in $cmds; do 28968 IFS="$save_ifs" 28969- eval "cmd=\"$cmd\"" 28970- func_len " $cmd" 28971- len=$func_len_result 28972- if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then 28973+ # Take the normal branch if the nm_file_list_spec branch 28974+ # doesn't work or if tool conversion is not needed. 28975+ case $nm_file_list_spec~$to_tool_file_cmd in 28976+ *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) 28977+ try_normal_branch=yes 28978+ eval cmd=\"$cmd1\" 28979+ func_len " $cmd" 28980+ len=$func_len_result 28981+ ;; 28982+ *) 28983+ try_normal_branch=no 28984+ ;; 28985+ esac 28986+ if test "$try_normal_branch" = yes \ 28987+ && { test "$len" -lt "$max_cmd_len" \ 28988+ || test "$max_cmd_len" -le -1; } 28989+ then 28990+ func_show_eval "$cmd" 'exit $?' 28991+ skipped_export=false 28992+ elif test -n "$nm_file_list_spec"; then 28993+ func_basename "$output" 28994+ output_la=$func_basename_result 28995+ save_libobjs=$libobjs 28996+ save_output=$output 28997+ output=${output_objdir}/${output_la}.nm 28998+ func_to_tool_file "$output" 28999+ libobjs=$nm_file_list_spec$func_to_tool_file_result 29000+ func_append delfiles " $output" 29001+ func_verbose "creating $NM input file list: $output" 29002+ for obj in $save_libobjs; do 29003+ func_to_tool_file "$obj" 29004+ $ECHO "$func_to_tool_file_result" 29005+ done > "$output" 29006+ eval cmd=\"$cmd1\" 29007 func_show_eval "$cmd" 'exit $?' 29008+ output=$save_output 29009+ libobjs=$save_libobjs 29010 skipped_export=false 29011 else 29012 # The command line is too long to execute in one step. 29013@@ -7248,7 +8211,7 @@ EOF 29014 if test -n "$export_symbols" && test -n "$include_expsyms"; then 29015 tmp_export_symbols="$export_symbols" 29016 test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" 29017- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols" 29018+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' 29019 fi 29020 29021 if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then 29022@@ -7260,7 +8223,7 @@ EOF 29023 # global variables. join(1) would be nice here, but unfortunately 29024 # isn't a blessed tool. 29025 $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter 29026- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" 29027+ func_append delfiles " $export_symbols $output_objdir/$libname.filter" 29028 export_symbols=$output_objdir/$libname.def 29029 $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols 29030 fi 29031@@ -7270,7 +8233,7 @@ EOF 29032 case " $convenience " in 29033 *" $test_deplib "*) ;; 29034 *) 29035- tmp_deplibs="$tmp_deplibs $test_deplib" 29036+ func_append tmp_deplibs " $test_deplib" 29037 ;; 29038 esac 29039 done 29040@@ -7286,43 +8249,43 @@ EOF 29041 fi 29042 if test -n "$whole_archive_flag_spec"; then 29043 save_libobjs=$libobjs 29044- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\"" 29045+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" 29046 test "X$libobjs" = "X " && libobjs= 29047 else 29048 gentop="$output_objdir/${outputname}x" 29049- generated="$generated $gentop" 29050+ func_append generated " $gentop" 29051 29052 func_extract_archives $gentop $convenience 29053- libobjs="$libobjs $func_extract_archives_result" 29054+ func_append libobjs " $func_extract_archives_result" 29055 test "X$libobjs" = "X " && libobjs= 29056 fi 29057 fi 29058 29059 if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then 29060- eval "flag=\"$thread_safe_flag_spec\"" 29061- linker_flags="$linker_flags $flag" 29062+ eval flag=\"$thread_safe_flag_spec\" 29063+ func_append linker_flags " $flag" 29064 fi 29065 29066 # Make a backup of the uninstalled library when relinking 29067- if test "$mode" = relink; then 29068- $opt_dry_run || (cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U) || exit $? 29069+ if test "$opt_mode" = relink; then 29070+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? 29071 fi 29072 29073 # Do each of the archive commands. 29074 if test "$module" = yes && test -n "$module_cmds" ; then 29075 if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then 29076- eval "test_cmds=\"$module_expsym_cmds\"" 29077+ eval test_cmds=\"$module_expsym_cmds\" 29078 cmds=$module_expsym_cmds 29079 else 29080- eval "test_cmds=\"$module_cmds\"" 29081+ eval test_cmds=\"$module_cmds\" 29082 cmds=$module_cmds 29083 fi 29084 else 29085 if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then 29086- eval "test_cmds=\"$archive_expsym_cmds\"" 29087+ eval test_cmds=\"$archive_expsym_cmds\" 29088 cmds=$archive_expsym_cmds 29089 else 29090- eval "test_cmds=\"$archive_cmds\"" 29091+ eval test_cmds=\"$archive_cmds\" 29092 cmds=$archive_cmds 29093 fi 29094 fi 29095@@ -7366,10 +8329,13 @@ EOF 29096 echo 'INPUT (' > $output 29097 for obj in $save_libobjs 29098 do 29099- $ECHO "$obj" >> $output 29100+ func_to_tool_file "$obj" 29101+ $ECHO "$func_to_tool_file_result" >> $output 29102 done 29103 echo ')' >> $output 29104- delfiles="$delfiles $output" 29105+ func_append delfiles " $output" 29106+ func_to_tool_file "$output" 29107+ output=$func_to_tool_file_result 29108 elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then 29109 output=${output_objdir}/${output_la}.lnk 29110 func_verbose "creating linker input file list: $output" 29111@@ -7383,15 +8349,17 @@ EOF 29112 fi 29113 for obj 29114 do 29115- $ECHO "$obj" >> $output 29116+ func_to_tool_file "$obj" 29117+ $ECHO "$func_to_tool_file_result" >> $output 29118 done 29119- delfiles="$delfiles $output" 29120- output=$firstobj\"$file_list_spec$output\" 29121+ func_append delfiles " $output" 29122+ func_to_tool_file "$output" 29123+ output=$firstobj\"$file_list_spec$func_to_tool_file_result\" 29124 else 29125 if test -n "$save_libobjs"; then 29126 func_verbose "creating reloadable object files..." 29127 output=$output_objdir/$output_la-${k}.$objext 29128- eval "test_cmds=\"$reload_cmds\"" 29129+ eval test_cmds=\"$reload_cmds\" 29130 func_len " $test_cmds" 29131 len0=$func_len_result 29132 len=$len0 29133@@ -7411,12 +8379,12 @@ EOF 29134 if test "$k" -eq 1 ; then 29135 # The first file doesn't have a previous command to add. 29136 reload_objs=$objlist 29137- eval "concat_cmds=\"$reload_cmds\"" 29138+ eval concat_cmds=\"$reload_cmds\" 29139 else 29140 # All subsequent reloadable object files will link in 29141 # the last one created. 29142 reload_objs="$objlist $last_robj" 29143- eval "concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"" 29144+ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" 29145 fi 29146 last_robj=$output_objdir/$output_la-${k}.$objext 29147 func_arith $k + 1 29148@@ -7433,11 +8401,11 @@ EOF 29149 # files will link in the last one created. 29150 test -z "$concat_cmds" || concat_cmds=$concat_cmds~ 29151 reload_objs="$objlist $last_robj" 29152- eval "concat_cmds=\"\${concat_cmds}$reload_cmds\"" 29153+ eval concat_cmds=\"\${concat_cmds}$reload_cmds\" 29154 if test -n "$last_robj"; then 29155- eval "concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"" 29156+ eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" 29157 fi 29158- delfiles="$delfiles $output" 29159+ func_append delfiles " $output" 29160 29161 else 29162 output= 29163@@ -7450,9 +8418,9 @@ EOF 29164 libobjs=$output 29165 # Append the command to create the export file. 29166 test -z "$concat_cmds" || concat_cmds=$concat_cmds~ 29167- eval "concat_cmds=\"\$concat_cmds$export_symbols_cmds\"" 29168+ eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" 29169 if test -n "$last_robj"; then 29170- eval "concat_cmds=\"\$concat_cmds~\$RM $last_robj\"" 29171+ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" 29172 fi 29173 fi 29174 29175@@ -7471,7 +8439,7 @@ EOF 29176 lt_exit=$? 29177 29178 # Restore the uninstalled library and exit 29179- if test "$mode" = relink; then 29180+ if test "$opt_mode" = relink; then 29181 ( cd "$output_objdir" && \ 29182 $RM "${realname}T" && \ 29183 $MV "${realname}U" "$realname" ) 29184@@ -7492,7 +8460,7 @@ EOF 29185 if test -n "$export_symbols" && test -n "$include_expsyms"; then 29186 tmp_export_symbols="$export_symbols" 29187 test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" 29188- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols" 29189+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' 29190 fi 29191 29192 if test -n "$orig_export_symbols"; then 29193@@ -7504,7 +8472,7 @@ EOF 29194 # global variables. join(1) would be nice here, but unfortunately 29195 # isn't a blessed tool. 29196 $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter 29197- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" 29198+ func_append delfiles " $export_symbols $output_objdir/$libname.filter" 29199 export_symbols=$output_objdir/$libname.def 29200 $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols 29201 fi 29202@@ -7515,7 +8483,7 @@ EOF 29203 output=$save_output 29204 29205 if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then 29206- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\"" 29207+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" 29208 test "X$libobjs" = "X " && libobjs= 29209 fi 29210 # Expand the library linking commands again to reset the 29211@@ -7539,23 +8507,23 @@ EOF 29212 29213 if test -n "$delfiles"; then 29214 # Append the command to remove temporary files to $cmds. 29215- eval "cmds=\"\$cmds~\$RM $delfiles\"" 29216+ eval cmds=\"\$cmds~\$RM $delfiles\" 29217 fi 29218 29219 # Add any objects from preloaded convenience libraries 29220 if test -n "$dlprefiles"; then 29221 gentop="$output_objdir/${outputname}x" 29222- generated="$generated $gentop" 29223+ func_append generated " $gentop" 29224 29225 func_extract_archives $gentop $dlprefiles 29226- libobjs="$libobjs $func_extract_archives_result" 29227+ func_append libobjs " $func_extract_archives_result" 29228 test "X$libobjs" = "X " && libobjs= 29229 fi 29230 29231 save_ifs="$IFS"; IFS='~' 29232 for cmd in $cmds; do 29233 IFS="$save_ifs" 29234- eval "cmd=\"$cmd\"" 29235+ eval cmd=\"$cmd\" 29236 $opt_silent || { 29237 func_quote_for_expand "$cmd" 29238 eval "func_echo $func_quote_for_expand_result" 29239@@ -7564,7 +8532,7 @@ EOF 29240 lt_exit=$? 29241 29242 # Restore the uninstalled library and exit 29243- if test "$mode" = relink; then 29244+ if test "$opt_mode" = relink; then 29245 ( cd "$output_objdir" && \ 29246 $RM "${realname}T" && \ 29247 $MV "${realname}U" "$realname" ) 29248@@ -7576,8 +8544,8 @@ EOF 29249 IFS="$save_ifs" 29250 29251 # Restore the uninstalled library and exit 29252- if test "$mode" = relink; then 29253- $opt_dry_run || (cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname) || exit $? 29254+ if test "$opt_mode" = relink; then 29255+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? 29256 29257 if test -n "$convenience"; then 29258 if test -z "$whole_archive_flag_spec"; then 29259@@ -7656,17 +8624,20 @@ EOF 29260 29261 if test -n "$convenience"; then 29262 if test -n "$whole_archive_flag_spec"; then 29263- eval "tmp_whole_archive_flags=\"$whole_archive_flag_spec\"" 29264+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" 29265 reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` 29266 else 29267 gentop="$output_objdir/${obj}x" 29268- generated="$generated $gentop" 29269+ func_append generated " $gentop" 29270 29271 func_extract_archives $gentop $convenience 29272 reload_conv_objs="$reload_objs $func_extract_archives_result" 29273 fi 29274 fi 29275 29276+ # If we're not building shared, we need to use non_pic_objs 29277+ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" 29278+ 29279 # Create the old-style object. 29280 reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test 29281 29282@@ -7690,7 +8661,7 @@ EOF 29283 # Create an invalid libtool object if no PIC, so that we don't 29284 # accidentally link it into a program. 29285 # $show "echo timestamp > $libobj" 29286- # $opt_dry_run || echo timestamp > $libobj || exit $? 29287+ # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? 29288 exit $EXIT_SUCCESS 29289 fi 29290 29291@@ -7740,8 +8711,8 @@ EOF 29292 if test "$tagname" = CXX ; then 29293 case ${MACOSX_DEPLOYMENT_TARGET-10.0} in 29294 10.[0123]) 29295- compile_command="$compile_command ${wl}-bind_at_load" 29296- finalize_command="$finalize_command ${wl}-bind_at_load" 29297+ func_append compile_command " ${wl}-bind_at_load" 29298+ func_append finalize_command " ${wl}-bind_at_load" 29299 ;; 29300 esac 29301 fi 29302@@ -7761,7 +8732,7 @@ EOF 29303 *) 29304 case " $compile_deplibs " in 29305 *" -L$path/$objdir "*) 29306- new_libs="$new_libs -L$path/$objdir" ;; 29307+ func_append new_libs " -L$path/$objdir" ;; 29308 esac 29309 ;; 29310 esac 29311@@ -7771,17 +8742,17 @@ EOF 29312 -L*) 29313 case " $new_libs " in 29314 *" $deplib "*) ;; 29315- *) new_libs="$new_libs $deplib" ;; 29316+ *) func_append new_libs " $deplib" ;; 29317 esac 29318 ;; 29319- *) new_libs="$new_libs $deplib" ;; 29320+ *) func_append new_libs " $deplib" ;; 29321 esac 29322 done 29323 compile_deplibs="$new_libs" 29324 29325 29326- compile_command="$compile_command $compile_deplibs" 29327- finalize_command="$finalize_command $finalize_deplibs" 29328+ func_append compile_command " $compile_deplibs" 29329+ func_append finalize_command " $finalize_deplibs" 29330 29331 if test -n "$rpath$xrpath"; then 29332 # If the user specified any rpath flags, then add them. 29333@@ -7789,7 +8760,7 @@ EOF 29334 # This is the magic to use -rpath. 29335 case "$finalize_rpath " in 29336 *" $libdir "*) ;; 29337- *) finalize_rpath="$finalize_rpath $libdir" ;; 29338+ *) func_append finalize_rpath " $libdir" ;; 29339 esac 29340 done 29341 fi 29342@@ -7808,18 +8779,18 @@ EOF 29343 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) 29344 ;; 29345 *) 29346- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" 29347+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" 29348 ;; 29349 esac 29350 fi 29351 else 29352- eval "flag=\"$hardcode_libdir_flag_spec\"" 29353- rpath="$rpath $flag" 29354+ eval flag=\"$hardcode_libdir_flag_spec\" 29355+ func_append rpath " $flag" 29356 fi 29357 elif test -n "$runpath_var"; then 29358 case "$perm_rpath " in 29359 *" $libdir "*) ;; 29360- *) perm_rpath="$perm_rpath $libdir" ;; 29361+ *) func_append perm_rpath " $libdir" ;; 29362 esac 29363 fi 29364 case $host in 29365@@ -7828,12 +8799,12 @@ EOF 29366 case :$dllsearchpath: in 29367 *":$libdir:"*) ;; 29368 ::) dllsearchpath=$libdir;; 29369- *) dllsearchpath="$dllsearchpath:$libdir";; 29370+ *) func_append dllsearchpath ":$libdir";; 29371 esac 29372 case :$dllsearchpath: in 29373 *":$testbindir:"*) ;; 29374 ::) dllsearchpath=$testbindir;; 29375- *) dllsearchpath="$dllsearchpath:$testbindir";; 29376+ *) func_append dllsearchpath ":$testbindir";; 29377 esac 29378 ;; 29379 esac 29380@@ -7842,7 +8813,7 @@ EOF 29381 if test -n "$hardcode_libdir_separator" && 29382 test -n "$hardcode_libdirs"; then 29383 libdir="$hardcode_libdirs" 29384- eval "rpath=\" $hardcode_libdir_flag_spec\"" 29385+ eval rpath=\" $hardcode_libdir_flag_spec\" 29386 fi 29387 compile_rpath="$rpath" 29388 29389@@ -7859,18 +8830,18 @@ EOF 29390 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) 29391 ;; 29392 *) 29393- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" 29394+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" 29395 ;; 29396 esac 29397 fi 29398 else 29399- eval "flag=\"$hardcode_libdir_flag_spec\"" 29400- rpath="$rpath $flag" 29401+ eval flag=\"$hardcode_libdir_flag_spec\" 29402+ func_append rpath " $flag" 29403 fi 29404 elif test -n "$runpath_var"; then 29405 case "$finalize_perm_rpath " in 29406 *" $libdir "*) ;; 29407- *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; 29408+ *) func_append finalize_perm_rpath " $libdir" ;; 29409 esac 29410 fi 29411 done 29412@@ -7878,7 +8849,7 @@ EOF 29413 if test -n "$hardcode_libdir_separator" && 29414 test -n "$hardcode_libdirs"; then 29415 libdir="$hardcode_libdirs" 29416- eval "rpath=\" $hardcode_libdir_flag_spec\"" 29417+ eval rpath=\" $hardcode_libdir_flag_spec\" 29418 fi 29419 finalize_rpath="$rpath" 29420 29421@@ -7921,6 +8892,12 @@ EOF 29422 exit_status=0 29423 func_show_eval "$link_command" 'exit_status=$?' 29424 29425+ if test -n "$postlink_cmds"; then 29426+ func_to_tool_file "$output" 29427+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` 29428+ func_execute_cmds "$postlink_cmds" 'exit $?' 29429+ fi 29430+ 29431 # Delete the generated files. 29432 if test -f "$output_objdir/${outputname}S.${objext}"; then 29433 func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' 29434@@ -7943,7 +8920,7 @@ EOF 29435 # We should set the runpath_var. 29436 rpath= 29437 for dir in $perm_rpath; do 29438- rpath="$rpath$dir:" 29439+ func_append rpath "$dir:" 29440 done 29441 compile_var="$runpath_var=\"$rpath\$$runpath_var\" " 29442 fi 29443@@ -7951,7 +8928,7 @@ EOF 29444 # We should set the runpath_var. 29445 rpath= 29446 for dir in $finalize_perm_rpath; do 29447- rpath="$rpath$dir:" 29448+ func_append rpath "$dir:" 29449 done 29450 finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " 29451 fi 29452@@ -7966,6 +8943,13 @@ EOF 29453 $opt_dry_run || $RM $output 29454 # Link the executable and exit 29455 func_show_eval "$link_command" 'exit $?' 29456+ 29457+ if test -n "$postlink_cmds"; then 29458+ func_to_tool_file "$output" 29459+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` 29460+ func_execute_cmds "$postlink_cmds" 'exit $?' 29461+ fi 29462+ 29463 exit $EXIT_SUCCESS 29464 fi 29465 29466@@ -7999,6 +8983,12 @@ EOF 29467 29468 func_show_eval "$link_command" 'exit $?' 29469 29470+ if test -n "$postlink_cmds"; then 29471+ func_to_tool_file "$output_objdir/$outputname" 29472+ 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'` 29473+ func_execute_cmds "$postlink_cmds" 'exit $?' 29474+ fi 29475+ 29476 # Now create the wrapper script. 29477 func_verbose "creating $output" 29478 29479@@ -8096,7 +9086,7 @@ EOF 29480 else 29481 oldobjs="$old_deplibs $non_pic_objects" 29482 if test "$preload" = yes && test -f "$symfileobj"; then 29483- oldobjs="$oldobjs $symfileobj" 29484+ func_append oldobjs " $symfileobj" 29485 fi 29486 fi 29487 addlibs="$old_convenience" 29488@@ -8104,10 +9094,10 @@ EOF 29489 29490 if test -n "$addlibs"; then 29491 gentop="$output_objdir/${outputname}x" 29492- generated="$generated $gentop" 29493+ func_append generated " $gentop" 29494 29495 func_extract_archives $gentop $addlibs 29496- oldobjs="$oldobjs $func_extract_archives_result" 29497+ func_append oldobjs " $func_extract_archives_result" 29498 fi 29499 29500 # Do each command in the archive commands. 29501@@ -8118,10 +9108,10 @@ EOF 29502 # Add any objects from preloaded convenience libraries 29503 if test -n "$dlprefiles"; then 29504 gentop="$output_objdir/${outputname}x" 29505- generated="$generated $gentop" 29506+ func_append generated " $gentop" 29507 29508 func_extract_archives $gentop $dlprefiles 29509- oldobjs="$oldobjs $func_extract_archives_result" 29510+ func_append oldobjs " $func_extract_archives_result" 29511 fi 29512 29513 # POSIX demands no paths to be encoded in archives. We have 29514@@ -8139,7 +9129,7 @@ EOF 29515 else 29516 echo "copying selected object files to avoid basename conflicts..." 29517 gentop="$output_objdir/${outputname}x" 29518- generated="$generated $gentop" 29519+ func_append generated " $gentop" 29520 func_mkdir_p "$gentop" 29521 save_oldobjs=$oldobjs 29522 oldobjs= 29523@@ -8163,18 +9153,28 @@ EOF 29524 esac 29525 done 29526 func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" 29527- oldobjs="$oldobjs $gentop/$newobj" 29528+ func_append oldobjs " $gentop/$newobj" 29529 ;; 29530- *) oldobjs="$oldobjs $obj" ;; 29531+ *) func_append oldobjs " $obj" ;; 29532 esac 29533 done 29534 fi 29535- eval "cmds=\"$old_archive_cmds\"" 29536+ eval cmds=\"$old_archive_cmds\" 29537 29538 func_len " $cmds" 29539 len=$func_len_result 29540 if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then 29541 cmds=$old_archive_cmds 29542+ elif test -n "$archiver_list_spec"; then 29543+ func_verbose "using command file archive linking..." 29544+ for obj in $oldobjs 29545+ do 29546+ func_to_tool_file "$obj" 29547+ $ECHO "$func_to_tool_file_result" 29548+ done > $output_objdir/$libname.libcmd 29549+ func_to_tool_file "$output_objdir/$libname.libcmd" 29550+ oldobjs=" $archiver_list_spec$func_to_tool_file_result" 29551+ cmds=$old_archive_cmds 29552 else 29553 # the command line is too long to link in one step, link in parts 29554 func_verbose "using piecewise archive linking..." 29555@@ -8189,7 +9189,7 @@ EOF 29556 do 29557 last_oldobj=$obj 29558 done 29559- eval "test_cmds=\"$old_archive_cmds\"" 29560+ eval test_cmds=\"$old_archive_cmds\" 29561 func_len " $test_cmds" 29562 len0=$func_len_result 29563 len=$len0 29564@@ -8208,7 +9208,7 @@ EOF 29565 RANLIB=$save_RANLIB 29566 fi 29567 test -z "$concat_cmds" || concat_cmds=$concat_cmds~ 29568- eval "concat_cmds=\"\${concat_cmds}$old_archive_cmds\"" 29569+ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" 29570 objlist= 29571 len=$len0 29572 fi 29573@@ -8216,9 +9216,9 @@ EOF 29574 RANLIB=$save_RANLIB 29575 oldobjs=$objlist 29576 if test "X$oldobjs" = "X" ; then 29577- eval "cmds=\"\$concat_cmds\"" 29578+ eval cmds=\"\$concat_cmds\" 29579 else 29580- eval "cmds=\"\$concat_cmds~\$old_archive_cmds\"" 29581+ eval cmds=\"\$concat_cmds~\$old_archive_cmds\" 29582 fi 29583 fi 29584 fi 29585@@ -8268,12 +9268,23 @@ EOF 29586 *.la) 29587 func_basename "$deplib" 29588 name="$func_basename_result" 29589- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` 29590+ func_resolve_sysroot "$deplib" 29591+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` 29592 test -z "$libdir" && \ 29593 func_fatal_error "\`$deplib' is not a valid libtool archive" 29594- newdependency_libs="$newdependency_libs $libdir/$name" 29595+ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" 29596+ ;; 29597+ -L*) 29598+ func_stripname -L '' "$deplib" 29599+ func_replace_sysroot "$func_stripname_result" 29600+ func_append newdependency_libs " -L$func_replace_sysroot_result" 29601 ;; 29602- *) newdependency_libs="$newdependency_libs $deplib" ;; 29603+ -R*) 29604+ func_stripname -R '' "$deplib" 29605+ func_replace_sysroot "$func_stripname_result" 29606+ func_append newdependency_libs " -R$func_replace_sysroot_result" 29607+ ;; 29608+ *) func_append newdependency_libs " $deplib" ;; 29609 esac 29610 done 29611 dependency_libs="$newdependency_libs" 29612@@ -8284,12 +9295,14 @@ EOF 29613 *.la) 29614 func_basename "$lib" 29615 name="$func_basename_result" 29616- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` 29617+ func_resolve_sysroot "$lib" 29618+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` 29619+ 29620 test -z "$libdir" && \ 29621 func_fatal_error "\`$lib' is not a valid libtool archive" 29622- newdlfiles="$newdlfiles $libdir/$name" 29623+ func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" 29624 ;; 29625- *) newdlfiles="$newdlfiles $lib" ;; 29626+ *) func_append newdlfiles " $lib" ;; 29627 esac 29628 done 29629 dlfiles="$newdlfiles" 29630@@ -8303,10 +9316,11 @@ EOF 29631 # the library: 29632 func_basename "$lib" 29633 name="$func_basename_result" 29634- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` 29635+ func_resolve_sysroot "$lib" 29636+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` 29637 test -z "$libdir" && \ 29638 func_fatal_error "\`$lib' is not a valid libtool archive" 29639- newdlprefiles="$newdlprefiles $libdir/$name" 29640+ func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" 29641 ;; 29642 esac 29643 done 29644@@ -8318,7 +9332,7 @@ EOF 29645 [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; 29646 *) abs=`pwd`"/$lib" ;; 29647 esac 29648- newdlfiles="$newdlfiles $abs" 29649+ func_append newdlfiles " $abs" 29650 done 29651 dlfiles="$newdlfiles" 29652 newdlprefiles= 29653@@ -8327,7 +9341,7 @@ EOF 29654 [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; 29655 *) abs=`pwd`"/$lib" ;; 29656 esac 29657- newdlprefiles="$newdlprefiles $abs" 29658+ func_append newdlprefiles " $abs" 29659 done 29660 dlprefiles="$newdlprefiles" 29661 fi 29662@@ -8412,7 +9426,7 @@ relink_command=\"$relink_command\"" 29663 exit $EXIT_SUCCESS 29664 } 29665 29666-{ test "$mode" = link || test "$mode" = relink; } && 29667+{ test "$opt_mode" = link || test "$opt_mode" = relink; } && 29668 func_mode_link ${1+"$@"} 29669 29670 29671@@ -8432,9 +9446,9 @@ func_mode_uninstall () 29672 for arg 29673 do 29674 case $arg in 29675- -f) RM="$RM $arg"; rmforce=yes ;; 29676- -*) RM="$RM $arg" ;; 29677- *) files="$files $arg" ;; 29678+ -f) func_append RM " $arg"; rmforce=yes ;; 29679+ -*) func_append RM " $arg" ;; 29680+ *) func_append files " $arg" ;; 29681 esac 29682 done 29683 29684@@ -8443,24 +9457,23 @@ func_mode_uninstall () 29685 29686 rmdirs= 29687 29688- origobjdir="$objdir" 29689 for file in $files; do 29690 func_dirname "$file" "" "." 29691 dir="$func_dirname_result" 29692 if test "X$dir" = X.; then 29693- objdir="$origobjdir" 29694+ odir="$objdir" 29695 else 29696- objdir="$dir/$origobjdir" 29697+ odir="$dir/$objdir" 29698 fi 29699 func_basename "$file" 29700 name="$func_basename_result" 29701- test "$mode" = uninstall && objdir="$dir" 29702+ test "$opt_mode" = uninstall && odir="$dir" 29703 29704- # Remember objdir for removal later, being careful to avoid duplicates 29705- if test "$mode" = clean; then 29706+ # Remember odir for removal later, being careful to avoid duplicates 29707+ if test "$opt_mode" = clean; then 29708 case " $rmdirs " in 29709- *" $objdir "*) ;; 29710- *) rmdirs="$rmdirs $objdir" ;; 29711+ *" $odir "*) ;; 29712+ *) func_append rmdirs " $odir" ;; 29713 esac 29714 fi 29715 29716@@ -8486,18 +9499,17 @@ func_mode_uninstall () 29717 29718 # Delete the libtool libraries and symlinks. 29719 for n in $library_names; do 29720- rmfiles="$rmfiles $objdir/$n" 29721+ func_append rmfiles " $odir/$n" 29722 done 29723- test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" 29724+ test -n "$old_library" && func_append rmfiles " $odir/$old_library" 29725 29726- case "$mode" in 29727+ case "$opt_mode" in 29728 clean) 29729- case " $library_names " in 29730- # " " in the beginning catches empty $dlname 29731+ case " $library_names " in 29732 *" $dlname "*) ;; 29733- *) rmfiles="$rmfiles $objdir/$dlname" ;; 29734+ *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; 29735 esac 29736- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" 29737+ test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" 29738 ;; 29739 uninstall) 29740 if test -n "$library_names"; then 29741@@ -8525,19 +9537,19 @@ func_mode_uninstall () 29742 # Add PIC object to the list of files to remove. 29743 if test -n "$pic_object" && 29744 test "$pic_object" != none; then 29745- rmfiles="$rmfiles $dir/$pic_object" 29746+ func_append rmfiles " $dir/$pic_object" 29747 fi 29748 29749 # Add non-PIC object to the list of files to remove. 29750 if test -n "$non_pic_object" && 29751 test "$non_pic_object" != none; then 29752- rmfiles="$rmfiles $dir/$non_pic_object" 29753+ func_append rmfiles " $dir/$non_pic_object" 29754 fi 29755 fi 29756 ;; 29757 29758 *) 29759- if test "$mode" = clean ; then 29760+ if test "$opt_mode" = clean ; then 29761 noexename=$name 29762 case $file in 29763 *.exe) 29764@@ -8547,7 +9559,7 @@ func_mode_uninstall () 29765 noexename=$func_stripname_result 29766 # $file with .exe has already been added to rmfiles, 29767 # add $file without .exe 29768- rmfiles="$rmfiles $file" 29769+ func_append rmfiles " $file" 29770 ;; 29771 esac 29772 # Do a test to see if this is a libtool program. 29773@@ -8556,7 +9568,7 @@ func_mode_uninstall () 29774 func_ltwrapper_scriptname "$file" 29775 relink_command= 29776 func_source $func_ltwrapper_scriptname_result 29777- rmfiles="$rmfiles $func_ltwrapper_scriptname_result" 29778+ func_append rmfiles " $func_ltwrapper_scriptname_result" 29779 else 29780 relink_command= 29781 func_source $dir/$noexename 29782@@ -8564,12 +9576,12 @@ func_mode_uninstall () 29783 29784 # note $name still contains .exe if it was in $file originally 29785 # as does the version of $file that was added into $rmfiles 29786- rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" 29787+ func_append rmfiles " $odir/$name $odir/${name}S.${objext}" 29788 if test "$fast_install" = yes && test -n "$relink_command"; then 29789- rmfiles="$rmfiles $objdir/lt-$name" 29790+ func_append rmfiles " $odir/lt-$name" 29791 fi 29792 if test "X$noexename" != "X$name" ; then 29793- rmfiles="$rmfiles $objdir/lt-${noexename}.c" 29794+ func_append rmfiles " $odir/lt-${noexename}.c" 29795 fi 29796 fi 29797 fi 29798@@ -8577,7 +9589,6 @@ func_mode_uninstall () 29799 esac 29800 func_show_eval "$RM $rmfiles" 'exit_status=1' 29801 done 29802- objdir="$origobjdir" 29803 29804 # Try to remove the ${objdir}s in the directories where we deleted files 29805 for dir in $rmdirs; do 29806@@ -8589,16 +9600,16 @@ func_mode_uninstall () 29807 exit $exit_status 29808 } 29809 29810-{ test "$mode" = uninstall || test "$mode" = clean; } && 29811+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && 29812 func_mode_uninstall ${1+"$@"} 29813 29814-test -z "$mode" && { 29815+test -z "$opt_mode" && { 29816 help="$generic_help" 29817 func_fatal_help "you must specify a MODE" 29818 } 29819 29820 test -z "$exec_cmd" && \ 29821- func_fatal_help "invalid operation mode \`$mode'" 29822+ func_fatal_help "invalid operation mode \`$opt_mode'" 29823 29824 if test -n "$exec_cmd"; then 29825 eval exec "$exec_cmd" 29826diff --git a/ltoptions.m4 b/ltoptions.m4 29827index 5ef12ced2a8..17cfd51c0b3 100644 29828--- a/ltoptions.m4 29829+++ b/ltoptions.m4 29830@@ -8,7 +8,7 @@ 29831 # unlimited permission to copy and/or distribute it, with or without 29832 # modifications, as long as this notice is preserved. 29833 29834-# serial 6 ltoptions.m4 29835+# serial 7 ltoptions.m4 29836 29837 # This is to help aclocal find these macros, as it can't see m4_define. 29838 AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) 29839diff --git a/ltversion.m4 b/ltversion.m4 29840index bf87f77132d..9c7b5d41185 100644 29841--- a/ltversion.m4 29842+++ b/ltversion.m4 29843@@ -7,17 +7,17 @@ 29844 # unlimited permission to copy and/or distribute it, with or without 29845 # modifications, as long as this notice is preserved. 29846 29847-# Generated from ltversion.in. 29848+# @configure_input@ 29849 29850-# serial 3134 ltversion.m4 29851+# serial 3293 ltversion.m4 29852 # This file is part of GNU Libtool 29853 29854-m4_define([LT_PACKAGE_VERSION], [2.2.7a]) 29855-m4_define([LT_PACKAGE_REVISION], [1.3134]) 29856+m4_define([LT_PACKAGE_VERSION], [2.4]) 29857+m4_define([LT_PACKAGE_REVISION], [1.3293]) 29858 29859 AC_DEFUN([LTVERSION_VERSION], 29860-[macro_version='2.2.7a' 29861-macro_revision='1.3134' 29862+[macro_version='2.4' 29863+macro_revision='1.3293' 29864 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) 29865 _LT_DECL(, macro_revision, 0) 29866 ]) 29867diff --git a/lt~obsolete.m4 b/lt~obsolete.m4 29868index bf92b5e0790..c573da90c5c 100644 29869--- a/lt~obsolete.m4 29870+++ b/lt~obsolete.m4 29871@@ -7,7 +7,7 @@ 29872 # unlimited permission to copy and/or distribute it, with or without 29873 # modifications, as long as this notice is preserved. 29874 29875-# serial 4 lt~obsolete.m4 29876+# serial 5 lt~obsolete.m4 29877 29878 # These exist entirely to fool aclocal when bootstrapping libtool. 29879 # 29880diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in 29881index c1eca5a42ed..7cab295b26d 100644 29882--- a/opcodes/Makefile.in 29883+++ b/opcodes/Makefile.in 29884@@ -292,6 +292,7 @@ CYGPATH_W = @CYGPATH_W@ 29885 DATADIRNAME = @DATADIRNAME@ 29886 DEFS = @DEFS@ 29887 DEPDIR = @DEPDIR@ 29888+DLLTOOL = @DLLTOOL@ 29889 DSYMUTIL = @DSYMUTIL@ 29890 DUMPBIN = @DUMPBIN@ 29891 ECHO_C = @ECHO_C@ 29892@@ -325,6 +326,7 @@ LN_S = @LN_S@ 29893 LTLIBOBJS = @LTLIBOBJS@ 29894 MAINT = @MAINT@ 29895 MAKEINFO = @MAKEINFO@ 29896+MANIFEST_TOOL = @MANIFEST_TOOL@ 29897 MKDIR_P = @MKDIR_P@ 29898 MKINSTALLDIRS = @MKINSTALLDIRS@ 29899 MSGFMT = @MSGFMT@ 29900@@ -363,6 +365,7 @@ abs_builddir = @abs_builddir@ 29901 abs_srcdir = @abs_srcdir@ 29902 abs_top_builddir = @abs_top_builddir@ 29903 abs_top_srcdir = @abs_top_srcdir@ 29904+ac_ct_AR = @ac_ct_AR@ 29905 ac_ct_CC = @ac_ct_CC@ 29906 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ 29907 am__include = @am__include@ 29908diff --git a/opcodes/configure b/opcodes/configure 29909index d2364991ee8..f9a46eec7a3 100755 29910--- a/opcodes/configure 29911+++ b/opcodes/configure 29912@@ -682,6 +682,9 @@ OTOOL 29913 LIPO 29914 NMEDIT 29915 DSYMUTIL 29916+MANIFEST_TOOL 29917+ac_ct_AR 29918+DLLTOOL 29919 OBJDUMP 29920 LN_S 29921 NM 29922@@ -800,6 +803,7 @@ enable_static 29923 with_pic 29924 enable_fast_install 29925 with_gnu_ld 29926+with_libtool_sysroot 29927 enable_libtool_lock 29928 enable_checking 29929 enable_targets 29930@@ -1468,6 +1472,8 @@ Optional Packages: 29931 --with-pic try to use only PIC/non-PIC objects [default=use 29932 both] 29933 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 29934+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR 29935+ (or the compiler's sysroot if not specified). 29936 29937 Some influential environment variables: 29938 CC C compiler command 29939@@ -4977,8 +4983,8 @@ esac 29940 29941 29942 29943-macro_version='2.2.7a' 29944-macro_revision='1.3134' 29945+macro_version='2.4' 29946+macro_revision='1.3293' 29947 29948 29949 29950@@ -5018,7 +5024,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 29951 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 29952 $as_echo_n "checking how to print strings... " >&6; } 29953 # Test print first, because it will be a builtin if present. 29954-if test "X`print -r -- -n 2>/dev/null`" = X-n && \ 29955+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ 29956 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 29957 ECHO='print -r --' 29958 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 29959@@ -5711,8 +5717,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 29960 # Try some XSI features 29961 xsi_shell=no 29962 ( _lt_dummy="a/b/c" 29963- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ 29964- = c,a/b,, \ 29965+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ 29966+ = c,a/b,b/c, \ 29967 && eval 'test $(( 1 + 1 )) -eq 2 \ 29968 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 29969 && xsi_shell=yes 29970@@ -5761,6 +5767,80 @@ esac 29971 29972 29973 29974+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 29975+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } 29976+if ${lt_cv_to_host_file_cmd+:} false; then : 29977+ $as_echo_n "(cached) " >&6 29978+else 29979+ case $host in 29980+ *-*-mingw* ) 29981+ case $build in 29982+ *-*-mingw* ) # actually msys 29983+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 29984+ ;; 29985+ *-*-cygwin* ) 29986+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 29987+ ;; 29988+ * ) # otherwise, assume *nix 29989+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 29990+ ;; 29991+ esac 29992+ ;; 29993+ *-*-cygwin* ) 29994+ case $build in 29995+ *-*-mingw* ) # actually msys 29996+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin 29997+ ;; 29998+ *-*-cygwin* ) 29999+ lt_cv_to_host_file_cmd=func_convert_file_noop 30000+ ;; 30001+ * ) # otherwise, assume *nix 30002+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin 30003+ ;; 30004+ esac 30005+ ;; 30006+ * ) # unhandled hosts (and "normal" native builds) 30007+ lt_cv_to_host_file_cmd=func_convert_file_noop 30008+ ;; 30009+esac 30010+ 30011+fi 30012+ 30013+to_host_file_cmd=$lt_cv_to_host_file_cmd 30014+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 30015+$as_echo "$lt_cv_to_host_file_cmd" >&6; } 30016+ 30017+ 30018+ 30019+ 30020+ 30021+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 30022+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } 30023+if ${lt_cv_to_tool_file_cmd+:} false; then : 30024+ $as_echo_n "(cached) " >&6 30025+else 30026+ #assume ordinary cross tools, or native build. 30027+lt_cv_to_tool_file_cmd=func_convert_file_noop 30028+case $host in 30029+ *-*-mingw* ) 30030+ case $build in 30031+ *-*-mingw* ) # actually msys 30032+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 30033+ ;; 30034+ esac 30035+ ;; 30036+esac 30037+ 30038+fi 30039+ 30040+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 30041+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 30042+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } 30043+ 30044+ 30045+ 30046+ 30047+ 30048 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 30049 $as_echo_n "checking for $LD option to reload object files... " >&6; } 30050 if ${lt_cv_ld_reload_flag+:} false; then : 30051@@ -5777,6 +5857,11 @@ case $reload_flag in 30052 esac 30053 reload_cmds='$LD$reload_flag -o $output$reload_objs' 30054 case $host_os in 30055+ cygwin* | mingw* | pw32* | cegcc*) 30056+ if test "$GCC" != yes; then 30057+ reload_cmds=false 30058+ fi 30059+ ;; 30060 darwin*) 30061 if test "$GCC" = yes; then 30062 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 30063@@ -5945,7 +6030,8 @@ mingw* | pw32*) 30064 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 30065 lt_cv_file_magic_cmd='func_win32_libid' 30066 else 30067- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' 30068+ # Keep this pattern in sync with the one in func_win32_libid. 30069+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' 30070 lt_cv_file_magic_cmd='$OBJDUMP -f' 30071 fi 30072 ;; 30073@@ -6099,6 +6185,21 @@ esac 30074 fi 30075 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 30076 $as_echo "$lt_cv_deplibs_check_method" >&6; } 30077+ 30078+file_magic_glob= 30079+want_nocaseglob=no 30080+if test "$build" = "$host"; then 30081+ case $host_os in 30082+ mingw* | pw32*) 30083+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then 30084+ want_nocaseglob=yes 30085+ else 30086+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` 30087+ fi 30088+ ;; 30089+ esac 30090+fi 30091+ 30092 file_magic_cmd=$lt_cv_file_magic_cmd 30093 deplibs_check_method=$lt_cv_deplibs_check_method 30094 test -z "$deplibs_check_method" && deplibs_check_method=unknown 30095@@ -6114,6 +6215,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 30096 30097 30098 30099+ 30100+ 30101+ 30102+ 30103+ 30104+ 30105+ 30106+ 30107+ 30108+ 30109+if test -n "$ac_tool_prefix"; then 30110+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. 30111+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 30112+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 30113+$as_echo_n "checking for $ac_word... " >&6; } 30114+if ${ac_cv_prog_DLLTOOL+:} false; then : 30115+ $as_echo_n "(cached) " >&6 30116+else 30117+ if test -n "$DLLTOOL"; then 30118+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. 30119+else 30120+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 30121+for as_dir in $PATH 30122+do 30123+ IFS=$as_save_IFS 30124+ test -z "$as_dir" && as_dir=. 30125+ for ac_exec_ext in '' $ac_executable_extensions; do 30126+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 30127+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" 30128+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 30129+ break 2 30130+ fi 30131+done 30132+ done 30133+IFS=$as_save_IFS 30134+ 30135+fi 30136+fi 30137+DLLTOOL=$ac_cv_prog_DLLTOOL 30138+if test -n "$DLLTOOL"; then 30139+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 30140+$as_echo "$DLLTOOL" >&6; } 30141+else 30142+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 30143+$as_echo "no" >&6; } 30144+fi 30145+ 30146+ 30147+fi 30148+if test -z "$ac_cv_prog_DLLTOOL"; then 30149+ ac_ct_DLLTOOL=$DLLTOOL 30150+ # Extract the first word of "dlltool", so it can be a program name with args. 30151+set dummy dlltool; ac_word=$2 30152+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 30153+$as_echo_n "checking for $ac_word... " >&6; } 30154+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : 30155+ $as_echo_n "(cached) " >&6 30156+else 30157+ if test -n "$ac_ct_DLLTOOL"; then 30158+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. 30159+else 30160+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 30161+for as_dir in $PATH 30162+do 30163+ IFS=$as_save_IFS 30164+ test -z "$as_dir" && as_dir=. 30165+ for ac_exec_ext in '' $ac_executable_extensions; do 30166+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 30167+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" 30168+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 30169+ break 2 30170+ fi 30171+done 30172+ done 30173+IFS=$as_save_IFS 30174+ 30175+fi 30176+fi 30177+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL 30178+if test -n "$ac_ct_DLLTOOL"; then 30179+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 30180+$as_echo "$ac_ct_DLLTOOL" >&6; } 30181+else 30182+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 30183+$as_echo "no" >&6; } 30184+fi 30185+ 30186+ if test "x$ac_ct_DLLTOOL" = x; then 30187+ DLLTOOL="false" 30188+ else 30189+ case $cross_compiling:$ac_tool_warned in 30190+yes:) 30191+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 30192+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 30193+ac_tool_warned=yes ;; 30194+esac 30195+ DLLTOOL=$ac_ct_DLLTOOL 30196+ fi 30197+else 30198+ DLLTOOL="$ac_cv_prog_DLLTOOL" 30199+fi 30200+ 30201+test -z "$DLLTOOL" && DLLTOOL=dlltool 30202+ 30203+ 30204+ 30205+ 30206+ 30207+ 30208+ 30209+ 30210+ 30211+ 30212+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 30213+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } 30214+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : 30215+ $as_echo_n "(cached) " >&6 30216+else 30217+ lt_cv_sharedlib_from_linklib_cmd='unknown' 30218+ 30219+case $host_os in 30220+cygwin* | mingw* | pw32* | cegcc*) 30221+ # two different shell functions defined in ltmain.sh 30222+ # decide which to use based on capabilities of $DLLTOOL 30223+ case `$DLLTOOL --help 2>&1` in 30224+ *--identify-strict*) 30225+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib 30226+ ;; 30227+ *) 30228+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback 30229+ ;; 30230+ esac 30231+ ;; 30232+*) 30233+ # fallback: assume linklib IS sharedlib 30234+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" 30235+ ;; 30236+esac 30237+ 30238+fi 30239+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 30240+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } 30241+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd 30242+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO 30243+ 30244+ 30245+ 30246+ 30247+ 30248+ 30249+ 30250 plugin_option= 30251 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 30252 for plugin in $plugin_names; do 30253@@ -6128,8 +6380,10 @@ for plugin in $plugin_names; do 30254 done 30255 30256 if test -n "$ac_tool_prefix"; then 30257- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 30258-set dummy ${ac_tool_prefix}ar; ac_word=$2 30259+ for ac_prog in ar 30260+ do 30261+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 30262+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 30263 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 30264 $as_echo_n "checking for $ac_word... " >&6; } 30265 if ${ac_cv_prog_AR+:} false; then : 30266@@ -6145,7 +6399,7 @@ do 30267 test -z "$as_dir" && as_dir=. 30268 for ac_exec_ext in '' $ac_executable_extensions; do 30269 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 30270- ac_cv_prog_AR="${ac_tool_prefix}ar" 30271+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" 30272 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 30273 break 2 30274 fi 30275@@ -6165,11 +6419,15 @@ $as_echo "no" >&6; } 30276 fi 30277 30278 30279+ test -n "$AR" && break 30280+ done 30281 fi 30282-if test -z "$ac_cv_prog_AR"; then 30283+if test -z "$AR"; then 30284 ac_ct_AR=$AR 30285- # Extract the first word of "ar", so it can be a program name with args. 30286-set dummy ar; ac_word=$2 30287+ for ac_prog in ar 30288+do 30289+ # Extract the first word of "$ac_prog", so it can be a program name with args. 30290+set dummy $ac_prog; ac_word=$2 30291 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 30292 $as_echo_n "checking for $ac_word... " >&6; } 30293 if ${ac_cv_prog_ac_ct_AR+:} false; then : 30294@@ -6185,7 +6443,7 @@ do 30295 test -z "$as_dir" && as_dir=. 30296 for ac_exec_ext in '' $ac_executable_extensions; do 30297 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 30298- ac_cv_prog_ac_ct_AR="ar" 30299+ ac_cv_prog_ac_ct_AR="$ac_prog" 30300 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 30301 break 2 30302 fi 30303@@ -6204,6 +6462,10 @@ else 30304 $as_echo "no" >&6; } 30305 fi 30306 30307+ 30308+ test -n "$ac_ct_AR" && break 30309+done 30310+ 30311 if test "x$ac_ct_AR" = x; then 30312 AR="false" 30313 else 30314@@ -6215,25 +6477,20 @@ ac_tool_warned=yes ;; 30315 esac 30316 AR=$ac_ct_AR 30317 fi 30318-else 30319- AR="$ac_cv_prog_AR" 30320 fi 30321 30322-test -z "$AR" && AR=ar 30323-if test -n "$plugin_option"; then 30324- if $AR --help 2>&1 | grep -q "\--plugin"; then 30325- touch conftest.c 30326- $AR $plugin_option rc conftest.a conftest.c 30327- if test "$?" != 0; then 30328- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 30329+ touch conftest.c 30330+ $AR $plugin_option rc conftest.a conftest.c 30331+ if test "$?" != 0; then 30332+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 30333 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} 30334- else 30335- AR="$AR $plugin_option" 30336- fi 30337- rm -f conftest.* 30338+ else 30339+ AR="$AR $plugin_option" 30340 fi 30341-fi 30342-test -z "$AR_FLAGS" && AR_FLAGS=cru 30343+ rm -f conftest.* 30344+: ${AR=ar} 30345+: ${AR_FLAGS=cru} 30346+ 30347 30348 30349 30350@@ -6244,6 +6501,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 30351 30352 30353 30354+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 30355+$as_echo_n "checking for archiver @FILE support... " >&6; } 30356+if ${lt_cv_ar_at_file+:} false; then : 30357+ $as_echo_n "(cached) " >&6 30358+else 30359+ lt_cv_ar_at_file=no 30360+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 30361+/* end confdefs.h. */ 30362+ 30363+int 30364+main () 30365+{ 30366+ 30367+ ; 30368+ return 0; 30369+} 30370+_ACEOF 30371+if ac_fn_c_try_compile "$LINENO"; then : 30372+ echo conftest.$ac_objext > conftest.lst 30373+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' 30374+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 30375+ (eval $lt_ar_try) 2>&5 30376+ ac_status=$? 30377+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 30378+ test $ac_status = 0; } 30379+ if test "$ac_status" -eq 0; then 30380+ # Ensure the archiver fails upon bogus file names. 30381+ rm -f conftest.$ac_objext libconftest.a 30382+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 30383+ (eval $lt_ar_try) 2>&5 30384+ ac_status=$? 30385+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 30386+ test $ac_status = 0; } 30387+ if test "$ac_status" -ne 0; then 30388+ lt_cv_ar_at_file=@ 30389+ fi 30390+ fi 30391+ rm -f conftest.* libconftest.a 30392+ 30393+fi 30394+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 30395+ 30396+fi 30397+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 30398+$as_echo "$lt_cv_ar_at_file" >&6; } 30399+ 30400+if test "x$lt_cv_ar_at_file" = xno; then 30401+ archiver_list_spec= 30402+else 30403+ archiver_list_spec=$lt_cv_ar_at_file 30404+fi 30405+ 30406+ 30407+ 30408+ 30409+ 30410+ 30411 30412 if test -n "$ac_tool_prefix"; then 30413 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 30414@@ -6584,8 +6898,8 @@ esac 30415 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 30416 30417 # Transform an extracted symbol line into symbol name and symbol address 30418-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 30419-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'" 30420+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 30421+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'" 30422 30423 # Handle CRLF in mingw tool chain 30424 opt_cr= 30425@@ -6621,6 +6935,7 @@ for ac_symprfx in "" "_"; do 30426 else 30427 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 30428 fi 30429+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" 30430 30431 # Check to see that the pipe works correctly. 30432 pipe_works=no 30433@@ -6662,6 +6977,18 @@ _LT_EOF 30434 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 30435 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 30436 cat <<_LT_EOF > conftest.$ac_ext 30437+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ 30438+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) 30439+/* DATA imports from DLLs on WIN32 con't be const, because runtime 30440+ relocations are performed -- see ld's documentation on pseudo-relocs. */ 30441+# define LT_DLSYM_CONST 30442+#elif defined(__osf__) 30443+/* This system does not cope well with relocations in const data. */ 30444+# define LT_DLSYM_CONST 30445+#else 30446+# define LT_DLSYM_CONST const 30447+#endif 30448+ 30449 #ifdef __cplusplus 30450 extern "C" { 30451 #endif 30452@@ -6673,7 +7000,7 @@ _LT_EOF 30453 cat <<_LT_EOF >> conftest.$ac_ext 30454 30455 /* The mapping between symbol names and symbols. */ 30456-const struct { 30457+LT_DLSYM_CONST struct { 30458 const char *name; 30459 void *address; 30460 } 30461@@ -6699,8 +7026,8 @@ static const void *lt_preloaded_setup() { 30462 _LT_EOF 30463 # Now try linking the two files. 30464 mv conftest.$ac_objext conftstm.$ac_objext 30465- lt_save_LIBS="$LIBS" 30466- lt_save_CFLAGS="$CFLAGS" 30467+ lt_globsym_save_LIBS=$LIBS 30468+ lt_globsym_save_CFLAGS=$CFLAGS 30469 LIBS="conftstm.$ac_objext" 30470 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 30471 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 30472@@ -6710,8 +7037,8 @@ _LT_EOF 30473 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 30474 pipe_works=yes 30475 fi 30476- LIBS="$lt_save_LIBS" 30477- CFLAGS="$lt_save_CFLAGS" 30478+ LIBS=$lt_globsym_save_LIBS 30479+ CFLAGS=$lt_globsym_save_CFLAGS 30480 else 30481 echo "cannot find nm_test_func in $nlist" >&5 30482 fi 30483@@ -6748,6 +7075,14 @@ else 30484 $as_echo "ok" >&6; } 30485 fi 30486 30487+# Response file support. 30488+if test "$lt_cv_nm_interface" = "MS dumpbin"; then 30489+ nm_file_list_spec='@' 30490+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then 30491+ nm_file_list_spec='@' 30492+fi 30493+ 30494+ 30495 30496 30497 30498@@ -6766,6 +7101,47 @@ fi 30499 30500 30501 30502+ 30503+ 30504+ 30505+ 30506+ 30507+ 30508+ 30509+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 30510+$as_echo_n "checking for sysroot... " >&6; } 30511+ 30512+# Check whether --with-libtool-sysroot was given. 30513+if test "${with_libtool_sysroot+set}" = set; then : 30514+ withval=$with_libtool_sysroot; 30515+else 30516+ with_libtool_sysroot=no 30517+fi 30518+ 30519+ 30520+lt_sysroot= 30521+case ${with_libtool_sysroot} in #( 30522+ yes) 30523+ if test "$GCC" = yes; then 30524+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` 30525+ fi 30526+ ;; #( 30527+ /*) 30528+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` 30529+ ;; #( 30530+ no|'') 30531+ ;; #( 30532+ *) 30533+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 30534+$as_echo "${with_libtool_sysroot}" >&6; } 30535+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 30536+ ;; 30537+esac 30538+ 30539+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 30540+$as_echo "${lt_sysroot:-no}" >&6; } 30541+ 30542+ 30543 30544 30545 30546@@ -6975,6 +7351,123 @@ esac 30547 30548 need_locks="$enable_libtool_lock" 30549 30550+if test -n "$ac_tool_prefix"; then 30551+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. 30552+set dummy ${ac_tool_prefix}mt; ac_word=$2 30553+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 30554+$as_echo_n "checking for $ac_word... " >&6; } 30555+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : 30556+ $as_echo_n "(cached) " >&6 30557+else 30558+ if test -n "$MANIFEST_TOOL"; then 30559+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. 30560+else 30561+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 30562+for as_dir in $PATH 30563+do 30564+ IFS=$as_save_IFS 30565+ test -z "$as_dir" && as_dir=. 30566+ for ac_exec_ext in '' $ac_executable_extensions; do 30567+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 30568+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" 30569+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 30570+ break 2 30571+ fi 30572+done 30573+ done 30574+IFS=$as_save_IFS 30575+ 30576+fi 30577+fi 30578+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL 30579+if test -n "$MANIFEST_TOOL"; then 30580+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 30581+$as_echo "$MANIFEST_TOOL" >&6; } 30582+else 30583+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 30584+$as_echo "no" >&6; } 30585+fi 30586+ 30587+ 30588+fi 30589+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then 30590+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL 30591+ # Extract the first word of "mt", so it can be a program name with args. 30592+set dummy mt; ac_word=$2 30593+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 30594+$as_echo_n "checking for $ac_word... " >&6; } 30595+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : 30596+ $as_echo_n "(cached) " >&6 30597+else 30598+ if test -n "$ac_ct_MANIFEST_TOOL"; then 30599+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. 30600+else 30601+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 30602+for as_dir in $PATH 30603+do 30604+ IFS=$as_save_IFS 30605+ test -z "$as_dir" && as_dir=. 30606+ for ac_exec_ext in '' $ac_executable_extensions; do 30607+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 30608+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" 30609+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 30610+ break 2 30611+ fi 30612+done 30613+ done 30614+IFS=$as_save_IFS 30615+ 30616+fi 30617+fi 30618+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL 30619+if test -n "$ac_ct_MANIFEST_TOOL"; then 30620+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 30621+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } 30622+else 30623+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 30624+$as_echo "no" >&6; } 30625+fi 30626+ 30627+ if test "x$ac_ct_MANIFEST_TOOL" = x; then 30628+ MANIFEST_TOOL=":" 30629+ else 30630+ case $cross_compiling:$ac_tool_warned in 30631+yes:) 30632+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 30633+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 30634+ac_tool_warned=yes ;; 30635+esac 30636+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL 30637+ fi 30638+else 30639+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" 30640+fi 30641+ 30642+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt 30643+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 30644+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } 30645+if ${lt_cv_path_mainfest_tool+:} false; then : 30646+ $as_echo_n "(cached) " >&6 30647+else 30648+ lt_cv_path_mainfest_tool=no 30649+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 30650+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out 30651+ cat conftest.err >&5 30652+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then 30653+ lt_cv_path_mainfest_tool=yes 30654+ fi 30655+ rm -f conftest* 30656+fi 30657+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 30658+$as_echo "$lt_cv_path_mainfest_tool" >&6; } 30659+if test "x$lt_cv_path_mainfest_tool" != xyes; then 30660+ MANIFEST_TOOL=: 30661+fi 30662+ 30663+ 30664+ 30665+ 30666+ 30667 30668 case $host_os in 30669 rhapsody* | darwin*) 30670@@ -7538,6 +8031,8 @@ _LT_EOF 30671 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 30672 echo "$AR cru libconftest.a conftest.o" >&5 30673 $AR cru libconftest.a conftest.o 2>&5 30674+ echo "$RANLIB libconftest.a" >&5 30675+ $RANLIB libconftest.a 2>&5 30676 cat > conftest.c << _LT_EOF 30677 int main() { return 0;} 30678 _LT_EOF 30679@@ -8090,8 +8585,6 @@ fi 30680 lt_prog_compiler_pic= 30681 lt_prog_compiler_static= 30682 30683-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 30684-$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 30685 30686 if test "$GCC" = yes; then 30687 lt_prog_compiler_wl='-Wl,' 30688@@ -8257,6 +8750,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 30689 lt_prog_compiler_pic='--shared' 30690 lt_prog_compiler_static='--static' 30691 ;; 30692+ nagfor*) 30693+ # NAG Fortran compiler 30694+ lt_prog_compiler_wl='-Wl,-Wl,,' 30695+ lt_prog_compiler_pic='-PIC' 30696+ lt_prog_compiler_static='-Bstatic' 30697+ ;; 30698 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 30699 # Portland Group compilers (*not* the Pentium gcc compiler, 30700 # which looks to be a dead project) 30701@@ -8319,7 +8818,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 30702 lt_prog_compiler_pic='-KPIC' 30703 lt_prog_compiler_static='-Bstatic' 30704 case $cc_basename in 30705- f77* | f90* | f95*) 30706+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) 30707 lt_prog_compiler_wl='-Qoption ld ';; 30708 *) 30709 lt_prog_compiler_wl='-Wl,';; 30710@@ -8376,13 +8875,17 @@ case $host_os in 30711 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 30712 ;; 30713 esac 30714-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 30715-$as_echo "$lt_prog_compiler_pic" >&6; } 30716- 30717- 30718- 30719- 30720 30721+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 30722+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 30723+if ${lt_cv_prog_compiler_pic+:} false; then : 30724+ $as_echo_n "(cached) " >&6 30725+else 30726+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic 30727+fi 30728+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 30729+$as_echo "$lt_cv_prog_compiler_pic" >&6; } 30730+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic 30731 30732 # 30733 # Check to make sure the PIC flag actually works. 30734@@ -8443,6 +8946,11 @@ fi 30735 30736 30737 30738+ 30739+ 30740+ 30741+ 30742+ 30743 # 30744 # Check to make sure the static flag actually works. 30745 # 30746@@ -8793,7 +9301,8 @@ _LT_EOF 30747 allow_undefined_flag=unsupported 30748 always_export_symbols=no 30749 enable_shared_with_static_runtimes=yes 30750- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 30751+ 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' 30752+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' 30753 30754 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 30755 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 30756@@ -8892,12 +9401,12 @@ _LT_EOF 30757 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 30758 hardcode_libdir_flag_spec= 30759 hardcode_libdir_flag_spec_ld='-rpath $libdir' 30760- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' 30761+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' 30762 if test "x$supports_anon_versioning" = xyes; then 30763 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ 30764 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ 30765 echo "local: *; };" >> $output_objdir/$libname.ver~ 30766- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 30767+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 30768 fi 30769 ;; 30770 esac 30771@@ -8911,8 +9420,8 @@ _LT_EOF 30772 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 30773 wlarc= 30774 else 30775- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 30776- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 30777+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 30778+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 30779 fi 30780 ;; 30781 30782@@ -8930,8 +9439,8 @@ _LT_EOF 30783 30784 _LT_EOF 30785 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 30786- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 30787- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 30788+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 30789+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 30790 else 30791 ld_shlibs=no 30792 fi 30793@@ -8977,8 +9486,8 @@ _LT_EOF 30794 30795 *) 30796 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 30797- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 30798- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 30799+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 30800+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 30801 else 30802 ld_shlibs=no 30803 fi 30804@@ -9108,7 +9617,13 @@ _LT_EOF 30805 allow_undefined_flag='-berok' 30806 # Determine the default libpath from the value encoded in an 30807 # empty executable. 30808- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 30809+ if test "${lt_cv_aix_libpath+set}" = set; then 30810+ aix_libpath=$lt_cv_aix_libpath 30811+else 30812+ if ${lt_cv_aix_libpath_+:} false; then : 30813+ $as_echo_n "(cached) " >&6 30814+else 30815+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 30816 /* end confdefs.h. */ 30817 30818 int 30819@@ -9121,22 +9636,29 @@ main () 30820 _ACEOF 30821 if ac_fn_c_try_link "$LINENO"; then : 30822 30823-lt_aix_libpath_sed=' 30824- /Import File Strings/,/^$/ { 30825- /^0/ { 30826- s/^0 *\(.*\)$/\1/ 30827- p 30828- } 30829- }' 30830-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 30831-# Check for a 64-bit object if we didn't find anything. 30832-if test -z "$aix_libpath"; then 30833- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 30834-fi 30835+ lt_aix_libpath_sed=' 30836+ /Import File Strings/,/^$/ { 30837+ /^0/ { 30838+ s/^0 *\([^ ]*\) *$/\1/ 30839+ p 30840+ } 30841+ }' 30842+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 30843+ # Check for a 64-bit object if we didn't find anything. 30844+ if test -z "$lt_cv_aix_libpath_"; then 30845+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 30846+ fi 30847 fi 30848 rm -f core conftest.err conftest.$ac_objext \ 30849 conftest$ac_exeext conftest.$ac_ext 30850-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 30851+ if test -z "$lt_cv_aix_libpath_"; then 30852+ lt_cv_aix_libpath_="/usr/lib:/lib" 30853+ fi 30854+ 30855+fi 30856+ 30857+ aix_libpath=$lt_cv_aix_libpath_ 30858+fi 30859 30860 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 30861 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" 30862@@ -9148,7 +9670,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 30863 else 30864 # Determine the default libpath from the value encoded in an 30865 # empty executable. 30866- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 30867+ if test "${lt_cv_aix_libpath+set}" = set; then 30868+ aix_libpath=$lt_cv_aix_libpath 30869+else 30870+ if ${lt_cv_aix_libpath_+:} false; then : 30871+ $as_echo_n "(cached) " >&6 30872+else 30873+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 30874 /* end confdefs.h. */ 30875 30876 int 30877@@ -9161,22 +9689,29 @@ main () 30878 _ACEOF 30879 if ac_fn_c_try_link "$LINENO"; then : 30880 30881-lt_aix_libpath_sed=' 30882- /Import File Strings/,/^$/ { 30883- /^0/ { 30884- s/^0 *\(.*\)$/\1/ 30885- p 30886- } 30887- }' 30888-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 30889-# Check for a 64-bit object if we didn't find anything. 30890-if test -z "$aix_libpath"; then 30891- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 30892-fi 30893+ lt_aix_libpath_sed=' 30894+ /Import File Strings/,/^$/ { 30895+ /^0/ { 30896+ s/^0 *\([^ ]*\) *$/\1/ 30897+ p 30898+ } 30899+ }' 30900+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 30901+ # Check for a 64-bit object if we didn't find anything. 30902+ if test -z "$lt_cv_aix_libpath_"; then 30903+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 30904+ fi 30905 fi 30906 rm -f core conftest.err conftest.$ac_objext \ 30907 conftest$ac_exeext conftest.$ac_ext 30908-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 30909+ if test -z "$lt_cv_aix_libpath_"; then 30910+ lt_cv_aix_libpath_="/usr/lib:/lib" 30911+ fi 30912+ 30913+fi 30914+ 30915+ aix_libpath=$lt_cv_aix_libpath_ 30916+fi 30917 30918 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 30919 # Warning - without using the other run time loading flags, 30920@@ -9221,20 +9756,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 30921 # Microsoft Visual C++. 30922 # hardcode_libdir_flag_spec is actually meaningless, as there is 30923 # no search path for DLLs. 30924- hardcode_libdir_flag_spec=' ' 30925- allow_undefined_flag=unsupported 30926- # Tell ltmain to make .lib files, not .a files. 30927- libext=lib 30928- # Tell ltmain to make .dll files, not .so files. 30929- shrext_cmds=".dll" 30930- # FIXME: Setting linknames here is a bad hack. 30931- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 30932- # The linker will automatically build a .lib file if we build a DLL. 30933- old_archive_from_new_cmds='true' 30934- # FIXME: Should let the user specify the lib program. 30935- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 30936- fix_srcfile_path='`cygpath -w "$srcfile"`' 30937- enable_shared_with_static_runtimes=yes 30938+ case $cc_basename in 30939+ cl*) 30940+ # Native MSVC 30941+ hardcode_libdir_flag_spec=' ' 30942+ allow_undefined_flag=unsupported 30943+ always_export_symbols=yes 30944+ file_list_spec='@' 30945+ # Tell ltmain to make .lib files, not .a files. 30946+ libext=lib 30947+ # Tell ltmain to make .dll files, not .so files. 30948+ shrext_cmds=".dll" 30949+ # FIXME: Setting linknames here is a bad hack. 30950+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' 30951+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 30952+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; 30953+ else 30954+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; 30955+ fi~ 30956+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ 30957+ linknames=' 30958+ # The linker will not automatically build a static lib if we build a DLL. 30959+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' 30960+ enable_shared_with_static_runtimes=yes 30961+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 30962+ # Don't use ranlib 30963+ old_postinstall_cmds='chmod 644 $oldlib' 30964+ postlink_cmds='lt_outputfile="@OUTPUT@"~ 30965+ lt_tool_outputfile="@TOOL_OUTPUT@"~ 30966+ case $lt_outputfile in 30967+ *.exe|*.EXE) ;; 30968+ *) 30969+ lt_outputfile="$lt_outputfile.exe" 30970+ lt_tool_outputfile="$lt_tool_outputfile.exe" 30971+ ;; 30972+ esac~ 30973+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then 30974+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; 30975+ $RM "$lt_outputfile.manifest"; 30976+ fi' 30977+ ;; 30978+ *) 30979+ # Assume MSVC wrapper 30980+ hardcode_libdir_flag_spec=' ' 30981+ allow_undefined_flag=unsupported 30982+ # Tell ltmain to make .lib files, not .a files. 30983+ libext=lib 30984+ # Tell ltmain to make .dll files, not .so files. 30985+ shrext_cmds=".dll" 30986+ # FIXME: Setting linknames here is a bad hack. 30987+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 30988+ # The linker will automatically build a .lib file if we build a DLL. 30989+ old_archive_from_new_cmds='true' 30990+ # FIXME: Should let the user specify the lib program. 30991+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 30992+ enable_shared_with_static_runtimes=yes 30993+ ;; 30994+ esac 30995 ;; 30996 30997 darwin* | rhapsody*) 30998@@ -9295,7 +9873,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 30999 31000 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 31001 freebsd* | dragonfly*) 31002- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' 31003+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' 31004 hardcode_libdir_flag_spec='-R$libdir' 31005 hardcode_direct=yes 31006 hardcode_shlibpath_var=no 31007@@ -9303,7 +9881,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 31008 31009 hpux9*) 31010 if test "$GCC" = yes; then 31011- 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' 31012+ 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' 31013 else 31014 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' 31015 fi 31016@@ -9319,7 +9897,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 31017 31018 hpux10*) 31019 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 31020- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 31021+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 31022 else 31023 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 31024 fi 31025@@ -9343,10 +9921,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 31026 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 31027 ;; 31028 ia64*) 31029- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 31030+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 31031 ;; 31032 *) 31033- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 31034+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 31035 ;; 31036 esac 31037 else 31038@@ -9425,23 +10003,36 @@ fi 31039 31040 irix5* | irix6* | nonstopux*) 31041 if test "$GCC" = yes; then 31042- 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' 31043+ 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' 31044 # Try to use the -exported_symbol ld option, if it does not 31045 # work, assume that -exports_file does not work either and 31046 # implicitly export all symbols. 31047- save_LDFLAGS="$LDFLAGS" 31048- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 31049- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 31050+ # This should be the same for all languages, so no per-tag cache variable. 31051+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 31052+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } 31053+if ${lt_cv_irix_exported_symbol+:} false; then : 31054+ $as_echo_n "(cached) " >&6 31055+else 31056+ save_LDFLAGS="$LDFLAGS" 31057+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 31058+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 31059 /* end confdefs.h. */ 31060-int foo(void) {} 31061+int foo (void) { return 0; } 31062 _ACEOF 31063 if ac_fn_c_try_link "$LINENO"; then : 31064- 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' 31065- 31066+ lt_cv_irix_exported_symbol=yes 31067+else 31068+ lt_cv_irix_exported_symbol=no 31069 fi 31070 rm -f core conftest.err conftest.$ac_objext \ 31071 conftest$ac_exeext conftest.$ac_ext 31072- LDFLAGS="$save_LDFLAGS" 31073+ LDFLAGS="$save_LDFLAGS" 31074+fi 31075+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 31076+$as_echo "$lt_cv_irix_exported_symbol" >&6; } 31077+ if test "$lt_cv_irix_exported_symbol" = yes; then 31078+ 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' 31079+ fi 31080 else 31081 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' 31082 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' 31083@@ -9526,7 +10117,7 @@ rm -f core conftest.err conftest.$ac_objext \ 31084 osf4* | osf5*) # as osf3* with the addition of -msym flag 31085 if test "$GCC" = yes; then 31086 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 31087- 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' 31088+ 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' 31089 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 31090 else 31091 allow_undefined_flag=' -expect_unresolved \*' 31092@@ -9545,9 +10136,9 @@ rm -f core conftest.err conftest.$ac_objext \ 31093 no_undefined_flag=' -z defs' 31094 if test "$GCC" = yes; then 31095 wlarc='${wl}' 31096- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 31097+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 31098 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ 31099- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' 31100+ $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' 31101 else 31102 case `$CC -V 2>&1` in 31103 *"Compilers 5.0"*) 31104@@ -10123,8 +10714,9 @@ cygwin* | mingw* | pw32* | cegcc*) 31105 need_version=no 31106 need_lib_prefix=no 31107 31108- case $GCC,$host_os in 31109- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) 31110+ case $GCC,$cc_basename in 31111+ yes,*) 31112+ # gcc 31113 library_names_spec='$libname.dll.a' 31114 # DLL is installed to $(libdir)/../bin by postinstall_cmds 31115 postinstall_cmds='base_file=`basename \${file}`~ 31116@@ -10157,13 +10749,71 @@ cygwin* | mingw* | pw32* | cegcc*) 31117 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 31118 ;; 31119 esac 31120+ dynamic_linker='Win32 ld.exe' 31121+ ;; 31122+ 31123+ *,cl*) 31124+ # Native MSVC 31125+ libname_spec='$name' 31126+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 31127+ library_names_spec='${libname}.dll.lib' 31128+ 31129+ case $build_os in 31130+ mingw*) 31131+ sys_lib_search_path_spec= 31132+ lt_save_ifs=$IFS 31133+ IFS=';' 31134+ for lt_path in $LIB 31135+ do 31136+ IFS=$lt_save_ifs 31137+ # Let DOS variable expansion print the short 8.3 style file name. 31138+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` 31139+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" 31140+ done 31141+ IFS=$lt_save_ifs 31142+ # Convert to MSYS style. 31143+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` 31144+ ;; 31145+ cygwin*) 31146+ # Convert to unix form, then to dos form, then back to unix form 31147+ # but this time dos style (no spaces!) so that the unix form looks 31148+ # like /cygdrive/c/PROGRA~1:/cygdr... 31149+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` 31150+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` 31151+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 31152+ ;; 31153+ *) 31154+ sys_lib_search_path_spec="$LIB" 31155+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then 31156+ # It is most probably a Windows format PATH. 31157+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` 31158+ else 31159+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 31160+ fi 31161+ # FIXME: find the short name or the path components, as spaces are 31162+ # common. (e.g. "Program Files" -> "PROGRA~1") 31163+ ;; 31164+ esac 31165+ 31166+ # DLL is installed to $(libdir)/../bin by postinstall_cmds 31167+ postinstall_cmds='base_file=`basename \${file}`~ 31168+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ 31169+ dldir=$destdir/`dirname \$dlpath`~ 31170+ test -d \$dldir || mkdir -p \$dldir~ 31171+ $install_prog $dir/$dlname \$dldir/$dlname' 31172+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ 31173+ dlpath=$dir/\$dldll~ 31174+ $RM \$dlpath' 31175+ shlibpath_overrides_runpath=yes 31176+ dynamic_linker='Win32 link.exe' 31177 ;; 31178 31179 *) 31180+ # Assume MSVC wrapper 31181 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' 31182+ dynamic_linker='Win32 ld.exe' 31183 ;; 31184 esac 31185- dynamic_linker='Win32 ld.exe' 31186 # FIXME: first we should search . and the directory the executable is in 31187 shlibpath_var=PATH 31188 ;; 31189@@ -11041,7 +11691,7 @@ else 31190 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 31191 lt_status=$lt_dlunknown 31192 cat > conftest.$ac_ext <<_LT_EOF 31193-#line 11044 "configure" 31194+#line $LINENO "configure" 31195 #include "confdefs.h" 31196 31197 #if HAVE_DLFCN_H 31198@@ -11085,10 +11735,10 @@ else 31199 /* When -fvisbility=hidden is used, assume the code has been annotated 31200 correspondingly for the symbols needed. */ 31201 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 31202-void fnord () __attribute__((visibility("default"))); 31203+int fnord () __attribute__((visibility("default"))); 31204 #endif 31205 31206-void fnord () { int i=42; } 31207+int fnord () { return 42; } 31208 int main () 31209 { 31210 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 31211@@ -11147,7 +11797,7 @@ else 31212 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 31213 lt_status=$lt_dlunknown 31214 cat > conftest.$ac_ext <<_LT_EOF 31215-#line 11150 "configure" 31216+#line $LINENO "configure" 31217 #include "confdefs.h" 31218 31219 #if HAVE_DLFCN_H 31220@@ -11191,10 +11841,10 @@ else 31221 /* When -fvisbility=hidden is used, assume the code has been annotated 31222 correspondingly for the symbols needed. */ 31223 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 31224-void fnord () __attribute__((visibility("default"))); 31225+int fnord () __attribute__((visibility("default"))); 31226 #endif 31227 31228-void fnord () { int i=42; } 31229+int fnord () { return 42; } 31230 int main () 31231 { 31232 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 31233@@ -13414,13 +14064,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 31234 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 31235 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 31236 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 31237+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' 31238+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' 31239 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' 31240 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' 31241 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' 31242 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' 31243 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' 31244+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' 31245+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' 31246+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' 31247+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' 31248 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' 31249 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' 31250+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' 31251 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 31252 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 31253 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 31254@@ -13435,14 +14092,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 31255 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 31256 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 31257 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"`' 31258+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' 31259+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' 31260 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' 31261 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' 31262 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' 31263-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 31264 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' 31265+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 31266 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' 31267 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' 31268 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' 31269+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' 31270 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 31271 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 31272 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 31273@@ -13475,12 +14135,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 31274 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 31275 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 31276 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 31277-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' 31278 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' 31279 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' 31280 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' 31281 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' 31282 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' 31283+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' 31284 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 31285 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 31286 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 31287@@ -13535,8 +14195,13 @@ reload_flag \ 31288 OBJDUMP \ 31289 deplibs_check_method \ 31290 file_magic_cmd \ 31291+file_magic_glob \ 31292+want_nocaseglob \ 31293+DLLTOOL \ 31294+sharedlib_from_linklib_cmd \ 31295 AR \ 31296 AR_FLAGS \ 31297+archiver_list_spec \ 31298 STRIP \ 31299 RANLIB \ 31300 CC \ 31301@@ -13546,12 +14211,14 @@ lt_cv_sys_global_symbol_pipe \ 31302 lt_cv_sys_global_symbol_to_cdecl \ 31303 lt_cv_sys_global_symbol_to_c_name_address \ 31304 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 31305+nm_file_list_spec \ 31306 lt_prog_compiler_no_builtin_flag \ 31307-lt_prog_compiler_wl \ 31308 lt_prog_compiler_pic \ 31309+lt_prog_compiler_wl \ 31310 lt_prog_compiler_static \ 31311 lt_cv_prog_compiler_c_o \ 31312 need_locks \ 31313+MANIFEST_TOOL \ 31314 DSYMUTIL \ 31315 NMEDIT \ 31316 LIPO \ 31317@@ -13567,7 +14234,6 @@ no_undefined_flag \ 31318 hardcode_libdir_flag_spec \ 31319 hardcode_libdir_flag_spec_ld \ 31320 hardcode_libdir_separator \ 31321-fix_srcfile_path \ 31322 exclude_expsyms \ 31323 include_expsyms \ 31324 file_list_spec \ 31325@@ -13603,6 +14269,7 @@ module_cmds \ 31326 module_expsym_cmds \ 31327 export_symbols_cmds \ 31328 prelink_cmds \ 31329+postlink_cmds \ 31330 postinstall_cmds \ 31331 postuninstall_cmds \ 31332 finish_cmds \ 31333@@ -14368,7 +15035,8 @@ $as_echo X"$file" | 31334 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 31335 # 31336 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 31337-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. 31338+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, 31339+# Inc. 31340 # Written by Gordon Matzigkeit, 1996 31341 # 31342 # This file is part of GNU Libtool. 31343@@ -14471,19 +15139,42 @@ SP2NL=$lt_lt_SP2NL 31344 # turn newlines into spaces. 31345 NL2SP=$lt_lt_NL2SP 31346 31347+# convert \$build file names to \$host format. 31348+to_host_file_cmd=$lt_cv_to_host_file_cmd 31349+ 31350+# convert \$build files to toolchain format. 31351+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 31352+ 31353 # An object symbol dumper. 31354 OBJDUMP=$lt_OBJDUMP 31355 31356 # Method to check whether dependent libraries are shared objects. 31357 deplibs_check_method=$lt_deplibs_check_method 31358 31359-# Command to use when deplibs_check_method == "file_magic". 31360+# Command to use when deplibs_check_method = "file_magic". 31361 file_magic_cmd=$lt_file_magic_cmd 31362 31363+# How to find potential files when deplibs_check_method = "file_magic". 31364+file_magic_glob=$lt_file_magic_glob 31365+ 31366+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". 31367+want_nocaseglob=$lt_want_nocaseglob 31368+ 31369+# DLL creation program. 31370+DLLTOOL=$lt_DLLTOOL 31371+ 31372+# Command to associate shared and link libraries. 31373+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd 31374+ 31375 # The archiver. 31376 AR=$lt_AR 31377+ 31378+# Flags to create an archive. 31379 AR_FLAGS=$lt_AR_FLAGS 31380 31381+# How to feed a file listing to the archiver. 31382+archiver_list_spec=$lt_archiver_list_spec 31383+ 31384 # A symbol stripping program. 31385 STRIP=$lt_STRIP 31386 31387@@ -14513,6 +15204,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 31388 # Transform the output of nm in a C name address pair when lib prefix is needed. 31389 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 31390 31391+# Specify filename containing input files for \$NM. 31392+nm_file_list_spec=$lt_nm_file_list_spec 31393+ 31394+# The root where to search for dependent libraries,and in which our libraries should be installed. 31395+lt_sysroot=$lt_sysroot 31396+ 31397 # The name of the directory that contains temporary libtool files. 31398 objdir=$objdir 31399 31400@@ -14522,6 +15219,9 @@ MAGIC_CMD=$MAGIC_CMD 31401 # Must we lock files when doing compilation? 31402 need_locks=$lt_need_locks 31403 31404+# Manifest tool. 31405+MANIFEST_TOOL=$lt_MANIFEST_TOOL 31406+ 31407 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 31408 DSYMUTIL=$lt_DSYMUTIL 31409 31410@@ -14636,12 +15336,12 @@ with_gcc=$GCC 31411 # Compiler flag to turn off builtin functions. 31412 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 31413 31414-# How to pass a linker flag through the compiler. 31415-wl=$lt_lt_prog_compiler_wl 31416- 31417 # Additional compiler flags for building library objects. 31418 pic_flag=$lt_lt_prog_compiler_pic 31419 31420+# How to pass a linker flag through the compiler. 31421+wl=$lt_lt_prog_compiler_wl 31422+ 31423 # Compiler flag to prevent dynamic linking. 31424 link_static_flag=$lt_lt_prog_compiler_static 31425 31426@@ -14728,9 +15428,6 @@ inherit_rpath=$inherit_rpath 31427 # Whether libtool must link a program against all its dependency libraries. 31428 link_all_deplibs=$link_all_deplibs 31429 31430-# Fix the shell variable \$srcfile for the compiler. 31431-fix_srcfile_path=$lt_fix_srcfile_path 31432- 31433 # Set to "yes" if exported symbols are required. 31434 always_export_symbols=$always_export_symbols 31435 31436@@ -14746,6 +15443,9 @@ include_expsyms=$lt_include_expsyms 31437 # Commands necessary for linking programs (against libraries) with templates. 31438 prelink_cmds=$lt_prelink_cmds 31439 31440+# Commands necessary for finishing linking programs. 31441+postlink_cmds=$lt_postlink_cmds 31442+ 31443 # Specify filename containing input files. 31444 file_list_spec=$lt_file_list_spec 31445 31446@@ -14778,210 +15478,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 31447 # if finds mixed CR/LF and LF-only lines. Since sed operates in 31448 # text mode, it properly converts lines to CR/LF. This bash problem 31449 # is reportedly fixed, but why not run on old versions too? 31450- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ 31451- || (rm -f "$cfgfile"; exit 1) 31452- 31453- case $xsi_shell in 31454- yes) 31455- cat << \_LT_EOF >> "$cfgfile" 31456- 31457-# func_dirname file append nondir_replacement 31458-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 31459-# otherwise set result to NONDIR_REPLACEMENT. 31460-func_dirname () 31461-{ 31462- case ${1} in 31463- */*) func_dirname_result="${1%/*}${2}" ;; 31464- * ) func_dirname_result="${3}" ;; 31465- esac 31466-} 31467- 31468-# func_basename file 31469-func_basename () 31470-{ 31471- func_basename_result="${1##*/}" 31472-} 31473- 31474-# func_dirname_and_basename file append nondir_replacement 31475-# perform func_basename and func_dirname in a single function 31476-# call: 31477-# dirname: Compute the dirname of FILE. If nonempty, 31478-# add APPEND to the result, otherwise set result 31479-# to NONDIR_REPLACEMENT. 31480-# value returned in "$func_dirname_result" 31481-# basename: Compute filename of FILE. 31482-# value retuned in "$func_basename_result" 31483-# Implementation must be kept synchronized with func_dirname 31484-# and func_basename. For efficiency, we do not delegate to 31485-# those functions but instead duplicate the functionality here. 31486-func_dirname_and_basename () 31487-{ 31488- case ${1} in 31489- */*) func_dirname_result="${1%/*}${2}" ;; 31490- * ) func_dirname_result="${3}" ;; 31491- esac 31492- func_basename_result="${1##*/}" 31493-} 31494- 31495-# func_stripname prefix suffix name 31496-# strip PREFIX and SUFFIX off of NAME. 31497-# PREFIX and SUFFIX must not contain globbing or regex special 31498-# characters, hashes, percent signs, but SUFFIX may contain a leading 31499-# dot (in which case that matches only a dot). 31500-func_stripname () 31501-{ 31502- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are 31503- # positional parameters, so assign one to ordinary parameter first. 31504- func_stripname_result=${3} 31505- func_stripname_result=${func_stripname_result#"${1}"} 31506- func_stripname_result=${func_stripname_result%"${2}"} 31507-} 31508- 31509-# func_opt_split 31510-func_opt_split () 31511-{ 31512- func_opt_split_opt=${1%%=*} 31513- func_opt_split_arg=${1#*=} 31514-} 31515- 31516-# func_lo2o object 31517-func_lo2o () 31518-{ 31519- case ${1} in 31520- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; 31521- *) func_lo2o_result=${1} ;; 31522- esac 31523-} 31524- 31525-# func_xform libobj-or-source 31526-func_xform () 31527-{ 31528- func_xform_result=${1%.*}.lo 31529-} 31530- 31531-# func_arith arithmetic-term... 31532-func_arith () 31533-{ 31534- func_arith_result=$(( $* )) 31535-} 31536- 31537-# func_len string 31538-# STRING may not start with a hyphen. 31539-func_len () 31540-{ 31541- func_len_result=${#1} 31542-} 31543- 31544-_LT_EOF 31545- ;; 31546- *) # Bourne compatible functions. 31547- cat << \_LT_EOF >> "$cfgfile" 31548- 31549-# func_dirname file append nondir_replacement 31550-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 31551-# otherwise set result to NONDIR_REPLACEMENT. 31552-func_dirname () 31553-{ 31554- # Extract subdirectory from the argument. 31555- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` 31556- if test "X$func_dirname_result" = "X${1}"; then 31557- func_dirname_result="${3}" 31558- else 31559- func_dirname_result="$func_dirname_result${2}" 31560- fi 31561-} 31562- 31563-# func_basename file 31564-func_basename () 31565-{ 31566- func_basename_result=`$ECHO "${1}" | $SED "$basename"` 31567-} 31568- 31569- 31570-# func_stripname prefix suffix name 31571-# strip PREFIX and SUFFIX off of NAME. 31572-# PREFIX and SUFFIX must not contain globbing or regex special 31573-# characters, hashes, percent signs, but SUFFIX may contain a leading 31574-# dot (in which case that matches only a dot). 31575-# func_strip_suffix prefix name 31576-func_stripname () 31577-{ 31578- case ${2} in 31579- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; 31580- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; 31581- esac 31582-} 31583- 31584-# sed scripts: 31585-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' 31586-my_sed_long_arg='1s/^-[^=]*=//' 31587- 31588-# func_opt_split 31589-func_opt_split () 31590-{ 31591- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` 31592- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` 31593-} 31594- 31595-# func_lo2o object 31596-func_lo2o () 31597-{ 31598- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` 31599-} 31600- 31601-# func_xform libobj-or-source 31602-func_xform () 31603-{ 31604- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` 31605-} 31606- 31607-# func_arith arithmetic-term... 31608-func_arith () 31609-{ 31610- func_arith_result=`expr "$@"` 31611-} 31612- 31613-# func_len string 31614-# STRING may not start with a hyphen. 31615-func_len () 31616-{ 31617- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` 31618-} 31619- 31620-_LT_EOF 31621-esac 31622- 31623-case $lt_shell_append in 31624- yes) 31625- cat << \_LT_EOF >> "$cfgfile" 31626- 31627-# func_append var value 31628-# Append VALUE to the end of shell variable VAR. 31629-func_append () 31630-{ 31631- eval "$1+=\$2" 31632-} 31633-_LT_EOF 31634- ;; 31635- *) 31636- cat << \_LT_EOF >> "$cfgfile" 31637- 31638-# func_append var value 31639-# Append VALUE to the end of shell variable VAR. 31640-func_append () 31641-{ 31642- eval "$1=\$$1\$2" 31643-} 31644- 31645-_LT_EOF 31646- ;; 31647- esac 31648- 31649- 31650- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ 31651- || (rm -f "$cfgfile"; exit 1) 31652- 31653- mv -f "$cfgfile" "$ofile" || 31654+ sed '$q' "$ltmain" >> "$cfgfile" \ 31655+ || (rm -f "$cfgfile"; exit 1) 31656+ 31657+ if test x"$xsi_shell" = xyes; then 31658+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ 31659+func_dirname ()\ 31660+{\ 31661+\ case ${1} in\ 31662+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 31663+\ * ) func_dirname_result="${3}" ;;\ 31664+\ esac\ 31665+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ 31666+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 31667+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 31668+test 0 -eq $? || _lt_function_replace_fail=: 31669+ 31670+ 31671+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ 31672+func_basename ()\ 31673+{\ 31674+\ func_basename_result="${1##*/}"\ 31675+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ 31676+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 31677+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 31678+test 0 -eq $? || _lt_function_replace_fail=: 31679+ 31680+ 31681+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ 31682+func_dirname_and_basename ()\ 31683+{\ 31684+\ case ${1} in\ 31685+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 31686+\ * ) func_dirname_result="${3}" ;;\ 31687+\ esac\ 31688+\ func_basename_result="${1##*/}"\ 31689+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ 31690+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 31691+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 31692+test 0 -eq $? || _lt_function_replace_fail=: 31693+ 31694+ 31695+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ 31696+func_stripname ()\ 31697+{\ 31698+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ 31699+\ # positional parameters, so assign one to ordinary parameter first.\ 31700+\ func_stripname_result=${3}\ 31701+\ func_stripname_result=${func_stripname_result#"${1}"}\ 31702+\ func_stripname_result=${func_stripname_result%"${2}"}\ 31703+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ 31704+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 31705+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 31706+test 0 -eq $? || _lt_function_replace_fail=: 31707+ 31708+ 31709+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ 31710+func_split_long_opt ()\ 31711+{\ 31712+\ func_split_long_opt_name=${1%%=*}\ 31713+\ func_split_long_opt_arg=${1#*=}\ 31714+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ 31715+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 31716+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 31717+test 0 -eq $? || _lt_function_replace_fail=: 31718+ 31719+ 31720+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ 31721+func_split_short_opt ()\ 31722+{\ 31723+\ func_split_short_opt_arg=${1#??}\ 31724+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ 31725+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ 31726+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 31727+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 31728+test 0 -eq $? || _lt_function_replace_fail=: 31729+ 31730+ 31731+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ 31732+func_lo2o ()\ 31733+{\ 31734+\ case ${1} in\ 31735+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ 31736+\ *) func_lo2o_result=${1} ;;\ 31737+\ esac\ 31738+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ 31739+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 31740+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 31741+test 0 -eq $? || _lt_function_replace_fail=: 31742+ 31743+ 31744+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ 31745+func_xform ()\ 31746+{\ 31747+ func_xform_result=${1%.*}.lo\ 31748+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ 31749+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 31750+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 31751+test 0 -eq $? || _lt_function_replace_fail=: 31752+ 31753+ 31754+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ 31755+func_arith ()\ 31756+{\ 31757+ func_arith_result=$(( $* ))\ 31758+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ 31759+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 31760+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 31761+test 0 -eq $? || _lt_function_replace_fail=: 31762+ 31763+ 31764+ sed -e '/^func_len ()$/,/^} # func_len /c\ 31765+func_len ()\ 31766+{\ 31767+ func_len_result=${#1}\ 31768+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ 31769+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 31770+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 31771+test 0 -eq $? || _lt_function_replace_fail=: 31772+ 31773+fi 31774+ 31775+if test x"$lt_shell_append" = xyes; then 31776+ sed -e '/^func_append ()$/,/^} # func_append /c\ 31777+func_append ()\ 31778+{\ 31779+ eval "${1}+=\\${2}"\ 31780+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ 31781+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 31782+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 31783+test 0 -eq $? || _lt_function_replace_fail=: 31784+ 31785+ 31786+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ 31787+func_append_quoted ()\ 31788+{\ 31789+\ func_quote_for_eval "${2}"\ 31790+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ 31791+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ 31792+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 31793+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 31794+test 0 -eq $? || _lt_function_replace_fail=: 31795+ 31796+ 31797+ # Save a `func_append' function call where possible by direct use of '+=' 31798+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ 31799+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 31800+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 31801+ test 0 -eq $? || _lt_function_replace_fail=: 31802+else 31803+ # Save a `func_append' function call even when '+=' is not available 31804+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ 31805+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 31806+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 31807+ test 0 -eq $? || _lt_function_replace_fail=: 31808+fi 31809+ 31810+if test x"$_lt_function_replace_fail" = x":"; then 31811+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 31812+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} 31813+fi 31814+ 31815+ 31816+ mv -f "$cfgfile" "$ofile" || 31817 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 31818 chmod +x "$ofile" 31819 31820diff --git a/sim/Makefile.in b/sim/Makefile.in 31821index 65085cada9c..c216f21920f 100644 31822--- a/sim/Makefile.in 31823+++ b/sim/Makefile.in 31824@@ -1029,6 +1029,7 @@ CYGPATH_W = @CYGPATH_W@ 31825 C_DIALECT = @C_DIALECT@ 31826 DEFS = @DEFS@ 31827 DEPDIR = @DEPDIR@ 31828+DLLTOOL = @DLLTOOL@ 31829 DSYMUTIL = @DSYMUTIL@ 31830 DTC = @DTC@ 31831 DUMPBIN = @DUMPBIN@ 31832@@ -1089,6 +1090,7 @@ LN_S = @LN_S@ 31833 LTLIBOBJS = @LTLIBOBJS@ 31834 MAINT = @MAINT@ 31835 MAKEINFO = @MAKEINFO@ 31836+MANIFEST_TOOL = @MANIFEST_TOOL@ 31837 MKDIR_P = @MKDIR_P@ 31838 NM = @NM@ 31839 NMEDIT = @NMEDIT@ 31840@@ -1150,6 +1152,7 @@ abs_builddir = @abs_builddir@ 31841 abs_srcdir = @abs_srcdir@ 31842 abs_top_builddir = @abs_top_builddir@ 31843 abs_top_srcdir = @abs_top_srcdir@ 31844+ac_ct_AR = @ac_ct_AR@ 31845 ac_ct_CC = @ac_ct_CC@ 31846 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ 31847 am__include = @am__include@ 31848diff --git a/sim/configure b/sim/configure 31849index c31ff71c805..1936741abe2 100755 31850--- a/sim/configure 31851+++ b/sim/configure 31852@@ -887,8 +887,11 @@ OTOOL 31853 LIPO 31854 NMEDIT 31855 DSYMUTIL 31856+MANIFEST_TOOL 31857 AWK 31858 STRIP 31859+ac_ct_AR 31860+DLLTOOL 31861 OBJDUMP 31862 LN_S 31863 NM 31864@@ -991,6 +994,7 @@ enable_static 31865 with_pic 31866 enable_fast_install 31867 with_gnu_ld 31868+with_libtool_sysroot 31869 enable_libtool_lock 31870 enable_maintainer_mode 31871 enable_dependency_tracking 31872@@ -1809,6 +1813,8 @@ Optional Packages: 31873 --with-pic try to use only PIC/non-PIC objects [default=use 31874 both] 31875 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 31876+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR 31877+ (or the compiler's sysroot if not specified). 31878 31879 Some influential environment variables: 31880 CC C compiler command 31881@@ -5642,8 +5648,8 @@ esac 31882 31883 31884 31885-macro_version='2.2.7a' 31886-macro_revision='1.3134' 31887+macro_version='2.4' 31888+macro_revision='1.3293' 31889 31890 31891 31892@@ -5683,7 +5689,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 31893 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 31894 $as_echo_n "checking how to print strings... " >&6; } 31895 # Test print first, because it will be a builtin if present. 31896-if test "X`print -r -- -n 2>/dev/null`" = X-n && \ 31897+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ 31898 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 31899 ECHO='print -r --' 31900 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 31901@@ -6376,8 +6382,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 31902 # Try some XSI features 31903 xsi_shell=no 31904 ( _lt_dummy="a/b/c" 31905- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ 31906- = c,a/b,, \ 31907+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ 31908+ = c,a/b,b/c, \ 31909 && eval 'test $(( 1 + 1 )) -eq 2 \ 31910 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 31911 && xsi_shell=yes 31912@@ -6426,6 +6432,80 @@ esac 31913 31914 31915 31916+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 31917+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } 31918+if ${lt_cv_to_host_file_cmd+:} false; then : 31919+ $as_echo_n "(cached) " >&6 31920+else 31921+ case $host in 31922+ *-*-mingw* ) 31923+ case $build in 31924+ *-*-mingw* ) # actually msys 31925+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 31926+ ;; 31927+ *-*-cygwin* ) 31928+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 31929+ ;; 31930+ * ) # otherwise, assume *nix 31931+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 31932+ ;; 31933+ esac 31934+ ;; 31935+ *-*-cygwin* ) 31936+ case $build in 31937+ *-*-mingw* ) # actually msys 31938+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin 31939+ ;; 31940+ *-*-cygwin* ) 31941+ lt_cv_to_host_file_cmd=func_convert_file_noop 31942+ ;; 31943+ * ) # otherwise, assume *nix 31944+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin 31945+ ;; 31946+ esac 31947+ ;; 31948+ * ) # unhandled hosts (and "normal" native builds) 31949+ lt_cv_to_host_file_cmd=func_convert_file_noop 31950+ ;; 31951+esac 31952+ 31953+fi 31954+ 31955+to_host_file_cmd=$lt_cv_to_host_file_cmd 31956+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 31957+$as_echo "$lt_cv_to_host_file_cmd" >&6; } 31958+ 31959+ 31960+ 31961+ 31962+ 31963+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 31964+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } 31965+if ${lt_cv_to_tool_file_cmd+:} false; then : 31966+ $as_echo_n "(cached) " >&6 31967+else 31968+ #assume ordinary cross tools, or native build. 31969+lt_cv_to_tool_file_cmd=func_convert_file_noop 31970+case $host in 31971+ *-*-mingw* ) 31972+ case $build in 31973+ *-*-mingw* ) # actually msys 31974+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 31975+ ;; 31976+ esac 31977+ ;; 31978+esac 31979+ 31980+fi 31981+ 31982+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 31983+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 31984+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } 31985+ 31986+ 31987+ 31988+ 31989+ 31990 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 31991 $as_echo_n "checking for $LD option to reload object files... " >&6; } 31992 if ${lt_cv_ld_reload_flag+:} false; then : 31993@@ -6442,6 +6522,11 @@ case $reload_flag in 31994 esac 31995 reload_cmds='$LD$reload_flag -o $output$reload_objs' 31996 case $host_os in 31997+ cygwin* | mingw* | pw32* | cegcc*) 31998+ if test "$GCC" != yes; then 31999+ reload_cmds=false 32000+ fi 32001+ ;; 32002 darwin*) 32003 if test "$GCC" = yes; then 32004 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 32005@@ -6610,7 +6695,8 @@ mingw* | pw32*) 32006 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 32007 lt_cv_file_magic_cmd='func_win32_libid' 32008 else 32009- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' 32010+ # Keep this pattern in sync with the one in func_win32_libid. 32011+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' 32012 lt_cv_file_magic_cmd='$OBJDUMP -f' 32013 fi 32014 ;; 32015@@ -6764,6 +6850,21 @@ esac 32016 fi 32017 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 32018 $as_echo "$lt_cv_deplibs_check_method" >&6; } 32019+ 32020+file_magic_glob= 32021+want_nocaseglob=no 32022+if test "$build" = "$host"; then 32023+ case $host_os in 32024+ mingw* | pw32*) 32025+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then 32026+ want_nocaseglob=yes 32027+ else 32028+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` 32029+ fi 32030+ ;; 32031+ esac 32032+fi 32033+ 32034 file_magic_cmd=$lt_cv_file_magic_cmd 32035 deplibs_check_method=$lt_cv_deplibs_check_method 32036 test -z "$deplibs_check_method" && deplibs_check_method=unknown 32037@@ -6779,6 +6880,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 32038 32039 32040 32041+ 32042+ 32043+ 32044+ 32045+ 32046+ 32047+ 32048+ 32049+ 32050+ 32051+if test -n "$ac_tool_prefix"; then 32052+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. 32053+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 32054+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 32055+$as_echo_n "checking for $ac_word... " >&6; } 32056+if ${ac_cv_prog_DLLTOOL+:} false; then : 32057+ $as_echo_n "(cached) " >&6 32058+else 32059+ if test -n "$DLLTOOL"; then 32060+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. 32061+else 32062+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 32063+for as_dir in $PATH 32064+do 32065+ IFS=$as_save_IFS 32066+ test -z "$as_dir" && as_dir=. 32067+ for ac_exec_ext in '' $ac_executable_extensions; do 32068+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 32069+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" 32070+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 32071+ break 2 32072+ fi 32073+done 32074+ done 32075+IFS=$as_save_IFS 32076+ 32077+fi 32078+fi 32079+DLLTOOL=$ac_cv_prog_DLLTOOL 32080+if test -n "$DLLTOOL"; then 32081+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 32082+$as_echo "$DLLTOOL" >&6; } 32083+else 32084+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 32085+$as_echo "no" >&6; } 32086+fi 32087+ 32088+ 32089+fi 32090+if test -z "$ac_cv_prog_DLLTOOL"; then 32091+ ac_ct_DLLTOOL=$DLLTOOL 32092+ # Extract the first word of "dlltool", so it can be a program name with args. 32093+set dummy dlltool; ac_word=$2 32094+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 32095+$as_echo_n "checking for $ac_word... " >&6; } 32096+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : 32097+ $as_echo_n "(cached) " >&6 32098+else 32099+ if test -n "$ac_ct_DLLTOOL"; then 32100+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. 32101+else 32102+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 32103+for as_dir in $PATH 32104+do 32105+ IFS=$as_save_IFS 32106+ test -z "$as_dir" && as_dir=. 32107+ for ac_exec_ext in '' $ac_executable_extensions; do 32108+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 32109+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" 32110+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 32111+ break 2 32112+ fi 32113+done 32114+ done 32115+IFS=$as_save_IFS 32116+ 32117+fi 32118+fi 32119+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL 32120+if test -n "$ac_ct_DLLTOOL"; then 32121+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 32122+$as_echo "$ac_ct_DLLTOOL" >&6; } 32123+else 32124+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 32125+$as_echo "no" >&6; } 32126+fi 32127+ 32128+ if test "x$ac_ct_DLLTOOL" = x; then 32129+ DLLTOOL="false" 32130+ else 32131+ case $cross_compiling:$ac_tool_warned in 32132+yes:) 32133+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 32134+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 32135+ac_tool_warned=yes ;; 32136+esac 32137+ DLLTOOL=$ac_ct_DLLTOOL 32138+ fi 32139+else 32140+ DLLTOOL="$ac_cv_prog_DLLTOOL" 32141+fi 32142+ 32143+test -z "$DLLTOOL" && DLLTOOL=dlltool 32144+ 32145+ 32146+ 32147+ 32148+ 32149+ 32150+ 32151+ 32152+ 32153+ 32154+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 32155+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } 32156+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : 32157+ $as_echo_n "(cached) " >&6 32158+else 32159+ lt_cv_sharedlib_from_linklib_cmd='unknown' 32160+ 32161+case $host_os in 32162+cygwin* | mingw* | pw32* | cegcc*) 32163+ # two different shell functions defined in ltmain.sh 32164+ # decide which to use based on capabilities of $DLLTOOL 32165+ case `$DLLTOOL --help 2>&1` in 32166+ *--identify-strict*) 32167+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib 32168+ ;; 32169+ *) 32170+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback 32171+ ;; 32172+ esac 32173+ ;; 32174+*) 32175+ # fallback: assume linklib IS sharedlib 32176+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" 32177+ ;; 32178+esac 32179+ 32180+fi 32181+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 32182+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } 32183+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd 32184+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO 32185+ 32186+ 32187+ 32188+ 32189+ 32190+ 32191+ 32192 plugin_option= 32193 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 32194 for plugin in $plugin_names; do 32195@@ -6793,8 +7045,10 @@ for plugin in $plugin_names; do 32196 done 32197 32198 if test -n "$ac_tool_prefix"; then 32199- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 32200-set dummy ${ac_tool_prefix}ar; ac_word=$2 32201+ for ac_prog in ar 32202+ do 32203+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 32204+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 32205 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 32206 $as_echo_n "checking for $ac_word... " >&6; } 32207 if ${ac_cv_prog_AR+:} false; then : 32208@@ -6810,7 +7064,7 @@ do 32209 test -z "$as_dir" && as_dir=. 32210 for ac_exec_ext in '' $ac_executable_extensions; do 32211 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 32212- ac_cv_prog_AR="${ac_tool_prefix}ar" 32213+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" 32214 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 32215 break 2 32216 fi 32217@@ -6830,11 +7084,15 @@ $as_echo "no" >&6; } 32218 fi 32219 32220 32221+ test -n "$AR" && break 32222+ done 32223 fi 32224-if test -z "$ac_cv_prog_AR"; then 32225+if test -z "$AR"; then 32226 ac_ct_AR=$AR 32227- # Extract the first word of "ar", so it can be a program name with args. 32228-set dummy ar; ac_word=$2 32229+ for ac_prog in ar 32230+do 32231+ # Extract the first word of "$ac_prog", so it can be a program name with args. 32232+set dummy $ac_prog; ac_word=$2 32233 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 32234 $as_echo_n "checking for $ac_word... " >&6; } 32235 if ${ac_cv_prog_ac_ct_AR+:} false; then : 32236@@ -6850,7 +7108,7 @@ do 32237 test -z "$as_dir" && as_dir=. 32238 for ac_exec_ext in '' $ac_executable_extensions; do 32239 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 32240- ac_cv_prog_ac_ct_AR="ar" 32241+ ac_cv_prog_ac_ct_AR="$ac_prog" 32242 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 32243 break 2 32244 fi 32245@@ -6869,6 +7127,10 @@ else 32246 $as_echo "no" >&6; } 32247 fi 32248 32249+ 32250+ test -n "$ac_ct_AR" && break 32251+done 32252+ 32253 if test "x$ac_ct_AR" = x; then 32254 AR="false" 32255 else 32256@@ -6880,29 +7142,81 @@ ac_tool_warned=yes ;; 32257 esac 32258 AR=$ac_ct_AR 32259 fi 32260-else 32261- AR="$ac_cv_prog_AR" 32262 fi 32263 32264-test -z "$AR" && AR=ar 32265-if test -n "$plugin_option"; then 32266- if $AR --help 2>&1 | grep -q "\--plugin"; then 32267- touch conftest.c 32268- $AR $plugin_option rc conftest.a conftest.c 32269- if test "$?" != 0; then 32270- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 32271+ touch conftest.c 32272+ $AR $plugin_option rc conftest.a conftest.c 32273+ if test "$?" != 0; then 32274+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 32275 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} 32276- else 32277- AR="$AR $plugin_option" 32278- fi 32279- rm -f conftest.* 32280+ else 32281+ AR="$AR $plugin_option" 32282 fi 32283-fi 32284-test -z "$AR_FLAGS" && AR_FLAGS=cru 32285+ rm -f conftest.* 32286+: ${AR=ar} 32287+: ${AR_FLAGS=cru} 32288+ 32289+ 32290+ 32291+ 32292+ 32293+ 32294+ 32295+ 32296+ 32297+ 32298+ 32299+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 32300+$as_echo_n "checking for archiver @FILE support... " >&6; } 32301+if ${lt_cv_ar_at_file+:} false; then : 32302+ $as_echo_n "(cached) " >&6 32303+else 32304+ lt_cv_ar_at_file=no 32305+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 32306+/* end confdefs.h. */ 32307+ 32308+int 32309+main () 32310+{ 32311 32312+ ; 32313+ return 0; 32314+} 32315+_ACEOF 32316+if ac_fn_c_try_compile "$LINENO"; then : 32317+ echo conftest.$ac_objext > conftest.lst 32318+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' 32319+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 32320+ (eval $lt_ar_try) 2>&5 32321+ ac_status=$? 32322+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 32323+ test $ac_status = 0; } 32324+ if test "$ac_status" -eq 0; then 32325+ # Ensure the archiver fails upon bogus file names. 32326+ rm -f conftest.$ac_objext libconftest.a 32327+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 32328+ (eval $lt_ar_try) 2>&5 32329+ ac_status=$? 32330+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 32331+ test $ac_status = 0; } 32332+ if test "$ac_status" -ne 0; then 32333+ lt_cv_ar_at_file=@ 32334+ fi 32335+ fi 32336+ rm -f conftest.* libconftest.a 32337 32338+fi 32339+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 32340 32341+fi 32342+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 32343+$as_echo "$lt_cv_ar_at_file" >&6; } 32344 32345+if test "x$lt_cv_ar_at_file" = xno; then 32346+ archiver_list_spec= 32347+else 32348+ archiver_list_spec=$lt_cv_ar_at_file 32349+fi 32350 32351 32352 32353@@ -7291,8 +7605,8 @@ esac 32354 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 32355 32356 # Transform an extracted symbol line into symbol name and symbol address 32357-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 32358-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'" 32359+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 32360+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'" 32361 32362 # Handle CRLF in mingw tool chain 32363 opt_cr= 32364@@ -7328,6 +7642,7 @@ for ac_symprfx in "" "_"; do 32365 else 32366 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 32367 fi 32368+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" 32369 32370 # Check to see that the pipe works correctly. 32371 pipe_works=no 32372@@ -7369,6 +7684,18 @@ _LT_EOF 32373 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 32374 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 32375 cat <<_LT_EOF > conftest.$ac_ext 32376+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ 32377+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) 32378+/* DATA imports from DLLs on WIN32 con't be const, because runtime 32379+ relocations are performed -- see ld's documentation on pseudo-relocs. */ 32380+# define LT_DLSYM_CONST 32381+#elif defined(__osf__) 32382+/* This system does not cope well with relocations in const data. */ 32383+# define LT_DLSYM_CONST 32384+#else 32385+# define LT_DLSYM_CONST const 32386+#endif 32387+ 32388 #ifdef __cplusplus 32389 extern "C" { 32390 #endif 32391@@ -7380,7 +7707,7 @@ _LT_EOF 32392 cat <<_LT_EOF >> conftest.$ac_ext 32393 32394 /* The mapping between symbol names and symbols. */ 32395-const struct { 32396+LT_DLSYM_CONST struct { 32397 const char *name; 32398 void *address; 32399 } 32400@@ -7406,8 +7733,8 @@ static const void *lt_preloaded_setup() { 32401 _LT_EOF 32402 # Now try linking the two files. 32403 mv conftest.$ac_objext conftstm.$ac_objext 32404- lt_save_LIBS="$LIBS" 32405- lt_save_CFLAGS="$CFLAGS" 32406+ lt_globsym_save_LIBS=$LIBS 32407+ lt_globsym_save_CFLAGS=$CFLAGS 32408 LIBS="conftstm.$ac_objext" 32409 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 32410 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 32411@@ -7417,8 +7744,8 @@ _LT_EOF 32412 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 32413 pipe_works=yes 32414 fi 32415- LIBS="$lt_save_LIBS" 32416- CFLAGS="$lt_save_CFLAGS" 32417+ LIBS=$lt_globsym_save_LIBS 32418+ CFLAGS=$lt_globsym_save_CFLAGS 32419 else 32420 echo "cannot find nm_test_func in $nlist" >&5 32421 fi 32422@@ -7455,6 +7782,14 @@ else 32423 $as_echo "ok" >&6; } 32424 fi 32425 32426+# Response file support. 32427+if test "$lt_cv_nm_interface" = "MS dumpbin"; then 32428+ nm_file_list_spec='@' 32429+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then 32430+ nm_file_list_spec='@' 32431+fi 32432+ 32433+ 32434 32435 32436 32437@@ -7473,6 +7808,47 @@ fi 32438 32439 32440 32441+ 32442+ 32443+ 32444+ 32445+ 32446+ 32447+ 32448+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 32449+$as_echo_n "checking for sysroot... " >&6; } 32450+ 32451+# Check whether --with-libtool-sysroot was given. 32452+if test "${with_libtool_sysroot+set}" = set; then : 32453+ withval=$with_libtool_sysroot; 32454+else 32455+ with_libtool_sysroot=no 32456+fi 32457+ 32458+ 32459+lt_sysroot= 32460+case ${with_libtool_sysroot} in #( 32461+ yes) 32462+ if test "$GCC" = yes; then 32463+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` 32464+ fi 32465+ ;; #( 32466+ /*) 32467+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` 32468+ ;; #( 32469+ no|'') 32470+ ;; #( 32471+ *) 32472+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 32473+$as_echo "${with_libtool_sysroot}" >&6; } 32474+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 32475+ ;; 32476+esac 32477+ 32478+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 32479+$as_echo "${lt_sysroot:-no}" >&6; } 32480+ 32481+ 32482 32483 32484 32485@@ -7682,6 +8058,123 @@ esac 32486 32487 need_locks="$enable_libtool_lock" 32488 32489+if test -n "$ac_tool_prefix"; then 32490+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. 32491+set dummy ${ac_tool_prefix}mt; ac_word=$2 32492+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 32493+$as_echo_n "checking for $ac_word... " >&6; } 32494+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : 32495+ $as_echo_n "(cached) " >&6 32496+else 32497+ if test -n "$MANIFEST_TOOL"; then 32498+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. 32499+else 32500+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 32501+for as_dir in $PATH 32502+do 32503+ IFS=$as_save_IFS 32504+ test -z "$as_dir" && as_dir=. 32505+ for ac_exec_ext in '' $ac_executable_extensions; do 32506+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 32507+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" 32508+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 32509+ break 2 32510+ fi 32511+done 32512+ done 32513+IFS=$as_save_IFS 32514+ 32515+fi 32516+fi 32517+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL 32518+if test -n "$MANIFEST_TOOL"; then 32519+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 32520+$as_echo "$MANIFEST_TOOL" >&6; } 32521+else 32522+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 32523+$as_echo "no" >&6; } 32524+fi 32525+ 32526+ 32527+fi 32528+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then 32529+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL 32530+ # Extract the first word of "mt", so it can be a program name with args. 32531+set dummy mt; ac_word=$2 32532+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 32533+$as_echo_n "checking for $ac_word... " >&6; } 32534+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : 32535+ $as_echo_n "(cached) " >&6 32536+else 32537+ if test -n "$ac_ct_MANIFEST_TOOL"; then 32538+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. 32539+else 32540+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 32541+for as_dir in $PATH 32542+do 32543+ IFS=$as_save_IFS 32544+ test -z "$as_dir" && as_dir=. 32545+ for ac_exec_ext in '' $ac_executable_extensions; do 32546+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 32547+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" 32548+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 32549+ break 2 32550+ fi 32551+done 32552+ done 32553+IFS=$as_save_IFS 32554+ 32555+fi 32556+fi 32557+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL 32558+if test -n "$ac_ct_MANIFEST_TOOL"; then 32559+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 32560+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } 32561+else 32562+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 32563+$as_echo "no" >&6; } 32564+fi 32565+ 32566+ if test "x$ac_ct_MANIFEST_TOOL" = x; then 32567+ MANIFEST_TOOL=":" 32568+ else 32569+ case $cross_compiling:$ac_tool_warned in 32570+yes:) 32571+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 32572+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 32573+ac_tool_warned=yes ;; 32574+esac 32575+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL 32576+ fi 32577+else 32578+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" 32579+fi 32580+ 32581+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt 32582+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 32583+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } 32584+if ${lt_cv_path_mainfest_tool+:} false; then : 32585+ $as_echo_n "(cached) " >&6 32586+else 32587+ lt_cv_path_mainfest_tool=no 32588+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 32589+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out 32590+ cat conftest.err >&5 32591+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then 32592+ lt_cv_path_mainfest_tool=yes 32593+ fi 32594+ rm -f conftest* 32595+fi 32596+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 32597+$as_echo "$lt_cv_path_mainfest_tool" >&6; } 32598+if test "x$lt_cv_path_mainfest_tool" != xyes; then 32599+ MANIFEST_TOOL=: 32600+fi 32601+ 32602+ 32603+ 32604+ 32605+ 32606 32607 case $host_os in 32608 rhapsody* | darwin*) 32609@@ -8245,6 +8738,8 @@ _LT_EOF 32610 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 32611 echo "$AR cru libconftest.a conftest.o" >&5 32612 $AR cru libconftest.a conftest.o 2>&5 32613+ echo "$RANLIB libconftest.a" >&5 32614+ $RANLIB libconftest.a 2>&5 32615 cat > conftest.c << _LT_EOF 32616 int main() { return 0;} 32617 _LT_EOF 32618@@ -9499,8 +9994,6 @@ fi 32619 lt_prog_compiler_pic= 32620 lt_prog_compiler_static= 32621 32622-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 32623-$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 32624 32625 if test "$GCC" = yes; then 32626 lt_prog_compiler_wl='-Wl,' 32627@@ -9666,6 +10159,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 32628 lt_prog_compiler_pic='--shared' 32629 lt_prog_compiler_static='--static' 32630 ;; 32631+ nagfor*) 32632+ # NAG Fortran compiler 32633+ lt_prog_compiler_wl='-Wl,-Wl,,' 32634+ lt_prog_compiler_pic='-PIC' 32635+ lt_prog_compiler_static='-Bstatic' 32636+ ;; 32637 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 32638 # Portland Group compilers (*not* the Pentium gcc compiler, 32639 # which looks to be a dead project) 32640@@ -9728,7 +10227,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 32641 lt_prog_compiler_pic='-KPIC' 32642 lt_prog_compiler_static='-Bstatic' 32643 case $cc_basename in 32644- f77* | f90* | f95*) 32645+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) 32646 lt_prog_compiler_wl='-Qoption ld ';; 32647 *) 32648 lt_prog_compiler_wl='-Wl,';; 32649@@ -9785,13 +10284,17 @@ case $host_os in 32650 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 32651 ;; 32652 esac 32653-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 32654-$as_echo "$lt_prog_compiler_pic" >&6; } 32655- 32656- 32657- 32658- 32659 32660+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 32661+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 32662+if ${lt_cv_prog_compiler_pic+:} false; then : 32663+ $as_echo_n "(cached) " >&6 32664+else 32665+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic 32666+fi 32667+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 32668+$as_echo "$lt_cv_prog_compiler_pic" >&6; } 32669+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic 32670 32671 # 32672 # Check to make sure the PIC flag actually works. 32673@@ -9852,6 +10355,11 @@ fi 32674 32675 32676 32677+ 32678+ 32679+ 32680+ 32681+ 32682 # 32683 # Check to make sure the static flag actually works. 32684 # 32685@@ -10202,7 +10710,8 @@ _LT_EOF 32686 allow_undefined_flag=unsupported 32687 always_export_symbols=no 32688 enable_shared_with_static_runtimes=yes 32689- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 32690+ 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' 32691+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' 32692 32693 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 32694 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 32695@@ -10301,12 +10810,12 @@ _LT_EOF 32696 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 32697 hardcode_libdir_flag_spec= 32698 hardcode_libdir_flag_spec_ld='-rpath $libdir' 32699- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' 32700+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' 32701 if test "x$supports_anon_versioning" = xyes; then 32702 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ 32703 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ 32704 echo "local: *; };" >> $output_objdir/$libname.ver~ 32705- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 32706+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 32707 fi 32708 ;; 32709 esac 32710@@ -10320,8 +10829,8 @@ _LT_EOF 32711 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 32712 wlarc= 32713 else 32714- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 32715- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 32716+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 32717+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 32718 fi 32719 ;; 32720 32721@@ -10339,8 +10848,8 @@ _LT_EOF 32722 32723 _LT_EOF 32724 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 32725- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 32726- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 32727+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 32728+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 32729 else 32730 ld_shlibs=no 32731 fi 32732@@ -10386,8 +10895,8 @@ _LT_EOF 32733 32734 *) 32735 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 32736- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 32737- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 32738+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 32739+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 32740 else 32741 ld_shlibs=no 32742 fi 32743@@ -10517,7 +11026,13 @@ _LT_EOF 32744 allow_undefined_flag='-berok' 32745 # Determine the default libpath from the value encoded in an 32746 # empty executable. 32747- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 32748+ if test "${lt_cv_aix_libpath+set}" = set; then 32749+ aix_libpath=$lt_cv_aix_libpath 32750+else 32751+ if ${lt_cv_aix_libpath_+:} false; then : 32752+ $as_echo_n "(cached) " >&6 32753+else 32754+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 32755 /* end confdefs.h. */ 32756 32757 int 32758@@ -10530,22 +11045,29 @@ main () 32759 _ACEOF 32760 if ac_fn_c_try_link "$LINENO"; then : 32761 32762-lt_aix_libpath_sed=' 32763- /Import File Strings/,/^$/ { 32764- /^0/ { 32765- s/^0 *\(.*\)$/\1/ 32766- p 32767- } 32768- }' 32769-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 32770-# Check for a 64-bit object if we didn't find anything. 32771-if test -z "$aix_libpath"; then 32772- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 32773-fi 32774+ lt_aix_libpath_sed=' 32775+ /Import File Strings/,/^$/ { 32776+ /^0/ { 32777+ s/^0 *\([^ ]*\) *$/\1/ 32778+ p 32779+ } 32780+ }' 32781+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 32782+ # Check for a 64-bit object if we didn't find anything. 32783+ if test -z "$lt_cv_aix_libpath_"; then 32784+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 32785+ fi 32786 fi 32787 rm -f core conftest.err conftest.$ac_objext \ 32788 conftest$ac_exeext conftest.$ac_ext 32789-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 32790+ if test -z "$lt_cv_aix_libpath_"; then 32791+ lt_cv_aix_libpath_="/usr/lib:/lib" 32792+ fi 32793+ 32794+fi 32795+ 32796+ aix_libpath=$lt_cv_aix_libpath_ 32797+fi 32798 32799 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 32800 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" 32801@@ -10557,7 +11079,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 32802 else 32803 # Determine the default libpath from the value encoded in an 32804 # empty executable. 32805- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 32806+ if test "${lt_cv_aix_libpath+set}" = set; then 32807+ aix_libpath=$lt_cv_aix_libpath 32808+else 32809+ if ${lt_cv_aix_libpath_+:} false; then : 32810+ $as_echo_n "(cached) " >&6 32811+else 32812+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 32813 /* end confdefs.h. */ 32814 32815 int 32816@@ -10570,22 +11098,29 @@ main () 32817 _ACEOF 32818 if ac_fn_c_try_link "$LINENO"; then : 32819 32820-lt_aix_libpath_sed=' 32821- /Import File Strings/,/^$/ { 32822- /^0/ { 32823- s/^0 *\(.*\)$/\1/ 32824- p 32825- } 32826- }' 32827-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 32828-# Check for a 64-bit object if we didn't find anything. 32829-if test -z "$aix_libpath"; then 32830- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 32831-fi 32832+ lt_aix_libpath_sed=' 32833+ /Import File Strings/,/^$/ { 32834+ /^0/ { 32835+ s/^0 *\([^ ]*\) *$/\1/ 32836+ p 32837+ } 32838+ }' 32839+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 32840+ # Check for a 64-bit object if we didn't find anything. 32841+ if test -z "$lt_cv_aix_libpath_"; then 32842+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 32843+ fi 32844 fi 32845 rm -f core conftest.err conftest.$ac_objext \ 32846 conftest$ac_exeext conftest.$ac_ext 32847-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 32848+ if test -z "$lt_cv_aix_libpath_"; then 32849+ lt_cv_aix_libpath_="/usr/lib:/lib" 32850+ fi 32851+ 32852+fi 32853+ 32854+ aix_libpath=$lt_cv_aix_libpath_ 32855+fi 32856 32857 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 32858 # Warning - without using the other run time loading flags, 32859@@ -10630,20 +11165,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 32860 # Microsoft Visual C++. 32861 # hardcode_libdir_flag_spec is actually meaningless, as there is 32862 # no search path for DLLs. 32863- hardcode_libdir_flag_spec=' ' 32864- allow_undefined_flag=unsupported 32865- # Tell ltmain to make .lib files, not .a files. 32866- libext=lib 32867- # Tell ltmain to make .dll files, not .so files. 32868- shrext_cmds=".dll" 32869- # FIXME: Setting linknames here is a bad hack. 32870- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 32871- # The linker will automatically build a .lib file if we build a DLL. 32872- old_archive_from_new_cmds='true' 32873- # FIXME: Should let the user specify the lib program. 32874- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 32875- fix_srcfile_path='`cygpath -w "$srcfile"`' 32876- enable_shared_with_static_runtimes=yes 32877+ case $cc_basename in 32878+ cl*) 32879+ # Native MSVC 32880+ hardcode_libdir_flag_spec=' ' 32881+ allow_undefined_flag=unsupported 32882+ always_export_symbols=yes 32883+ file_list_spec='@' 32884+ # Tell ltmain to make .lib files, not .a files. 32885+ libext=lib 32886+ # Tell ltmain to make .dll files, not .so files. 32887+ shrext_cmds=".dll" 32888+ # FIXME: Setting linknames here is a bad hack. 32889+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' 32890+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 32891+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; 32892+ else 32893+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; 32894+ fi~ 32895+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ 32896+ linknames=' 32897+ # The linker will not automatically build a static lib if we build a DLL. 32898+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' 32899+ enable_shared_with_static_runtimes=yes 32900+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 32901+ # Don't use ranlib 32902+ old_postinstall_cmds='chmod 644 $oldlib' 32903+ postlink_cmds='lt_outputfile="@OUTPUT@"~ 32904+ lt_tool_outputfile="@TOOL_OUTPUT@"~ 32905+ case $lt_outputfile in 32906+ *.exe|*.EXE) ;; 32907+ *) 32908+ lt_outputfile="$lt_outputfile.exe" 32909+ lt_tool_outputfile="$lt_tool_outputfile.exe" 32910+ ;; 32911+ esac~ 32912+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then 32913+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; 32914+ $RM "$lt_outputfile.manifest"; 32915+ fi' 32916+ ;; 32917+ *) 32918+ # Assume MSVC wrapper 32919+ hardcode_libdir_flag_spec=' ' 32920+ allow_undefined_flag=unsupported 32921+ # Tell ltmain to make .lib files, not .a files. 32922+ libext=lib 32923+ # Tell ltmain to make .dll files, not .so files. 32924+ shrext_cmds=".dll" 32925+ # FIXME: Setting linknames here is a bad hack. 32926+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 32927+ # The linker will automatically build a .lib file if we build a DLL. 32928+ old_archive_from_new_cmds='true' 32929+ # FIXME: Should let the user specify the lib program. 32930+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 32931+ enable_shared_with_static_runtimes=yes 32932+ ;; 32933+ esac 32934 ;; 32935 32936 darwin* | rhapsody*) 32937@@ -10704,7 +11282,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 32938 32939 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 32940 freebsd* | dragonfly*) 32941- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' 32942+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' 32943 hardcode_libdir_flag_spec='-R$libdir' 32944 hardcode_direct=yes 32945 hardcode_shlibpath_var=no 32946@@ -10712,7 +11290,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 32947 32948 hpux9*) 32949 if test "$GCC" = yes; then 32950- 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' 32951+ 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' 32952 else 32953 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' 32954 fi 32955@@ -10728,7 +11306,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 32956 32957 hpux10*) 32958 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 32959- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 32960+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 32961 else 32962 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 32963 fi 32964@@ -10752,10 +11330,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 32965 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 32966 ;; 32967 ia64*) 32968- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 32969+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 32970 ;; 32971 *) 32972- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 32973+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 32974 ;; 32975 esac 32976 else 32977@@ -10834,23 +11412,36 @@ fi 32978 32979 irix5* | irix6* | nonstopux*) 32980 if test "$GCC" = yes; then 32981- 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' 32982+ 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' 32983 # Try to use the -exported_symbol ld option, if it does not 32984 # work, assume that -exports_file does not work either and 32985 # implicitly export all symbols. 32986- save_LDFLAGS="$LDFLAGS" 32987- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 32988- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 32989+ # This should be the same for all languages, so no per-tag cache variable. 32990+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 32991+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } 32992+if ${lt_cv_irix_exported_symbol+:} false; then : 32993+ $as_echo_n "(cached) " >&6 32994+else 32995+ save_LDFLAGS="$LDFLAGS" 32996+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 32997+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 32998 /* end confdefs.h. */ 32999-int foo(void) {} 33000+int foo (void) { return 0; } 33001 _ACEOF 33002 if ac_fn_c_try_link "$LINENO"; then : 33003- 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' 33004- 33005+ lt_cv_irix_exported_symbol=yes 33006+else 33007+ lt_cv_irix_exported_symbol=no 33008 fi 33009 rm -f core conftest.err conftest.$ac_objext \ 33010 conftest$ac_exeext conftest.$ac_ext 33011- LDFLAGS="$save_LDFLAGS" 33012+ LDFLAGS="$save_LDFLAGS" 33013+fi 33014+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 33015+$as_echo "$lt_cv_irix_exported_symbol" >&6; } 33016+ if test "$lt_cv_irix_exported_symbol" = yes; then 33017+ 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' 33018+ fi 33019 else 33020 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' 33021 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' 33022@@ -10935,7 +11526,7 @@ rm -f core conftest.err conftest.$ac_objext \ 33023 osf4* | osf5*) # as osf3* with the addition of -msym flag 33024 if test "$GCC" = yes; then 33025 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 33026- 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' 33027+ 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' 33028 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 33029 else 33030 allow_undefined_flag=' -expect_unresolved \*' 33031@@ -10954,9 +11545,9 @@ rm -f core conftest.err conftest.$ac_objext \ 33032 no_undefined_flag=' -z defs' 33033 if test "$GCC" = yes; then 33034 wlarc='${wl}' 33035- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 33036+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 33037 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ 33038- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' 33039+ $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' 33040 else 33041 case `$CC -V 2>&1` in 33042 *"Compilers 5.0"*) 33043@@ -11532,8 +12123,9 @@ cygwin* | mingw* | pw32* | cegcc*) 33044 need_version=no 33045 need_lib_prefix=no 33046 33047- case $GCC,$host_os in 33048- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) 33049+ case $GCC,$cc_basename in 33050+ yes,*) 33051+ # gcc 33052 library_names_spec='$libname.dll.a' 33053 # DLL is installed to $(libdir)/../bin by postinstall_cmds 33054 postinstall_cmds='base_file=`basename \${file}`~ 33055@@ -11566,13 +12158,71 @@ cygwin* | mingw* | pw32* | cegcc*) 33056 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 33057 ;; 33058 esac 33059+ dynamic_linker='Win32 ld.exe' 33060+ ;; 33061+ 33062+ *,cl*) 33063+ # Native MSVC 33064+ libname_spec='$name' 33065+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 33066+ library_names_spec='${libname}.dll.lib' 33067+ 33068+ case $build_os in 33069+ mingw*) 33070+ sys_lib_search_path_spec= 33071+ lt_save_ifs=$IFS 33072+ IFS=';' 33073+ for lt_path in $LIB 33074+ do 33075+ IFS=$lt_save_ifs 33076+ # Let DOS variable expansion print the short 8.3 style file name. 33077+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` 33078+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" 33079+ done 33080+ IFS=$lt_save_ifs 33081+ # Convert to MSYS style. 33082+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` 33083+ ;; 33084+ cygwin*) 33085+ # Convert to unix form, then to dos form, then back to unix form 33086+ # but this time dos style (no spaces!) so that the unix form looks 33087+ # like /cygdrive/c/PROGRA~1:/cygdr... 33088+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` 33089+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` 33090+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 33091+ ;; 33092+ *) 33093+ sys_lib_search_path_spec="$LIB" 33094+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then 33095+ # It is most probably a Windows format PATH. 33096+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` 33097+ else 33098+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 33099+ fi 33100+ # FIXME: find the short name or the path components, as spaces are 33101+ # common. (e.g. "Program Files" -> "PROGRA~1") 33102+ ;; 33103+ esac 33104+ 33105+ # DLL is installed to $(libdir)/../bin by postinstall_cmds 33106+ postinstall_cmds='base_file=`basename \${file}`~ 33107+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ 33108+ dldir=$destdir/`dirname \$dlpath`~ 33109+ test -d \$dldir || mkdir -p \$dldir~ 33110+ $install_prog $dir/$dlname \$dldir/$dlname' 33111+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ 33112+ dlpath=$dir/\$dldll~ 33113+ $RM \$dlpath' 33114+ shlibpath_overrides_runpath=yes 33115+ dynamic_linker='Win32 link.exe' 33116 ;; 33117 33118 *) 33119+ # Assume MSVC wrapper 33120 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' 33121+ dynamic_linker='Win32 ld.exe' 33122 ;; 33123 esac 33124- dynamic_linker='Win32 ld.exe' 33125 # FIXME: first we should search . and the directory the executable is in 33126 shlibpath_var=PATH 33127 ;; 33128@@ -12450,7 +13100,7 @@ else 33129 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 33130 lt_status=$lt_dlunknown 33131 cat > conftest.$ac_ext <<_LT_EOF 33132-#line 12453 "configure" 33133+#line $LINENO "configure" 33134 #include "confdefs.h" 33135 33136 #if HAVE_DLFCN_H 33137@@ -12494,10 +13144,10 @@ else 33138 /* When -fvisbility=hidden is used, assume the code has been annotated 33139 correspondingly for the symbols needed. */ 33140 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 33141-void fnord () __attribute__((visibility("default"))); 33142+int fnord () __attribute__((visibility("default"))); 33143 #endif 33144 33145-void fnord () { int i=42; } 33146+int fnord () { return 42; } 33147 int main () 33148 { 33149 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 33150@@ -12556,7 +13206,7 @@ else 33151 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 33152 lt_status=$lt_dlunknown 33153 cat > conftest.$ac_ext <<_LT_EOF 33154-#line 12559 "configure" 33155+#line $LINENO "configure" 33156 #include "confdefs.h" 33157 33158 #if HAVE_DLFCN_H 33159@@ -12600,10 +13250,10 @@ else 33160 /* When -fvisbility=hidden is used, assume the code has been annotated 33161 correspondingly for the symbols needed. */ 33162 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 33163-void fnord () __attribute__((visibility("default"))); 33164+int fnord () __attribute__((visibility("default"))); 33165 #endif 33166 33167-void fnord () { int i=42; } 33168+int fnord () { return 42; } 33169 int main () 33170 { 33171 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 33172@@ -17596,13 +18246,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 33173 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 33174 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 33175 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 33176+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' 33177+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' 33178 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' 33179 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' 33180 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' 33181 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' 33182 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' 33183+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' 33184+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' 33185+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' 33186+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' 33187 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' 33188 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' 33189+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' 33190 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 33191 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 33192 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 33193@@ -17617,14 +18274,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 33194 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 33195 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 33196 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"`' 33197+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' 33198+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' 33199 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' 33200 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' 33201 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' 33202-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 33203 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' 33204+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 33205 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' 33206 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' 33207 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' 33208+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' 33209 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 33210 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 33211 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 33212@@ -17657,12 +18317,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 33213 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 33214 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 33215 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 33216-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' 33217 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' 33218 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' 33219 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' 33220 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' 33221 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' 33222+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' 33223 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 33224 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 33225 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 33226@@ -17717,8 +18377,13 @@ reload_flag \ 33227 OBJDUMP \ 33228 deplibs_check_method \ 33229 file_magic_cmd \ 33230+file_magic_glob \ 33231+want_nocaseglob \ 33232+DLLTOOL \ 33233+sharedlib_from_linklib_cmd \ 33234 AR \ 33235 AR_FLAGS \ 33236+archiver_list_spec \ 33237 STRIP \ 33238 RANLIB \ 33239 CC \ 33240@@ -17728,12 +18393,14 @@ lt_cv_sys_global_symbol_pipe \ 33241 lt_cv_sys_global_symbol_to_cdecl \ 33242 lt_cv_sys_global_symbol_to_c_name_address \ 33243 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 33244+nm_file_list_spec \ 33245 lt_prog_compiler_no_builtin_flag \ 33246-lt_prog_compiler_wl \ 33247 lt_prog_compiler_pic \ 33248+lt_prog_compiler_wl \ 33249 lt_prog_compiler_static \ 33250 lt_cv_prog_compiler_c_o \ 33251 need_locks \ 33252+MANIFEST_TOOL \ 33253 DSYMUTIL \ 33254 NMEDIT \ 33255 LIPO \ 33256@@ -17749,7 +18416,6 @@ no_undefined_flag \ 33257 hardcode_libdir_flag_spec \ 33258 hardcode_libdir_flag_spec_ld \ 33259 hardcode_libdir_separator \ 33260-fix_srcfile_path \ 33261 exclude_expsyms \ 33262 include_expsyms \ 33263 file_list_spec \ 33264@@ -17785,6 +18451,7 @@ module_cmds \ 33265 module_expsym_cmds \ 33266 export_symbols_cmds \ 33267 prelink_cmds \ 33268+postlink_cmds \ 33269 postinstall_cmds \ 33270 postuninstall_cmds \ 33271 finish_cmds \ 33272@@ -18610,7 +19277,8 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} 33273 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 33274 # 33275 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 33276-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. 33277+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, 33278+# Inc. 33279 # Written by Gordon Matzigkeit, 1996 33280 # 33281 # This file is part of GNU Libtool. 33282@@ -18713,19 +19381,42 @@ SP2NL=$lt_lt_SP2NL 33283 # turn newlines into spaces. 33284 NL2SP=$lt_lt_NL2SP 33285 33286+# convert \$build file names to \$host format. 33287+to_host_file_cmd=$lt_cv_to_host_file_cmd 33288+ 33289+# convert \$build files to toolchain format. 33290+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 33291+ 33292 # An object symbol dumper. 33293 OBJDUMP=$lt_OBJDUMP 33294 33295 # Method to check whether dependent libraries are shared objects. 33296 deplibs_check_method=$lt_deplibs_check_method 33297 33298-# Command to use when deplibs_check_method == "file_magic". 33299+# Command to use when deplibs_check_method = "file_magic". 33300 file_magic_cmd=$lt_file_magic_cmd 33301 33302+# How to find potential files when deplibs_check_method = "file_magic". 33303+file_magic_glob=$lt_file_magic_glob 33304+ 33305+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". 33306+want_nocaseglob=$lt_want_nocaseglob 33307+ 33308+# DLL creation program. 33309+DLLTOOL=$lt_DLLTOOL 33310+ 33311+# Command to associate shared and link libraries. 33312+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd 33313+ 33314 # The archiver. 33315 AR=$lt_AR 33316+ 33317+# Flags to create an archive. 33318 AR_FLAGS=$lt_AR_FLAGS 33319 33320+# How to feed a file listing to the archiver. 33321+archiver_list_spec=$lt_archiver_list_spec 33322+ 33323 # A symbol stripping program. 33324 STRIP=$lt_STRIP 33325 33326@@ -18755,6 +19446,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 33327 # Transform the output of nm in a C name address pair when lib prefix is needed. 33328 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 33329 33330+# Specify filename containing input files for \$NM. 33331+nm_file_list_spec=$lt_nm_file_list_spec 33332+ 33333+# The root where to search for dependent libraries,and in which our libraries should be installed. 33334+lt_sysroot=$lt_sysroot 33335+ 33336 # The name of the directory that contains temporary libtool files. 33337 objdir=$objdir 33338 33339@@ -18764,6 +19461,9 @@ MAGIC_CMD=$MAGIC_CMD 33340 # Must we lock files when doing compilation? 33341 need_locks=$lt_need_locks 33342 33343+# Manifest tool. 33344+MANIFEST_TOOL=$lt_MANIFEST_TOOL 33345+ 33346 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 33347 DSYMUTIL=$lt_DSYMUTIL 33348 33349@@ -18878,12 +19578,12 @@ with_gcc=$GCC 33350 # Compiler flag to turn off builtin functions. 33351 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 33352 33353-# How to pass a linker flag through the compiler. 33354-wl=$lt_lt_prog_compiler_wl 33355- 33356 # Additional compiler flags for building library objects. 33357 pic_flag=$lt_lt_prog_compiler_pic 33358 33359+# How to pass a linker flag through the compiler. 33360+wl=$lt_lt_prog_compiler_wl 33361+ 33362 # Compiler flag to prevent dynamic linking. 33363 link_static_flag=$lt_lt_prog_compiler_static 33364 33365@@ -18970,9 +19670,6 @@ inherit_rpath=$inherit_rpath 33366 # Whether libtool must link a program against all its dependency libraries. 33367 link_all_deplibs=$link_all_deplibs 33368 33369-# Fix the shell variable \$srcfile for the compiler. 33370-fix_srcfile_path=$lt_fix_srcfile_path 33371- 33372 # Set to "yes" if exported symbols are required. 33373 always_export_symbols=$always_export_symbols 33374 33375@@ -18988,6 +19685,9 @@ include_expsyms=$lt_include_expsyms 33376 # Commands necessary for linking programs (against libraries) with templates. 33377 prelink_cmds=$lt_prelink_cmds 33378 33379+# Commands necessary for finishing linking programs. 33380+postlink_cmds=$lt_postlink_cmds 33381+ 33382 # Specify filename containing input files. 33383 file_list_spec=$lt_file_list_spec 33384 33385@@ -19020,210 +19720,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 33386 # if finds mixed CR/LF and LF-only lines. Since sed operates in 33387 # text mode, it properly converts lines to CR/LF. This bash problem 33388 # is reportedly fixed, but why not run on old versions too? 33389- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ 33390- || (rm -f "$cfgfile"; exit 1) 33391- 33392- case $xsi_shell in 33393- yes) 33394- cat << \_LT_EOF >> "$cfgfile" 33395- 33396-# func_dirname file append nondir_replacement 33397-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 33398-# otherwise set result to NONDIR_REPLACEMENT. 33399-func_dirname () 33400-{ 33401- case ${1} in 33402- */*) func_dirname_result="${1%/*}${2}" ;; 33403- * ) func_dirname_result="${3}" ;; 33404- esac 33405-} 33406- 33407-# func_basename file 33408-func_basename () 33409-{ 33410- func_basename_result="${1##*/}" 33411-} 33412- 33413-# func_dirname_and_basename file append nondir_replacement 33414-# perform func_basename and func_dirname in a single function 33415-# call: 33416-# dirname: Compute the dirname of FILE. If nonempty, 33417-# add APPEND to the result, otherwise set result 33418-# to NONDIR_REPLACEMENT. 33419-# value returned in "$func_dirname_result" 33420-# basename: Compute filename of FILE. 33421-# value retuned in "$func_basename_result" 33422-# Implementation must be kept synchronized with func_dirname 33423-# and func_basename. For efficiency, we do not delegate to 33424-# those functions but instead duplicate the functionality here. 33425-func_dirname_and_basename () 33426-{ 33427- case ${1} in 33428- */*) func_dirname_result="${1%/*}${2}" ;; 33429- * ) func_dirname_result="${3}" ;; 33430- esac 33431- func_basename_result="${1##*/}" 33432-} 33433- 33434-# func_stripname prefix suffix name 33435-# strip PREFIX and SUFFIX off of NAME. 33436-# PREFIX and SUFFIX must not contain globbing or regex special 33437-# characters, hashes, percent signs, but SUFFIX may contain a leading 33438-# dot (in which case that matches only a dot). 33439-func_stripname () 33440-{ 33441- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are 33442- # positional parameters, so assign one to ordinary parameter first. 33443- func_stripname_result=${3} 33444- func_stripname_result=${func_stripname_result#"${1}"} 33445- func_stripname_result=${func_stripname_result%"${2}"} 33446-} 33447- 33448-# func_opt_split 33449-func_opt_split () 33450-{ 33451- func_opt_split_opt=${1%%=*} 33452- func_opt_split_arg=${1#*=} 33453-} 33454- 33455-# func_lo2o object 33456-func_lo2o () 33457-{ 33458- case ${1} in 33459- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; 33460- *) func_lo2o_result=${1} ;; 33461- esac 33462-} 33463- 33464-# func_xform libobj-or-source 33465-func_xform () 33466-{ 33467- func_xform_result=${1%.*}.lo 33468-} 33469- 33470-# func_arith arithmetic-term... 33471-func_arith () 33472-{ 33473- func_arith_result=$(( $* )) 33474-} 33475- 33476-# func_len string 33477-# STRING may not start with a hyphen. 33478-func_len () 33479-{ 33480- func_len_result=${#1} 33481-} 33482- 33483-_LT_EOF 33484- ;; 33485- *) # Bourne compatible functions. 33486- cat << \_LT_EOF >> "$cfgfile" 33487- 33488-# func_dirname file append nondir_replacement 33489-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 33490-# otherwise set result to NONDIR_REPLACEMENT. 33491-func_dirname () 33492-{ 33493- # Extract subdirectory from the argument. 33494- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` 33495- if test "X$func_dirname_result" = "X${1}"; then 33496- func_dirname_result="${3}" 33497- else 33498- func_dirname_result="$func_dirname_result${2}" 33499- fi 33500-} 33501- 33502-# func_basename file 33503-func_basename () 33504-{ 33505- func_basename_result=`$ECHO "${1}" | $SED "$basename"` 33506-} 33507- 33508- 33509-# func_stripname prefix suffix name 33510-# strip PREFIX and SUFFIX off of NAME. 33511-# PREFIX and SUFFIX must not contain globbing or regex special 33512-# characters, hashes, percent signs, but SUFFIX may contain a leading 33513-# dot (in which case that matches only a dot). 33514-# func_strip_suffix prefix name 33515-func_stripname () 33516-{ 33517- case ${2} in 33518- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; 33519- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; 33520- esac 33521-} 33522- 33523-# sed scripts: 33524-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' 33525-my_sed_long_arg='1s/^-[^=]*=//' 33526- 33527-# func_opt_split 33528-func_opt_split () 33529-{ 33530- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` 33531- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` 33532-} 33533- 33534-# func_lo2o object 33535-func_lo2o () 33536-{ 33537- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` 33538-} 33539- 33540-# func_xform libobj-or-source 33541-func_xform () 33542-{ 33543- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` 33544-} 33545- 33546-# func_arith arithmetic-term... 33547-func_arith () 33548-{ 33549- func_arith_result=`expr "$@"` 33550-} 33551- 33552-# func_len string 33553-# STRING may not start with a hyphen. 33554-func_len () 33555-{ 33556- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` 33557-} 33558- 33559-_LT_EOF 33560-esac 33561- 33562-case $lt_shell_append in 33563- yes) 33564- cat << \_LT_EOF >> "$cfgfile" 33565- 33566-# func_append var value 33567-# Append VALUE to the end of shell variable VAR. 33568-func_append () 33569-{ 33570- eval "$1+=\$2" 33571-} 33572-_LT_EOF 33573- ;; 33574- *) 33575- cat << \_LT_EOF >> "$cfgfile" 33576- 33577-# func_append var value 33578-# Append VALUE to the end of shell variable VAR. 33579-func_append () 33580-{ 33581- eval "$1=\$$1\$2" 33582-} 33583- 33584-_LT_EOF 33585- ;; 33586- esac 33587- 33588- 33589- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ 33590- || (rm -f "$cfgfile"; exit 1) 33591- 33592- mv -f "$cfgfile" "$ofile" || 33593+ sed '$q' "$ltmain" >> "$cfgfile" \ 33594+ || (rm -f "$cfgfile"; exit 1) 33595+ 33596+ if test x"$xsi_shell" = xyes; then 33597+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ 33598+func_dirname ()\ 33599+{\ 33600+\ case ${1} in\ 33601+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 33602+\ * ) func_dirname_result="${3}" ;;\ 33603+\ esac\ 33604+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ 33605+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 33606+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 33607+test 0 -eq $? || _lt_function_replace_fail=: 33608+ 33609+ 33610+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ 33611+func_basename ()\ 33612+{\ 33613+\ func_basename_result="${1##*/}"\ 33614+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ 33615+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 33616+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 33617+test 0 -eq $? || _lt_function_replace_fail=: 33618+ 33619+ 33620+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ 33621+func_dirname_and_basename ()\ 33622+{\ 33623+\ case ${1} in\ 33624+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 33625+\ * ) func_dirname_result="${3}" ;;\ 33626+\ esac\ 33627+\ func_basename_result="${1##*/}"\ 33628+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ 33629+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 33630+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 33631+test 0 -eq $? || _lt_function_replace_fail=: 33632+ 33633+ 33634+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ 33635+func_stripname ()\ 33636+{\ 33637+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ 33638+\ # positional parameters, so assign one to ordinary parameter first.\ 33639+\ func_stripname_result=${3}\ 33640+\ func_stripname_result=${func_stripname_result#"${1}"}\ 33641+\ func_stripname_result=${func_stripname_result%"${2}"}\ 33642+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ 33643+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 33644+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 33645+test 0 -eq $? || _lt_function_replace_fail=: 33646+ 33647+ 33648+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ 33649+func_split_long_opt ()\ 33650+{\ 33651+\ func_split_long_opt_name=${1%%=*}\ 33652+\ func_split_long_opt_arg=${1#*=}\ 33653+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ 33654+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 33655+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 33656+test 0 -eq $? || _lt_function_replace_fail=: 33657+ 33658+ 33659+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ 33660+func_split_short_opt ()\ 33661+{\ 33662+\ func_split_short_opt_arg=${1#??}\ 33663+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ 33664+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ 33665+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 33666+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 33667+test 0 -eq $? || _lt_function_replace_fail=: 33668+ 33669+ 33670+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ 33671+func_lo2o ()\ 33672+{\ 33673+\ case ${1} in\ 33674+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ 33675+\ *) func_lo2o_result=${1} ;;\ 33676+\ esac\ 33677+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ 33678+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 33679+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 33680+test 0 -eq $? || _lt_function_replace_fail=: 33681+ 33682+ 33683+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ 33684+func_xform ()\ 33685+{\ 33686+ func_xform_result=${1%.*}.lo\ 33687+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ 33688+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 33689+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 33690+test 0 -eq $? || _lt_function_replace_fail=: 33691+ 33692+ 33693+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ 33694+func_arith ()\ 33695+{\ 33696+ func_arith_result=$(( $* ))\ 33697+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ 33698+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 33699+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 33700+test 0 -eq $? || _lt_function_replace_fail=: 33701+ 33702+ 33703+ sed -e '/^func_len ()$/,/^} # func_len /c\ 33704+func_len ()\ 33705+{\ 33706+ func_len_result=${#1}\ 33707+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ 33708+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 33709+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 33710+test 0 -eq $? || _lt_function_replace_fail=: 33711+ 33712+fi 33713+ 33714+if test x"$lt_shell_append" = xyes; then 33715+ sed -e '/^func_append ()$/,/^} # func_append /c\ 33716+func_append ()\ 33717+{\ 33718+ eval "${1}+=\\${2}"\ 33719+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ 33720+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 33721+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 33722+test 0 -eq $? || _lt_function_replace_fail=: 33723+ 33724+ 33725+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ 33726+func_append_quoted ()\ 33727+{\ 33728+\ func_quote_for_eval "${2}"\ 33729+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ 33730+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ 33731+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 33732+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 33733+test 0 -eq $? || _lt_function_replace_fail=: 33734+ 33735+ 33736+ # Save a `func_append' function call where possible by direct use of '+=' 33737+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ 33738+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 33739+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 33740+ test 0 -eq $? || _lt_function_replace_fail=: 33741+else 33742+ # Save a `func_append' function call even when '+=' is not available 33743+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ 33744+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 33745+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 33746+ test 0 -eq $? || _lt_function_replace_fail=: 33747+fi 33748+ 33749+if test x"$_lt_function_replace_fail" = x":"; then 33750+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 33751+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} 33752+fi 33753+ 33754+ 33755+ mv -f "$cfgfile" "$ofile" || 33756 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 33757 chmod +x "$ofile" 33758 33759diff --git a/zlib/Makefile.in b/zlib/Makefile.in 33760index 855c23eea23..0605835c14f 100644 33761--- a/zlib/Makefile.in 33762+++ b/zlib/Makefile.in 33763@@ -281,6 +281,7 @@ CPPFLAGS = @CPPFLAGS@ 33764 CYGPATH_W = @CYGPATH_W@ 33765 DEFS = @DEFS@ 33766 DEPDIR = @DEPDIR@ 33767+DLLTOOL = @DLLTOOL@ 33768 DSYMUTIL = @DSYMUTIL@ 33769 DUMPBIN = @DUMPBIN@ 33770 ECHO_C = @ECHO_C@ 33771@@ -305,6 +306,7 @@ LN_S = @LN_S@ 33772 LTLIBOBJS = @LTLIBOBJS@ 33773 MAINT = @MAINT@ 33774 MAKEINFO = @MAKEINFO@ 33775+MANIFEST_TOOL = @MANIFEST_TOOL@ 33776 MKDIR_P = @MKDIR_P@ 33777 NM = @NM@ 33778 NMEDIT = @NMEDIT@ 33779@@ -331,6 +333,7 @@ abs_builddir = @abs_builddir@ 33780 abs_srcdir = @abs_srcdir@ 33781 abs_top_builddir = @abs_top_builddir@ 33782 abs_top_srcdir = @abs_top_srcdir@ 33783+ac_ct_AR = @ac_ct_AR@ 33784 ac_ct_CC = @ac_ct_CC@ 33785 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ 33786 am__include = @am__include@ 33787diff --git a/zlib/configure b/zlib/configure 33788index e65ade3badd..35b44e2819c 100755 33789--- a/zlib/configure 33790+++ b/zlib/configure 33791@@ -646,8 +646,11 @@ OTOOL 33792 LIPO 33793 NMEDIT 33794 DSYMUTIL 33795+MANIFEST_TOOL 33796 RANLIB 33797+ac_ct_AR 33798 AR 33799+DLLTOOL 33800 OBJDUMP 33801 LN_S 33802 NM 33803@@ -774,6 +777,7 @@ enable_static 33804 with_pic 33805 enable_fast_install 33806 with_gnu_ld 33807+with_libtool_sysroot 33808 enable_libtool_lock 33809 enable_host_shared 33810 ' 33811@@ -1428,6 +1432,8 @@ Optional Packages: 33812 --with-pic try to use only PIC/non-PIC objects [default=use 33813 both] 33814 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 33815+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR 33816+ (or the compiler's sysroot if not specified). 33817 33818 Some influential environment variables: 33819 CC C compiler command 33820@@ -4186,8 +4192,8 @@ esac 33821 33822 33823 33824-macro_version='2.2.7a' 33825-macro_revision='1.3134' 33826+macro_version='2.4' 33827+macro_revision='1.3293' 33828 33829 33830 33831@@ -4227,7 +4233,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 33832 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 33833 $as_echo_n "checking how to print strings... " >&6; } 33834 # Test print first, because it will be a builtin if present. 33835-if test "X`print -r -- -n 2>/dev/null`" = X-n && \ 33836+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ 33837 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 33838 ECHO='print -r --' 33839 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 33840@@ -5050,8 +5056,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 33841 # Try some XSI features 33842 xsi_shell=no 33843 ( _lt_dummy="a/b/c" 33844- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ 33845- = c,a/b,, \ 33846+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ 33847+ = c,a/b,b/c, \ 33848 && eval 'test $(( 1 + 1 )) -eq 2 \ 33849 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 33850 && xsi_shell=yes 33851@@ -5100,6 +5106,80 @@ esac 33852 33853 33854 33855+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 33856+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } 33857+if ${lt_cv_to_host_file_cmd+:} false; then : 33858+ $as_echo_n "(cached) " >&6 33859+else 33860+ case $host in 33861+ *-*-mingw* ) 33862+ case $build in 33863+ *-*-mingw* ) # actually msys 33864+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 33865+ ;; 33866+ *-*-cygwin* ) 33867+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 33868+ ;; 33869+ * ) # otherwise, assume *nix 33870+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 33871+ ;; 33872+ esac 33873+ ;; 33874+ *-*-cygwin* ) 33875+ case $build in 33876+ *-*-mingw* ) # actually msys 33877+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin 33878+ ;; 33879+ *-*-cygwin* ) 33880+ lt_cv_to_host_file_cmd=func_convert_file_noop 33881+ ;; 33882+ * ) # otherwise, assume *nix 33883+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin 33884+ ;; 33885+ esac 33886+ ;; 33887+ * ) # unhandled hosts (and "normal" native builds) 33888+ lt_cv_to_host_file_cmd=func_convert_file_noop 33889+ ;; 33890+esac 33891+ 33892+fi 33893+ 33894+to_host_file_cmd=$lt_cv_to_host_file_cmd 33895+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 33896+$as_echo "$lt_cv_to_host_file_cmd" >&6; } 33897+ 33898+ 33899+ 33900+ 33901+ 33902+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 33903+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } 33904+if ${lt_cv_to_tool_file_cmd+:} false; then : 33905+ $as_echo_n "(cached) " >&6 33906+else 33907+ #assume ordinary cross tools, or native build. 33908+lt_cv_to_tool_file_cmd=func_convert_file_noop 33909+case $host in 33910+ *-*-mingw* ) 33911+ case $build in 33912+ *-*-mingw* ) # actually msys 33913+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 33914+ ;; 33915+ esac 33916+ ;; 33917+esac 33918+ 33919+fi 33920+ 33921+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 33922+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 33923+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } 33924+ 33925+ 33926+ 33927+ 33928+ 33929 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 33930 $as_echo_n "checking for $LD option to reload object files... " >&6; } 33931 if ${lt_cv_ld_reload_flag+:} false; then : 33932@@ -5116,6 +5196,11 @@ case $reload_flag in 33933 esac 33934 reload_cmds='$LD$reload_flag -o $output$reload_objs' 33935 case $host_os in 33936+ cygwin* | mingw* | pw32* | cegcc*) 33937+ if test "$GCC" != yes; then 33938+ reload_cmds=false 33939+ fi 33940+ ;; 33941 darwin*) 33942 if test "$GCC" = yes; then 33943 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 33944@@ -5284,7 +5369,8 @@ mingw* | pw32*) 33945 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 33946 lt_cv_file_magic_cmd='func_win32_libid' 33947 else 33948- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' 33949+ # Keep this pattern in sync with the one in func_win32_libid. 33950+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' 33951 lt_cv_file_magic_cmd='$OBJDUMP -f' 33952 fi 33953 ;; 33954@@ -5438,6 +5524,21 @@ esac 33955 fi 33956 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 33957 $as_echo "$lt_cv_deplibs_check_method" >&6; } 33958+ 33959+file_magic_glob= 33960+want_nocaseglob=no 33961+if test "$build" = "$host"; then 33962+ case $host_os in 33963+ mingw* | pw32*) 33964+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then 33965+ want_nocaseglob=yes 33966+ else 33967+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` 33968+ fi 33969+ ;; 33970+ esac 33971+fi 33972+ 33973 file_magic_cmd=$lt_cv_file_magic_cmd 33974 deplibs_check_method=$lt_cv_deplibs_check_method 33975 test -z "$deplibs_check_method" && deplibs_check_method=unknown 33976@@ -5453,6 +5554,158 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 33977 33978 33979 33980+ 33981+ 33982+ 33983+ 33984+ 33985+ 33986+ 33987+ 33988+ 33989+ 33990+if test -n "$ac_tool_prefix"; then 33991+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. 33992+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 33993+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 33994+$as_echo_n "checking for $ac_word... " >&6; } 33995+if ${ac_cv_prog_DLLTOOL+:} false; then : 33996+ $as_echo_n "(cached) " >&6 33997+else 33998+ if test -n "$DLLTOOL"; then 33999+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. 34000+else 34001+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 34002+for as_dir in $PATH 34003+do 34004+ IFS=$as_save_IFS 34005+ test -z "$as_dir" && as_dir=. 34006+ for ac_exec_ext in '' $ac_executable_extensions; do 34007+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 34008+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" 34009+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 34010+ break 2 34011+ fi 34012+done 34013+ done 34014+IFS=$as_save_IFS 34015+ 34016+fi 34017+fi 34018+DLLTOOL=$ac_cv_prog_DLLTOOL 34019+if test -n "$DLLTOOL"; then 34020+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 34021+$as_echo "$DLLTOOL" >&6; } 34022+else 34023+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 34024+$as_echo "no" >&6; } 34025+fi 34026+ 34027+ 34028+fi 34029+if test -z "$ac_cv_prog_DLLTOOL"; then 34030+ ac_ct_DLLTOOL=$DLLTOOL 34031+ # Extract the first word of "dlltool", so it can be a program name with args. 34032+set dummy dlltool; ac_word=$2 34033+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 34034+$as_echo_n "checking for $ac_word... " >&6; } 34035+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : 34036+ $as_echo_n "(cached) " >&6 34037+else 34038+ if test -n "$ac_ct_DLLTOOL"; then 34039+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. 34040+else 34041+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 34042+for as_dir in $PATH 34043+do 34044+ IFS=$as_save_IFS 34045+ test -z "$as_dir" && as_dir=. 34046+ for ac_exec_ext in '' $ac_executable_extensions; do 34047+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 34048+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" 34049+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 34050+ break 2 34051+ fi 34052+done 34053+ done 34054+IFS=$as_save_IFS 34055+ 34056+fi 34057+fi 34058+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL 34059+if test -n "$ac_ct_DLLTOOL"; then 34060+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 34061+$as_echo "$ac_ct_DLLTOOL" >&6; } 34062+else 34063+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 34064+$as_echo "no" >&6; } 34065+fi 34066+ 34067+ if test "x$ac_ct_DLLTOOL" = x; then 34068+ DLLTOOL="false" 34069+ else 34070+ case $cross_compiling:$ac_tool_warned in 34071+yes:) 34072+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 34073+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 34074+ac_tool_warned=yes ;; 34075+esac 34076+ DLLTOOL=$ac_ct_DLLTOOL 34077+ fi 34078+else 34079+ DLLTOOL="$ac_cv_prog_DLLTOOL" 34080+fi 34081+ 34082+test -z "$DLLTOOL" && DLLTOOL=dlltool 34083+ 34084+ 34085+ 34086+ 34087+ 34088+ 34089+ 34090+ 34091+ 34092+ 34093+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 34094+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } 34095+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : 34096+ $as_echo_n "(cached) " >&6 34097+else 34098+ lt_cv_sharedlib_from_linklib_cmd='unknown' 34099+ 34100+case $host_os in 34101+cygwin* | mingw* | pw32* | cegcc*) 34102+ # two different shell functions defined in ltmain.sh 34103+ # decide which to use based on capabilities of $DLLTOOL 34104+ case `$DLLTOOL --help 2>&1` in 34105+ *--identify-strict*) 34106+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib 34107+ ;; 34108+ *) 34109+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback 34110+ ;; 34111+ esac 34112+ ;; 34113+*) 34114+ # fallback: assume linklib IS sharedlib 34115+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" 34116+ ;; 34117+esac 34118+ 34119+fi 34120+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 34121+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } 34122+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd 34123+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO 34124+ 34125+ 34126+ 34127+ 34128+ 34129+ 34130+ 34131+ 34132 plugin_option= 34133 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 34134 for plugin in $plugin_names; do 34135@@ -5467,8 +5720,10 @@ for plugin in $plugin_names; do 34136 done 34137 34138 if test -n "$ac_tool_prefix"; then 34139- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 34140-set dummy ${ac_tool_prefix}ar; ac_word=$2 34141+ for ac_prog in ar 34142+ do 34143+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 34144+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 34145 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 34146 $as_echo_n "checking for $ac_word... " >&6; } 34147 if ${ac_cv_prog_AR+:} false; then : 34148@@ -5484,7 +5739,7 @@ do 34149 test -z "$as_dir" && as_dir=. 34150 for ac_exec_ext in '' $ac_executable_extensions; do 34151 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 34152- ac_cv_prog_AR="${ac_tool_prefix}ar" 34153+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" 34154 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 34155 break 2 34156 fi 34157@@ -5504,11 +5759,15 @@ $as_echo "no" >&6; } 34158 fi 34159 34160 34161+ test -n "$AR" && break 34162+ done 34163 fi 34164-if test -z "$ac_cv_prog_AR"; then 34165+if test -z "$AR"; then 34166 ac_ct_AR=$AR 34167- # Extract the first word of "ar", so it can be a program name with args. 34168-set dummy ar; ac_word=$2 34169+ for ac_prog in ar 34170+do 34171+ # Extract the first word of "$ac_prog", so it can be a program name with args. 34172+set dummy $ac_prog; ac_word=$2 34173 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 34174 $as_echo_n "checking for $ac_word... " >&6; } 34175 if ${ac_cv_prog_ac_ct_AR+:} false; then : 34176@@ -5524,7 +5783,7 @@ do 34177 test -z "$as_dir" && as_dir=. 34178 for ac_exec_ext in '' $ac_executable_extensions; do 34179 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 34180- ac_cv_prog_ac_ct_AR="ar" 34181+ ac_cv_prog_ac_ct_AR="$ac_prog" 34182 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 34183 break 2 34184 fi 34185@@ -5543,6 +5802,10 @@ else 34186 $as_echo "no" >&6; } 34187 fi 34188 34189+ 34190+ test -n "$ac_ct_AR" && break 34191+done 34192+ 34193 if test "x$ac_ct_AR" = x; then 34194 AR="false" 34195 else 34196@@ -5554,25 +5817,19 @@ ac_tool_warned=yes ;; 34197 esac 34198 AR=$ac_ct_AR 34199 fi 34200-else 34201- AR="$ac_cv_prog_AR" 34202 fi 34203 34204-test -z "$AR" && AR=ar 34205-if test -n "$plugin_option"; then 34206- if $AR --help 2>&1 | grep -q "\--plugin"; then 34207- touch conftest.c 34208- $AR $plugin_option rc conftest.a conftest.c 34209- if test "$?" != 0; then 34210- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 34211+ touch conftest.c 34212+ $AR $plugin_option rc conftest.a conftest.c 34213+ if test "$?" != 0; then 34214+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 34215 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} 34216- else 34217- AR="$AR $plugin_option" 34218- fi 34219- rm -f conftest.* 34220+ else 34221+ AR="$AR $plugin_option" 34222 fi 34223-fi 34224-test -z "$AR_FLAGS" && AR_FLAGS=cru 34225+ rm -f conftest.* 34226+: ${AR=ar} 34227+: ${AR_FLAGS=cru} 34228 34229 34230 34231@@ -5584,6 +5841,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 34232 34233 34234 34235+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 34236+$as_echo_n "checking for archiver @FILE support... " >&6; } 34237+if ${lt_cv_ar_at_file+:} false; then : 34238+ $as_echo_n "(cached) " >&6 34239+else 34240+ lt_cv_ar_at_file=no 34241+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 34242+/* end confdefs.h. */ 34243+ 34244+int 34245+main () 34246+{ 34247+ 34248+ ; 34249+ return 0; 34250+} 34251+_ACEOF 34252+if ac_fn_c_try_compile "$LINENO"; then : 34253+ echo conftest.$ac_objext > conftest.lst 34254+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' 34255+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 34256+ (eval $lt_ar_try) 2>&5 34257+ ac_status=$? 34258+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 34259+ test $ac_status = 0; } 34260+ if test "$ac_status" -eq 0; then 34261+ # Ensure the archiver fails upon bogus file names. 34262+ rm -f conftest.$ac_objext libconftest.a 34263+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 34264+ (eval $lt_ar_try) 2>&5 34265+ ac_status=$? 34266+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 34267+ test $ac_status = 0; } 34268+ if test "$ac_status" -ne 0; then 34269+ lt_cv_ar_at_file=@ 34270+ fi 34271+ fi 34272+ rm -f conftest.* libconftest.a 34273+ 34274+fi 34275+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 34276+ 34277+fi 34278+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 34279+$as_echo "$lt_cv_ar_at_file" >&6; } 34280+ 34281+if test "x$lt_cv_ar_at_file" = xno; then 34282+ archiver_list_spec= 34283+else 34284+ archiver_list_spec=$lt_cv_ar_at_file 34285+fi 34286+ 34287+ 34288+ 34289+ 34290+ 34291+ 34292+ 34293 if test -n "$ac_tool_prefix"; then 34294 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 34295 set dummy ${ac_tool_prefix}strip; ac_word=$2 34296@@ -5923,8 +6238,8 @@ esac 34297 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 34298 34299 # Transform an extracted symbol line into symbol name and symbol address 34300-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 34301-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'" 34302+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 34303+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'" 34304 34305 # Handle CRLF in mingw tool chain 34306 opt_cr= 34307@@ -5960,6 +6275,7 @@ for ac_symprfx in "" "_"; do 34308 else 34309 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 34310 fi 34311+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" 34312 34313 # Check to see that the pipe works correctly. 34314 pipe_works=no 34315@@ -6001,6 +6317,18 @@ _LT_EOF 34316 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 34317 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 34318 cat <<_LT_EOF > conftest.$ac_ext 34319+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ 34320+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) 34321+/* DATA imports from DLLs on WIN32 con't be const, because runtime 34322+ relocations are performed -- see ld's documentation on pseudo-relocs. */ 34323+# define LT_DLSYM_CONST 34324+#elif defined(__osf__) 34325+/* This system does not cope well with relocations in const data. */ 34326+# define LT_DLSYM_CONST 34327+#else 34328+# define LT_DLSYM_CONST const 34329+#endif 34330+ 34331 #ifdef __cplusplus 34332 extern "C" { 34333 #endif 34334@@ -6012,7 +6340,7 @@ _LT_EOF 34335 cat <<_LT_EOF >> conftest.$ac_ext 34336 34337 /* The mapping between symbol names and symbols. */ 34338-const struct { 34339+LT_DLSYM_CONST struct { 34340 const char *name; 34341 void *address; 34342 } 34343@@ -6038,8 +6366,8 @@ static const void *lt_preloaded_setup() { 34344 _LT_EOF 34345 # Now try linking the two files. 34346 mv conftest.$ac_objext conftstm.$ac_objext 34347- lt_save_LIBS="$LIBS" 34348- lt_save_CFLAGS="$CFLAGS" 34349+ lt_globsym_save_LIBS=$LIBS 34350+ lt_globsym_save_CFLAGS=$CFLAGS 34351 LIBS="conftstm.$ac_objext" 34352 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 34353 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 34354@@ -6049,8 +6377,8 @@ _LT_EOF 34355 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 34356 pipe_works=yes 34357 fi 34358- LIBS="$lt_save_LIBS" 34359- CFLAGS="$lt_save_CFLAGS" 34360+ LIBS=$lt_globsym_save_LIBS 34361+ CFLAGS=$lt_globsym_save_CFLAGS 34362 else 34363 echo "cannot find nm_test_func in $nlist" >&5 34364 fi 34365@@ -6087,6 +6415,17 @@ else 34366 $as_echo "ok" >&6; } 34367 fi 34368 34369+# Response file support. 34370+if test "$lt_cv_nm_interface" = "MS dumpbin"; then 34371+ nm_file_list_spec='@' 34372+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then 34373+ nm_file_list_spec='@' 34374+fi 34375+ 34376+ 34377+ 34378+ 34379+ 34380 34381 34382 34383@@ -6104,6 +6443,43 @@ fi 34384 34385 34386 34387+ 34388+ 34389+ 34390+ 34391+ 34392+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 34393+$as_echo_n "checking for sysroot... " >&6; } 34394+ 34395+# Check whether --with-libtool-sysroot was given. 34396+if test "${with_libtool_sysroot+set}" = set; then : 34397+ withval=$with_libtool_sysroot; 34398+else 34399+ with_libtool_sysroot=no 34400+fi 34401+ 34402+ 34403+lt_sysroot= 34404+case ${with_libtool_sysroot} in #( 34405+ yes) 34406+ if test "$GCC" = yes; then 34407+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` 34408+ fi 34409+ ;; #( 34410+ /*) 34411+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` 34412+ ;; #( 34413+ no|'') 34414+ ;; #( 34415+ *) 34416+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 34417+$as_echo "${with_libtool_sysroot}" >&6; } 34418+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 34419+ ;; 34420+esac 34421+ 34422+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 34423+$as_echo "${lt_sysroot:-no}" >&6; } 34424 34425 34426 34427@@ -6318,6 +6694,123 @@ esac 34428 34429 need_locks="$enable_libtool_lock" 34430 34431+if test -n "$ac_tool_prefix"; then 34432+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. 34433+set dummy ${ac_tool_prefix}mt; ac_word=$2 34434+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 34435+$as_echo_n "checking for $ac_word... " >&6; } 34436+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : 34437+ $as_echo_n "(cached) " >&6 34438+else 34439+ if test -n "$MANIFEST_TOOL"; then 34440+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. 34441+else 34442+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 34443+for as_dir in $PATH 34444+do 34445+ IFS=$as_save_IFS 34446+ test -z "$as_dir" && as_dir=. 34447+ for ac_exec_ext in '' $ac_executable_extensions; do 34448+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 34449+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" 34450+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 34451+ break 2 34452+ fi 34453+done 34454+ done 34455+IFS=$as_save_IFS 34456+ 34457+fi 34458+fi 34459+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL 34460+if test -n "$MANIFEST_TOOL"; then 34461+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 34462+$as_echo "$MANIFEST_TOOL" >&6; } 34463+else 34464+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 34465+$as_echo "no" >&6; } 34466+fi 34467+ 34468+ 34469+fi 34470+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then 34471+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL 34472+ # Extract the first word of "mt", so it can be a program name with args. 34473+set dummy mt; ac_word=$2 34474+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 34475+$as_echo_n "checking for $ac_word... " >&6; } 34476+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : 34477+ $as_echo_n "(cached) " >&6 34478+else 34479+ if test -n "$ac_ct_MANIFEST_TOOL"; then 34480+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. 34481+else 34482+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 34483+for as_dir in $PATH 34484+do 34485+ IFS=$as_save_IFS 34486+ test -z "$as_dir" && as_dir=. 34487+ for ac_exec_ext in '' $ac_executable_extensions; do 34488+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 34489+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" 34490+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 34491+ break 2 34492+ fi 34493+done 34494+ done 34495+IFS=$as_save_IFS 34496+ 34497+fi 34498+fi 34499+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL 34500+if test -n "$ac_ct_MANIFEST_TOOL"; then 34501+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 34502+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } 34503+else 34504+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 34505+$as_echo "no" >&6; } 34506+fi 34507+ 34508+ if test "x$ac_ct_MANIFEST_TOOL" = x; then 34509+ MANIFEST_TOOL=":" 34510+ else 34511+ case $cross_compiling:$ac_tool_warned in 34512+yes:) 34513+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 34514+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 34515+ac_tool_warned=yes ;; 34516+esac 34517+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL 34518+ fi 34519+else 34520+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" 34521+fi 34522+ 34523+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt 34524+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 34525+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } 34526+if ${lt_cv_path_mainfest_tool+:} false; then : 34527+ $as_echo_n "(cached) " >&6 34528+else 34529+ lt_cv_path_mainfest_tool=no 34530+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 34531+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out 34532+ cat conftest.err >&5 34533+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then 34534+ lt_cv_path_mainfest_tool=yes 34535+ fi 34536+ rm -f conftest* 34537+fi 34538+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 34539+$as_echo "$lt_cv_path_mainfest_tool" >&6; } 34540+if test "x$lt_cv_path_mainfest_tool" != xyes; then 34541+ MANIFEST_TOOL=: 34542+fi 34543+ 34544+ 34545+ 34546+ 34547+ 34548 34549 case $host_os in 34550 rhapsody* | darwin*) 34551@@ -6884,6 +7377,8 @@ _LT_EOF 34552 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 34553 echo "$AR cru libconftest.a conftest.o" >&5 34554 $AR cru libconftest.a conftest.o 2>&5 34555+ echo "$RANLIB libconftest.a" >&5 34556+ $RANLIB libconftest.a 2>&5 34557 cat > conftest.c << _LT_EOF 34558 int main() { return 0;} 34559 _LT_EOF 34560@@ -7733,8 +8228,6 @@ fi 34561 lt_prog_compiler_pic= 34562 lt_prog_compiler_static= 34563 34564-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 34565-$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 34566 34567 if test "$GCC" = yes; then 34568 lt_prog_compiler_wl='-Wl,' 34569@@ -7900,6 +8393,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 34570 lt_prog_compiler_pic='--shared' 34571 lt_prog_compiler_static='--static' 34572 ;; 34573+ nagfor*) 34574+ # NAG Fortran compiler 34575+ lt_prog_compiler_wl='-Wl,-Wl,,' 34576+ lt_prog_compiler_pic='-PIC' 34577+ lt_prog_compiler_static='-Bstatic' 34578+ ;; 34579 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 34580 # Portland Group compilers (*not* the Pentium gcc compiler, 34581 # which looks to be a dead project) 34582@@ -7962,7 +8461,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 34583 lt_prog_compiler_pic='-KPIC' 34584 lt_prog_compiler_static='-Bstatic' 34585 case $cc_basename in 34586- f77* | f90* | f95*) 34587+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) 34588 lt_prog_compiler_wl='-Qoption ld ';; 34589 *) 34590 lt_prog_compiler_wl='-Wl,';; 34591@@ -8019,13 +8518,17 @@ case $host_os in 34592 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 34593 ;; 34594 esac 34595-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 34596-$as_echo "$lt_prog_compiler_pic" >&6; } 34597- 34598- 34599- 34600- 34601 34602+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 34603+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 34604+if ${lt_cv_prog_compiler_pic+:} false; then : 34605+ $as_echo_n "(cached) " >&6 34606+else 34607+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic 34608+fi 34609+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 34610+$as_echo "$lt_cv_prog_compiler_pic" >&6; } 34611+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic 34612 34613 # 34614 # Check to make sure the PIC flag actually works. 34615@@ -8086,6 +8589,11 @@ fi 34616 34617 34618 34619+ 34620+ 34621+ 34622+ 34623+ 34624 # 34625 # Check to make sure the static flag actually works. 34626 # 34627@@ -8436,7 +8944,8 @@ _LT_EOF 34628 allow_undefined_flag=unsupported 34629 always_export_symbols=no 34630 enable_shared_with_static_runtimes=yes 34631- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 34632+ 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' 34633+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' 34634 34635 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 34636 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 34637@@ -8535,12 +9044,12 @@ _LT_EOF 34638 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 34639 hardcode_libdir_flag_spec= 34640 hardcode_libdir_flag_spec_ld='-rpath $libdir' 34641- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' 34642+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' 34643 if test "x$supports_anon_versioning" = xyes; then 34644 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ 34645 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ 34646 echo "local: *; };" >> $output_objdir/$libname.ver~ 34647- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 34648+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 34649 fi 34650 ;; 34651 esac 34652@@ -8554,8 +9063,8 @@ _LT_EOF 34653 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 34654 wlarc= 34655 else 34656- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 34657- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 34658+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 34659+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 34660 fi 34661 ;; 34662 34663@@ -8573,8 +9082,8 @@ _LT_EOF 34664 34665 _LT_EOF 34666 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 34667- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 34668- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 34669+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 34670+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 34671 else 34672 ld_shlibs=no 34673 fi 34674@@ -8620,8 +9129,8 @@ _LT_EOF 34675 34676 *) 34677 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 34678- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 34679- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 34680+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 34681+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 34682 else 34683 ld_shlibs=no 34684 fi 34685@@ -8751,7 +9260,13 @@ _LT_EOF 34686 allow_undefined_flag='-berok' 34687 # Determine the default libpath from the value encoded in an 34688 # empty executable. 34689- if test x$gcc_no_link = xyes; then 34690+ if test "${lt_cv_aix_libpath+set}" = set; then 34691+ aix_libpath=$lt_cv_aix_libpath 34692+else 34693+ if ${lt_cv_aix_libpath_+:} false; then : 34694+ $as_echo_n "(cached) " >&6 34695+else 34696+ if test x$gcc_no_link = xyes; then 34697 as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 34698 fi 34699 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 34700@@ -8767,22 +9282,29 @@ main () 34701 _ACEOF 34702 if ac_fn_c_try_link "$LINENO"; then : 34703 34704-lt_aix_libpath_sed=' 34705- /Import File Strings/,/^$/ { 34706- /^0/ { 34707- s/^0 *\(.*\)$/\1/ 34708- p 34709- } 34710- }' 34711-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 34712-# Check for a 64-bit object if we didn't find anything. 34713-if test -z "$aix_libpath"; then 34714- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 34715-fi 34716+ lt_aix_libpath_sed=' 34717+ /Import File Strings/,/^$/ { 34718+ /^0/ { 34719+ s/^0 *\([^ ]*\) *$/\1/ 34720+ p 34721+ } 34722+ }' 34723+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 34724+ # Check for a 64-bit object if we didn't find anything. 34725+ if test -z "$lt_cv_aix_libpath_"; then 34726+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 34727+ fi 34728 fi 34729 rm -f core conftest.err conftest.$ac_objext \ 34730 conftest$ac_exeext conftest.$ac_ext 34731-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 34732+ if test -z "$lt_cv_aix_libpath_"; then 34733+ lt_cv_aix_libpath_="/usr/lib:/lib" 34734+ fi 34735+ 34736+fi 34737+ 34738+ aix_libpath=$lt_cv_aix_libpath_ 34739+fi 34740 34741 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 34742 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" 34743@@ -8794,7 +9316,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 34744 else 34745 # Determine the default libpath from the value encoded in an 34746 # empty executable. 34747- if test x$gcc_no_link = xyes; then 34748+ if test "${lt_cv_aix_libpath+set}" = set; then 34749+ aix_libpath=$lt_cv_aix_libpath 34750+else 34751+ if ${lt_cv_aix_libpath_+:} false; then : 34752+ $as_echo_n "(cached) " >&6 34753+else 34754+ if test x$gcc_no_link = xyes; then 34755 as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 34756 fi 34757 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 34758@@ -8810,22 +9338,29 @@ main () 34759 _ACEOF 34760 if ac_fn_c_try_link "$LINENO"; then : 34761 34762-lt_aix_libpath_sed=' 34763- /Import File Strings/,/^$/ { 34764- /^0/ { 34765- s/^0 *\(.*\)$/\1/ 34766- p 34767- } 34768- }' 34769-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 34770-# Check for a 64-bit object if we didn't find anything. 34771-if test -z "$aix_libpath"; then 34772- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 34773-fi 34774+ lt_aix_libpath_sed=' 34775+ /Import File Strings/,/^$/ { 34776+ /^0/ { 34777+ s/^0 *\([^ ]*\) *$/\1/ 34778+ p 34779+ } 34780+ }' 34781+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 34782+ # Check for a 64-bit object if we didn't find anything. 34783+ if test -z "$lt_cv_aix_libpath_"; then 34784+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 34785+ fi 34786 fi 34787 rm -f core conftest.err conftest.$ac_objext \ 34788 conftest$ac_exeext conftest.$ac_ext 34789-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 34790+ if test -z "$lt_cv_aix_libpath_"; then 34791+ lt_cv_aix_libpath_="/usr/lib:/lib" 34792+ fi 34793+ 34794+fi 34795+ 34796+ aix_libpath=$lt_cv_aix_libpath_ 34797+fi 34798 34799 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 34800 # Warning - without using the other run time loading flags, 34801@@ -8870,20 +9405,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 34802 # Microsoft Visual C++. 34803 # hardcode_libdir_flag_spec is actually meaningless, as there is 34804 # no search path for DLLs. 34805- hardcode_libdir_flag_spec=' ' 34806- allow_undefined_flag=unsupported 34807- # Tell ltmain to make .lib files, not .a files. 34808- libext=lib 34809- # Tell ltmain to make .dll files, not .so files. 34810- shrext_cmds=".dll" 34811- # FIXME: Setting linknames here is a bad hack. 34812- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 34813- # The linker will automatically build a .lib file if we build a DLL. 34814- old_archive_from_new_cmds='true' 34815- # FIXME: Should let the user specify the lib program. 34816- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 34817- fix_srcfile_path='`cygpath -w "$srcfile"`' 34818- enable_shared_with_static_runtimes=yes 34819+ case $cc_basename in 34820+ cl*) 34821+ # Native MSVC 34822+ hardcode_libdir_flag_spec=' ' 34823+ allow_undefined_flag=unsupported 34824+ always_export_symbols=yes 34825+ file_list_spec='@' 34826+ # Tell ltmain to make .lib files, not .a files. 34827+ libext=lib 34828+ # Tell ltmain to make .dll files, not .so files. 34829+ shrext_cmds=".dll" 34830+ # FIXME: Setting linknames here is a bad hack. 34831+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' 34832+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 34833+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; 34834+ else 34835+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; 34836+ fi~ 34837+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ 34838+ linknames=' 34839+ # The linker will not automatically build a static lib if we build a DLL. 34840+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' 34841+ enable_shared_with_static_runtimes=yes 34842+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 34843+ # Don't use ranlib 34844+ old_postinstall_cmds='chmod 644 $oldlib' 34845+ postlink_cmds='lt_outputfile="@OUTPUT@"~ 34846+ lt_tool_outputfile="@TOOL_OUTPUT@"~ 34847+ case $lt_outputfile in 34848+ *.exe|*.EXE) ;; 34849+ *) 34850+ lt_outputfile="$lt_outputfile.exe" 34851+ lt_tool_outputfile="$lt_tool_outputfile.exe" 34852+ ;; 34853+ esac~ 34854+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then 34855+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; 34856+ $RM "$lt_outputfile.manifest"; 34857+ fi' 34858+ ;; 34859+ *) 34860+ # Assume MSVC wrapper 34861+ hardcode_libdir_flag_spec=' ' 34862+ allow_undefined_flag=unsupported 34863+ # Tell ltmain to make .lib files, not .a files. 34864+ libext=lib 34865+ # Tell ltmain to make .dll files, not .so files. 34866+ shrext_cmds=".dll" 34867+ # FIXME: Setting linknames here is a bad hack. 34868+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 34869+ # The linker will automatically build a .lib file if we build a DLL. 34870+ old_archive_from_new_cmds='true' 34871+ # FIXME: Should let the user specify the lib program. 34872+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 34873+ enable_shared_with_static_runtimes=yes 34874+ ;; 34875+ esac 34876 ;; 34877 34878 darwin* | rhapsody*) 34879@@ -8944,7 +9522,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 34880 34881 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 34882 freebsd* | dragonfly*) 34883- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' 34884+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' 34885 hardcode_libdir_flag_spec='-R$libdir' 34886 hardcode_direct=yes 34887 hardcode_shlibpath_var=no 34888@@ -8952,7 +9530,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 34889 34890 hpux9*) 34891 if test "$GCC" = yes; then 34892- 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' 34893+ 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' 34894 else 34895 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' 34896 fi 34897@@ -8968,7 +9546,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 34898 34899 hpux10*) 34900 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 34901- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 34902+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 34903 else 34904 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 34905 fi 34906@@ -8992,10 +9570,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 34907 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 34908 ;; 34909 ia64*) 34910- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 34911+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 34912 ;; 34913 *) 34914- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 34915+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 34916 ;; 34917 esac 34918 else 34919@@ -9074,26 +9652,39 @@ fi 34920 34921 irix5* | irix6* | nonstopux*) 34922 if test "$GCC" = yes; then 34923- 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' 34924+ 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' 34925 # Try to use the -exported_symbol ld option, if it does not 34926 # work, assume that -exports_file does not work either and 34927 # implicitly export all symbols. 34928- save_LDFLAGS="$LDFLAGS" 34929- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 34930- if test x$gcc_no_link = xyes; then 34931+ # This should be the same for all languages, so no per-tag cache variable. 34932+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 34933+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } 34934+if ${lt_cv_irix_exported_symbol+:} false; then : 34935+ $as_echo_n "(cached) " >&6 34936+else 34937+ save_LDFLAGS="$LDFLAGS" 34938+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 34939+ if test x$gcc_no_link = xyes; then 34940 as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 34941 fi 34942 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 34943 /* end confdefs.h. */ 34944-int foo(void) {} 34945+int foo (void) { return 0; } 34946 _ACEOF 34947 if ac_fn_c_try_link "$LINENO"; then : 34948- 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' 34949- 34950+ lt_cv_irix_exported_symbol=yes 34951+else 34952+ lt_cv_irix_exported_symbol=no 34953 fi 34954 rm -f core conftest.err conftest.$ac_objext \ 34955 conftest$ac_exeext conftest.$ac_ext 34956- LDFLAGS="$save_LDFLAGS" 34957+ LDFLAGS="$save_LDFLAGS" 34958+fi 34959+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 34960+$as_echo "$lt_cv_irix_exported_symbol" >&6; } 34961+ if test "$lt_cv_irix_exported_symbol" = yes; then 34962+ 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' 34963+ fi 34964 else 34965 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' 34966 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' 34967@@ -9178,7 +9769,7 @@ rm -f core conftest.err conftest.$ac_objext \ 34968 osf4* | osf5*) # as osf3* with the addition of -msym flag 34969 if test "$GCC" = yes; then 34970 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 34971- 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' 34972+ 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' 34973 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 34974 else 34975 allow_undefined_flag=' -expect_unresolved \*' 34976@@ -9197,9 +9788,9 @@ rm -f core conftest.err conftest.$ac_objext \ 34977 no_undefined_flag=' -z defs' 34978 if test "$GCC" = yes; then 34979 wlarc='${wl}' 34980- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 34981+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 34982 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ 34983- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' 34984+ $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' 34985 else 34986 case `$CC -V 2>&1` in 34987 *"Compilers 5.0"*) 34988@@ -9775,8 +10366,9 @@ cygwin* | mingw* | pw32* | cegcc*) 34989 need_version=no 34990 need_lib_prefix=no 34991 34992- case $GCC,$host_os in 34993- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) 34994+ case $GCC,$cc_basename in 34995+ yes,*) 34996+ # gcc 34997 library_names_spec='$libname.dll.a' 34998 # DLL is installed to $(libdir)/../bin by postinstall_cmds 34999 postinstall_cmds='base_file=`basename \${file}`~ 35000@@ -9809,13 +10401,71 @@ cygwin* | mingw* | pw32* | cegcc*) 35001 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 35002 ;; 35003 esac 35004+ dynamic_linker='Win32 ld.exe' 35005+ ;; 35006+ 35007+ *,cl*) 35008+ # Native MSVC 35009+ libname_spec='$name' 35010+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 35011+ library_names_spec='${libname}.dll.lib' 35012+ 35013+ case $build_os in 35014+ mingw*) 35015+ sys_lib_search_path_spec= 35016+ lt_save_ifs=$IFS 35017+ IFS=';' 35018+ for lt_path in $LIB 35019+ do 35020+ IFS=$lt_save_ifs 35021+ # Let DOS variable expansion print the short 8.3 style file name. 35022+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` 35023+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" 35024+ done 35025+ IFS=$lt_save_ifs 35026+ # Convert to MSYS style. 35027+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` 35028+ ;; 35029+ cygwin*) 35030+ # Convert to unix form, then to dos form, then back to unix form 35031+ # but this time dos style (no spaces!) so that the unix form looks 35032+ # like /cygdrive/c/PROGRA~1:/cygdr... 35033+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` 35034+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` 35035+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 35036+ ;; 35037+ *) 35038+ sys_lib_search_path_spec="$LIB" 35039+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then 35040+ # It is most probably a Windows format PATH. 35041+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` 35042+ else 35043+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 35044+ fi 35045+ # FIXME: find the short name or the path components, as spaces are 35046+ # common. (e.g. "Program Files" -> "PROGRA~1") 35047+ ;; 35048+ esac 35049+ 35050+ # DLL is installed to $(libdir)/../bin by postinstall_cmds 35051+ postinstall_cmds='base_file=`basename \${file}`~ 35052+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ 35053+ dldir=$destdir/`dirname \$dlpath`~ 35054+ test -d \$dldir || mkdir -p \$dldir~ 35055+ $install_prog $dir/$dlname \$dldir/$dlname' 35056+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ 35057+ dlpath=$dir/\$dldll~ 35058+ $RM \$dlpath' 35059+ shlibpath_overrides_runpath=yes 35060+ dynamic_linker='Win32 link.exe' 35061 ;; 35062 35063 *) 35064+ # Assume MSVC wrapper 35065 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' 35066+ dynamic_linker='Win32 ld.exe' 35067 ;; 35068 esac 35069- dynamic_linker='Win32 ld.exe' 35070 # FIXME: first we should search . and the directory the executable is in 35071 shlibpath_var=PATH 35072 ;; 35073@@ -10711,7 +11361,7 @@ else 35074 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 35075 lt_status=$lt_dlunknown 35076 cat > conftest.$ac_ext <<_LT_EOF 35077-#line 10714 "configure" 35078+#line $LINENO "configure" 35079 #include "confdefs.h" 35080 35081 #if HAVE_DLFCN_H 35082@@ -10755,10 +11405,10 @@ else 35083 /* When -fvisbility=hidden is used, assume the code has been annotated 35084 correspondingly for the symbols needed. */ 35085 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 35086-void fnord () __attribute__((visibility("default"))); 35087+int fnord () __attribute__((visibility("default"))); 35088 #endif 35089 35090-void fnord () { int i=42; } 35091+int fnord () { return 42; } 35092 int main () 35093 { 35094 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 35095@@ -10817,7 +11467,7 @@ else 35096 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 35097 lt_status=$lt_dlunknown 35098 cat > conftest.$ac_ext <<_LT_EOF 35099-#line 10820 "configure" 35100+#line $LINENO "configure" 35101 #include "confdefs.h" 35102 35103 #if HAVE_DLFCN_H 35104@@ -10861,10 +11511,10 @@ else 35105 /* When -fvisbility=hidden is used, assume the code has been annotated 35106 correspondingly for the symbols needed. */ 35107 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 35108-void fnord () __attribute__((visibility("default"))); 35109+int fnord () __attribute__((visibility("default"))); 35110 #endif 35111 35112-void fnord () { int i=42; } 35113+int fnord () { return 42; } 35114 int main () 35115 { 35116 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 35117@@ -12334,13 +12984,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 35118 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 35119 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 35120 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 35121+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' 35122+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' 35123 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' 35124 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' 35125 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' 35126 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' 35127 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' 35128+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' 35129+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' 35130+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' 35131+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' 35132 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' 35133 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' 35134+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' 35135 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 35136 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 35137 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 35138@@ -12355,14 +13012,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 35139 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 35140 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 35141 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"`' 35142+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' 35143+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' 35144 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' 35145 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' 35146 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' 35147-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 35148 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' 35149+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 35150 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' 35151 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' 35152 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' 35153+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' 35154 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 35155 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 35156 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 35157@@ -12395,12 +13055,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 35158 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 35159 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 35160 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 35161-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' 35162 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' 35163 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' 35164 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' 35165 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' 35166 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' 35167+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' 35168 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 35169 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 35170 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 35171@@ -12455,8 +13115,13 @@ reload_flag \ 35172 OBJDUMP \ 35173 deplibs_check_method \ 35174 file_magic_cmd \ 35175+file_magic_glob \ 35176+want_nocaseglob \ 35177+DLLTOOL \ 35178+sharedlib_from_linklib_cmd \ 35179 AR \ 35180 AR_FLAGS \ 35181+archiver_list_spec \ 35182 STRIP \ 35183 RANLIB \ 35184 CC \ 35185@@ -12466,12 +13131,14 @@ lt_cv_sys_global_symbol_pipe \ 35186 lt_cv_sys_global_symbol_to_cdecl \ 35187 lt_cv_sys_global_symbol_to_c_name_address \ 35188 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 35189+nm_file_list_spec \ 35190 lt_prog_compiler_no_builtin_flag \ 35191-lt_prog_compiler_wl \ 35192 lt_prog_compiler_pic \ 35193+lt_prog_compiler_wl \ 35194 lt_prog_compiler_static \ 35195 lt_cv_prog_compiler_c_o \ 35196 need_locks \ 35197+MANIFEST_TOOL \ 35198 DSYMUTIL \ 35199 NMEDIT \ 35200 LIPO \ 35201@@ -12487,7 +13154,6 @@ no_undefined_flag \ 35202 hardcode_libdir_flag_spec \ 35203 hardcode_libdir_flag_spec_ld \ 35204 hardcode_libdir_separator \ 35205-fix_srcfile_path \ 35206 exclude_expsyms \ 35207 include_expsyms \ 35208 file_list_spec \ 35209@@ -12523,6 +13189,7 @@ module_cmds \ 35210 module_expsym_cmds \ 35211 export_symbols_cmds \ 35212 prelink_cmds \ 35213+postlink_cmds \ 35214 postinstall_cmds \ 35215 postuninstall_cmds \ 35216 finish_cmds \ 35217@@ -13121,7 +13788,8 @@ $as_echo X"$file" | 35218 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 35219 # 35220 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 35221-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. 35222+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, 35223+# Inc. 35224 # Written by Gordon Matzigkeit, 1996 35225 # 35226 # This file is part of GNU Libtool. 35227@@ -13224,19 +13892,42 @@ SP2NL=$lt_lt_SP2NL 35228 # turn newlines into spaces. 35229 NL2SP=$lt_lt_NL2SP 35230 35231+# convert \$build file names to \$host format. 35232+to_host_file_cmd=$lt_cv_to_host_file_cmd 35233+ 35234+# convert \$build files to toolchain format. 35235+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 35236+ 35237 # An object symbol dumper. 35238 OBJDUMP=$lt_OBJDUMP 35239 35240 # Method to check whether dependent libraries are shared objects. 35241 deplibs_check_method=$lt_deplibs_check_method 35242 35243-# Command to use when deplibs_check_method == "file_magic". 35244+# Command to use when deplibs_check_method = "file_magic". 35245 file_magic_cmd=$lt_file_magic_cmd 35246 35247+# How to find potential files when deplibs_check_method = "file_magic". 35248+file_magic_glob=$lt_file_magic_glob 35249+ 35250+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". 35251+want_nocaseglob=$lt_want_nocaseglob 35252+ 35253+# DLL creation program. 35254+DLLTOOL=$lt_DLLTOOL 35255+ 35256+# Command to associate shared and link libraries. 35257+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd 35258+ 35259 # The archiver. 35260 AR=$lt_AR 35261+ 35262+# Flags to create an archive. 35263 AR_FLAGS=$lt_AR_FLAGS 35264 35265+# How to feed a file listing to the archiver. 35266+archiver_list_spec=$lt_archiver_list_spec 35267+ 35268 # A symbol stripping program. 35269 STRIP=$lt_STRIP 35270 35271@@ -13266,6 +13957,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 35272 # Transform the output of nm in a C name address pair when lib prefix is needed. 35273 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 35274 35275+# Specify filename containing input files for \$NM. 35276+nm_file_list_spec=$lt_nm_file_list_spec 35277+ 35278+# The root where to search for dependent libraries,and in which our libraries should be installed. 35279+lt_sysroot=$lt_sysroot 35280+ 35281 # The name of the directory that contains temporary libtool files. 35282 objdir=$objdir 35283 35284@@ -13275,6 +13972,9 @@ MAGIC_CMD=$MAGIC_CMD 35285 # Must we lock files when doing compilation? 35286 need_locks=$lt_need_locks 35287 35288+# Manifest tool. 35289+MANIFEST_TOOL=$lt_MANIFEST_TOOL 35290+ 35291 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 35292 DSYMUTIL=$lt_DSYMUTIL 35293 35294@@ -13389,12 +14089,12 @@ with_gcc=$GCC 35295 # Compiler flag to turn off builtin functions. 35296 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 35297 35298-# How to pass a linker flag through the compiler. 35299-wl=$lt_lt_prog_compiler_wl 35300- 35301 # Additional compiler flags for building library objects. 35302 pic_flag=$lt_lt_prog_compiler_pic 35303 35304+# How to pass a linker flag through the compiler. 35305+wl=$lt_lt_prog_compiler_wl 35306+ 35307 # Compiler flag to prevent dynamic linking. 35308 link_static_flag=$lt_lt_prog_compiler_static 35309 35310@@ -13481,9 +14181,6 @@ inherit_rpath=$inherit_rpath 35311 # Whether libtool must link a program against all its dependency libraries. 35312 link_all_deplibs=$link_all_deplibs 35313 35314-# Fix the shell variable \$srcfile for the compiler. 35315-fix_srcfile_path=$lt_fix_srcfile_path 35316- 35317 # Set to "yes" if exported symbols are required. 35318 always_export_symbols=$always_export_symbols 35319 35320@@ -13499,6 +14196,9 @@ include_expsyms=$lt_include_expsyms 35321 # Commands necessary for linking programs (against libraries) with templates. 35322 prelink_cmds=$lt_prelink_cmds 35323 35324+# Commands necessary for finishing linking programs. 35325+postlink_cmds=$lt_postlink_cmds 35326+ 35327 # Specify filename containing input files. 35328 file_list_spec=$lt_file_list_spec 35329 35330@@ -13531,210 +14231,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 35331 # if finds mixed CR/LF and LF-only lines. Since sed operates in 35332 # text mode, it properly converts lines to CR/LF. This bash problem 35333 # is reportedly fixed, but why not run on old versions too? 35334- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ 35335- || (rm -f "$cfgfile"; exit 1) 35336- 35337- case $xsi_shell in 35338- yes) 35339- cat << \_LT_EOF >> "$cfgfile" 35340- 35341-# func_dirname file append nondir_replacement 35342-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 35343-# otherwise set result to NONDIR_REPLACEMENT. 35344-func_dirname () 35345-{ 35346- case ${1} in 35347- */*) func_dirname_result="${1%/*}${2}" ;; 35348- * ) func_dirname_result="${3}" ;; 35349- esac 35350-} 35351- 35352-# func_basename file 35353-func_basename () 35354-{ 35355- func_basename_result="${1##*/}" 35356-} 35357- 35358-# func_dirname_and_basename file append nondir_replacement 35359-# perform func_basename and func_dirname in a single function 35360-# call: 35361-# dirname: Compute the dirname of FILE. If nonempty, 35362-# add APPEND to the result, otherwise set result 35363-# to NONDIR_REPLACEMENT. 35364-# value returned in "$func_dirname_result" 35365-# basename: Compute filename of FILE. 35366-# value retuned in "$func_basename_result" 35367-# Implementation must be kept synchronized with func_dirname 35368-# and func_basename. For efficiency, we do not delegate to 35369-# those functions but instead duplicate the functionality here. 35370-func_dirname_and_basename () 35371-{ 35372- case ${1} in 35373- */*) func_dirname_result="${1%/*}${2}" ;; 35374- * ) func_dirname_result="${3}" ;; 35375- esac 35376- func_basename_result="${1##*/}" 35377-} 35378- 35379-# func_stripname prefix suffix name 35380-# strip PREFIX and SUFFIX off of NAME. 35381-# PREFIX and SUFFIX must not contain globbing or regex special 35382-# characters, hashes, percent signs, but SUFFIX may contain a leading 35383-# dot (in which case that matches only a dot). 35384-func_stripname () 35385-{ 35386- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are 35387- # positional parameters, so assign one to ordinary parameter first. 35388- func_stripname_result=${3} 35389- func_stripname_result=${func_stripname_result#"${1}"} 35390- func_stripname_result=${func_stripname_result%"${2}"} 35391-} 35392- 35393-# func_opt_split 35394-func_opt_split () 35395-{ 35396- func_opt_split_opt=${1%%=*} 35397- func_opt_split_arg=${1#*=} 35398-} 35399- 35400-# func_lo2o object 35401-func_lo2o () 35402-{ 35403- case ${1} in 35404- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; 35405- *) func_lo2o_result=${1} ;; 35406- esac 35407-} 35408- 35409-# func_xform libobj-or-source 35410-func_xform () 35411-{ 35412- func_xform_result=${1%.*}.lo 35413-} 35414- 35415-# func_arith arithmetic-term... 35416-func_arith () 35417-{ 35418- func_arith_result=$(( $* )) 35419-} 35420- 35421-# func_len string 35422-# STRING may not start with a hyphen. 35423-func_len () 35424-{ 35425- func_len_result=${#1} 35426-} 35427- 35428-_LT_EOF 35429- ;; 35430- *) # Bourne compatible functions. 35431- cat << \_LT_EOF >> "$cfgfile" 35432- 35433-# func_dirname file append nondir_replacement 35434-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 35435-# otherwise set result to NONDIR_REPLACEMENT. 35436-func_dirname () 35437-{ 35438- # Extract subdirectory from the argument. 35439- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` 35440- if test "X$func_dirname_result" = "X${1}"; then 35441- func_dirname_result="${3}" 35442- else 35443- func_dirname_result="$func_dirname_result${2}" 35444- fi 35445-} 35446- 35447-# func_basename file 35448-func_basename () 35449-{ 35450- func_basename_result=`$ECHO "${1}" | $SED "$basename"` 35451-} 35452- 35453- 35454-# func_stripname prefix suffix name 35455-# strip PREFIX and SUFFIX off of NAME. 35456-# PREFIX and SUFFIX must not contain globbing or regex special 35457-# characters, hashes, percent signs, but SUFFIX may contain a leading 35458-# dot (in which case that matches only a dot). 35459-# func_strip_suffix prefix name 35460-func_stripname () 35461-{ 35462- case ${2} in 35463- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; 35464- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; 35465- esac 35466-} 35467- 35468-# sed scripts: 35469-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' 35470-my_sed_long_arg='1s/^-[^=]*=//' 35471- 35472-# func_opt_split 35473-func_opt_split () 35474-{ 35475- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` 35476- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` 35477-} 35478- 35479-# func_lo2o object 35480-func_lo2o () 35481-{ 35482- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` 35483-} 35484- 35485-# func_xform libobj-or-source 35486-func_xform () 35487-{ 35488- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` 35489-} 35490- 35491-# func_arith arithmetic-term... 35492-func_arith () 35493-{ 35494- func_arith_result=`expr "$@"` 35495-} 35496- 35497-# func_len string 35498-# STRING may not start with a hyphen. 35499-func_len () 35500-{ 35501- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` 35502-} 35503- 35504-_LT_EOF 35505-esac 35506- 35507-case $lt_shell_append in 35508- yes) 35509- cat << \_LT_EOF >> "$cfgfile" 35510- 35511-# func_append var value 35512-# Append VALUE to the end of shell variable VAR. 35513-func_append () 35514-{ 35515- eval "$1+=\$2" 35516-} 35517-_LT_EOF 35518- ;; 35519- *) 35520- cat << \_LT_EOF >> "$cfgfile" 35521- 35522-# func_append var value 35523-# Append VALUE to the end of shell variable VAR. 35524-func_append () 35525-{ 35526- eval "$1=\$$1\$2" 35527-} 35528- 35529-_LT_EOF 35530- ;; 35531- esac 35532- 35533- 35534- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ 35535- || (rm -f "$cfgfile"; exit 1) 35536- 35537- mv -f "$cfgfile" "$ofile" || 35538+ sed '$q' "$ltmain" >> "$cfgfile" \ 35539+ || (rm -f "$cfgfile"; exit 1) 35540+ 35541+ if test x"$xsi_shell" = xyes; then 35542+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ 35543+func_dirname ()\ 35544+{\ 35545+\ case ${1} in\ 35546+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 35547+\ * ) func_dirname_result="${3}" ;;\ 35548+\ esac\ 35549+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ 35550+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 35551+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 35552+test 0 -eq $? || _lt_function_replace_fail=: 35553+ 35554+ 35555+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ 35556+func_basename ()\ 35557+{\ 35558+\ func_basename_result="${1##*/}"\ 35559+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ 35560+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 35561+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 35562+test 0 -eq $? || _lt_function_replace_fail=: 35563+ 35564+ 35565+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ 35566+func_dirname_and_basename ()\ 35567+{\ 35568+\ case ${1} in\ 35569+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 35570+\ * ) func_dirname_result="${3}" ;;\ 35571+\ esac\ 35572+\ func_basename_result="${1##*/}"\ 35573+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ 35574+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 35575+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 35576+test 0 -eq $? || _lt_function_replace_fail=: 35577+ 35578+ 35579+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ 35580+func_stripname ()\ 35581+{\ 35582+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ 35583+\ # positional parameters, so assign one to ordinary parameter first.\ 35584+\ func_stripname_result=${3}\ 35585+\ func_stripname_result=${func_stripname_result#"${1}"}\ 35586+\ func_stripname_result=${func_stripname_result%"${2}"}\ 35587+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ 35588+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 35589+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 35590+test 0 -eq $? || _lt_function_replace_fail=: 35591+ 35592+ 35593+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ 35594+func_split_long_opt ()\ 35595+{\ 35596+\ func_split_long_opt_name=${1%%=*}\ 35597+\ func_split_long_opt_arg=${1#*=}\ 35598+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ 35599+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 35600+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 35601+test 0 -eq $? || _lt_function_replace_fail=: 35602+ 35603+ 35604+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ 35605+func_split_short_opt ()\ 35606+{\ 35607+\ func_split_short_opt_arg=${1#??}\ 35608+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ 35609+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ 35610+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 35611+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 35612+test 0 -eq $? || _lt_function_replace_fail=: 35613+ 35614+ 35615+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ 35616+func_lo2o ()\ 35617+{\ 35618+\ case ${1} in\ 35619+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ 35620+\ *) func_lo2o_result=${1} ;;\ 35621+\ esac\ 35622+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ 35623+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 35624+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 35625+test 0 -eq $? || _lt_function_replace_fail=: 35626+ 35627+ 35628+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ 35629+func_xform ()\ 35630+{\ 35631+ func_xform_result=${1%.*}.lo\ 35632+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ 35633+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 35634+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 35635+test 0 -eq $? || _lt_function_replace_fail=: 35636+ 35637+ 35638+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ 35639+func_arith ()\ 35640+{\ 35641+ func_arith_result=$(( $* ))\ 35642+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ 35643+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 35644+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 35645+test 0 -eq $? || _lt_function_replace_fail=: 35646+ 35647+ 35648+ sed -e '/^func_len ()$/,/^} # func_len /c\ 35649+func_len ()\ 35650+{\ 35651+ func_len_result=${#1}\ 35652+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ 35653+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 35654+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 35655+test 0 -eq $? || _lt_function_replace_fail=: 35656+ 35657+fi 35658+ 35659+if test x"$lt_shell_append" = xyes; then 35660+ sed -e '/^func_append ()$/,/^} # func_append /c\ 35661+func_append ()\ 35662+{\ 35663+ eval "${1}+=\\${2}"\ 35664+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ 35665+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 35666+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 35667+test 0 -eq $? || _lt_function_replace_fail=: 35668+ 35669+ 35670+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ 35671+func_append_quoted ()\ 35672+{\ 35673+\ func_quote_for_eval "${2}"\ 35674+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ 35675+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ 35676+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 35677+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 35678+test 0 -eq $? || _lt_function_replace_fail=: 35679+ 35680+ 35681+ # Save a `func_append' function call where possible by direct use of '+=' 35682+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ 35683+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 35684+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 35685+ test 0 -eq $? || _lt_function_replace_fail=: 35686+else 35687+ # Save a `func_append' function call even when '+=' is not available 35688+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ 35689+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 35690+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 35691+ test 0 -eq $? || _lt_function_replace_fail=: 35692+fi 35693+ 35694+if test x"$_lt_function_replace_fail" = x":"; then 35695+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 35696+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} 35697+fi 35698+ 35699+ 35700+ mv -f "$cfgfile" "$ofile" || 35701 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 35702 chmod +x "$ofile" 35703 35704