diff options
Diffstat (limited to 'meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch')
| -rw-r--r-- | meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch | 1243 |
1 files changed, 563 insertions, 680 deletions
diff --git a/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch b/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch index e54ab1bc8a..f2411c47df 100644 --- a/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch +++ b/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch @@ -1,7 +1,7 @@ -From da70f0876cdd8ed703d9ed1524212ccfefb09ef3 Mon Sep 17 00:00:00 2001 +From 71adcde3648db47f7fa155db12810591ffd3ae34 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 14 Feb 2016 17:04:07 +0000 -Subject: [PATCH 06/14] Use libtool 2.4 +Subject: [PATCH 06/13] Use libtool 2.4 get libtool sysroot support @@ -9,28 +9,28 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> --- Upstream-Status: Pending - bfd/configure | 1322 +++++++++++++++++------ + bfd/configure | 1318 +++++++++++++++++------ bfd/configure.ac | 2 +- - binutils/configure | 1320 +++++++++++++++++------ + binutils/configure | 1316 +++++++++++++++++------ configure | 4 +- - gas/configure | 1320 +++++++++++++++++------ - gprof/configure | 1325 +++++++++++++++++------ - ld/configure | 1695 +++++++++++++++++++++-------- + gas/configure | 1314 +++++++++++++++++------ + gprof/configure | 1321 +++++++++++++++++------ + ld/configure | 1691 +++++++++++++++++++++-------- libtool.m4 | 1080 +++++++++++++------ ltmain.sh | 2925 +++++++++++++++++++++++++++++++++----------------- ltoptions.m4 | 2 +- ltversion.m4 | 12 +- lt~obsolete.m4 | 2 +- - opcodes/configure | 1322 +++++++++++++++++------ + opcodes/configure | 1318 +++++++++++++++++------ opcodes/configure.ac | 2 +- zlib/configure | 1320 +++++++++++++++++------ - 15 files changed, 9944 insertions(+), 3709 deletions(-) + 15 files changed, 9930 insertions(+), 3697 deletions(-) diff --git a/bfd/configure b/bfd/configure -index 7411c6d..eae743e 100755 +index a437569..575a257 100755 --- a/bfd/configure +++ b/bfd/configure -@@ -670,6 +670,9 @@ OTOOL +@@ -671,6 +671,9 @@ OTOOL LIPO NMEDIT DSYMUTIL @@ -40,7 +40,7 @@ index 7411c6d..eae743e 100755 OBJDUMP LN_S NM -@@ -782,6 +785,7 @@ enable_static +@@ -784,6 +787,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -48,7 +48,7 @@ index 7411c6d..eae743e 100755 enable_libtool_lock enable_plugins enable_largefile -@@ -1458,6 +1462,8 @@ Optional Packages: +@@ -1460,6 +1464,8 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] @@ -57,7 +57,7 @@ index 7411c6d..eae743e 100755 --with-mmap try using mmap for BFD input files if available --with-separate-debug-dir=DIR Look for global separate debug info in DIR -@@ -5388,8 +5394,8 @@ esac +@@ -5392,8 +5398,8 @@ esac @@ -68,7 +68,7 @@ index 7411c6d..eae743e 100755 -@@ -5429,7 +5435,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -5433,7 +5439,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 $as_echo_n "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. @@ -77,7 +77,7 @@ index 7411c6d..eae743e 100755 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6115,8 +6121,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; +@@ -6119,8 +6125,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -88,7 +88,7 @@ index 7411c6d..eae743e 100755 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -6165,6 +6171,80 @@ esac +@@ -6169,6 +6175,80 @@ esac @@ -169,7 +169,7 @@ index 7411c6d..eae743e 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } if test "${lt_cv_ld_reload_flag+set}" = set; then : -@@ -6181,6 +6261,11 @@ case $reload_flag in +@@ -6185,6 +6265,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -181,7 +181,7 @@ index 7411c6d..eae743e 100755 darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6349,7 +6434,8 @@ mingw* | pw32*) +@@ -6353,7 +6438,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -191,7 +191,7 @@ index 7411c6d..eae743e 100755 lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -6503,6 +6589,21 @@ esac +@@ -6507,6 +6593,21 @@ esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } @@ -213,7 +213,7 @@ index 7411c6d..eae743e 100755 file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6518,9 +6619,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -6522,9 +6623,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -378,7 +378,7 @@ index 7411c6d..eae743e 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_AR+set}" = set; then : -@@ -6536,7 +6790,7 @@ do +@@ -6540,7 +6794,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then @@ -387,7 +387,7 @@ index 7411c6d..eae743e 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6556,11 +6810,15 @@ $as_echo "no" >&6; } +@@ -6560,11 +6814,15 @@ $as_echo "no" >&6; } fi @@ -406,7 +406,7 @@ index 7411c6d..eae743e 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : -@@ -6576,7 +6834,7 @@ do +@@ -6580,7 +6838,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then @@ -415,7 +415,7 @@ index 7411c6d..eae743e 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6595,6 +6853,10 @@ else +@@ -6599,6 +6857,10 @@ else $as_echo "no" >&6; } fi @@ -426,7 +426,7 @@ index 7411c6d..eae743e 100755 if test "x$ac_ct_AR" = x; then AR="false" else -@@ -6606,16 +6868,72 @@ ac_tool_warned=yes ;; +@@ -6610,16 +6872,72 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -503,7 +503,7 @@ index 7411c6d..eae743e 100755 -@@ -6957,8 +7275,8 @@ esac +@@ -6961,8 +7279,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address @@ -514,7 +514,7 @@ index 7411c6d..eae743e 100755 # Handle CRLF in mingw tool chain opt_cr= -@@ -6994,6 +7312,7 @@ for ac_symprfx in "" "_"; do +@@ -6998,6 +7316,7 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi @@ -522,7 +522,7 @@ index 7411c6d..eae743e 100755 # Check to see that the pipe works correctly. pipe_works=no -@@ -7035,6 +7354,18 @@ _LT_EOF +@@ -7039,6 +7358,18 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext @@ -541,7 +541,7 @@ index 7411c6d..eae743e 100755 #ifdef __cplusplus extern "C" { #endif -@@ -7046,7 +7377,7 @@ _LT_EOF +@@ -7050,7 +7381,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -550,7 +550,7 @@ index 7411c6d..eae743e 100755 const char *name; void *address; } -@@ -7072,8 +7403,8 @@ static const void *lt_preloaded_setup() { +@@ -7076,8 +7407,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -561,7 +561,7 @@ index 7411c6d..eae743e 100755 LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7083,8 +7414,8 @@ _LT_EOF +@@ -7087,8 +7418,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -572,7 +572,7 @@ index 7411c6d..eae743e 100755 else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -7121,6 +7452,16 @@ else +@@ -7125,6 +7456,16 @@ else $as_echo "ok" >&6; } fi @@ -589,7 +589,7 @@ index 7411c6d..eae743e 100755 -@@ -7142,6 +7483,45 @@ fi +@@ -7146,6 +7487,45 @@ fi @@ -635,7 +635,7 @@ index 7411c6d..eae743e 100755 # Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then : enableval=$enable_libtool_lock; -@@ -7348,6 +7728,123 @@ esac +@@ -7352,6 +7732,123 @@ esac need_locks="$enable_libtool_lock" @@ -759,7 +759,7 @@ index 7411c6d..eae743e 100755 case $host_os in rhapsody* | darwin*) -@@ -7911,6 +8408,8 @@ _LT_EOF +@@ -7915,6 +8412,8 @@ _LT_EOF $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 echo "$AR cru libconftest.a conftest.o" >&5 $AR cru libconftest.a conftest.o 2>&5 @@ -768,7 +768,7 @@ index 7411c6d..eae743e 100755 cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -8075,7 +8574,8 @@ fi +@@ -8079,7 +8578,8 @@ fi LIBTOOL_DEPS="$ltmain" # Always use our own libtool. @@ -778,7 +778,7 @@ index 7411c6d..eae743e 100755 -@@ -8164,7 +8664,7 @@ aix3*) +@@ -8168,7 +8668,7 @@ aix3*) esac # Global variables: @@ -787,7 +787,7 @@ index 7411c6d..eae743e 100755 can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8462,8 +8962,6 @@ fi +@@ -8466,8 +8966,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -796,7 +796,7 @@ index 7411c6d..eae743e 100755 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8629,6 +9127,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8633,6 +9131,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -809,7 +809,7 @@ index 7411c6d..eae743e 100755 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8691,7 +9195,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8695,7 +9199,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -818,7 +818,7 @@ index 7411c6d..eae743e 100755 lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -8748,13 +9252,17 @@ case $host_os in +@@ -8752,13 +9256,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -842,7 +842,7 @@ index 7411c6d..eae743e 100755 # # Check to make sure the PIC flag actually works. -@@ -8815,6 +9323,11 @@ fi +@@ -8819,6 +9327,11 @@ fi @@ -854,7 +854,7 @@ index 7411c6d..eae743e 100755 # # Check to make sure the static flag actually works. # -@@ -9165,7 +9678,8 @@ _LT_EOF +@@ -9169,7 +9682,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -864,7 +864,7 @@ index 7411c6d..eae743e 100755 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9264,12 +9778,12 @@ _LT_EOF +@@ -9268,12 +9782,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -879,7 +879,7 @@ index 7411c6d..eae743e 100755 fi ;; esac -@@ -9283,8 +9797,8 @@ _LT_EOF +@@ -9287,8 +9801,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -890,7 +890,7 @@ index 7411c6d..eae743e 100755 fi ;; -@@ -9302,8 +9816,8 @@ _LT_EOF +@@ -9306,8 +9820,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -901,7 +901,7 @@ index 7411c6d..eae743e 100755 else ld_shlibs=no fi -@@ -9349,8 +9863,8 @@ _LT_EOF +@@ -9353,8 +9867,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -912,7 +912,7 @@ index 7411c6d..eae743e 100755 else ld_shlibs=no fi -@@ -9480,7 +9994,13 @@ _LT_EOF +@@ -9484,7 +9998,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -927,7 +927,7 @@ index 7411c6d..eae743e 100755 /* end confdefs.h. */ int -@@ -9493,22 +10013,29 @@ main () +@@ -9497,22 +10017,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -970,7 +970,7 @@ index 7411c6d..eae743e 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 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" -@@ -9520,7 +10047,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9524,7 +10051,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -985,7 +985,7 @@ index 7411c6d..eae743e 100755 /* end confdefs.h. */ int -@@ -9533,22 +10066,29 @@ main () +@@ -9537,22 +10070,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -1028,7 +1028,7 @@ index 7411c6d..eae743e 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9593,20 +10133,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9597,20 +10137,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -1106,7 +1106,7 @@ index 7411c6d..eae743e 100755 ;; darwin* | rhapsody*) -@@ -9667,7 +10250,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9671,7 +10254,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -1115,7 +1115,7 @@ index 7411c6d..eae743e 100755 hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9675,7 +10258,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9679,7 +10262,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -1124,7 +1124,7 @@ index 7411c6d..eae743e 100755 else 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' fi -@@ -9691,7 +10274,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9695,7 +10278,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -1133,7 +1133,7 @@ index 7411c6d..eae743e 100755 else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -9715,10 +10298,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9719,10 +10302,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -1146,7 +1146,7 @@ index 7411c6d..eae743e 100755 ;; esac else -@@ -9797,23 +10380,36 @@ fi +@@ -9801,23 +10384,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -1191,7 +1191,7 @@ index 7411c6d..eae743e 100755 else 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' 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' -@@ -9898,7 +10494,7 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9902,7 +10498,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -1200,7 +1200,7 @@ index 7411c6d..eae743e 100755 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -9917,9 +10513,9 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9921,9 +10517,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -1212,7 +1212,7 @@ index 7411c6d..eae743e 100755 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -10495,8 +11091,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10499,8 +11095,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -1224,7 +1224,7 @@ index 7411c6d..eae743e 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -10529,13 +11126,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10533,13 +11130,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -1297,7 +1297,7 @@ index 7411c6d..eae743e 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -10627,7 +11282,7 @@ haiku*) +@@ -10631,7 +11286,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -1306,16 +1306,7 @@ index 7411c6d..eae743e 100755 hardcode_into_libs=yes ;; -@@ -11423,7 +12078,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11426 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11467,10 +12122,10 @@ else +@@ -11471,10 +12126,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -1328,16 +1319,7 @@ index 7411c6d..eae743e 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11529,7 +12184,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11532 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11573,10 +12228,10 @@ else +@@ -11577,10 +12232,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -1350,7 +1332,7 @@ index 7411c6d..eae743e 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -15121,7 +15776,7 @@ SHARED_LDFLAGS= +@@ -14078,7 +14733,7 @@ SHARED_LDFLAGS= if test "$enable_shared" = "yes"; then x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` if test -n "$x"; then @@ -1359,7 +1341,7 @@ index 7411c6d..eae743e 100755 fi # More hacks to build DLLs on Windows. -@@ -16746,13 +17401,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -16789,13 +17444,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -1380,7 +1362,7 @@ index 7411c6d..eae743e 100755 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -16767,14 +17429,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -16810,14 +17472,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 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"`' @@ -1399,7 +1381,7 @@ index 7411c6d..eae743e 100755 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -16807,12 +17472,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -16850,12 +17515,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -1413,7 +1395,7 @@ index 7411c6d..eae743e 100755 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -16867,8 +17532,13 @@ reload_flag \ +@@ -16910,8 +17575,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -1427,7 +1409,7 @@ index 7411c6d..eae743e 100755 STRIP \ RANLIB \ CC \ -@@ -16878,12 +17548,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -16921,12 +17591,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ @@ -1443,7 +1425,7 @@ index 7411c6d..eae743e 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -16899,7 +17571,6 @@ no_undefined_flag \ +@@ -16942,7 +17614,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -1451,7 +1433,7 @@ index 7411c6d..eae743e 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -16935,6 +17606,7 @@ module_cmds \ +@@ -16978,6 +17649,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -1459,7 +1441,7 @@ index 7411c6d..eae743e 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -17714,7 +18386,8 @@ $as_echo X"$file" | +@@ -17757,7 +18429,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -1469,7 +1451,7 @@ index 7411c6d..eae743e 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -17817,19 +18490,42 @@ SP2NL=$lt_lt_SP2NL +@@ -17860,19 +18533,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -1513,7 +1495,7 @@ index 7411c6d..eae743e 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -17859,6 +18555,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -17902,6 +18598,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -1526,7 +1508,7 @@ index 7411c6d..eae743e 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -17868,6 +18570,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -17911,6 +18613,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -1536,7 +1518,7 @@ index 7411c6d..eae743e 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -17982,12 +18687,12 @@ with_gcc=$GCC +@@ -18025,12 +18730,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -1552,7 +1534,7 @@ index 7411c6d..eae743e 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -18074,9 +18779,6 @@ inherit_rpath=$inherit_rpath +@@ -18117,9 +18822,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -1562,7 +1544,7 @@ index 7411c6d..eae743e 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -18092,6 +18794,9 @@ include_expsyms=$lt_include_expsyms +@@ -18135,6 +18837,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -1572,7 +1554,7 @@ index 7411c6d..eae743e 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -18124,210 +18829,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -18167,210 +18872,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? @@ -1947,10 +1929,10 @@ index 7411c6d..eae743e 100755 chmod +x "$ofile" diff --git a/bfd/configure.ac b/bfd/configure.ac -index 6f5e85f..44bd02c 100644 +index 669cff7..5f57877 100644 --- a/bfd/configure.ac +++ b/bfd/configure.ac -@@ -567,7 +567,7 @@ changequote(,)dnl +@@ -253,7 +253,7 @@ changequote(,)dnl x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` changequote([,])dnl if test -n "$x"; then @@ -1960,10 +1942,10 @@ index 6f5e85f..44bd02c 100644 # More hacks to build DLLs on Windows. diff --git a/binutils/configure b/binutils/configure -index d4f3e1e..a6df5bb 100755 +index 6cbf17c..6d20600 100755 --- a/binutils/configure +++ b/binutils/configure -@@ -657,8 +657,11 @@ OTOOL +@@ -658,8 +658,11 @@ OTOOL LIPO NMEDIT DSYMUTIL @@ -1975,7 +1957,7 @@ index d4f3e1e..a6df5bb 100755 OBJDUMP LN_S NM -@@ -769,6 +772,7 @@ enable_static +@@ -771,6 +774,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -1983,7 +1965,7 @@ index d4f3e1e..a6df5bb 100755 enable_libtool_lock enable_plugins enable_largefile -@@ -1441,6 +1445,8 @@ Optional Packages: +@@ -1443,6 +1447,8 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] @@ -1992,7 +1974,7 @@ index d4f3e1e..a6df5bb 100755 --with-system-zlib use installed libz --with-gnu-ld assume the C compiler uses GNU ld default=no --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib -@@ -5155,8 +5161,8 @@ esac +@@ -5159,8 +5165,8 @@ esac @@ -2003,7 +1985,7 @@ index d4f3e1e..a6df5bb 100755 -@@ -5196,7 +5202,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -5200,7 +5206,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 $as_echo_n "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. @@ -2012,7 +1994,7 @@ index d4f3e1e..a6df5bb 100755 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -5882,8 +5888,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; +@@ -5886,8 +5892,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -2023,7 +2005,7 @@ index d4f3e1e..a6df5bb 100755 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -5932,6 +5938,80 @@ esac +@@ -5936,6 +5942,80 @@ esac @@ -2104,7 +2086,7 @@ index d4f3e1e..a6df5bb 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } if test "${lt_cv_ld_reload_flag+set}" = set; then : -@@ -5948,6 +6028,11 @@ case $reload_flag in +@@ -5952,6 +6032,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -2116,7 +2098,7 @@ index d4f3e1e..a6df5bb 100755 darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6116,7 +6201,8 @@ mingw* | pw32*) +@@ -6120,7 +6205,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -2126,7 +2108,7 @@ index d4f3e1e..a6df5bb 100755 lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -6270,6 +6356,21 @@ esac +@@ -6274,6 +6360,21 @@ esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } @@ -2148,7 +2130,7 @@ index d4f3e1e..a6df5bb 100755 file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6285,9 +6386,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -6289,9 +6390,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -2313,7 +2295,7 @@ index d4f3e1e..a6df5bb 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_AR+set}" = set; then : -@@ -6303,7 +6557,7 @@ do +@@ -6307,7 +6561,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then @@ -2322,7 +2304,7 @@ index d4f3e1e..a6df5bb 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6323,11 +6577,15 @@ $as_echo "no" >&6; } +@@ -6327,11 +6581,15 @@ $as_echo "no" >&6; } fi @@ -2341,7 +2323,7 @@ index d4f3e1e..a6df5bb 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : -@@ -6343,7 +6601,7 @@ do +@@ -6347,7 +6605,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then @@ -2350,7 +2332,7 @@ index d4f3e1e..a6df5bb 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6362,6 +6620,10 @@ else +@@ -6366,6 +6624,10 @@ else $as_echo "no" >&6; } fi @@ -2361,7 +2343,7 @@ index d4f3e1e..a6df5bb 100755 if test "x$ac_ct_AR" = x; then AR="false" else -@@ -6373,12 +6635,10 @@ ac_tool_warned=yes ;; +@@ -6377,12 +6639,10 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -2376,7 +2358,7 @@ index d4f3e1e..a6df5bb 100755 -@@ -6390,6 +6650,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru +@@ -6394,6 +6654,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru @@ -2441,7 +2423,7 @@ index d4f3e1e..a6df5bb 100755 if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -@@ -6724,8 +7042,8 @@ esac +@@ -6728,8 +7046,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address @@ -2452,7 +2434,7 @@ index d4f3e1e..a6df5bb 100755 # Handle CRLF in mingw tool chain opt_cr= -@@ -6761,6 +7079,7 @@ for ac_symprfx in "" "_"; do +@@ -6765,6 +7083,7 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi @@ -2460,7 +2442,7 @@ index d4f3e1e..a6df5bb 100755 # Check to see that the pipe works correctly. pipe_works=no -@@ -6802,6 +7121,18 @@ _LT_EOF +@@ -6806,6 +7125,18 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext @@ -2479,7 +2461,7 @@ index d4f3e1e..a6df5bb 100755 #ifdef __cplusplus extern "C" { #endif -@@ -6813,7 +7144,7 @@ _LT_EOF +@@ -6817,7 +7148,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -2488,7 +2470,7 @@ index d4f3e1e..a6df5bb 100755 const char *name; void *address; } -@@ -6839,8 +7170,8 @@ static const void *lt_preloaded_setup() { +@@ -6843,8 +7174,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -2499,7 +2481,7 @@ index d4f3e1e..a6df5bb 100755 LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -6850,8 +7181,8 @@ _LT_EOF +@@ -6854,8 +7185,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -2510,7 +2492,7 @@ index d4f3e1e..a6df5bb 100755 else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -6888,6 +7219,21 @@ else +@@ -6892,6 +7223,21 @@ else $as_echo "ok" >&6; } fi @@ -2532,7 +2514,7 @@ index d4f3e1e..a6df5bb 100755 -@@ -6906,6 +7252,40 @@ fi +@@ -6910,6 +7256,40 @@ fi @@ -2573,7 +2555,7 @@ index d4f3e1e..a6df5bb 100755 -@@ -7115,6 +7495,123 @@ esac +@@ -7119,6 +7499,123 @@ esac need_locks="$enable_libtool_lock" @@ -2697,7 +2679,7 @@ index d4f3e1e..a6df5bb 100755 case $host_os in rhapsody* | darwin*) -@@ -7678,6 +8175,8 @@ _LT_EOF +@@ -7682,6 +8179,8 @@ _LT_EOF $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 echo "$AR cru libconftest.a conftest.o" >&5 $AR cru libconftest.a conftest.o 2>&5 @@ -2706,7 +2688,7 @@ index d4f3e1e..a6df5bb 100755 cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -7873,7 +8372,8 @@ fi +@@ -7877,7 +8376,8 @@ fi LIBTOOL_DEPS="$ltmain" # Always use our own libtool. @@ -2716,7 +2698,7 @@ index d4f3e1e..a6df5bb 100755 -@@ -7962,7 +8462,7 @@ aix3*) +@@ -7966,7 +8466,7 @@ aix3*) esac # Global variables: @@ -2725,7 +2707,7 @@ index d4f3e1e..a6df5bb 100755 can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8260,8 +8760,6 @@ fi +@@ -8264,8 +8764,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -2734,7 +2716,7 @@ index d4f3e1e..a6df5bb 100755 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8427,6 +8925,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8431,6 +8929,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -2747,7 +2729,7 @@ index d4f3e1e..a6df5bb 100755 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8489,7 +8993,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8493,7 +8997,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -2756,7 +2738,7 @@ index d4f3e1e..a6df5bb 100755 lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -8546,13 +9050,17 @@ case $host_os in +@@ -8550,13 +9054,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -2780,7 +2762,7 @@ index d4f3e1e..a6df5bb 100755 # # Check to make sure the PIC flag actually works. -@@ -8613,6 +9121,11 @@ fi +@@ -8617,6 +9125,11 @@ fi @@ -2792,7 +2774,7 @@ index d4f3e1e..a6df5bb 100755 # # Check to make sure the static flag actually works. # -@@ -8963,7 +9476,8 @@ _LT_EOF +@@ -8967,7 +9480,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -2802,7 +2784,7 @@ index d4f3e1e..a6df5bb 100755 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9062,12 +9576,12 @@ _LT_EOF +@@ -9066,12 +9580,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -2817,7 +2799,7 @@ index d4f3e1e..a6df5bb 100755 fi ;; esac -@@ -9081,8 +9595,8 @@ _LT_EOF +@@ -9085,8 +9599,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -2828,7 +2810,7 @@ index d4f3e1e..a6df5bb 100755 fi ;; -@@ -9100,8 +9614,8 @@ _LT_EOF +@@ -9104,8 +9618,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -2839,7 +2821,7 @@ index d4f3e1e..a6df5bb 100755 else ld_shlibs=no fi -@@ -9147,8 +9661,8 @@ _LT_EOF +@@ -9151,8 +9665,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -2850,7 +2832,7 @@ index d4f3e1e..a6df5bb 100755 else ld_shlibs=no fi -@@ -9278,7 +9792,13 @@ _LT_EOF +@@ -9282,7 +9796,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -2865,7 +2847,7 @@ index d4f3e1e..a6df5bb 100755 /* end confdefs.h. */ int -@@ -9291,22 +9811,29 @@ main () +@@ -9295,22 +9815,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -2908,7 +2890,7 @@ index d4f3e1e..a6df5bb 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 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" -@@ -9318,7 +9845,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9322,7 +9849,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -2923,7 +2905,7 @@ index d4f3e1e..a6df5bb 100755 /* end confdefs.h. */ int -@@ -9331,22 +9864,29 @@ main () +@@ -9335,22 +9868,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -2966,7 +2948,7 @@ index d4f3e1e..a6df5bb 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9391,20 +9931,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9395,20 +9935,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -3044,7 +3026,7 @@ index d4f3e1e..a6df5bb 100755 ;; darwin* | rhapsody*) -@@ -9465,7 +10048,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9469,7 +10052,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -3053,7 +3035,7 @@ index d4f3e1e..a6df5bb 100755 hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9473,7 +10056,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9477,7 +10060,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -3062,7 +3044,7 @@ index d4f3e1e..a6df5bb 100755 else 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' fi -@@ -9489,7 +10072,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9493,7 +10076,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -3071,7 +3053,7 @@ index d4f3e1e..a6df5bb 100755 else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -9513,10 +10096,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9517,10 +10100,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -3084,7 +3066,7 @@ index d4f3e1e..a6df5bb 100755 ;; esac else -@@ -9595,23 +10178,36 @@ fi +@@ -9599,23 +10182,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -3129,7 +3111,7 @@ index d4f3e1e..a6df5bb 100755 else 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' 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' -@@ -9696,7 +10292,7 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9700,7 +10296,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -3138,7 +3120,7 @@ index d4f3e1e..a6df5bb 100755 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -9715,9 +10311,9 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9719,9 +10315,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -3150,7 +3132,7 @@ index d4f3e1e..a6df5bb 100755 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -10293,8 +10889,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10297,8 +10893,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -3162,7 +3144,7 @@ index d4f3e1e..a6df5bb 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -10327,13 +10924,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10331,13 +10928,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -3235,7 +3217,7 @@ index d4f3e1e..a6df5bb 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -10425,7 +11080,7 @@ haiku*) +@@ -10429,7 +11084,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -3244,16 +3226,7 @@ index d4f3e1e..a6df5bb 100755 hardcode_into_libs=yes ;; -@@ -11221,7 +11876,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11224 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11265,10 +11920,10 @@ else +@@ -11269,10 +11924,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -3266,16 +3239,7 @@ index d4f3e1e..a6df5bb 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11327,7 +11982,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11330 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11371,10 +12026,10 @@ else +@@ -11375,10 +12030,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -3288,7 +3252,7 @@ index d4f3e1e..a6df5bb 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -15355,13 +16010,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -15392,13 +16047,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -3309,7 +3273,7 @@ index d4f3e1e..a6df5bb 100755 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -15376,14 +16038,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -15413,14 +16075,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 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"`' @@ -3328,7 +3292,7 @@ index d4f3e1e..a6df5bb 100755 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -15416,12 +16081,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -15453,12 +16118,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -3342,7 +3306,7 @@ index d4f3e1e..a6df5bb 100755 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -15476,8 +16141,13 @@ reload_flag \ +@@ -15513,8 +16178,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -3356,7 +3320,7 @@ index d4f3e1e..a6df5bb 100755 STRIP \ RANLIB \ CC \ -@@ -15487,12 +16157,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -15524,12 +16194,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ @@ -3372,7 +3336,7 @@ index d4f3e1e..a6df5bb 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -15508,7 +16180,6 @@ no_undefined_flag \ +@@ -15545,7 +16217,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -3380,7 +3344,7 @@ index d4f3e1e..a6df5bb 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -15544,6 +16215,7 @@ module_cmds \ +@@ -15581,6 +16252,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -3388,7 +3352,7 @@ index d4f3e1e..a6df5bb 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -16301,7 +16973,8 @@ $as_echo X"$file" | +@@ -16338,7 +17010,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -3398,7 +3362,7 @@ index d4f3e1e..a6df5bb 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -16404,19 +17077,42 @@ SP2NL=$lt_lt_SP2NL +@@ -16441,19 +17114,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -3442,7 +3406,7 @@ index d4f3e1e..a6df5bb 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -16446,6 +17142,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -16483,6 +17179,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -3455,7 +3419,7 @@ index d4f3e1e..a6df5bb 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -16455,6 +17157,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -16492,6 +17194,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -3465,7 +3429,7 @@ index d4f3e1e..a6df5bb 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -16569,12 +17274,12 @@ with_gcc=$GCC +@@ -16606,12 +17311,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -3481,7 +3445,7 @@ index d4f3e1e..a6df5bb 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -16661,9 +17366,6 @@ inherit_rpath=$inherit_rpath +@@ -16698,9 +17403,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -3491,7 +3455,7 @@ index d4f3e1e..a6df5bb 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -16679,6 +17381,9 @@ include_expsyms=$lt_include_expsyms +@@ -16716,6 +17418,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -3501,7 +3465,7 @@ index d4f3e1e..a6df5bb 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -16711,210 +17416,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -16748,210 +17453,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? @@ -3876,10 +3840,10 @@ index d4f3e1e..a6df5bb 100755 chmod +x "$ofile" diff --git a/configure b/configure -index 85414ab..34b66f7 100755 +index 2a74a77..ad3dfb7 100755 --- a/configure +++ b/configure -@@ -3445,7 +3445,7 @@ case "${target}" in +@@ -3444,7 +3444,7 @@ case "${target}" in ;; s390-*-* | s390x-*-*) ;; @@ -3888,7 +3852,7 @@ index 85414ab..34b66f7 100755 ;; sh64-*-* | sh5*-*-*) ;; -@@ -3939,7 +3939,7 @@ case "${target}" in +@@ -3946,7 +3946,7 @@ case "${target}" in or1k*-*-*) noconfigdirs="$noconfigdirs gdb" ;; @@ -3898,10 +3862,10 @@ index 85414ab..34b66f7 100755 sh*-*-elf) ;; diff --git a/gas/configure b/gas/configure -index dd9c953..89f18b3 100755 +index f7753b8..45da030 100755 --- a/gas/configure +++ b/gas/configure -@@ -647,8 +647,11 @@ OTOOL +@@ -648,8 +648,11 @@ OTOOL LIPO NMEDIT DSYMUTIL @@ -3913,7 +3877,7 @@ index dd9c953..89f18b3 100755 OBJDUMP LN_S NM -@@ -759,6 +762,7 @@ enable_static +@@ -761,6 +764,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -3921,16 +3885,7 @@ index dd9c953..89f18b3 100755 enable_libtool_lock enable_plugins enable_largefile -@@ -1430,6 +1434,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - --with-system-zlib use installed libz - - Some influential environment variables: -@@ -4909,8 +4915,8 @@ esac +@@ -4919,8 +4923,8 @@ esac @@ -3941,7 +3896,7 @@ index dd9c953..89f18b3 100755 -@@ -4950,7 +4956,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -4960,7 +4964,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 $as_echo_n "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. @@ -3950,7 +3905,7 @@ index dd9c953..89f18b3 100755 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -5636,8 +5642,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; +@@ -5646,8 +5650,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -3961,7 +3916,7 @@ index dd9c953..89f18b3 100755 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -5686,6 +5692,80 @@ esac +@@ -5696,6 +5700,80 @@ esac @@ -4042,7 +3997,7 @@ index dd9c953..89f18b3 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } if test "${lt_cv_ld_reload_flag+set}" = set; then : -@@ -5702,6 +5782,11 @@ case $reload_flag in +@@ -5712,6 +5790,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -4054,7 +4009,7 @@ index dd9c953..89f18b3 100755 darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -5870,7 +5955,8 @@ mingw* | pw32*) +@@ -5880,7 +5963,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -4064,7 +4019,7 @@ index dd9c953..89f18b3 100755 lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -6024,6 +6110,21 @@ esac +@@ -6034,6 +6118,21 @@ esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } @@ -4086,7 +4041,7 @@ index dd9c953..89f18b3 100755 file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6039,9 +6140,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -6049,9 +6148,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -4251,7 +4206,7 @@ index dd9c953..89f18b3 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_AR+set}" = set; then : -@@ -6057,7 +6311,7 @@ do +@@ -6067,7 +6319,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then @@ -4260,7 +4215,7 @@ index dd9c953..89f18b3 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6077,11 +6331,15 @@ $as_echo "no" >&6; } +@@ -6087,11 +6339,15 @@ $as_echo "no" >&6; } fi @@ -4279,7 +4234,7 @@ index dd9c953..89f18b3 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : -@@ -6097,7 +6355,7 @@ do +@@ -6107,7 +6363,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then @@ -4288,7 +4243,7 @@ index dd9c953..89f18b3 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6116,6 +6374,10 @@ else +@@ -6126,6 +6382,10 @@ else $as_echo "no" >&6; } fi @@ -4299,7 +4254,7 @@ index dd9c953..89f18b3 100755 if test "x$ac_ct_AR" = x; then AR="false" else -@@ -6127,12 +6389,10 @@ ac_tool_warned=yes ;; +@@ -6137,12 +6397,10 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -4314,7 +4269,7 @@ index dd9c953..89f18b3 100755 -@@ -6144,6 +6404,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru +@@ -6154,6 +6412,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru @@ -4379,7 +4334,7 @@ index dd9c953..89f18b3 100755 if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -@@ -6478,8 +6796,8 @@ esac +@@ -6488,8 +6804,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address @@ -4390,7 +4345,7 @@ index dd9c953..89f18b3 100755 # Handle CRLF in mingw tool chain opt_cr= -@@ -6515,6 +6833,7 @@ for ac_symprfx in "" "_"; do +@@ -6525,6 +6841,7 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi @@ -4398,7 +4353,7 @@ index dd9c953..89f18b3 100755 # Check to see that the pipe works correctly. pipe_works=no -@@ -6556,6 +6875,18 @@ _LT_EOF +@@ -6566,6 +6883,18 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext @@ -4417,7 +4372,7 @@ index dd9c953..89f18b3 100755 #ifdef __cplusplus extern "C" { #endif -@@ -6567,7 +6898,7 @@ _LT_EOF +@@ -6577,7 +6906,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -4426,7 +4381,7 @@ index dd9c953..89f18b3 100755 const char *name; void *address; } -@@ -6593,8 +6924,8 @@ static const void *lt_preloaded_setup() { +@@ -6603,8 +6932,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -4437,7 +4392,7 @@ index dd9c953..89f18b3 100755 LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -6604,8 +6935,8 @@ _LT_EOF +@@ -6614,8 +6943,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -4448,7 +4403,7 @@ index dd9c953..89f18b3 100755 else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -6642,6 +6973,21 @@ else +@@ -6652,6 +6981,21 @@ else $as_echo "ok" >&6; } fi @@ -4470,7 +4425,7 @@ index dd9c953..89f18b3 100755 -@@ -6660,6 +7006,40 @@ fi +@@ -6670,6 +7014,40 @@ fi @@ -4511,7 +4466,7 @@ index dd9c953..89f18b3 100755 -@@ -6869,6 +7249,123 @@ esac +@@ -6879,6 +7257,123 @@ esac need_locks="$enable_libtool_lock" @@ -4635,7 +4590,7 @@ index dd9c953..89f18b3 100755 case $host_os in rhapsody* | darwin*) -@@ -7432,6 +7929,8 @@ _LT_EOF +@@ -7442,6 +7937,8 @@ _LT_EOF $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 echo "$AR cru libconftest.a conftest.o" >&5 $AR cru libconftest.a conftest.o 2>&5 @@ -4644,7 +4599,7 @@ index dd9c953..89f18b3 100755 cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -7627,7 +8126,8 @@ fi +@@ -7637,7 +8134,8 @@ fi LIBTOOL_DEPS="$ltmain" # Always use our own libtool. @@ -4654,7 +4609,7 @@ index dd9c953..89f18b3 100755 -@@ -7716,7 +8216,7 @@ aix3*) +@@ -7726,7 +8224,7 @@ aix3*) esac # Global variables: @@ -4663,7 +4618,7 @@ index dd9c953..89f18b3 100755 can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8014,8 +8514,6 @@ fi +@@ -8024,8 +8522,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -4672,7 +4627,7 @@ index dd9c953..89f18b3 100755 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8181,6 +8679,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8191,6 +8687,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -4685,7 +4640,7 @@ index dd9c953..89f18b3 100755 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8243,7 +8747,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8253,7 +8755,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -4694,7 +4649,7 @@ index dd9c953..89f18b3 100755 lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -8300,13 +8804,17 @@ case $host_os in +@@ -8310,13 +8812,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -4718,7 +4673,7 @@ index dd9c953..89f18b3 100755 # # Check to make sure the PIC flag actually works. -@@ -8367,6 +8875,11 @@ fi +@@ -8377,6 +8883,11 @@ fi @@ -4730,7 +4685,7 @@ index dd9c953..89f18b3 100755 # # Check to make sure the static flag actually works. # -@@ -8717,7 +9230,8 @@ _LT_EOF +@@ -8727,7 +9238,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -4740,7 +4695,7 @@ index dd9c953..89f18b3 100755 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -8816,12 +9330,12 @@ _LT_EOF +@@ -8826,12 +9338,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -4755,7 +4710,7 @@ index dd9c953..89f18b3 100755 fi ;; esac -@@ -8835,8 +9349,8 @@ _LT_EOF +@@ -8845,8 +9357,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -4766,7 +4721,7 @@ index dd9c953..89f18b3 100755 fi ;; -@@ -8854,8 +9368,8 @@ _LT_EOF +@@ -8864,8 +9376,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -4777,7 +4732,7 @@ index dd9c953..89f18b3 100755 else ld_shlibs=no fi -@@ -8901,8 +9415,8 @@ _LT_EOF +@@ -8911,8 +9423,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -4788,7 +4743,7 @@ index dd9c953..89f18b3 100755 else ld_shlibs=no fi -@@ -9032,7 +9546,13 @@ _LT_EOF +@@ -9042,7 +9554,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -4803,7 +4758,7 @@ index dd9c953..89f18b3 100755 /* end confdefs.h. */ int -@@ -9045,22 +9565,29 @@ main () +@@ -9055,22 +9573,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -4846,7 +4801,7 @@ index dd9c953..89f18b3 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 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" -@@ -9072,7 +9599,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9082,7 +9607,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -4861,7 +4816,7 @@ index dd9c953..89f18b3 100755 /* end confdefs.h. */ int -@@ -9085,22 +9618,29 @@ main () +@@ -9095,22 +9626,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -4904,7 +4859,7 @@ index dd9c953..89f18b3 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9145,20 +9685,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9155,20 +9693,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -4982,7 +4937,7 @@ index dd9c953..89f18b3 100755 ;; darwin* | rhapsody*) -@@ -9219,7 +9802,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9229,7 +9810,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -4991,7 +4946,7 @@ index dd9c953..89f18b3 100755 hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9227,7 +9810,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9237,7 +9818,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -5000,7 +4955,7 @@ index dd9c953..89f18b3 100755 else 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' fi -@@ -9243,7 +9826,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9253,7 +9834,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -5009,7 +4964,7 @@ index dd9c953..89f18b3 100755 else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -9267,10 +9850,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9277,10 +9858,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -5022,7 +4977,7 @@ index dd9c953..89f18b3 100755 ;; esac else -@@ -9349,23 +9932,36 @@ fi +@@ -9359,23 +9940,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -5067,7 +5022,7 @@ index dd9c953..89f18b3 100755 else 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' 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' -@@ -9450,7 +10046,7 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9460,7 +10054,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -5076,7 +5031,7 @@ index dd9c953..89f18b3 100755 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -9469,9 +10065,9 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9479,9 +10073,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -5088,7 +5043,7 @@ index dd9c953..89f18b3 100755 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -10047,8 +10643,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10057,8 +10651,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -5100,7 +5055,7 @@ index dd9c953..89f18b3 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -10081,13 +10678,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10091,13 +10686,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -5173,7 +5128,7 @@ index dd9c953..89f18b3 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -10179,7 +10834,7 @@ haiku*) +@@ -10189,7 +10842,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -5182,16 +5137,7 @@ index dd9c953..89f18b3 100755 hardcode_into_libs=yes ;; -@@ -10975,7 +11630,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 10978 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11019,10 +11674,10 @@ else +@@ -11029,10 +11682,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -5204,16 +5150,7 @@ index dd9c953..89f18b3 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11081,7 +11736,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11084 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11125,10 +11780,10 @@ else +@@ -11135,10 +11788,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -5226,7 +5163,7 @@ index dd9c953..89f18b3 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -15276,13 +15931,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -15350,13 +16003,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -5247,7 +5184,7 @@ index dd9c953..89f18b3 100755 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -15297,14 +15959,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -15371,14 +16031,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 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"`' @@ -5266,7 +5203,7 @@ index dd9c953..89f18b3 100755 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -15337,12 +16002,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -15411,12 +16074,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -5280,7 +5217,7 @@ index dd9c953..89f18b3 100755 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -15397,8 +16062,13 @@ reload_flag \ +@@ -15471,8 +16134,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -5294,7 +5231,7 @@ index dd9c953..89f18b3 100755 STRIP \ RANLIB \ CC \ -@@ -15408,12 +16078,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -15482,12 +16150,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ @@ -5310,7 +5247,7 @@ index dd9c953..89f18b3 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -15429,7 +16101,6 @@ no_undefined_flag \ +@@ -15503,7 +16173,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -5318,7 +5255,7 @@ index dd9c953..89f18b3 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -15465,6 +16136,7 @@ module_cmds \ +@@ -15539,6 +16208,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -5326,7 +5263,7 @@ index dd9c953..89f18b3 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -16229,7 +16901,8 @@ $as_echo X"$file" | +@@ -16303,7 +16973,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -5336,7 +5273,7 @@ index dd9c953..89f18b3 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -16332,19 +17005,42 @@ SP2NL=$lt_lt_SP2NL +@@ -16406,19 +17077,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -5380,7 +5317,7 @@ index dd9c953..89f18b3 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -16374,6 +17070,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -16448,6 +17142,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -5393,7 +5330,7 @@ index dd9c953..89f18b3 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -16383,6 +17085,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -16457,6 +17157,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -5403,7 +5340,7 @@ index dd9c953..89f18b3 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -16497,12 +17202,12 @@ with_gcc=$GCC +@@ -16571,12 +17274,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -5419,7 +5356,7 @@ index dd9c953..89f18b3 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -16589,9 +17294,6 @@ inherit_rpath=$inherit_rpath +@@ -16663,9 +17366,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -5429,7 +5366,7 @@ index dd9c953..89f18b3 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -16607,6 +17309,9 @@ include_expsyms=$lt_include_expsyms +@@ -16681,6 +17381,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -5439,7 +5376,7 @@ index dd9c953..89f18b3 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -16639,210 +17344,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -16713,210 +17416,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? @@ -5814,10 +5751,10 @@ index dd9c953..89f18b3 100755 chmod +x "$ofile" diff --git a/gprof/configure b/gprof/configure -index d4db554..78b292c 100755 +index 626e1c7..a88719c 100755 --- a/gprof/configure +++ b/gprof/configure -@@ -629,8 +629,11 @@ OTOOL +@@ -630,8 +630,11 @@ OTOOL LIPO NMEDIT DSYMUTIL @@ -5829,7 +5766,7 @@ index d4db554..78b292c 100755 OBJDUMP LN_S NM -@@ -741,6 +744,7 @@ enable_static +@@ -743,6 +746,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -5837,7 +5774,7 @@ index d4db554..78b292c 100755 enable_libtool_lock enable_plugins enable_largefile -@@ -1399,6 +1403,8 @@ Optional Packages: +@@ -1401,6 +1405,8 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] @@ -5846,7 +5783,7 @@ index d4db554..78b292c 100755 Some influential environment variables: CC C compiler command -@@ -4831,8 +4837,8 @@ esac +@@ -4835,8 +4841,8 @@ esac @@ -5857,7 +5794,7 @@ index d4db554..78b292c 100755 -@@ -4872,7 +4878,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -4876,7 +4882,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 $as_echo_n "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. @@ -5866,7 +5803,7 @@ index d4db554..78b292c 100755 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -5558,8 +5564,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; +@@ -5562,8 +5568,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -5877,7 +5814,7 @@ index d4db554..78b292c 100755 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -5608,6 +5614,80 @@ esac +@@ -5612,6 +5618,80 @@ esac @@ -5958,7 +5895,7 @@ index d4db554..78b292c 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } if test "${lt_cv_ld_reload_flag+set}" = set; then : -@@ -5624,6 +5704,11 @@ case $reload_flag in +@@ -5628,6 +5708,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -5970,7 +5907,7 @@ index d4db554..78b292c 100755 darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -5792,7 +5877,8 @@ mingw* | pw32*) +@@ -5796,7 +5881,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -5980,7 +5917,7 @@ index d4db554..78b292c 100755 lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -5869,11 +5955,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) +@@ -5873,11 +5959,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -5992,7 +5929,7 @@ index d4db554..78b292c 100755 netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' -@@ -5951,6 +6032,21 @@ esac +@@ -5955,6 +6036,21 @@ esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } @@ -6014,7 +5951,7 @@ index d4db554..78b292c 100755 file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -5966,9 +6062,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -5970,9 +6066,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -6179,7 +6116,7 @@ index d4db554..78b292c 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_AR+set}" = set; then : -@@ -5984,7 +6233,7 @@ do +@@ -5988,7 +6237,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then @@ -6188,7 +6125,7 @@ index d4db554..78b292c 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6004,11 +6253,15 @@ $as_echo "no" >&6; } +@@ -6008,11 +6257,15 @@ $as_echo "no" >&6; } fi @@ -6207,7 +6144,7 @@ index d4db554..78b292c 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : -@@ -6024,7 +6277,7 @@ do +@@ -6028,7 +6281,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then @@ -6216,7 +6153,7 @@ index d4db554..78b292c 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6043,6 +6296,10 @@ else +@@ -6047,6 +6300,10 @@ else $as_echo "no" >&6; } fi @@ -6227,7 +6164,7 @@ index d4db554..78b292c 100755 if test "x$ac_ct_AR" = x; then AR="false" else -@@ -6054,12 +6311,10 @@ ac_tool_warned=yes ;; +@@ -6058,12 +6315,10 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -6242,7 +6179,7 @@ index d4db554..78b292c 100755 -@@ -6071,6 +6326,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru +@@ -6075,6 +6330,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru @@ -6307,7 +6244,7 @@ index d4db554..78b292c 100755 if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -@@ -6405,8 +6718,8 @@ esac +@@ -6409,8 +6722,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address @@ -6318,7 +6255,7 @@ index d4db554..78b292c 100755 # Handle CRLF in mingw tool chain opt_cr= -@@ -6442,6 +6755,7 @@ for ac_symprfx in "" "_"; do +@@ -6446,6 +6759,7 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi @@ -6326,7 +6263,7 @@ index d4db554..78b292c 100755 # Check to see that the pipe works correctly. pipe_works=no -@@ -6483,6 +6797,18 @@ _LT_EOF +@@ -6487,6 +6801,18 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext @@ -6345,7 +6282,7 @@ index d4db554..78b292c 100755 #ifdef __cplusplus extern "C" { #endif -@@ -6494,7 +6820,7 @@ _LT_EOF +@@ -6498,7 +6824,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -6354,7 +6291,7 @@ index d4db554..78b292c 100755 const char *name; void *address; } -@@ -6520,8 +6846,8 @@ static const void *lt_preloaded_setup() { +@@ -6524,8 +6850,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -6365,7 +6302,7 @@ index d4db554..78b292c 100755 LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -6531,8 +6857,8 @@ _LT_EOF +@@ -6535,8 +6861,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -6376,7 +6313,7 @@ index d4db554..78b292c 100755 else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -6569,6 +6895,18 @@ else +@@ -6573,6 +6899,18 @@ else $as_echo "ok" >&6; } fi @@ -6395,7 +6332,7 @@ index d4db554..78b292c 100755 -@@ -6590,6 +6928,43 @@ fi +@@ -6594,6 +6932,43 @@ fi @@ -6439,7 +6376,7 @@ index d4db554..78b292c 100755 # Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then : enableval=$enable_libtool_lock; -@@ -6796,6 +7171,123 @@ esac +@@ -6800,6 +7175,123 @@ esac need_locks="$enable_libtool_lock" @@ -6563,7 +6500,7 @@ index d4db554..78b292c 100755 case $host_os in rhapsody* | darwin*) -@@ -7359,6 +7851,8 @@ _LT_EOF +@@ -7363,6 +7855,8 @@ _LT_EOF $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 echo "$AR cru libconftest.a conftest.o" >&5 $AR cru libconftest.a conftest.o 2>&5 @@ -6572,7 +6509,7 @@ index d4db554..78b292c 100755 cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -7554,7 +8048,8 @@ fi +@@ -7558,7 +8052,8 @@ fi LIBTOOL_DEPS="$ltmain" # Always use our own libtool. @@ -6582,7 +6519,7 @@ index d4db554..78b292c 100755 -@@ -7643,7 +8138,7 @@ aix3*) +@@ -7647,7 +8142,7 @@ aix3*) esac # Global variables: @@ -6591,7 +6528,7 @@ index d4db554..78b292c 100755 can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -7941,8 +8436,6 @@ fi +@@ -7945,8 +8440,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -6600,7 +6537,7 @@ index d4db554..78b292c 100755 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8108,6 +8601,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8112,6 +8605,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -6613,7 +6550,7 @@ index d4db554..78b292c 100755 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8170,7 +8669,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8174,7 +8673,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -6622,7 +6559,7 @@ index d4db554..78b292c 100755 lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -8227,13 +8726,17 @@ case $host_os in +@@ -8231,13 +8730,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -6646,7 +6583,7 @@ index d4db554..78b292c 100755 # # Check to make sure the PIC flag actually works. -@@ -8294,6 +8797,11 @@ fi +@@ -8298,6 +8801,11 @@ fi @@ -6658,7 +6595,7 @@ index d4db554..78b292c 100755 # # Check to make sure the static flag actually works. # -@@ -8644,7 +9152,8 @@ _LT_EOF +@@ -8648,7 +9156,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -6668,7 +6605,7 @@ index d4db554..78b292c 100755 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -8743,12 +9252,12 @@ _LT_EOF +@@ -8747,12 +9256,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -6683,7 +6620,7 @@ index d4db554..78b292c 100755 fi ;; esac -@@ -8762,8 +9271,8 @@ _LT_EOF +@@ -8766,8 +9275,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -6694,7 +6631,7 @@ index d4db554..78b292c 100755 fi ;; -@@ -8781,8 +9290,8 @@ _LT_EOF +@@ -8785,8 +9294,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -6705,7 +6642,7 @@ index d4db554..78b292c 100755 else ld_shlibs=no fi -@@ -8828,8 +9337,8 @@ _LT_EOF +@@ -8832,8 +9341,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -6716,7 +6653,7 @@ index d4db554..78b292c 100755 else ld_shlibs=no fi -@@ -8959,7 +9468,13 @@ _LT_EOF +@@ -8963,7 +9472,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -6731,7 +6668,7 @@ index d4db554..78b292c 100755 /* end confdefs.h. */ int -@@ -8972,22 +9487,29 @@ main () +@@ -8976,22 +9491,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -6774,7 +6711,7 @@ index d4db554..78b292c 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 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" -@@ -8999,7 +9521,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9003,7 +9525,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -6789,7 +6726,7 @@ index d4db554..78b292c 100755 /* end confdefs.h. */ int -@@ -9012,22 +9540,29 @@ main () +@@ -9016,22 +9544,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -6832,7 +6769,7 @@ index d4db554..78b292c 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9072,20 +9607,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9076,20 +9611,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -6910,7 +6847,7 @@ index d4db554..78b292c 100755 ;; darwin* | rhapsody*) -@@ -9146,7 +9724,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9150,7 +9728,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -6919,7 +6856,7 @@ index d4db554..78b292c 100755 hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9154,7 +9732,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9158,7 +9736,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -6928,7 +6865,7 @@ index d4db554..78b292c 100755 else 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' fi -@@ -9170,7 +9748,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9174,7 +9752,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -6937,7 +6874,7 @@ index d4db554..78b292c 100755 else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -9194,10 +9772,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9198,10 +9776,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -6950,7 +6887,7 @@ index d4db554..78b292c 100755 ;; esac else -@@ -9276,23 +9854,36 @@ fi +@@ -9280,23 +9858,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -6995,7 +6932,7 @@ index d4db554..78b292c 100755 else 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' 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' -@@ -9377,7 +9968,7 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9381,7 +9972,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -7004,7 +6941,7 @@ index d4db554..78b292c 100755 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -9396,9 +9987,9 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9400,9 +9991,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -7016,7 +6953,7 @@ index d4db554..78b292c 100755 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -9974,8 +10565,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -9978,8 +10569,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -7028,7 +6965,7 @@ index d4db554..78b292c 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -10008,13 +10600,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10012,13 +10604,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -7101,7 +7038,7 @@ index d4db554..78b292c 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -10106,7 +10756,7 @@ haiku*) +@@ -10110,7 +10760,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -7110,16 +7047,7 @@ index d4db554..78b292c 100755 hardcode_into_libs=yes ;; -@@ -10902,7 +11552,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 10900 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -10946,10 +11596,10 @@ else +@@ -10950,10 +11600,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -7132,16 +7060,7 @@ index d4db554..78b292c 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11008,7 +11658,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11006 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11052,10 +11702,10 @@ else +@@ -11056,10 +11706,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -7154,7 +7073,7 @@ index d4db554..78b292c 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12924,13 +13574,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -12961,13 +13611,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -7175,7 +7094,7 @@ index d4db554..78b292c 100755 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -12945,14 +13602,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -12982,14 +13639,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 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"`' @@ -7194,7 +7113,7 @@ index d4db554..78b292c 100755 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -12985,12 +13645,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -13022,12 +13682,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -7208,7 +7127,7 @@ index d4db554..78b292c 100755 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -13045,8 +13705,13 @@ reload_flag \ +@@ -13082,8 +13742,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -7222,7 +7141,7 @@ index d4db554..78b292c 100755 STRIP \ RANLIB \ CC \ -@@ -13056,12 +13721,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -13093,12 +13758,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ @@ -7238,7 +7157,7 @@ index d4db554..78b292c 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -13077,7 +13744,6 @@ no_undefined_flag \ +@@ -13114,7 +13781,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -7246,7 +7165,7 @@ index d4db554..78b292c 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -13113,6 +13779,7 @@ module_cmds \ +@@ -13150,6 +13816,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -7254,7 +7173,7 @@ index d4db554..78b292c 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -13869,7 +14536,8 @@ $as_echo X"$file" | +@@ -13906,7 +14573,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -7264,7 +7183,7 @@ index d4db554..78b292c 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -13972,19 +14640,42 @@ SP2NL=$lt_lt_SP2NL +@@ -14009,19 +14677,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -7308,7 +7227,7 @@ index d4db554..78b292c 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -14014,6 +14705,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -14051,6 +14742,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -7321,7 +7240,7 @@ index d4db554..78b292c 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -14023,6 +14720,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -14060,6 +14757,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -7331,7 +7250,7 @@ index d4db554..78b292c 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -14137,12 +14837,12 @@ with_gcc=$GCC +@@ -14174,12 +14874,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -7347,7 +7266,7 @@ index d4db554..78b292c 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -14229,9 +14929,6 @@ inherit_rpath=$inherit_rpath +@@ -14266,9 +14966,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -7357,7 +7276,7 @@ index d4db554..78b292c 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -14247,6 +14944,9 @@ include_expsyms=$lt_include_expsyms +@@ -14284,6 +14981,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -7367,7 +7286,7 @@ index d4db554..78b292c 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -14279,210 +14979,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -14316,210 +15016,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? @@ -7742,10 +7661,10 @@ index d4db554..78b292c 100755 chmod +x "$ofile" diff --git a/ld/configure b/ld/configure -index 8095b71..eb4f0d7 100755 +index f9be51a..3df1149 100755 --- a/ld/configure +++ b/ld/configure -@@ -657,8 +657,11 @@ OTOOL +@@ -658,8 +658,11 @@ OTOOL LIPO NMEDIT DSYMUTIL @@ -7757,7 +7676,7 @@ index 8095b71..eb4f0d7 100755 OBJDUMP LN_S NM -@@ -779,6 +782,7 @@ enable_static +@@ -781,6 +784,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -7765,7 +7684,7 @@ index 8095b71..eb4f0d7 100755 enable_libtool_lock enable_plugins enable_largefile -@@ -1458,6 +1462,8 @@ Optional Packages: +@@ -1462,6 +1466,8 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] @@ -7774,7 +7693,7 @@ index 8095b71..eb4f0d7 100755 --with-lib-path=dir1:dir2... set default LIB_PATH --with-sysroot=DIR Search for usr/lib et al within DIR. -@@ -5649,8 +5655,8 @@ esac +@@ -5656,8 +5662,8 @@ esac @@ -7785,7 +7704,7 @@ index 8095b71..eb4f0d7 100755 -@@ -5690,7 +5696,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -5697,7 +5703,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 $as_echo_n "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. @@ -7794,7 +7713,7 @@ index 8095b71..eb4f0d7 100755 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6376,8 +6382,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; +@@ -6383,8 +6389,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -7805,7 +7724,7 @@ index 8095b71..eb4f0d7 100755 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -6426,6 +6432,80 @@ esac +@@ -6433,6 +6439,80 @@ esac @@ -7886,7 +7805,7 @@ index 8095b71..eb4f0d7 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } if test "${lt_cv_ld_reload_flag+set}" = set; then : -@@ -6442,6 +6522,11 @@ case $reload_flag in +@@ -6449,6 +6529,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -7898,7 +7817,7 @@ index 8095b71..eb4f0d7 100755 darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6610,7 +6695,8 @@ mingw* | pw32*) +@@ -6617,7 +6702,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -7908,7 +7827,7 @@ index 8095b71..eb4f0d7 100755 lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -6764,6 +6850,21 @@ esac +@@ -6771,6 +6857,21 @@ esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } @@ -7930,7 +7849,7 @@ index 8095b71..eb4f0d7 100755 file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6779,9 +6880,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -6786,9 +6887,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -8095,7 +8014,7 @@ index 8095b71..eb4f0d7 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_AR+set}" = set; then : -@@ -6797,7 +7051,7 @@ do +@@ -6804,7 +7058,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then @@ -8104,7 +8023,7 @@ index 8095b71..eb4f0d7 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6817,11 +7071,15 @@ $as_echo "no" >&6; } +@@ -6824,11 +7078,15 @@ $as_echo "no" >&6; } fi @@ -8123,7 +8042,7 @@ index 8095b71..eb4f0d7 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : -@@ -6837,7 +7095,7 @@ do +@@ -6844,7 +7102,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then @@ -8132,7 +8051,7 @@ index 8095b71..eb4f0d7 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6856,6 +7114,10 @@ else +@@ -6863,6 +7121,10 @@ else $as_echo "no" >&6; } fi @@ -8143,7 +8062,7 @@ index 8095b71..eb4f0d7 100755 if test "x$ac_ct_AR" = x; then AR="false" else -@@ -6867,12 +7129,12 @@ ac_tool_warned=yes ;; +@@ -6874,12 +7136,12 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -8160,7 +8079,7 @@ index 8095b71..eb4f0d7 100755 -@@ -6882,6 +7144,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru +@@ -6889,6 +7151,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru @@ -8223,7 +8142,7 @@ index 8095b71..eb4f0d7 100755 if test -n "$ac_tool_prefix"; then -@@ -7218,8 +7536,8 @@ esac +@@ -7225,8 +7543,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address @@ -8234,7 +8153,7 @@ index 8095b71..eb4f0d7 100755 # Handle CRLF in mingw tool chain opt_cr= -@@ -7255,6 +7573,7 @@ for ac_symprfx in "" "_"; do +@@ -7262,6 +7580,7 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi @@ -8242,7 +8161,7 @@ index 8095b71..eb4f0d7 100755 # Check to see that the pipe works correctly. pipe_works=no -@@ -7296,6 +7615,18 @@ _LT_EOF +@@ -7303,6 +7622,18 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext @@ -8261,7 +8180,7 @@ index 8095b71..eb4f0d7 100755 #ifdef __cplusplus extern "C" { #endif -@@ -7307,7 +7638,7 @@ _LT_EOF +@@ -7314,7 +7645,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -8270,7 +8189,7 @@ index 8095b71..eb4f0d7 100755 const char *name; void *address; } -@@ -7333,8 +7664,8 @@ static const void *lt_preloaded_setup() { +@@ -7340,8 +7671,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -8281,7 +8200,7 @@ index 8095b71..eb4f0d7 100755 LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7344,8 +7675,8 @@ _LT_EOF +@@ -7351,8 +7682,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -8292,7 +8211,7 @@ index 8095b71..eb4f0d7 100755 else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -7382,6 +7713,19 @@ else +@@ -7389,6 +7720,19 @@ else $as_echo "ok" >&6; } fi @@ -8312,7 +8231,7 @@ index 8095b71..eb4f0d7 100755 -@@ -7402,6 +7746,42 @@ fi +@@ -7409,6 +7753,42 @@ fi @@ -8355,7 +8274,7 @@ index 8095b71..eb4f0d7 100755 # Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then : -@@ -7609,6 +7989,123 @@ esac +@@ -7616,6 +7996,123 @@ esac need_locks="$enable_libtool_lock" @@ -8479,7 +8398,7 @@ index 8095b71..eb4f0d7 100755 case $host_os in rhapsody* | darwin*) -@@ -8172,6 +8669,8 @@ _LT_EOF +@@ -8179,6 +8676,8 @@ _LT_EOF $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 echo "$AR cru libconftest.a conftest.o" >&5 $AR cru libconftest.a conftest.o 2>&5 @@ -8488,7 +8407,7 @@ index 8095b71..eb4f0d7 100755 cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -8240,6 +8739,16 @@ done +@@ -8247,6 +8746,16 @@ done @@ -8505,7 +8424,7 @@ index 8095b71..eb4f0d7 100755 # Set options -@@ -8368,7 +8877,8 @@ fi +@@ -8375,7 +8884,8 @@ fi LIBTOOL_DEPS="$ltmain" # Always use our own libtool. @@ -8515,7 +8434,7 @@ index 8095b71..eb4f0d7 100755 -@@ -8457,7 +8967,7 @@ aix3*) +@@ -8464,7 +8974,7 @@ aix3*) esac # Global variables: @@ -8524,7 +8443,7 @@ index 8095b71..eb4f0d7 100755 can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8755,8 +9265,6 @@ fi +@@ -8762,8 +9272,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -8533,7 +8452,7 @@ index 8095b71..eb4f0d7 100755 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8922,6 +9430,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8929,6 +9437,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -8546,7 +8465,7 @@ index 8095b71..eb4f0d7 100755 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8984,7 +9498,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8991,7 +9505,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -8555,7 +8474,7 @@ index 8095b71..eb4f0d7 100755 lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -9041,13 +9555,17 @@ case $host_os in +@@ -9048,13 +9562,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -8579,7 +8498,7 @@ index 8095b71..eb4f0d7 100755 # # Check to make sure the PIC flag actually works. -@@ -9108,6 +9626,11 @@ fi +@@ -9115,6 +9633,11 @@ fi @@ -8591,7 +8510,7 @@ index 8095b71..eb4f0d7 100755 # # Check to make sure the static flag actually works. # -@@ -9458,7 +9981,8 @@ _LT_EOF +@@ -9465,7 +9988,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -8601,7 +8520,7 @@ index 8095b71..eb4f0d7 100755 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9557,12 +10081,12 @@ _LT_EOF +@@ -9564,12 +10088,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -8616,7 +8535,7 @@ index 8095b71..eb4f0d7 100755 fi ;; esac -@@ -9576,8 +10100,8 @@ _LT_EOF +@@ -9583,8 +10107,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -8627,7 +8546,7 @@ index 8095b71..eb4f0d7 100755 fi ;; -@@ -9595,8 +10119,8 @@ _LT_EOF +@@ -9602,8 +10126,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -8638,7 +8557,7 @@ index 8095b71..eb4f0d7 100755 else ld_shlibs=no fi -@@ -9642,8 +10166,8 @@ _LT_EOF +@@ -9649,8 +10173,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -8649,7 +8568,7 @@ index 8095b71..eb4f0d7 100755 else ld_shlibs=no fi -@@ -9773,7 +10297,13 @@ _LT_EOF +@@ -9780,7 +10304,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -8664,7 +8583,7 @@ index 8095b71..eb4f0d7 100755 /* end confdefs.h. */ int -@@ -9786,22 +10316,29 @@ main () +@@ -9793,22 +10323,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -8707,7 +8626,7 @@ index 8095b71..eb4f0d7 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 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" -@@ -9813,7 +10350,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9820,7 +10357,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -8722,7 +8641,7 @@ index 8095b71..eb4f0d7 100755 /* end confdefs.h. */ int -@@ -9826,22 +10369,29 @@ main () +@@ -9833,22 +10376,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -8765,7 +8684,7 @@ index 8095b71..eb4f0d7 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9885,21 +10435,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9892,21 +10442,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # When not using gcc, we currently assume that we are using # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is @@ -8845,7 +8764,7 @@ index 8095b71..eb4f0d7 100755 ;; darwin* | rhapsody*) -@@ -9960,7 +10553,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9967,7 +10560,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -8854,7 +8773,7 @@ index 8095b71..eb4f0d7 100755 hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9968,7 +10561,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9975,7 +10568,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -8863,7 +8782,7 @@ index 8095b71..eb4f0d7 100755 else 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' fi -@@ -9984,7 +10577,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9991,7 +10584,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -8872,7 +8791,7 @@ index 8095b71..eb4f0d7 100755 else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -10008,10 +10601,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -10015,10 +10608,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -8885,7 +8804,7 @@ index 8095b71..eb4f0d7 100755 ;; esac else -@@ -10090,23 +10683,36 @@ fi +@@ -10097,23 +10690,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -8930,7 +8849,7 @@ index 8095b71..eb4f0d7 100755 else 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' 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' -@@ -10191,7 +10797,7 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -10198,7 +10804,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -8939,7 +8858,7 @@ index 8095b71..eb4f0d7 100755 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -10210,9 +10816,9 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -10217,9 +10823,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -8951,7 +8870,7 @@ index 8095b71..eb4f0d7 100755 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -10788,8 +11394,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10795,8 +11401,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -8963,7 +8882,7 @@ index 8095b71..eb4f0d7 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -10822,13 +11429,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10829,13 +11436,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -9036,7 +8955,7 @@ index 8095b71..eb4f0d7 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -10920,7 +11585,7 @@ haiku*) +@@ -10927,7 +11592,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -9045,16 +8964,7 @@ index 8095b71..eb4f0d7 100755 hardcode_into_libs=yes ;; -@@ -11716,7 +12381,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11719 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11760,10 +12425,10 @@ else +@@ -11767,10 +12432,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -9067,16 +8977,7 @@ index 8095b71..eb4f0d7 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11822,7 +12487,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11825 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11866,10 +12531,10 @@ else +@@ -11873,10 +12538,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -9089,7 +8990,7 @@ index 8095b71..eb4f0d7 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12261,6 +12926,7 @@ $RM -r conftest* +@@ -12268,6 +12933,7 @@ $RM -r conftest* # Allow CC to be a program name with arguments. lt_save_CC=$CC @@ -9097,7 +8998,7 @@ index 8095b71..eb4f0d7 100755 lt_save_LD=$LD lt_save_GCC=$GCC GCC=$GXX -@@ -12278,6 +12944,7 @@ $RM -r conftest* +@@ -12285,6 +12951,7 @@ $RM -r conftest* fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} @@ -9105,7 +9006,7 @@ index 8095b71..eb4f0d7 100755 compiler=$CC compiler_CXX=$CC for cc_temp in $compiler""; do -@@ -12560,7 +13227,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie +@@ -12567,7 +13234,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie allow_undefined_flag_CXX='-berok' # Determine the default libpath from the value encoded in an empty # executable. @@ -9120,7 +9021,7 @@ index 8095b71..eb4f0d7 100755 /* end confdefs.h. */ int -@@ -12573,22 +13246,29 @@ main () +@@ -12580,22 +13253,29 @@ main () _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : @@ -9163,7 +9064,7 @@ index 8095b71..eb4f0d7 100755 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" -@@ -12601,7 +13281,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -12608,7 +13288,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -9178,7 +9079,7 @@ index 8095b71..eb4f0d7 100755 /* end confdefs.h. */ int -@@ -12614,22 +13300,29 @@ main () +@@ -12621,22 +13307,29 @@ main () _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : @@ -9221,7 +9122,7 @@ index 8095b71..eb4f0d7 100755 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -12672,29 +13365,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -12679,29 +13372,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; cygwin* | mingw* | pw32* | cegcc*) @@ -9320,7 +9221,7 @@ index 8095b71..eb4f0d7 100755 darwin* | rhapsody*) -@@ -12800,7 +13539,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -12807,7 +13546,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; *) if test "$GXX" = yes; then @@ -9329,7 +9230,7 @@ index 8095b71..eb4f0d7 100755 else # FIXME: insert proper C++ library support ld_shlibs_CXX=no -@@ -12871,10 +13610,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -12878,10 +13617,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) @@ -9342,7 +9243,7 @@ index 8095b71..eb4f0d7 100755 ;; esac fi -@@ -12915,9 +13654,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -12922,9 +13661,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then @@ -9354,7 +9255,7 @@ index 8095b71..eb4f0d7 100755 fi fi link_all_deplibs_CXX=yes -@@ -12987,20 +13726,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -12994,20 +13733,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi prelink_cmds_CXX='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ @@ -9379,7 +9280,7 @@ index 8095b71..eb4f0d7 100755 ;; *) # Version 6 and above use weak symbols archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -@@ -13195,7 +13934,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13202,7 +13941,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 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' ;; *) @@ -9388,7 +9289,7 @@ index 8095b71..eb4f0d7 100755 ;; esac -@@ -13241,7 +13980,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13248,7 +13987,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi solaris*) case $cc_basename in @@ -9397,7 +9298,7 @@ index 8095b71..eb4f0d7 100755 # Sun C++ 4.2, 5.x and Centerline C++ archive_cmds_need_lc_CXX=yes no_undefined_flag_CXX=' -zdefs' -@@ -13282,9 +14021,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13289,9 +14028,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi if test "$GXX" = yes && test "$with_gnu_ld" = no; then no_undefined_flag_CXX=' ${wl}-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then @@ -9409,7 +9310,7 @@ index 8095b71..eb4f0d7 100755 # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when -@@ -13419,6 +14158,13 @@ private: +@@ -13426,6 +14165,13 @@ private: }; _LT_EOF @@ -9423,7 +9324,7 @@ index 8095b71..eb4f0d7 100755 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? -@@ -13432,7 +14178,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 +@@ -13439,7 +14185,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do @@ -9432,7 +9333,7 @@ index 8095b71..eb4f0d7 100755 -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. -@@ -13441,13 +14187,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 +@@ -13448,13 +14194,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 test $p = "-R"; then prev=$p continue @@ -9459,7 +9360,7 @@ index 8095b71..eb4f0d7 100755 # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. -@@ -13467,8 +14222,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 +@@ -13474,8 +14229,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 postdeps_CXX="${postdeps_CXX} ${prev}${p}" fi fi @@ -9470,7 +9371,7 @@ index 8095b71..eb4f0d7 100755 *.$objext) # This assumes that the test object file only shows up # once in the compiler output. -@@ -13504,6 +14261,7 @@ else +@@ -13511,6 +14268,7 @@ else fi $RM -f confest.$objext @@ -9478,7 +9379,7 @@ index 8095b71..eb4f0d7 100755 # PORTME: override above test on systems where it is broken case $host_os in -@@ -13539,7 +14297,7 @@ linux*) +@@ -13546,7 +14304,7 @@ linux*) solaris*) case $cc_basename in @@ -9487,7 +9388,7 @@ index 8095b71..eb4f0d7 100755 # The more standards-conforming stlport4 library is # incompatible with the Cstd library. Avoid specifying # it if it's in CXXFLAGS. Ignore libCrun as -@@ -13604,8 +14362,6 @@ fi +@@ -13611,8 +14369,6 @@ fi lt_prog_compiler_pic_CXX= lt_prog_compiler_static_CXX= @@ -9496,7 +9397,7 @@ index 8095b71..eb4f0d7 100755 # C++ specific cases for pic, static, wl, etc. if test "$GXX" = yes; then -@@ -13710,6 +14466,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -13717,6 +14473,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } ;; esac ;; @@ -9508,7 +9409,7 @@ index 8095b71..eb4f0d7 100755 dgux*) case $cc_basename in ec++*) -@@ -13862,7 +14623,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -13869,7 +14630,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } ;; solaris*) case $cc_basename in @@ -9517,7 +9418,7 @@ index 8095b71..eb4f0d7 100755 # Sun C++ 4.2, 5.x and Centerline C++ lt_prog_compiler_pic_CXX='-KPIC' lt_prog_compiler_static_CXX='-Bstatic' -@@ -13927,10 +14688,17 @@ case $host_os in +@@ -13934,10 +14695,17 @@ case $host_os in lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" ;; esac @@ -9538,7 +9439,7 @@ index 8095b71..eb4f0d7 100755 # # Check to make sure the PIC flag actually works. -@@ -13988,6 +14756,8 @@ fi +@@ -13995,6 +14763,8 @@ fi @@ -9547,7 +9448,7 @@ index 8095b71..eb4f0d7 100755 # # Check to make sure the static flag actually works. # -@@ -14165,6 +14935,7 @@ fi +@@ -14172,6 +14942,7 @@ fi $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' @@ -9555,7 +9456,7 @@ index 8095b71..eb4f0d7 100755 case $host_os in aix[4-9]*) # If we're using GNU nm, then we don't want the "-C" option. -@@ -14179,15 +14950,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie +@@ -14186,15 +14957,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie ;; pw32*) export_symbols_cmds_CXX="$ltdll_cmds" @@ -9581,7 +9482,7 @@ index 8095b71..eb4f0d7 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 $as_echo "$ld_shlibs_CXX" >&6; } -@@ -14450,8 +15226,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -14457,8 +15233,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -9593,7 +9494,7 @@ index 8095b71..eb4f0d7 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -14483,13 +15260,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -14490,13 +15267,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -9666,7 +9567,7 @@ index 8095b71..eb4f0d7 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -14580,7 +15415,7 @@ haiku*) +@@ -14587,7 +15422,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -9675,7 +9576,7 @@ index 8095b71..eb4f0d7 100755 hardcode_into_libs=yes ;; -@@ -15039,6 +15874,7 @@ fi +@@ -15046,6 +15881,7 @@ fi fi # test -n "$compiler" CC=$lt_save_CC @@ -9683,7 +9584,7 @@ index 8095b71..eb4f0d7 100755 LDCXX=$LD LD=$lt_save_LD GCC=$lt_save_GCC -@@ -17953,13 +18789,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -17982,13 +18818,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -9704,7 +9605,7 @@ index 8095b71..eb4f0d7 100755 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -17974,14 +18817,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -18003,14 +18846,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 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"`' @@ -9723,7 +9624,7 @@ index 8095b71..eb4f0d7 100755 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -18014,12 +18860,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -18043,12 +18889,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -9737,7 +9638,7 @@ index 8095b71..eb4f0d7 100755 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -18058,8 +18904,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote +@@ -18087,8 +18933,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' @@ -9747,7 +9648,7 @@ index 8095b71..eb4f0d7 100755 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' -@@ -18086,12 +18932,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ +@@ -18115,12 +18961,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' @@ -9761,7 +9662,7 @@ index 8095b71..eb4f0d7 100755 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' -@@ -18129,8 +18975,13 @@ reload_flag \ +@@ -18158,8 +19004,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -9775,7 +9676,7 @@ index 8095b71..eb4f0d7 100755 STRIP \ RANLIB \ CC \ -@@ -18140,12 +18991,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -18169,12 +19020,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ @@ -9791,7 +9692,7 @@ index 8095b71..eb4f0d7 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -18161,7 +19014,6 @@ no_undefined_flag \ +@@ -18190,7 +19043,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -9799,7 +9700,7 @@ index 8095b71..eb4f0d7 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -18183,8 +19035,8 @@ LD_CXX \ +@@ -18212,8 +19064,8 @@ LD_CXX \ reload_flag_CXX \ compiler_CXX \ lt_prog_compiler_no_builtin_flag_CXX \ @@ -9809,7 +9710,7 @@ index 8095b71..eb4f0d7 100755 lt_prog_compiler_static_CXX \ lt_cv_prog_compiler_c_o_CXX \ export_dynamic_flag_spec_CXX \ -@@ -18196,7 +19048,6 @@ no_undefined_flag_CXX \ +@@ -18225,7 +19077,6 @@ no_undefined_flag_CXX \ hardcode_libdir_flag_spec_CXX \ hardcode_libdir_flag_spec_ld_CXX \ hardcode_libdir_separator_CXX \ @@ -9817,7 +9718,7 @@ index 8095b71..eb4f0d7 100755 exclude_expsyms_CXX \ include_expsyms_CXX \ file_list_spec_CXX \ -@@ -18230,6 +19081,7 @@ module_cmds \ +@@ -18259,6 +19110,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -9825,7 +9726,7 @@ index 8095b71..eb4f0d7 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -18244,7 +19096,8 @@ archive_expsym_cmds_CXX \ +@@ -18273,7 +19125,8 @@ archive_expsym_cmds_CXX \ module_cmds_CXX \ module_expsym_cmds_CXX \ export_symbols_cmds_CXX \ @@ -9835,7 +9736,7 @@ index 8095b71..eb4f0d7 100755 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" -@@ -19037,7 +19890,8 @@ $as_echo X"$file" | +@@ -19066,7 +19919,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -9845,7 +9746,7 @@ index 8095b71..eb4f0d7 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -19140,19 +19994,42 @@ SP2NL=$lt_lt_SP2NL +@@ -19169,19 +20023,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -9889,7 +9790,7 @@ index 8095b71..eb4f0d7 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -19182,6 +20059,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -19211,6 +20088,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -9902,7 +9803,7 @@ index 8095b71..eb4f0d7 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -19191,6 +20074,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -19220,6 +20103,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -9912,7 +9813,7 @@ index 8095b71..eb4f0d7 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -19305,12 +20191,12 @@ with_gcc=$GCC +@@ -19334,12 +20220,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -9928,7 +9829,7 @@ index 8095b71..eb4f0d7 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -19397,9 +20283,6 @@ inherit_rpath=$inherit_rpath +@@ -19426,9 +20312,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -9938,7 +9839,7 @@ index 8095b71..eb4f0d7 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -19415,6 +20298,9 @@ include_expsyms=$lt_include_expsyms +@@ -19444,6 +20327,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -9948,7 +9849,7 @@ index 8095b71..eb4f0d7 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -19461,210 +20347,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -19490,210 +20376,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? @@ -10322,7 +10223,7 @@ index 8095b71..eb4f0d7 100755 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" -@@ -19692,12 +20537,12 @@ with_gcc=$GCC_CXX +@@ -19721,12 +20566,12 @@ with_gcc=$GCC_CXX # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX @@ -10338,7 +10239,7 @@ index 8095b71..eb4f0d7 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static_CXX -@@ -19784,9 +20629,6 @@ inherit_rpath=$inherit_rpath_CXX +@@ -19813,9 +20658,6 @@ inherit_rpath=$inherit_rpath_CXX # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs_CXX @@ -10348,7 +10249,7 @@ index 8095b71..eb4f0d7 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols_CXX -@@ -19802,6 +20644,9 @@ include_expsyms=$lt_include_expsyms_CXX +@@ -19831,6 +20673,9 @@ include_expsyms=$lt_include_expsyms_CXX # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds_CXX @@ -10359,7 +10260,7 @@ index 8095b71..eb4f0d7 100755 file_list_spec=$lt_file_list_spec_CXX diff --git a/libtool.m4 b/libtool.m4 -index 4b2d30a..008d331 100644 +index 24d13f3..e45fdc6 100644 --- a/libtool.m4 +++ b/libtool.m4 @@ -1,7 +1,8 @@ @@ -17442,10 +17343,10 @@ index bf92b5e..c573da9 100644 # These exist entirely to fool aclocal when bootstrapping libtool. # diff --git a/opcodes/configure b/opcodes/configure -index eedb184..d3076e1 100755 +index f615634..a340983 100755 --- a/opcodes/configure +++ b/opcodes/configure -@@ -648,6 +648,9 @@ OTOOL +@@ -649,6 +649,9 @@ OTOOL LIPO NMEDIT DSYMUTIL @@ -17455,7 +17356,7 @@ index eedb184..d3076e1 100755 OBJDUMP LN_S NM -@@ -760,6 +763,7 @@ enable_static +@@ -762,6 +765,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -17463,7 +17364,7 @@ index eedb184..d3076e1 100755 enable_libtool_lock enable_targets enable_werror -@@ -1420,6 +1424,8 @@ Optional Packages: +@@ -1422,6 +1426,8 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] @@ -17472,7 +17373,7 @@ index eedb184..d3076e1 100755 Some influential environment variables: CC C compiler command -@@ -5110,8 +5116,8 @@ esac +@@ -5114,8 +5120,8 @@ esac @@ -17483,7 +17384,7 @@ index eedb184..d3076e1 100755 -@@ -5151,7 +5157,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -5155,7 +5161,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 $as_echo_n "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. @@ -17492,7 +17393,7 @@ index eedb184..d3076e1 100755 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -5837,8 +5843,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; +@@ -5841,8 +5847,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -17503,7 +17404,7 @@ index eedb184..d3076e1 100755 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -5887,6 +5893,80 @@ esac +@@ -5891,6 +5897,80 @@ esac @@ -17584,7 +17485,7 @@ index eedb184..d3076e1 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } if test "${lt_cv_ld_reload_flag+set}" = set; then : -@@ -5903,6 +5983,11 @@ case $reload_flag in +@@ -5907,6 +5987,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -17596,7 +17497,7 @@ index eedb184..d3076e1 100755 darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6071,7 +6156,8 @@ mingw* | pw32*) +@@ -6075,7 +6160,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -17606,7 +17507,7 @@ index eedb184..d3076e1 100755 lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -6225,6 +6311,21 @@ esac +@@ -6229,6 +6315,21 @@ esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } @@ -17628,7 +17529,7 @@ index eedb184..d3076e1 100755 file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6240,9 +6341,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -6244,9 +6345,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -17793,7 +17694,7 @@ index eedb184..d3076e1 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_AR+set}" = set; then : -@@ -6258,7 +6512,7 @@ do +@@ -6262,7 +6516,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then @@ -17802,7 +17703,7 @@ index eedb184..d3076e1 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6278,11 +6532,15 @@ $as_echo "no" >&6; } +@@ -6282,11 +6536,15 @@ $as_echo "no" >&6; } fi @@ -17821,7 +17722,7 @@ index eedb184..d3076e1 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : -@@ -6298,7 +6556,7 @@ do +@@ -6302,7 +6560,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then @@ -17830,7 +17731,7 @@ index eedb184..d3076e1 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6317,6 +6575,10 @@ else +@@ -6321,6 +6579,10 @@ else $as_echo "no" >&6; } fi @@ -17841,7 +17742,7 @@ index eedb184..d3076e1 100755 if test "x$ac_ct_AR" = x; then AR="false" else -@@ -6328,16 +6590,72 @@ ac_tool_warned=yes ;; +@@ -6332,16 +6594,72 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -17918,7 +17819,7 @@ index eedb184..d3076e1 100755 -@@ -6679,8 +6997,8 @@ esac +@@ -6683,8 +7001,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address @@ -17929,7 +17830,7 @@ index eedb184..d3076e1 100755 # Handle CRLF in mingw tool chain opt_cr= -@@ -6716,6 +7034,7 @@ for ac_symprfx in "" "_"; do +@@ -6720,6 +7038,7 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi @@ -17937,7 +17838,7 @@ index eedb184..d3076e1 100755 # Check to see that the pipe works correctly. pipe_works=no -@@ -6757,6 +7076,18 @@ _LT_EOF +@@ -6761,6 +7080,18 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext @@ -17956,7 +17857,7 @@ index eedb184..d3076e1 100755 #ifdef __cplusplus extern "C" { #endif -@@ -6768,7 +7099,7 @@ _LT_EOF +@@ -6772,7 +7103,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -17965,7 +17866,7 @@ index eedb184..d3076e1 100755 const char *name; void *address; } -@@ -6794,8 +7125,8 @@ static const void *lt_preloaded_setup() { +@@ -6798,8 +7129,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -17976,7 +17877,7 @@ index eedb184..d3076e1 100755 LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -6805,8 +7136,8 @@ _LT_EOF +@@ -6809,8 +7140,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -17987,7 +17888,7 @@ index eedb184..d3076e1 100755 else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -6843,6 +7174,16 @@ else +@@ -6847,6 +7178,16 @@ else $as_echo "ok" >&6; } fi @@ -18004,7 +17905,7 @@ index eedb184..d3076e1 100755 -@@ -6864,6 +7205,45 @@ fi +@@ -6868,6 +7209,45 @@ fi @@ -18050,7 +17951,7 @@ index eedb184..d3076e1 100755 # Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then : enableval=$enable_libtool_lock; -@@ -7070,6 +7450,123 @@ esac +@@ -7074,6 +7454,123 @@ esac need_locks="$enable_libtool_lock" @@ -18174,7 +18075,7 @@ index eedb184..d3076e1 100755 case $host_os in rhapsody* | darwin*) -@@ -7633,6 +8130,8 @@ _LT_EOF +@@ -7637,6 +8134,8 @@ _LT_EOF $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 echo "$AR cru libconftest.a conftest.o" >&5 $AR cru libconftest.a conftest.o 2>&5 @@ -18183,7 +18084,7 @@ index eedb184..d3076e1 100755 cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -7798,7 +8297,8 @@ fi +@@ -7802,7 +8301,8 @@ fi LIBTOOL_DEPS="$ltmain" # Always use our own libtool. @@ -18193,7 +18094,7 @@ index eedb184..d3076e1 100755 -@@ -7887,7 +8387,7 @@ aix3*) +@@ -7891,7 +8391,7 @@ aix3*) esac # Global variables: @@ -18202,7 +18103,7 @@ index eedb184..d3076e1 100755 can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8185,8 +8685,6 @@ fi +@@ -8189,8 +8689,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -18211,7 +18112,7 @@ index eedb184..d3076e1 100755 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8352,6 +8850,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8356,6 +8854,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -18224,7 +18125,7 @@ index eedb184..d3076e1 100755 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8414,7 +8918,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8418,7 +8922,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -18233,7 +18134,7 @@ index eedb184..d3076e1 100755 lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -8471,13 +8975,17 @@ case $host_os in +@@ -8475,13 +8979,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -18257,7 +18158,7 @@ index eedb184..d3076e1 100755 # # Check to make sure the PIC flag actually works. -@@ -8538,6 +9046,11 @@ fi +@@ -8542,6 +9050,11 @@ fi @@ -18269,7 +18170,7 @@ index eedb184..d3076e1 100755 # # Check to make sure the static flag actually works. # -@@ -8888,7 +9401,8 @@ _LT_EOF +@@ -8892,7 +9405,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -18279,7 +18180,7 @@ index eedb184..d3076e1 100755 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -8987,12 +9501,12 @@ _LT_EOF +@@ -8991,12 +9505,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -18294,7 +18195,7 @@ index eedb184..d3076e1 100755 fi ;; esac -@@ -9006,8 +9520,8 @@ _LT_EOF +@@ -9010,8 +9524,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -18305,7 +18206,7 @@ index eedb184..d3076e1 100755 fi ;; -@@ -9025,8 +9539,8 @@ _LT_EOF +@@ -9029,8 +9543,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -18316,7 +18217,7 @@ index eedb184..d3076e1 100755 else ld_shlibs=no fi -@@ -9072,8 +9586,8 @@ _LT_EOF +@@ -9076,8 +9590,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -18327,7 +18228,7 @@ index eedb184..d3076e1 100755 else ld_shlibs=no fi -@@ -9203,7 +9717,13 @@ _LT_EOF +@@ -9207,7 +9721,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -18342,7 +18243,7 @@ index eedb184..d3076e1 100755 /* end confdefs.h. */ int -@@ -9216,22 +9736,29 @@ main () +@@ -9220,22 +9740,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -18385,7 +18286,7 @@ index eedb184..d3076e1 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 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" -@@ -9243,7 +9770,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9247,7 +9774,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -18400,7 +18301,7 @@ index eedb184..d3076e1 100755 /* end confdefs.h. */ int -@@ -9256,22 +9789,29 @@ main () +@@ -9260,22 +9793,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -18443,7 +18344,7 @@ index eedb184..d3076e1 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9316,20 +9856,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9320,20 +9860,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -18521,7 +18422,7 @@ index eedb184..d3076e1 100755 ;; darwin* | rhapsody*) -@@ -9390,7 +9973,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9394,7 +9977,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -18530,7 +18431,7 @@ index eedb184..d3076e1 100755 hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9398,7 +9981,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9402,7 +9985,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -18539,7 +18440,7 @@ index eedb184..d3076e1 100755 else 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' fi -@@ -9414,7 +9997,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9418,7 +10001,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -18548,7 +18449,7 @@ index eedb184..d3076e1 100755 else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -9438,10 +10021,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9442,10 +10025,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -18561,7 +18462,7 @@ index eedb184..d3076e1 100755 ;; esac else -@@ -9520,23 +10103,36 @@ fi +@@ -9524,23 +10107,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -18606,7 +18507,7 @@ index eedb184..d3076e1 100755 else 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' 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' -@@ -9621,7 +10217,7 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9625,7 +10221,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -18615,7 +18516,7 @@ index eedb184..d3076e1 100755 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -9640,9 +10236,9 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9644,9 +10240,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -18627,7 +18528,7 @@ index eedb184..d3076e1 100755 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -10218,8 +10814,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10222,8 +10818,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -18639,7 +18540,7 @@ index eedb184..d3076e1 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -10252,13 +10849,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10256,13 +10853,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -18712,7 +18613,7 @@ index eedb184..d3076e1 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -10350,7 +11005,7 @@ haiku*) +@@ -10354,7 +11009,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -18721,16 +18622,7 @@ index eedb184..d3076e1 100755 hardcode_into_libs=yes ;; -@@ -11146,7 +11801,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11149 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11190,10 +11845,10 @@ else +@@ -11194,10 +11849,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -18743,16 +18635,7 @@ index eedb184..d3076e1 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11252,7 +11907,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11255 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11296,10 +11951,10 @@ else +@@ -11300,10 +11955,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -18765,7 +18648,7 @@ index eedb184..d3076e1 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12462,7 +13117,7 @@ if test "$enable_shared" = "yes"; then +@@ -12499,7 +13154,7 @@ if test "$enable_shared" = "yes"; then # since libbfd may not pull in the entirety of libiberty. x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` if test -n "$x"; then @@ -18774,7 +18657,7 @@ index eedb184..d3076e1 100755 fi case "${host}" in -@@ -13436,13 +14091,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -13473,13 +14128,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -18795,7 +18678,7 @@ index eedb184..d3076e1 100755 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -13457,14 +14119,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -13494,14 +14156,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 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"`' @@ -18814,7 +18697,7 @@ index eedb184..d3076e1 100755 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -13497,12 +14162,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -13534,12 +14199,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -18828,7 +18711,7 @@ index eedb184..d3076e1 100755 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -13557,8 +14222,13 @@ reload_flag \ +@@ -13594,8 +14259,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -18842,7 +18725,7 @@ index eedb184..d3076e1 100755 STRIP \ RANLIB \ CC \ -@@ -13568,12 +14238,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -13605,12 +14275,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ @@ -18858,7 +18741,7 @@ index eedb184..d3076e1 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -13589,7 +14261,6 @@ no_undefined_flag \ +@@ -13626,7 +14298,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -18866,7 +18749,7 @@ index eedb184..d3076e1 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -13625,6 +14296,7 @@ module_cmds \ +@@ -13662,6 +14333,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -18874,7 +18757,7 @@ index eedb184..d3076e1 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -14381,7 +15053,8 @@ $as_echo X"$file" | +@@ -14418,7 +15090,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -18884,7 +18767,7 @@ index eedb184..d3076e1 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -14484,19 +15157,42 @@ SP2NL=$lt_lt_SP2NL +@@ -14521,19 +15194,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -18928,7 +18811,7 @@ index eedb184..d3076e1 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -14526,6 +15222,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -14563,6 +15259,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -18941,7 +18824,7 @@ index eedb184..d3076e1 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -14535,6 +15237,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -14572,6 +15274,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -18951,7 +18834,7 @@ index eedb184..d3076e1 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -14649,12 +15354,12 @@ with_gcc=$GCC +@@ -14686,12 +15391,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -18967,7 +18850,7 @@ index eedb184..d3076e1 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -14741,9 +15446,6 @@ inherit_rpath=$inherit_rpath +@@ -14778,9 +15483,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -18977,7 +18860,7 @@ index eedb184..d3076e1 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -14759,6 +15461,9 @@ include_expsyms=$lt_include_expsyms +@@ -14796,6 +15498,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -18987,7 +18870,7 @@ index eedb184..d3076e1 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -14791,210 +15496,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -14828,210 +15533,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? @@ -19362,7 +19245,7 @@ index eedb184..d3076e1 100755 chmod +x "$ofile" diff --git a/opcodes/configure.ac b/opcodes/configure.ac -index 07e3162..c0c75d4 100644 +index c7f4783..f2e002d 100644 --- a/opcodes/configure.ac +++ b/opcodes/configure.ac @@ -167,7 +167,7 @@ changequote(,)dnl @@ -19375,7 +19258,7 @@ index 07e3162..c0c75d4 100644 case "${host}" in diff --git a/zlib/configure b/zlib/configure -index 8378857..7584940 100755 +index bba9fd2..25a2dae 100755 --- a/zlib/configure +++ b/zlib/configure @@ -614,8 +614,11 @@ OTOOL @@ -19390,7 +19273,7 @@ index 8378857..7584940 100755 OBJDUMP LN_S NM -@@ -736,6 +739,7 @@ enable_static +@@ -737,6 +740,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -19398,7 +19281,7 @@ index 8378857..7584940 100755 enable_libtool_lock enable_host_shared ' -@@ -1384,6 +1388,8 @@ Optional Packages: +@@ -1385,6 +1389,8 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] @@ -19407,7 +19290,7 @@ index 8378857..7584940 100755 Some influential environment variables: CC C compiler command -@@ -3907,8 +3913,8 @@ esac +@@ -3910,8 +3916,8 @@ esac @@ -19418,7 +19301,7 @@ index 8378857..7584940 100755 -@@ -3948,7 +3954,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -3951,7 +3957,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 $as_echo_n "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. @@ -19427,7 +19310,7 @@ index 8378857..7584940 100755 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -4764,8 +4770,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; +@@ -4767,8 +4773,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -19438,7 +19321,7 @@ index 8378857..7584940 100755 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -4814,6 +4820,80 @@ esac +@@ -4817,6 +4823,80 @@ esac @@ -19519,7 +19402,7 @@ index 8378857..7584940 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } if test "${lt_cv_ld_reload_flag+set}" = set; then : -@@ -4830,6 +4910,11 @@ case $reload_flag in +@@ -4833,6 +4913,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -19531,7 +19414,7 @@ index 8378857..7584940 100755 darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -4998,7 +5083,8 @@ mingw* | pw32*) +@@ -5001,7 +5086,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -19541,7 +19424,7 @@ index 8378857..7584940 100755 lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -5152,6 +5238,21 @@ esac +@@ -5155,6 +5241,21 @@ esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } @@ -19563,7 +19446,7 @@ index 8378857..7584940 100755 file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -5167,9 +5268,163 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -5170,9 +5271,163 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -19729,7 +19612,7 @@ index 8378857..7584940 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_AR+set}" = set; then : -@@ -5185,7 +5440,7 @@ do +@@ -5188,7 +5443,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then @@ -19738,7 +19621,7 @@ index 8378857..7584940 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -5205,11 +5460,15 @@ $as_echo "no" >&6; } +@@ -5208,11 +5463,15 @@ $as_echo "no" >&6; } fi @@ -19757,7 +19640,7 @@ index 8378857..7584940 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : -@@ -5225,7 +5484,7 @@ do +@@ -5228,7 +5487,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then @@ -19766,7 +19649,7 @@ index 8378857..7584940 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -5244,6 +5503,10 @@ else +@@ -5247,6 +5506,10 @@ else $as_echo "no" >&6; } fi @@ -19777,7 +19660,7 @@ index 8378857..7584940 100755 if test "x$ac_ct_AR" = x; then AR="false" else -@@ -5255,16 +5518,72 @@ ac_tool_warned=yes ;; +@@ -5258,16 +5521,72 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -19854,7 +19737,7 @@ index 8378857..7584940 100755 -@@ -5606,8 +5925,8 @@ esac +@@ -5609,8 +5928,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address @@ -19865,7 +19748,7 @@ index 8378857..7584940 100755 # Handle CRLF in mingw tool chain opt_cr= -@@ -5643,6 +5962,7 @@ for ac_symprfx in "" "_"; do +@@ -5646,6 +5965,7 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi @@ -19873,7 +19756,7 @@ index 8378857..7584940 100755 # Check to see that the pipe works correctly. pipe_works=no -@@ -5684,6 +6004,18 @@ _LT_EOF +@@ -5687,6 +6007,18 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext @@ -19892,7 +19775,7 @@ index 8378857..7584940 100755 #ifdef __cplusplus extern "C" { #endif -@@ -5695,7 +6027,7 @@ _LT_EOF +@@ -5698,7 +6030,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -19901,7 +19784,7 @@ index 8378857..7584940 100755 const char *name; void *address; } -@@ -5721,8 +6053,8 @@ static const void *lt_preloaded_setup() { +@@ -5724,8 +6056,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -19912,7 +19795,7 @@ index 8378857..7584940 100755 LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -5732,8 +6064,8 @@ _LT_EOF +@@ -5735,8 +6067,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -19923,7 +19806,7 @@ index 8378857..7584940 100755 else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -5770,6 +6102,19 @@ else +@@ -5773,6 +6105,19 @@ else $as_echo "ok" >&6; } fi @@ -19943,7 +19826,7 @@ index 8378857..7584940 100755 -@@ -5790,6 +6135,41 @@ fi +@@ -5793,6 +6138,41 @@ fi @@ -19985,7 +19868,7 @@ index 8378857..7584940 100755 # Check whether --enable-libtool-lock was given. -@@ -6001,6 +6381,123 @@ esac +@@ -6004,6 +6384,123 @@ esac need_locks="$enable_libtool_lock" @@ -20109,7 +19992,7 @@ index 8378857..7584940 100755 case $host_os in rhapsody* | darwin*) -@@ -6567,6 +7064,8 @@ _LT_EOF +@@ -6570,6 +7067,8 @@ _LT_EOF $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 echo "$AR cru libconftest.a conftest.o" >&5 $AR cru libconftest.a conftest.o 2>&5 @@ -20118,7 +20001,7 @@ index 8378857..7584940 100755 cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -7030,7 +7529,8 @@ fi +@@ -7033,7 +7532,8 @@ fi LIBTOOL_DEPS="$ltmain" # Always use our own libtool. @@ -20128,7 +20011,7 @@ index 8378857..7584940 100755 -@@ -7119,7 +7619,7 @@ aix3*) +@@ -7122,7 +7622,7 @@ aix3*) esac # Global variables: @@ -20137,7 +20020,7 @@ index 8378857..7584940 100755 can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -7417,8 +7917,6 @@ fi +@@ -7420,8 +7920,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -20146,7 +20029,7 @@ index 8378857..7584940 100755 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -7584,6 +8082,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -7587,6 +8085,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -20159,7 +20042,7 @@ index 8378857..7584940 100755 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -7646,7 +8150,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -7649,7 +8153,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -20168,7 +20051,7 @@ index 8378857..7584940 100755 lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -7703,13 +8207,17 @@ case $host_os in +@@ -7706,13 +8210,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -20192,7 +20075,7 @@ index 8378857..7584940 100755 # # Check to make sure the PIC flag actually works. -@@ -7770,6 +8278,11 @@ fi +@@ -7773,6 +8281,11 @@ fi @@ -20204,7 +20087,7 @@ index 8378857..7584940 100755 # # Check to make sure the static flag actually works. # -@@ -8120,7 +8633,8 @@ _LT_EOF +@@ -8123,7 +8636,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -20214,7 +20097,7 @@ index 8378857..7584940 100755 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -8219,12 +8733,12 @@ _LT_EOF +@@ -8222,12 +8736,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -20229,7 +20112,7 @@ index 8378857..7584940 100755 fi ;; esac -@@ -8238,8 +8752,8 @@ _LT_EOF +@@ -8241,8 +8755,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -20240,7 +20123,7 @@ index 8378857..7584940 100755 fi ;; -@@ -8257,8 +8771,8 @@ _LT_EOF +@@ -8260,8 +8774,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -20251,7 +20134,7 @@ index 8378857..7584940 100755 else ld_shlibs=no fi -@@ -8304,8 +8818,8 @@ _LT_EOF +@@ -8307,8 +8821,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -20262,7 +20145,7 @@ index 8378857..7584940 100755 else ld_shlibs=no fi -@@ -8435,7 +8949,13 @@ _LT_EOF +@@ -8438,7 +8952,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -20277,7 +20160,7 @@ index 8378857..7584940 100755 as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -8451,22 +8971,29 @@ main () +@@ -8454,22 +8974,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -20320,7 +20203,7 @@ index 8378857..7584940 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 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" -@@ -8478,7 +9005,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8481,7 +9008,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -20335,7 +20218,7 @@ index 8378857..7584940 100755 as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -8494,22 +9027,29 @@ main () +@@ -8497,22 +9030,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -20378,7 +20261,7 @@ index 8378857..7584940 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -8554,20 +9094,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8557,20 +9097,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -20456,7 +20339,7 @@ index 8378857..7584940 100755 ;; darwin* | rhapsody*) -@@ -8628,7 +9211,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8631,7 +9214,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -20465,7 +20348,7 @@ index 8378857..7584940 100755 hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -8636,7 +9219,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8639,7 +9222,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -20474,7 +20357,7 @@ index 8378857..7584940 100755 else 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' fi -@@ -8652,7 +9235,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8655,7 +9238,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -20483,7 +20366,7 @@ index 8378857..7584940 100755 else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -8676,10 +9259,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8679,10 +9262,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -20496,7 +20379,7 @@ index 8378857..7584940 100755 ;; esac else -@@ -8758,26 +9341,39 @@ fi +@@ -8761,26 +9344,39 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -20544,7 +20427,7 @@ index 8378857..7584940 100755 else 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' 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' -@@ -8862,7 +9458,7 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -8865,7 +9461,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -20553,7 +20436,7 @@ index 8378857..7584940 100755 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -8881,9 +9477,9 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -8884,9 +9480,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -20565,7 +20448,7 @@ index 8378857..7584940 100755 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -9459,8 +10055,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -9462,8 +10058,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -20577,7 +20460,7 @@ index 8378857..7584940 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -9493,13 +10090,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -9496,13 +10093,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -20650,7 +20533,7 @@ index 8378857..7584940 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -9591,7 +10246,7 @@ haiku*) +@@ -9594,7 +10249,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -20659,16 +20542,16 @@ index 8378857..7584940 100755 hardcode_into_libs=yes ;; -@@ -10405,7 +11060,7 @@ else +@@ -10408,7 +11063,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 10408 "configure" +-#line 10411 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -10449,10 +11104,10 @@ else +@@ -10452,10 +11107,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -20681,16 +20564,16 @@ index 8378857..7584940 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -10511,7 +11166,7 @@ else +@@ -10514,7 +11169,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 10514 "configure" +-#line 10517 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -10555,10 +11210,10 @@ else +@@ -10558,10 +11213,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -20703,7 +20586,7 @@ index 8378857..7584940 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11990,13 +12645,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -11993,13 +12648,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -20724,7 +20607,7 @@ index 8378857..7584940 100755 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -12011,14 +12673,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -12014,14 +12676,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 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"`' @@ -20743,7 +20626,7 @@ index 8378857..7584940 100755 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -12051,12 +12716,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -12054,12 +12719,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -20757,7 +20640,7 @@ index 8378857..7584940 100755 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -12111,8 +12776,13 @@ reload_flag \ +@@ -12114,8 +12779,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -20771,7 +20654,7 @@ index 8378857..7584940 100755 STRIP \ RANLIB \ CC \ -@@ -12122,12 +12792,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -12125,12 +12795,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ @@ -20787,7 +20670,7 @@ index 8378857..7584940 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -12143,7 +12815,6 @@ no_undefined_flag \ +@@ -12146,7 +12818,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -20795,7 +20678,7 @@ index 8378857..7584940 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -12179,6 +12850,7 @@ module_cmds \ +@@ -12182,6 +12853,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -20803,7 +20686,7 @@ index 8378857..7584940 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -12768,7 +13440,8 @@ $as_echo X"$file" | +@@ -12771,7 +13443,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -20813,7 +20696,7 @@ index 8378857..7584940 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -12871,19 +13544,42 @@ SP2NL=$lt_lt_SP2NL +@@ -12874,19 +13547,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -20857,7 +20740,7 @@ index 8378857..7584940 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -12913,6 +13609,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -12916,6 +13612,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -20870,7 +20753,7 @@ index 8378857..7584940 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -12922,6 +13624,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -12925,6 +13627,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -20880,7 +20763,7 @@ index 8378857..7584940 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -13036,12 +13741,12 @@ with_gcc=$GCC +@@ -13039,12 +13744,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -20896,7 +20779,7 @@ index 8378857..7584940 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -13128,9 +13833,6 @@ inherit_rpath=$inherit_rpath +@@ -13131,9 +13836,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -20906,7 +20789,7 @@ index 8378857..7584940 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -13146,6 +13848,9 @@ include_expsyms=$lt_include_expsyms +@@ -13149,6 +13851,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -20916,7 +20799,7 @@ index 8378857..7584940 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -13178,210 +13883,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -13181,210 +13886,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? @@ -21291,5 +21174,5 @@ index 8378857..7584940 100755 chmod +x "$ofile" -- -2.7.1 +2.9.0 |