summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-01-30 06:28:38 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-01 11:20:18 +0000
commitc85c54f7f8cf253687464cfbe19cf7f305868578 (patch)
tree99389d9f6589c71a9c5e665698423f84942e23b4 /meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch
parentba2fdcddafcd7c0c42eecd740698a722c2d75144 (diff)
downloadpoky-c85c54f7f8cf253687464cfbe19cf7f305868578.tar.gz
binutils: Upgrade to 2.26
(From OE-Core rev: 86ade2cc2553c942d9526c5323a11ae151653505) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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.patch2916
1 files changed, 2425 insertions, 491 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 62967efb19..779efd4a55 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,35 +1,36 @@
1From 03eb9b4fe583e88a22fd8c25b43fbd9bafe21af6 Mon Sep 17 00:00:00 2001 1From 807b3164599359644dddd1c853a73a51165c026c Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:34:41 +0000 3Date: Fri, 15 Jan 2016 06:26:54 +0000
4Subject: [PATCH 06/13] Use libtool 2.4 4Subject: [PATCH 06/12] Use libtool 2.4
5 5
6So we can get libtool sysroot support 6get libtool sysroot support
7
8Upstream-Status: Pending
9 7
10Signed-off-by: Khem Raj <raj.khem@gmail.com> 8Signed-off-by: Khem Raj <raj.khem@gmail.com>
11--- 9---
12 bfd/configure | 1320 +++++++++++++++++------ 10Upstream-Status: Pending
11
12 bfd/configure | 1322 +++++++++++++++++------
13 bfd/configure.ac | 2 +- 13 bfd/configure.ac | 2 +-
14 binutils/configure | 1318 +++++++++++++++++------ 14 binutils/configure | 1320 +++++++++++++++++------
15 configure | 2 +- 15 configure | 4 +-
16 gas/configure | 1318 +++++++++++++++++------ 16 gas/configure | 1320 +++++++++++++++++------
17 gprof/configure | 1323 +++++++++++++++++------ 17 gprof/configure | 1325 +++++++++++++++++------
18 ld/configure | 1701 +++++++++++++++++++++-------- 18 ld/configure | 1695 +++++++++++++++++++++--------
19 libtool.m4 | 1086 +++++++++++++------ 19 libtool.m4 | 1080 +++++++++++++------
20 ltmain.sh | 2925 +++++++++++++++++++++++++++++++++----------------- 20 ltmain.sh | 2925 +++++++++++++++++++++++++++++++++-----------------
21 ltoptions.m4 | 2 +- 21 ltoptions.m4 | 2 +-
22 ltversion.m4 | 12 +- 22 ltversion.m4 | 12 +-
23 lt~obsolete.m4 | 2 +- 23 lt~obsolete.m4 | 2 +-
24 opcodes/configure | 1320 +++++++++++++++++------ 24 opcodes/configure | 1322 +++++++++++++++++------
25 opcodes/configure.ac | 2 +- 25 opcodes/configure.ac | 2 +-
26 14 files changed, 8952 insertions(+), 3381 deletions(-) 26 zlib/configure | 1320 +++++++++++++++++------
27 15 files changed, 9944 insertions(+), 3709 deletions(-)
27 28
28diff --git a/bfd/configure b/bfd/configure 29diff --git a/bfd/configure b/bfd/configure
29index 85e6b82..3d3dd88 100755 30index 217ac69..2ef4b9e 100755
30--- a/bfd/configure 31--- a/bfd/configure
31+++ b/bfd/configure 32+++ b/bfd/configure
32@@ -668,6 +668,9 @@ OTOOL 33@@ -670,6 +670,9 @@ OTOOL
33 LIPO 34 LIPO
34 NMEDIT 35 NMEDIT
35 DSYMUTIL 36 DSYMUTIL
@@ -39,7 +40,7 @@ index 85e6b82..3d3dd88 100755
39 OBJDUMP 40 OBJDUMP
40 LN_S 41 LN_S
41 NM 42 NM
42@@ -780,6 +783,7 @@ enable_static 43@@ -782,6 +785,7 @@ enable_static
43 with_pic 44 with_pic
44 enable_fast_install 45 enable_fast_install
45 with_gnu_ld 46 with_gnu_ld
@@ -47,7 +48,7 @@ index 85e6b82..3d3dd88 100755
47 enable_libtool_lock 48 enable_libtool_lock
48 enable_plugins 49 enable_plugins
49 enable_largefile 50 enable_largefile
50@@ -1456,6 +1460,8 @@ Optional Packages: 51@@ -1458,6 +1462,8 @@ Optional Packages:
51 --with-pic try to use only PIC/non-PIC objects [default=use 52 --with-pic try to use only PIC/non-PIC objects [default=use
52 both] 53 both]
53 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 54 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -56,7 +57,7 @@ index 85e6b82..3d3dd88 100755
56 --with-mmap try using mmap for BFD input files if available 57 --with-mmap try using mmap for BFD input files if available
57 --with-separate-debug-dir=DIR 58 --with-separate-debug-dir=DIR
58 Look for global separate debug info in DIR 59 Look for global separate debug info in DIR
59@@ -5386,8 +5392,8 @@ esac 60@@ -5388,8 +5394,8 @@ esac
60 61
61 62
62 63
@@ -67,7 +68,7 @@ index 85e6b82..3d3dd88 100755
67 68
68 69
69 70
70@@ -5427,7 +5433,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 71@@ -5429,7 +5435,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
71 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 72 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
72 $as_echo_n "checking how to print strings... " >&6; } 73 $as_echo_n "checking how to print strings... " >&6; }
73 # Test print first, because it will be a builtin if present. 74 # Test print first, because it will be a builtin if present.
@@ -76,7 +77,7 @@ index 85e6b82..3d3dd88 100755
76 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 77 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
77 ECHO='print -r --' 78 ECHO='print -r --'
78 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 79 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
79@@ -6113,8 +6119,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 80@@ -6115,8 +6121,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
80 # Try some XSI features 81 # Try some XSI features
81 xsi_shell=no 82 xsi_shell=no
82 ( _lt_dummy="a/b/c" 83 ( _lt_dummy="a/b/c"
@@ -87,7 +88,7 @@ index 85e6b82..3d3dd88 100755
87 && eval 'test $(( 1 + 1 )) -eq 2 \ 88 && eval 'test $(( 1 + 1 )) -eq 2 \
88 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 89 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
89 && xsi_shell=yes 90 && xsi_shell=yes
90@@ -6163,6 +6169,80 @@ esac 91@@ -6165,6 +6171,80 @@ esac
91 92
92 93
93 94
@@ -168,7 +169,7 @@ index 85e6b82..3d3dd88 100755
168 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 169 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
169 $as_echo_n "checking for $LD option to reload object files... " >&6; } 170 $as_echo_n "checking for $LD option to reload object files... " >&6; }
170 if test "${lt_cv_ld_reload_flag+set}" = set; then : 171 if test "${lt_cv_ld_reload_flag+set}" = set; then :
171@@ -6179,6 +6259,11 @@ case $reload_flag in 172@@ -6181,6 +6261,11 @@ case $reload_flag in
172 esac 173 esac
173 reload_cmds='$LD$reload_flag -o $output$reload_objs' 174 reload_cmds='$LD$reload_flag -o $output$reload_objs'
174 case $host_os in 175 case $host_os in
@@ -180,7 +181,7 @@ index 85e6b82..3d3dd88 100755
180 darwin*) 181 darwin*)
181 if test "$GCC" = yes; then 182 if test "$GCC" = yes; then
182 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 183 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
183@@ -6347,7 +6432,8 @@ mingw* | pw32*) 184@@ -6349,7 +6434,8 @@ mingw* | pw32*)
184 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 185 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
185 lt_cv_file_magic_cmd='func_win32_libid' 186 lt_cv_file_magic_cmd='func_win32_libid'
186 else 187 else
@@ -190,7 +191,7 @@ index 85e6b82..3d3dd88 100755
190 lt_cv_file_magic_cmd='$OBJDUMP -f' 191 lt_cv_file_magic_cmd='$OBJDUMP -f'
191 fi 192 fi
192 ;; 193 ;;
193@@ -6501,6 +6587,21 @@ esac 194@@ -6503,6 +6589,21 @@ esac
194 fi 195 fi
195 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 196 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
196 $as_echo "$lt_cv_deplibs_check_method" >&6; } 197 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -212,7 +213,7 @@ index 85e6b82..3d3dd88 100755
212 file_magic_cmd=$lt_cv_file_magic_cmd 213 file_magic_cmd=$lt_cv_file_magic_cmd
213 deplibs_check_method=$lt_cv_deplibs_check_method 214 deplibs_check_method=$lt_cv_deplibs_check_method
214 test -z "$deplibs_check_method" && deplibs_check_method=unknown 215 test -z "$deplibs_check_method" && deplibs_check_method=unknown
215@@ -6516,9 +6617,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 216@@ -6518,9 +6619,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
216 217
217 218
218 219
@@ -377,7 +378,7 @@ index 85e6b82..3d3dd88 100755
377 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 378 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
378 $as_echo_n "checking for $ac_word... " >&6; } 379 $as_echo_n "checking for $ac_word... " >&6; }
379 if test "${ac_cv_prog_AR+set}" = set; then : 380 if test "${ac_cv_prog_AR+set}" = set; then :
380@@ -6534,7 +6788,7 @@ do 381@@ -6536,7 +6790,7 @@ do
381 test -z "$as_dir" && as_dir=. 382 test -z "$as_dir" && as_dir=.
382 for ac_exec_ext in '' $ac_executable_extensions; do 383 for ac_exec_ext in '' $ac_executable_extensions; do
383 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 384 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -386,7 +387,7 @@ index 85e6b82..3d3dd88 100755
386 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 387 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
387 break 2 388 break 2
388 fi 389 fi
389@@ -6554,11 +6808,15 @@ $as_echo "no" >&6; } 390@@ -6556,11 +6810,15 @@ $as_echo "no" >&6; }
390 fi 391 fi
391 392
392 393
@@ -405,7 +406,7 @@ index 85e6b82..3d3dd88 100755
405 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 406 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
406 $as_echo_n "checking for $ac_word... " >&6; } 407 $as_echo_n "checking for $ac_word... " >&6; }
407 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : 408 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
408@@ -6574,7 +6832,7 @@ do 409@@ -6576,7 +6834,7 @@ do
409 test -z "$as_dir" && as_dir=. 410 test -z "$as_dir" && as_dir=.
410 for ac_exec_ext in '' $ac_executable_extensions; do 411 for ac_exec_ext in '' $ac_executable_extensions; do
411 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 412 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -414,7 +415,7 @@ index 85e6b82..3d3dd88 100755
414 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 415 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
415 break 2 416 break 2
416 fi 417 fi
417@@ -6593,6 +6851,10 @@ else 418@@ -6595,6 +6853,10 @@ else
418 $as_echo "no" >&6; } 419 $as_echo "no" >&6; }
419 fi 420 fi
420 421
@@ -425,7 +426,7 @@ index 85e6b82..3d3dd88 100755
425 if test "x$ac_ct_AR" = x; then 426 if test "x$ac_ct_AR" = x; then
426 AR="false" 427 AR="false"
427 else 428 else
428@@ -6604,16 +6866,72 @@ ac_tool_warned=yes ;; 429@@ -6606,16 +6868,72 @@ ac_tool_warned=yes ;;
429 esac 430 esac
430 AR=$ac_ct_AR 431 AR=$ac_ct_AR
431 fi 432 fi
@@ -502,7 +503,7 @@ index 85e6b82..3d3dd88 100755
502 503
503 504
504 505
505@@ -6955,8 +7273,8 @@ esac 506@@ -6957,8 +7275,8 @@ esac
506 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 507 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
507 508
508 # Transform an extracted symbol line into symbol name and symbol address 509 # Transform an extracted symbol line into symbol name and symbol address
@@ -513,7 +514,7 @@ index 85e6b82..3d3dd88 100755
513 514
514 # Handle CRLF in mingw tool chain 515 # Handle CRLF in mingw tool chain
515 opt_cr= 516 opt_cr=
516@@ -6992,6 +7310,7 @@ for ac_symprfx in "" "_"; do 517@@ -6994,6 +7312,7 @@ for ac_symprfx in "" "_"; do
517 else 518 else
518 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 519 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
519 fi 520 fi
@@ -521,7 +522,7 @@ index 85e6b82..3d3dd88 100755
521 522
522 # Check to see that the pipe works correctly. 523 # Check to see that the pipe works correctly.
523 pipe_works=no 524 pipe_works=no
524@@ -7033,6 +7352,18 @@ _LT_EOF 525@@ -7035,6 +7354,18 @@ _LT_EOF
525 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 526 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
526 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 527 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
527 cat <<_LT_EOF > conftest.$ac_ext 528 cat <<_LT_EOF > conftest.$ac_ext
@@ -540,7 +541,7 @@ index 85e6b82..3d3dd88 100755
540 #ifdef __cplusplus 541 #ifdef __cplusplus
541 extern "C" { 542 extern "C" {
542 #endif 543 #endif
543@@ -7044,7 +7375,7 @@ _LT_EOF 544@@ -7046,7 +7377,7 @@ _LT_EOF
544 cat <<_LT_EOF >> conftest.$ac_ext 545 cat <<_LT_EOF >> conftest.$ac_ext
545 546
546 /* The mapping between symbol names and symbols. */ 547 /* The mapping between symbol names and symbols. */
@@ -549,7 +550,7 @@ index 85e6b82..3d3dd88 100755
549 const char *name; 550 const char *name;
550 void *address; 551 void *address;
551 } 552 }
552@@ -7070,8 +7401,8 @@ static const void *lt_preloaded_setup() { 553@@ -7072,8 +7403,8 @@ static const void *lt_preloaded_setup() {
553 _LT_EOF 554 _LT_EOF
554 # Now try linking the two files. 555 # Now try linking the two files.
555 mv conftest.$ac_objext conftstm.$ac_objext 556 mv conftest.$ac_objext conftstm.$ac_objext
@@ -560,7 +561,7 @@ index 85e6b82..3d3dd88 100755
560 LIBS="conftstm.$ac_objext" 561 LIBS="conftstm.$ac_objext"
561 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 562 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
562 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 563 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
563@@ -7081,8 +7412,8 @@ _LT_EOF 564@@ -7083,8 +7414,8 @@ _LT_EOF
564 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 565 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
565 pipe_works=yes 566 pipe_works=yes
566 fi 567 fi
@@ -571,7 +572,7 @@ index 85e6b82..3d3dd88 100755
571 else 572 else
572 echo "cannot find nm_test_func in $nlist" >&5 573 echo "cannot find nm_test_func in $nlist" >&5
573 fi 574 fi
574@@ -7119,6 +7450,16 @@ else 575@@ -7121,6 +7452,16 @@ else
575 $as_echo "ok" >&6; } 576 $as_echo "ok" >&6; }
576 fi 577 fi
577 578
@@ -588,7 +589,7 @@ index 85e6b82..3d3dd88 100755
588 589
589 590
590 591
591@@ -7140,6 +7481,45 @@ fi 592@@ -7142,6 +7483,45 @@ fi
592 593
593 594
594 595
@@ -634,7 +635,7 @@ index 85e6b82..3d3dd88 100755
634 # Check whether --enable-libtool-lock was given. 635 # Check whether --enable-libtool-lock was given.
635 if test "${enable_libtool_lock+set}" = set; then : 636 if test "${enable_libtool_lock+set}" = set; then :
636 enableval=$enable_libtool_lock; 637 enableval=$enable_libtool_lock;
637@@ -7346,6 +7726,123 @@ esac 638@@ -7348,6 +7728,123 @@ esac
638 639
639 need_locks="$enable_libtool_lock" 640 need_locks="$enable_libtool_lock"
640 641
@@ -758,7 +759,7 @@ index 85e6b82..3d3dd88 100755
758 759
759 case $host_os in 760 case $host_os in
760 rhapsody* | darwin*) 761 rhapsody* | darwin*)
761@@ -7909,6 +8406,8 @@ _LT_EOF 762@@ -7911,6 +8408,8 @@ _LT_EOF
762 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 763 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
763 echo "$AR cru libconftest.a conftest.o" >&5 764 echo "$AR cru libconftest.a conftest.o" >&5
764 $AR cru libconftest.a conftest.o 2>&5 765 $AR cru libconftest.a conftest.o 2>&5
@@ -767,7 +768,7 @@ index 85e6b82..3d3dd88 100755
767 cat > conftest.c << _LT_EOF 768 cat > conftest.c << _LT_EOF
768 int main() { return 0;} 769 int main() { return 0;}
769 _LT_EOF 770 _LT_EOF
770@@ -8073,7 +8572,8 @@ fi 771@@ -8075,7 +8574,8 @@ fi
771 LIBTOOL_DEPS="$ltmain" 772 LIBTOOL_DEPS="$ltmain"
772 773
773 # Always use our own libtool. 774 # Always use our own libtool.
@@ -777,7 +778,7 @@ index 85e6b82..3d3dd88 100755
777 778
778 779
779 780
780@@ -8162,7 +8662,7 @@ aix3*) 781@@ -8164,7 +8664,7 @@ aix3*)
781 esac 782 esac
782 783
783 # Global variables: 784 # Global variables:
@@ -786,7 +787,7 @@ index 85e6b82..3d3dd88 100755
786 can_build_shared=yes 787 can_build_shared=yes
787 788
788 # All known linkers require a `.a' archive for static linking (except MSVC, 789 # All known linkers require a `.a' archive for static linking (except MSVC,
789@@ -8460,8 +8960,6 @@ fi 790@@ -8462,8 +8962,6 @@ fi
790 lt_prog_compiler_pic= 791 lt_prog_compiler_pic=
791 lt_prog_compiler_static= 792 lt_prog_compiler_static=
792 793
@@ -795,7 +796,7 @@ index 85e6b82..3d3dd88 100755
795 796
796 if test "$GCC" = yes; then 797 if test "$GCC" = yes; then
797 lt_prog_compiler_wl='-Wl,' 798 lt_prog_compiler_wl='-Wl,'
798@@ -8627,6 +9125,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 799@@ -8629,6 +9127,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
799 lt_prog_compiler_pic='--shared' 800 lt_prog_compiler_pic='--shared'
800 lt_prog_compiler_static='--static' 801 lt_prog_compiler_static='--static'
801 ;; 802 ;;
@@ -808,7 +809,7 @@ index 85e6b82..3d3dd88 100755
808 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 809 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
809 # Portland Group compilers (*not* the Pentium gcc compiler, 810 # Portland Group compilers (*not* the Pentium gcc compiler,
810 # which looks to be a dead project) 811 # which looks to be a dead project)
811@@ -8689,7 +9193,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 812@@ -8691,7 +9195,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
812 lt_prog_compiler_pic='-KPIC' 813 lt_prog_compiler_pic='-KPIC'
813 lt_prog_compiler_static='-Bstatic' 814 lt_prog_compiler_static='-Bstatic'
814 case $cc_basename in 815 case $cc_basename in
@@ -817,7 +818,7 @@ index 85e6b82..3d3dd88 100755
817 lt_prog_compiler_wl='-Qoption ld ';; 818 lt_prog_compiler_wl='-Qoption ld ';;
818 *) 819 *)
819 lt_prog_compiler_wl='-Wl,';; 820 lt_prog_compiler_wl='-Wl,';;
820@@ -8746,13 +9250,17 @@ case $host_os in 821@@ -8748,13 +9252,17 @@ case $host_os in
821 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 822 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
822 ;; 823 ;;
823 esac 824 esac
@@ -841,7 +842,7 @@ index 85e6b82..3d3dd88 100755
841 842
842 # 843 #
843 # Check to make sure the PIC flag actually works. 844 # Check to make sure the PIC flag actually works.
844@@ -8813,6 +9321,11 @@ fi 845@@ -8815,6 +9323,11 @@ fi
845 846
846 847
847 848
@@ -853,7 +854,7 @@ index 85e6b82..3d3dd88 100755
853 # 854 #
854 # Check to make sure the static flag actually works. 855 # Check to make sure the static flag actually works.
855 # 856 #
856@@ -9163,7 +9676,8 @@ _LT_EOF 857@@ -9165,7 +9678,8 @@ _LT_EOF
857 allow_undefined_flag=unsupported 858 allow_undefined_flag=unsupported
858 always_export_symbols=no 859 always_export_symbols=no
859 enable_shared_with_static_runtimes=yes 860 enable_shared_with_static_runtimes=yes
@@ -863,16 +864,7 @@ index 85e6b82..3d3dd88 100755
863 864
864 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 865 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
865 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 866 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
866@@ -9211,7 +9725,7 @@ _LT_EOF 867@@ -9264,12 +9778,12 @@ _LT_EOF
867 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
868 && test "$tmp_diet" = no
869 then
870- tmp_addflag=
871+ tmp_addflag=' $pic_flag'
872 tmp_sharedflag='-shared'
873 case $cc_basename,$host_cpu in
874 pgcc*) # Portland Group C compiler
875@@ -9262,12 +9776,12 @@ _LT_EOF
876 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 868 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
877 hardcode_libdir_flag_spec= 869 hardcode_libdir_flag_spec=
878 hardcode_libdir_flag_spec_ld='-rpath $libdir' 870 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -887,7 +879,7 @@ index 85e6b82..3d3dd88 100755
887 fi 879 fi
888 ;; 880 ;;
889 esac 881 esac
890@@ -9281,8 +9795,8 @@ _LT_EOF 882@@ -9283,8 +9797,8 @@ _LT_EOF
891 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 883 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
892 wlarc= 884 wlarc=
893 else 885 else
@@ -898,7 +890,7 @@ index 85e6b82..3d3dd88 100755
898 fi 890 fi
899 ;; 891 ;;
900 892
901@@ -9300,8 +9814,8 @@ _LT_EOF 893@@ -9302,8 +9816,8 @@ _LT_EOF
902 894
903 _LT_EOF 895 _LT_EOF
904 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 896 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -909,7 +901,7 @@ index 85e6b82..3d3dd88 100755
909 else 901 else
910 ld_shlibs=no 902 ld_shlibs=no
911 fi 903 fi
912@@ -9347,8 +9861,8 @@ _LT_EOF 904@@ -9349,8 +9863,8 @@ _LT_EOF
913 905
914 *) 906 *)
915 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 907 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -920,7 +912,7 @@ index 85e6b82..3d3dd88 100755
920 else 912 else
921 ld_shlibs=no 913 ld_shlibs=no
922 fi 914 fi
923@@ -9478,7 +9992,13 @@ _LT_EOF 915@@ -9480,7 +9994,13 @@ _LT_EOF
924 allow_undefined_flag='-berok' 916 allow_undefined_flag='-berok'
925 # Determine the default libpath from the value encoded in an 917 # Determine the default libpath from the value encoded in an
926 # empty executable. 918 # empty executable.
@@ -935,7 +927,7 @@ index 85e6b82..3d3dd88 100755
935 /* end confdefs.h. */ 927 /* end confdefs.h. */
936 928
937 int 929 int
938@@ -9491,22 +10011,29 @@ main () 930@@ -9493,22 +10013,29 @@ main ()
939 _ACEOF 931 _ACEOF
940 if ac_fn_c_try_link "$LINENO"; then : 932 if ac_fn_c_try_link "$LINENO"; then :
941 933
@@ -978,7 +970,7 @@ index 85e6b82..3d3dd88 100755
978 970
979 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 971 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
980 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" 972 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"
981@@ -9518,7 +10045,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 973@@ -9520,7 +10047,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
982 else 974 else
983 # Determine the default libpath from the value encoded in an 975 # Determine the default libpath from the value encoded in an
984 # empty executable. 976 # empty executable.
@@ -993,7 +985,7 @@ index 85e6b82..3d3dd88 100755
993 /* end confdefs.h. */ 985 /* end confdefs.h. */
994 986
995 int 987 int
996@@ -9531,22 +10064,29 @@ main () 988@@ -9533,22 +10066,29 @@ main ()
997 _ACEOF 989 _ACEOF
998 if ac_fn_c_try_link "$LINENO"; then : 990 if ac_fn_c_try_link "$LINENO"; then :
999 991
@@ -1036,7 +1028,7 @@ index 85e6b82..3d3dd88 100755
1036 1028
1037 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 1029 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
1038 # Warning - without using the other run time loading flags, 1030 # Warning - without using the other run time loading flags,
1039@@ -9591,20 +10131,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1031@@ -9593,20 +10133,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1040 # Microsoft Visual C++. 1032 # Microsoft Visual C++.
1041 # hardcode_libdir_flag_spec is actually meaningless, as there is 1033 # hardcode_libdir_flag_spec is actually meaningless, as there is
1042 # no search path for DLLs. 1034 # no search path for DLLs.
@@ -1114,7 +1106,7 @@ index 85e6b82..3d3dd88 100755
1114 ;; 1106 ;;
1115 1107
1116 darwin* | rhapsody*) 1108 darwin* | rhapsody*)
1117@@ -9665,7 +10248,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1109@@ -9667,7 +10250,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1118 1110
1119 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 1111 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
1120 freebsd* | dragonfly*) 1112 freebsd* | dragonfly*)
@@ -1123,7 +1115,7 @@ index 85e6b82..3d3dd88 100755
1123 hardcode_libdir_flag_spec='-R$libdir' 1115 hardcode_libdir_flag_spec='-R$libdir'
1124 hardcode_direct=yes 1116 hardcode_direct=yes
1125 hardcode_shlibpath_var=no 1117 hardcode_shlibpath_var=no
1126@@ -9673,7 +10256,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1118@@ -9675,7 +10258,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1127 1119
1128 hpux9*) 1120 hpux9*)
1129 if test "$GCC" = yes; then 1121 if test "$GCC" = yes; then
@@ -1132,7 +1124,7 @@ index 85e6b82..3d3dd88 100755
1132 else 1124 else
1133 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' 1125 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'
1134 fi 1126 fi
1135@@ -9689,7 +10272,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1127@@ -9691,7 +10274,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1136 1128
1137 hpux10*) 1129 hpux10*)
1138 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 1130 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -1141,7 +1133,7 @@ index 85e6b82..3d3dd88 100755
1141 else 1133 else
1142 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 1134 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
1143 fi 1135 fi
1144@@ -9713,10 +10296,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1136@@ -9715,10 +10298,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1145 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 1137 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
1146 ;; 1138 ;;
1147 ia64*) 1139 ia64*)
@@ -1154,7 +1146,7 @@ index 85e6b82..3d3dd88 100755
1154 ;; 1146 ;;
1155 esac 1147 esac
1156 else 1148 else
1157@@ -9795,23 +10378,36 @@ fi 1149@@ -9797,23 +10380,36 @@ fi
1158 1150
1159 irix5* | irix6* | nonstopux*) 1151 irix5* | irix6* | nonstopux*)
1160 if test "$GCC" = yes; then 1152 if test "$GCC" = yes; then
@@ -1199,7 +1191,7 @@ index 85e6b82..3d3dd88 100755
1199 else 1191 else
1200 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' 1192 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'
1201 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' 1193 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'
1202@@ -9896,7 +10492,7 @@ rm -f core conftest.err conftest.$ac_objext \ 1194@@ -9898,7 +10494,7 @@ rm -f core conftest.err conftest.$ac_objext \
1203 osf4* | osf5*) # as osf3* with the addition of -msym flag 1195 osf4* | osf5*) # as osf3* with the addition of -msym flag
1204 if test "$GCC" = yes; then 1196 if test "$GCC" = yes; then
1205 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 1197 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -1208,7 +1200,7 @@ index 85e6b82..3d3dd88 100755
1208 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 1200 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
1209 else 1201 else
1210 allow_undefined_flag=' -expect_unresolved \*' 1202 allow_undefined_flag=' -expect_unresolved \*'
1211@@ -9915,9 +10511,9 @@ rm -f core conftest.err conftest.$ac_objext \ 1203@@ -9917,9 +10513,9 @@ rm -f core conftest.err conftest.$ac_objext \
1212 no_undefined_flag=' -z defs' 1204 no_undefined_flag=' -z defs'
1213 if test "$GCC" = yes; then 1205 if test "$GCC" = yes; then
1214 wlarc='${wl}' 1206 wlarc='${wl}'
@@ -1220,7 +1212,7 @@ index 85e6b82..3d3dd88 100755
1220 else 1212 else
1221 case `$CC -V 2>&1` in 1213 case `$CC -V 2>&1` in
1222 *"Compilers 5.0"*) 1214 *"Compilers 5.0"*)
1223@@ -10493,8 +11089,9 @@ cygwin* | mingw* | pw32* | cegcc*) 1215@@ -10495,8 +11091,9 @@ cygwin* | mingw* | pw32* | cegcc*)
1224 need_version=no 1216 need_version=no
1225 need_lib_prefix=no 1217 need_lib_prefix=no
1226 1218
@@ -1232,7 +1224,7 @@ index 85e6b82..3d3dd88 100755
1232 library_names_spec='$libname.dll.a' 1224 library_names_spec='$libname.dll.a'
1233 # DLL is installed to $(libdir)/../bin by postinstall_cmds 1225 # DLL is installed to $(libdir)/../bin by postinstall_cmds
1234 postinstall_cmds='base_file=`basename \${file}`~ 1226 postinstall_cmds='base_file=`basename \${file}`~
1235@@ -10527,13 +11124,71 @@ cygwin* | mingw* | pw32* | cegcc*) 1227@@ -10529,13 +11126,71 @@ cygwin* | mingw* | pw32* | cegcc*)
1236 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 1228 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
1237 ;; 1229 ;;
1238 esac 1230 esac
@@ -1305,7 +1297,7 @@ index 85e6b82..3d3dd88 100755
1305 # FIXME: first we should search . and the directory the executable is in 1297 # FIXME: first we should search . and the directory the executable is in
1306 shlibpath_var=PATH 1298 shlibpath_var=PATH
1307 ;; 1299 ;;
1308@@ -10625,7 +11280,7 @@ haiku*) 1300@@ -10627,7 +11282,7 @@ haiku*)
1309 soname_spec='${libname}${release}${shared_ext}$major' 1301 soname_spec='${libname}${release}${shared_ext}$major'
1310 shlibpath_var=LIBRARY_PATH 1302 shlibpath_var=LIBRARY_PATH
1311 shlibpath_overrides_runpath=yes 1303 shlibpath_overrides_runpath=yes
@@ -1314,7 +1306,16 @@ index 85e6b82..3d3dd88 100755
1314 hardcode_into_libs=yes 1306 hardcode_into_libs=yes
1315 ;; 1307 ;;
1316 1308
1317@@ -11465,10 +12120,10 @@ else 1309@@ -11423,7 +12078,7 @@ else
1310 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1311 lt_status=$lt_dlunknown
1312 cat > conftest.$ac_ext <<_LT_EOF
1313-#line 11426 "configure"
1314+#line $LINENO "configure"
1315 #include "confdefs.h"
1316
1317 #if HAVE_DLFCN_H
1318@@ -11467,10 +12122,10 @@ else
1318 /* When -fvisbility=hidden is used, assume the code has been annotated 1319 /* When -fvisbility=hidden is used, assume the code has been annotated
1319 correspondingly for the symbols needed. */ 1320 correspondingly for the symbols needed. */
1320 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 1321 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -1327,7 +1328,16 @@ index 85e6b82..3d3dd88 100755
1327 int main () 1328 int main ()
1328 { 1329 {
1329 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 1330 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
1330@@ -11571,10 +12226,10 @@ else 1331@@ -11529,7 +12184,7 @@ else
1332 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1333 lt_status=$lt_dlunknown
1334 cat > conftest.$ac_ext <<_LT_EOF
1335-#line 11532 "configure"
1336+#line $LINENO "configure"
1337 #include "confdefs.h"
1338
1339 #if HAVE_DLFCN_H
1340@@ -11573,10 +12228,10 @@ else
1331 /* When -fvisbility=hidden is used, assume the code has been annotated 1341 /* When -fvisbility=hidden is used, assume the code has been annotated
1332 correspondingly for the symbols needed. */ 1342 correspondingly for the symbols needed. */
1333 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 1343 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -1340,7 +1350,7 @@ index 85e6b82..3d3dd88 100755
1340 int main () 1350 int main ()
1341 { 1351 {
1342 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 1352 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
1343@@ -15163,7 +15818,7 @@ SHARED_LDFLAGS= 1353@@ -15121,7 +15776,7 @@ SHARED_LDFLAGS=
1344 if test "$enable_shared" = "yes"; then 1354 if test "$enable_shared" = "yes"; then
1345 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` 1355 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
1346 if test -n "$x"; then 1356 if test -n "$x"; then
@@ -1349,7 +1359,7 @@ index 85e6b82..3d3dd88 100755
1349 fi 1359 fi
1350 1360
1351 # More hacks to build DLLs on Windows. 1361 # More hacks to build DLLs on Windows.
1352@@ -16780,13 +17435,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 1362@@ -16746,13 +17401,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
1353 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 1363 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
1354 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 1364 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
1355 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 1365 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -1370,7 +1380,7 @@ index 85e6b82..3d3dd88 100755
1370 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 1380 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
1371 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 1381 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
1372 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 1382 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
1373@@ -16801,14 +17463,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 1383@@ -16767,14 +17429,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
1374 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 1384 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
1375 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 1385 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
1376 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"`' 1386 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"`'
@@ -1389,7 +1399,7 @@ index 85e6b82..3d3dd88 100755
1389 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 1399 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
1390 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 1400 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
1391 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 1401 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
1392@@ -16841,12 +17506,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 1402@@ -16807,12 +17472,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
1393 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 1403 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
1394 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 1404 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
1395 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 1405 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -1403,7 +1413,7 @@ index 85e6b82..3d3dd88 100755
1403 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 1413 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
1404 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 1414 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
1405 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 1415 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
1406@@ -16901,8 +17566,13 @@ reload_flag \ 1416@@ -16867,8 +17532,13 @@ reload_flag \
1407 OBJDUMP \ 1417 OBJDUMP \
1408 deplibs_check_method \ 1418 deplibs_check_method \
1409 file_magic_cmd \ 1419 file_magic_cmd \
@@ -1417,7 +1427,7 @@ index 85e6b82..3d3dd88 100755
1417 STRIP \ 1427 STRIP \
1418 RANLIB \ 1428 RANLIB \
1419 CC \ 1429 CC \
1420@@ -16912,12 +17582,14 @@ lt_cv_sys_global_symbol_pipe \ 1430@@ -16878,12 +17548,14 @@ lt_cv_sys_global_symbol_pipe \
1421 lt_cv_sys_global_symbol_to_cdecl \ 1431 lt_cv_sys_global_symbol_to_cdecl \
1422 lt_cv_sys_global_symbol_to_c_name_address \ 1432 lt_cv_sys_global_symbol_to_c_name_address \
1423 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 1433 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -1433,7 +1443,7 @@ index 85e6b82..3d3dd88 100755
1433 DSYMUTIL \ 1443 DSYMUTIL \
1434 NMEDIT \ 1444 NMEDIT \
1435 LIPO \ 1445 LIPO \
1436@@ -16933,7 +17605,6 @@ no_undefined_flag \ 1446@@ -16899,7 +17571,6 @@ no_undefined_flag \
1437 hardcode_libdir_flag_spec \ 1447 hardcode_libdir_flag_spec \
1438 hardcode_libdir_flag_spec_ld \ 1448 hardcode_libdir_flag_spec_ld \
1439 hardcode_libdir_separator \ 1449 hardcode_libdir_separator \
@@ -1441,7 +1451,7 @@ index 85e6b82..3d3dd88 100755
1441 exclude_expsyms \ 1451 exclude_expsyms \
1442 include_expsyms \ 1452 include_expsyms \
1443 file_list_spec \ 1453 file_list_spec \
1444@@ -16969,6 +17640,7 @@ module_cmds \ 1454@@ -16935,6 +17606,7 @@ module_cmds \
1445 module_expsym_cmds \ 1455 module_expsym_cmds \
1446 export_symbols_cmds \ 1456 export_symbols_cmds \
1447 prelink_cmds \ 1457 prelink_cmds \
@@ -1449,7 +1459,7 @@ index 85e6b82..3d3dd88 100755
1449 postinstall_cmds \ 1459 postinstall_cmds \
1450 postuninstall_cmds \ 1460 postuninstall_cmds \
1451 finish_cmds \ 1461 finish_cmds \
1452@@ -17748,7 +18420,8 @@ $as_echo X"$file" | 1462@@ -17714,7 +18386,8 @@ $as_echo X"$file" |
1453 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 1463 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
1454 # 1464 #
1455 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 1465 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -1459,7 +1469,7 @@ index 85e6b82..3d3dd88 100755
1459 # Written by Gordon Matzigkeit, 1996 1469 # Written by Gordon Matzigkeit, 1996
1460 # 1470 #
1461 # This file is part of GNU Libtool. 1471 # This file is part of GNU Libtool.
1462@@ -17851,19 +18524,42 @@ SP2NL=$lt_lt_SP2NL 1472@@ -17817,19 +18490,42 @@ SP2NL=$lt_lt_SP2NL
1463 # turn newlines into spaces. 1473 # turn newlines into spaces.
1464 NL2SP=$lt_lt_NL2SP 1474 NL2SP=$lt_lt_NL2SP
1465 1475
@@ -1503,7 +1513,7 @@ index 85e6b82..3d3dd88 100755
1503 # A symbol stripping program. 1513 # A symbol stripping program.
1504 STRIP=$lt_STRIP 1514 STRIP=$lt_STRIP
1505 1515
1506@@ -17893,6 +18589,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 1516@@ -17859,6 +18555,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
1507 # Transform the output of nm in a C name address pair when lib prefix is needed. 1517 # Transform the output of nm in a C name address pair when lib prefix is needed.
1508 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 1518 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
1509 1519
@@ -1516,7 +1526,7 @@ index 85e6b82..3d3dd88 100755
1516 # The name of the directory that contains temporary libtool files. 1526 # The name of the directory that contains temporary libtool files.
1517 objdir=$objdir 1527 objdir=$objdir
1518 1528
1519@@ -17902,6 +18604,9 @@ MAGIC_CMD=$MAGIC_CMD 1529@@ -17868,6 +18570,9 @@ MAGIC_CMD=$MAGIC_CMD
1520 # Must we lock files when doing compilation? 1530 # Must we lock files when doing compilation?
1521 need_locks=$lt_need_locks 1531 need_locks=$lt_need_locks
1522 1532
@@ -1526,7 +1536,7 @@ index 85e6b82..3d3dd88 100755
1526 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 1536 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
1527 DSYMUTIL=$lt_DSYMUTIL 1537 DSYMUTIL=$lt_DSYMUTIL
1528 1538
1529@@ -18016,12 +18721,12 @@ with_gcc=$GCC 1539@@ -17982,12 +18687,12 @@ with_gcc=$GCC
1530 # Compiler flag to turn off builtin functions. 1540 # Compiler flag to turn off builtin functions.
1531 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 1541 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
1532 1542
@@ -1542,7 +1552,7 @@ index 85e6b82..3d3dd88 100755
1542 # Compiler flag to prevent dynamic linking. 1552 # Compiler flag to prevent dynamic linking.
1543 link_static_flag=$lt_lt_prog_compiler_static 1553 link_static_flag=$lt_lt_prog_compiler_static
1544 1554
1545@@ -18108,9 +18813,6 @@ inherit_rpath=$inherit_rpath 1555@@ -18074,9 +18779,6 @@ inherit_rpath=$inherit_rpath
1546 # Whether libtool must link a program against all its dependency libraries. 1556 # Whether libtool must link a program against all its dependency libraries.
1547 link_all_deplibs=$link_all_deplibs 1557 link_all_deplibs=$link_all_deplibs
1548 1558
@@ -1552,7 +1562,7 @@ index 85e6b82..3d3dd88 100755
1552 # Set to "yes" if exported symbols are required. 1562 # Set to "yes" if exported symbols are required.
1553 always_export_symbols=$always_export_symbols 1563 always_export_symbols=$always_export_symbols
1554 1564
1555@@ -18126,6 +18828,9 @@ include_expsyms=$lt_include_expsyms 1565@@ -18092,6 +18794,9 @@ include_expsyms=$lt_include_expsyms
1556 # Commands necessary for linking programs (against libraries) with templates. 1566 # Commands necessary for linking programs (against libraries) with templates.
1557 prelink_cmds=$lt_prelink_cmds 1567 prelink_cmds=$lt_prelink_cmds
1558 1568
@@ -1562,7 +1572,7 @@ index 85e6b82..3d3dd88 100755
1562 # Specify filename containing input files. 1572 # Specify filename containing input files.
1563 file_list_spec=$lt_file_list_spec 1573 file_list_spec=$lt_file_list_spec
1564 1574
1565@@ -18158,210 +18863,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 1575@@ -18124,210 +18829,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
1566 # if finds mixed CR/LF and LF-only lines. Since sed operates in 1576 # if finds mixed CR/LF and LF-only lines. Since sed operates in
1567 # text mode, it properly converts lines to CR/LF. This bash problem 1577 # text mode, it properly converts lines to CR/LF. This bash problem
1568 # is reportedly fixed, but why not run on old versions too? 1578 # is reportedly fixed, but why not run on old versions too?
@@ -1937,10 +1947,10 @@ index 85e6b82..3d3dd88 100755
1937 chmod +x "$ofile" 1947 chmod +x "$ofile"
1938 1948
1939diff --git a/bfd/configure.ac b/bfd/configure.ac 1949diff --git a/bfd/configure.ac b/bfd/configure.ac
1940index ba98e39..88063cf 100644 1950index 6f5e85f..44bd02c 100644
1941--- a/bfd/configure.ac 1951--- a/bfd/configure.ac
1942+++ b/bfd/configure.ac 1952+++ b/bfd/configure.ac
1943@@ -564,7 +564,7 @@ changequote(,)dnl 1953@@ -567,7 +567,7 @@ changequote(,)dnl
1944 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` 1954 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
1945 changequote([,])dnl 1955 changequote([,])dnl
1946 if test -n "$x"; then 1956 if test -n "$x"; then
@@ -1950,10 +1960,10 @@ index ba98e39..88063cf 100644
1950 1960
1951 # More hacks to build DLLs on Windows. 1961 # More hacks to build DLLs on Windows.
1952diff --git a/binutils/configure b/binutils/configure 1962diff --git a/binutils/configure b/binutils/configure
1953index be4b81c..6606a5f 100755 1963index bbabdc6..9150d42 100755
1954--- a/binutils/configure 1964--- a/binutils/configure
1955+++ b/binutils/configure 1965+++ b/binutils/configure
1956@@ -655,8 +655,11 @@ OTOOL 1966@@ -657,8 +657,11 @@ OTOOL
1957 LIPO 1967 LIPO
1958 NMEDIT 1968 NMEDIT
1959 DSYMUTIL 1969 DSYMUTIL
@@ -1965,7 +1975,7 @@ index be4b81c..6606a5f 100755
1965 OBJDUMP 1975 OBJDUMP
1966 LN_S 1976 LN_S
1967 NM 1977 NM
1968@@ -767,6 +770,7 @@ enable_static 1978@@ -769,6 +772,7 @@ enable_static
1969 with_pic 1979 with_pic
1970 enable_fast_install 1980 enable_fast_install
1971 with_gnu_ld 1981 with_gnu_ld
@@ -1973,16 +1983,16 @@ index be4b81c..6606a5f 100755
1973 enable_libtool_lock 1983 enable_libtool_lock
1974 enable_plugins 1984 enable_plugins
1975 enable_largefile 1985 enable_largefile
1976@@ -1439,6 +1443,8 @@ Optional Packages: 1986@@ -1441,6 +1445,8 @@ Optional Packages:
1977 --with-pic try to use only PIC/non-PIC objects [default=use 1987 --with-pic try to use only PIC/non-PIC objects [default=use
1978 both] 1988 both]
1979 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 1989 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
1980+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR 1990+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
1981+ (or the compiler's sysroot if not specified). 1991+ (or the compiler's sysroot if not specified).
1982 --with-zlib include zlib support (auto/yes/no) default=auto 1992 --with-system-zlib use installed libz
1983 --with-gnu-ld assume the C compiler uses GNU ld default=no 1993 --with-gnu-ld assume the C compiler uses GNU ld default=no
1984 --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib 1994 --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
1985@@ -5153,8 +5159,8 @@ esac 1995@@ -5155,8 +5161,8 @@ esac
1986 1996
1987 1997
1988 1998
@@ -1993,7 +2003,7 @@ index be4b81c..6606a5f 100755
1993 2003
1994 2004
1995 2005
1996@@ -5194,7 +5200,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 2006@@ -5196,7 +5202,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
1997 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 2007 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
1998 $as_echo_n "checking how to print strings... " >&6; } 2008 $as_echo_n "checking how to print strings... " >&6; }
1999 # Test print first, because it will be a builtin if present. 2009 # Test print first, because it will be a builtin if present.
@@ -2002,7 +2012,7 @@ index be4b81c..6606a5f 100755
2002 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 2012 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
2003 ECHO='print -r --' 2013 ECHO='print -r --'
2004 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 2014 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
2005@@ -5880,8 +5886,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 2015@@ -5882,8 +5888,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
2006 # Try some XSI features 2016 # Try some XSI features
2007 xsi_shell=no 2017 xsi_shell=no
2008 ( _lt_dummy="a/b/c" 2018 ( _lt_dummy="a/b/c"
@@ -2013,7 +2023,7 @@ index be4b81c..6606a5f 100755
2013 && eval 'test $(( 1 + 1 )) -eq 2 \ 2023 && eval 'test $(( 1 + 1 )) -eq 2 \
2014 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 2024 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
2015 && xsi_shell=yes 2025 && xsi_shell=yes
2016@@ -5930,6 +5936,80 @@ esac 2026@@ -5932,6 +5938,80 @@ esac
2017 2027
2018 2028
2019 2029
@@ -2094,7 +2104,7 @@ index be4b81c..6606a5f 100755
2094 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 2104 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
2095 $as_echo_n "checking for $LD option to reload object files... " >&6; } 2105 $as_echo_n "checking for $LD option to reload object files... " >&6; }
2096 if test "${lt_cv_ld_reload_flag+set}" = set; then : 2106 if test "${lt_cv_ld_reload_flag+set}" = set; then :
2097@@ -5946,6 +6026,11 @@ case $reload_flag in 2107@@ -5948,6 +6028,11 @@ case $reload_flag in
2098 esac 2108 esac
2099 reload_cmds='$LD$reload_flag -o $output$reload_objs' 2109 reload_cmds='$LD$reload_flag -o $output$reload_objs'
2100 case $host_os in 2110 case $host_os in
@@ -2106,7 +2116,7 @@ index be4b81c..6606a5f 100755
2106 darwin*) 2116 darwin*)
2107 if test "$GCC" = yes; then 2117 if test "$GCC" = yes; then
2108 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 2118 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
2109@@ -6114,7 +6199,8 @@ mingw* | pw32*) 2119@@ -6116,7 +6201,8 @@ mingw* | pw32*)
2110 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 2120 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
2111 lt_cv_file_magic_cmd='func_win32_libid' 2121 lt_cv_file_magic_cmd='func_win32_libid'
2112 else 2122 else
@@ -2116,7 +2126,7 @@ index be4b81c..6606a5f 100755
2116 lt_cv_file_magic_cmd='$OBJDUMP -f' 2126 lt_cv_file_magic_cmd='$OBJDUMP -f'
2117 fi 2127 fi
2118 ;; 2128 ;;
2119@@ -6268,6 +6354,21 @@ esac 2129@@ -6270,6 +6356,21 @@ esac
2120 fi 2130 fi
2121 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 2131 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
2122 $as_echo "$lt_cv_deplibs_check_method" >&6; } 2132 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -2138,7 +2148,7 @@ index be4b81c..6606a5f 100755
2138 file_magic_cmd=$lt_cv_file_magic_cmd 2148 file_magic_cmd=$lt_cv_file_magic_cmd
2139 deplibs_check_method=$lt_cv_deplibs_check_method 2149 deplibs_check_method=$lt_cv_deplibs_check_method
2140 test -z "$deplibs_check_method" && deplibs_check_method=unknown 2150 test -z "$deplibs_check_method" && deplibs_check_method=unknown
2141@@ -6283,9 +6384,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 2151@@ -6285,9 +6386,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
2142 2152
2143 2153
2144 2154
@@ -2152,9 +2162,7 @@ index be4b81c..6606a5f 100755
2152+ 2162+
2153+ 2163+
2154+ 2164+
2155 if test -n "$ac_tool_prefix"; then 2165+if test -n "$ac_tool_prefix"; then
2156- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
2157-set dummy ${ac_tool_prefix}ar; ac_word=$2
2158+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. 2166+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
2159+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 2167+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
2160+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2168+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -2295,7 +2303,9 @@ index be4b81c..6606a5f 100755
2295+ 2303+
2296+ 2304+
2297+ 2305+
2298+if test -n "$ac_tool_prefix"; then 2306 if test -n "$ac_tool_prefix"; then
2307- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
2308-set dummy ${ac_tool_prefix}ar; ac_word=$2
2299+ for ac_prog in ar 2309+ for ac_prog in ar
2300+ do 2310+ do
2301+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 2311+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
@@ -2303,7 +2313,7 @@ index be4b81c..6606a5f 100755
2303 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2313 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2304 $as_echo_n "checking for $ac_word... " >&6; } 2314 $as_echo_n "checking for $ac_word... " >&6; }
2305 if test "${ac_cv_prog_AR+set}" = set; then : 2315 if test "${ac_cv_prog_AR+set}" = set; then :
2306@@ -6301,7 +6555,7 @@ do 2316@@ -6303,7 +6557,7 @@ do
2307 test -z "$as_dir" && as_dir=. 2317 test -z "$as_dir" && as_dir=.
2308 for ac_exec_ext in '' $ac_executable_extensions; do 2318 for ac_exec_ext in '' $ac_executable_extensions; do
2309 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 2319 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -2312,7 +2322,7 @@ index be4b81c..6606a5f 100755
2312 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2322 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2313 break 2 2323 break 2
2314 fi 2324 fi
2315@@ -6321,11 +6575,15 @@ $as_echo "no" >&6; } 2325@@ -6323,11 +6577,15 @@ $as_echo "no" >&6; }
2316 fi 2326 fi
2317 2327
2318 2328
@@ -2331,7 +2341,7 @@ index be4b81c..6606a5f 100755
2331 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2341 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2332 $as_echo_n "checking for $ac_word... " >&6; } 2342 $as_echo_n "checking for $ac_word... " >&6; }
2333 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : 2343 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
2334@@ -6341,7 +6599,7 @@ do 2344@@ -6343,7 +6601,7 @@ do
2335 test -z "$as_dir" && as_dir=. 2345 test -z "$as_dir" && as_dir=.
2336 for ac_exec_ext in '' $ac_executable_extensions; do 2346 for ac_exec_ext in '' $ac_executable_extensions; do
2337 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 2347 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -2340,7 +2350,7 @@ index be4b81c..6606a5f 100755
2340 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2350 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2341 break 2 2351 break 2
2342 fi 2352 fi
2343@@ -6360,6 +6618,10 @@ else 2353@@ -6362,6 +6620,10 @@ else
2344 $as_echo "no" >&6; } 2354 $as_echo "no" >&6; }
2345 fi 2355 fi
2346 2356
@@ -2351,7 +2361,7 @@ index be4b81c..6606a5f 100755
2351 if test "x$ac_ct_AR" = x; then 2361 if test "x$ac_ct_AR" = x; then
2352 AR="false" 2362 AR="false"
2353 else 2363 else
2354@@ -6371,16 +6633,72 @@ ac_tool_warned=yes ;; 2364@@ -6373,12 +6635,10 @@ ac_tool_warned=yes ;;
2355 esac 2365 esac
2356 AR=$ac_ct_AR 2366 AR=$ac_ct_AR
2357 fi 2367 fi
@@ -2363,17 +2373,13 @@ index be4b81c..6606a5f 100755
2363-test -z "$AR_FLAGS" && AR_FLAGS=cru 2373-test -z "$AR_FLAGS" && AR_FLAGS=cru
2364+: ${AR=ar} 2374+: ${AR=ar}
2365+: ${AR_FLAGS=cru} 2375+: ${AR_FLAGS=cru}
2366+ 2376
2367+ 2377
2368+ 2378
2369+ 2379@@ -6390,6 +6650,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
2370+ 2380
2371+ 2381
2372+ 2382
2373+
2374+
2375+
2376+
2377+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 2383+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
2378+$as_echo_n "checking for archiver @FILE support... " >&6; } 2384+$as_echo_n "checking for archiver @FILE support... " >&6; }
2379+if test "${lt_cv_ar_at_file+set}" = set; then : 2385+if test "${lt_cv_ar_at_file+set}" = set; then :
@@ -2386,7 +2392,7 @@ index be4b81c..6606a5f 100755
2386+int 2392+int
2387+main () 2393+main ()
2388+{ 2394+{
2389 2395+
2390+ ; 2396+ ;
2391+ return 0; 2397+ return 0;
2392+} 2398+}
@@ -2412,23 +2418,30 @@ index be4b81c..6606a5f 100755
2412+ fi 2418+ fi
2413+ fi 2419+ fi
2414+ rm -f conftest.* libconftest.a 2420+ rm -f conftest.* libconftest.a
2415 2421+
2416+fi 2422+fi
2417+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 2423+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2418 2424+
2419+fi 2425+fi
2420+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 2426+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
2421+$as_echo "$lt_cv_ar_at_file" >&6; } 2427+$as_echo "$lt_cv_ar_at_file" >&6; }
2422 2428+
2423+if test "x$lt_cv_ar_at_file" = xno; then 2429+if test "x$lt_cv_ar_at_file" = xno; then
2424+ archiver_list_spec= 2430+ archiver_list_spec=
2425+else 2431+else
2426+ archiver_list_spec=$lt_cv_ar_at_file 2432+ archiver_list_spec=$lt_cv_ar_at_file
2427+fi 2433+fi
2428 2434+
2429 2435+
2430 2436+
2431@@ -6722,8 +7040,8 @@ esac 2437+
2438+
2439+
2440+
2441 if test -n "$ac_tool_prefix"; then
2442 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
2443 set dummy ${ac_tool_prefix}strip; ac_word=$2
2444@@ -6724,8 +7042,8 @@ esac
2432 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 2445 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
2433 2446
2434 # Transform an extracted symbol line into symbol name and symbol address 2447 # Transform an extracted symbol line into symbol name and symbol address
@@ -2439,7 +2452,7 @@ index be4b81c..6606a5f 100755
2439 2452
2440 # Handle CRLF in mingw tool chain 2453 # Handle CRLF in mingw tool chain
2441 opt_cr= 2454 opt_cr=
2442@@ -6759,6 +7077,7 @@ for ac_symprfx in "" "_"; do 2455@@ -6761,6 +7079,7 @@ for ac_symprfx in "" "_"; do
2443 else 2456 else
2444 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 2457 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
2445 fi 2458 fi
@@ -2447,7 +2460,7 @@ index be4b81c..6606a5f 100755
2447 2460
2448 # Check to see that the pipe works correctly. 2461 # Check to see that the pipe works correctly.
2449 pipe_works=no 2462 pipe_works=no
2450@@ -6800,6 +7119,18 @@ _LT_EOF 2463@@ -6802,6 +7121,18 @@ _LT_EOF
2451 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 2464 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
2452 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 2465 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
2453 cat <<_LT_EOF > conftest.$ac_ext 2466 cat <<_LT_EOF > conftest.$ac_ext
@@ -2466,7 +2479,7 @@ index be4b81c..6606a5f 100755
2466 #ifdef __cplusplus 2479 #ifdef __cplusplus
2467 extern "C" { 2480 extern "C" {
2468 #endif 2481 #endif
2469@@ -6811,7 +7142,7 @@ _LT_EOF 2482@@ -6813,7 +7144,7 @@ _LT_EOF
2470 cat <<_LT_EOF >> conftest.$ac_ext 2483 cat <<_LT_EOF >> conftest.$ac_ext
2471 2484
2472 /* The mapping between symbol names and symbols. */ 2485 /* The mapping between symbol names and symbols. */
@@ -2475,7 +2488,7 @@ index be4b81c..6606a5f 100755
2475 const char *name; 2488 const char *name;
2476 void *address; 2489 void *address;
2477 } 2490 }
2478@@ -6837,8 +7168,8 @@ static const void *lt_preloaded_setup() { 2491@@ -6839,8 +7170,8 @@ static const void *lt_preloaded_setup() {
2479 _LT_EOF 2492 _LT_EOF
2480 # Now try linking the two files. 2493 # Now try linking the two files.
2481 mv conftest.$ac_objext conftstm.$ac_objext 2494 mv conftest.$ac_objext conftstm.$ac_objext
@@ -2486,7 +2499,7 @@ index be4b81c..6606a5f 100755
2486 LIBS="conftstm.$ac_objext" 2499 LIBS="conftstm.$ac_objext"
2487 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 2500 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
2488 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 2501 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
2489@@ -6848,8 +7179,8 @@ _LT_EOF 2502@@ -6850,8 +7181,8 @@ _LT_EOF
2490 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 2503 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
2491 pipe_works=yes 2504 pipe_works=yes
2492 fi 2505 fi
@@ -2497,7 +2510,7 @@ index be4b81c..6606a5f 100755
2497 else 2510 else
2498 echo "cannot find nm_test_func in $nlist" >&5 2511 echo "cannot find nm_test_func in $nlist" >&5
2499 fi 2512 fi
2500@@ -6886,6 +7217,20 @@ else 2513@@ -6888,6 +7219,21 @@ else
2501 $as_echo "ok" >&6; } 2514 $as_echo "ok" >&6; }
2502 fi 2515 fi
2503 2516
@@ -2515,10 +2528,11 @@ index be4b81c..6606a5f 100755
2515+ 2528+
2516+ 2529+
2517+ 2530+
2531+
2518 2532
2519 2533
2520 2534
2521@@ -6905,6 +7250,41 @@ fi 2535@@ -6906,6 +7252,40 @@ fi
2522 2536
2523 2537
2524 2538
@@ -2556,11 +2570,10 @@ index be4b81c..6606a5f 100755
2556+$as_echo "${lt_sysroot:-no}" >&6; } 2570+$as_echo "${lt_sysroot:-no}" >&6; }
2557+ 2571+
2558+ 2572+
2559+
2560 2573
2561 2574
2562 # Check whether --enable-libtool-lock was given. 2575
2563@@ -7113,6 +7493,123 @@ esac 2576@@ -7115,6 +7495,123 @@ esac
2564 2577
2565 need_locks="$enable_libtool_lock" 2578 need_locks="$enable_libtool_lock"
2566 2579
@@ -2684,7 +2697,7 @@ index be4b81c..6606a5f 100755
2684 2697
2685 case $host_os in 2698 case $host_os in
2686 rhapsody* | darwin*) 2699 rhapsody* | darwin*)
2687@@ -7676,6 +8173,8 @@ _LT_EOF 2700@@ -7678,6 +8175,8 @@ _LT_EOF
2688 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 2701 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
2689 echo "$AR cru libconftest.a conftest.o" >&5 2702 echo "$AR cru libconftest.a conftest.o" >&5
2690 $AR cru libconftest.a conftest.o 2>&5 2703 $AR cru libconftest.a conftest.o 2>&5
@@ -2693,7 +2706,7 @@ index be4b81c..6606a5f 100755
2693 cat > conftest.c << _LT_EOF 2706 cat > conftest.c << _LT_EOF
2694 int main() { return 0;} 2707 int main() { return 0;}
2695 _LT_EOF 2708 _LT_EOF
2696@@ -7871,7 +8370,8 @@ fi 2709@@ -7873,7 +8372,8 @@ fi
2697 LIBTOOL_DEPS="$ltmain" 2710 LIBTOOL_DEPS="$ltmain"
2698 2711
2699 # Always use our own libtool. 2712 # Always use our own libtool.
@@ -2703,7 +2716,7 @@ index be4b81c..6606a5f 100755
2703 2716
2704 2717
2705 2718
2706@@ -7960,7 +8460,7 @@ aix3*) 2719@@ -7962,7 +8462,7 @@ aix3*)
2707 esac 2720 esac
2708 2721
2709 # Global variables: 2722 # Global variables:
@@ -2712,7 +2725,7 @@ index be4b81c..6606a5f 100755
2712 can_build_shared=yes 2725 can_build_shared=yes
2713 2726
2714 # All known linkers require a `.a' archive for static linking (except MSVC, 2727 # All known linkers require a `.a' archive for static linking (except MSVC,
2715@@ -8258,8 +8758,6 @@ fi 2728@@ -8260,8 +8760,6 @@ fi
2716 lt_prog_compiler_pic= 2729 lt_prog_compiler_pic=
2717 lt_prog_compiler_static= 2730 lt_prog_compiler_static=
2718 2731
@@ -2721,7 +2734,7 @@ index be4b81c..6606a5f 100755
2721 2734
2722 if test "$GCC" = yes; then 2735 if test "$GCC" = yes; then
2723 lt_prog_compiler_wl='-Wl,' 2736 lt_prog_compiler_wl='-Wl,'
2724@@ -8425,6 +8923,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 2737@@ -8427,6 +8925,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2725 lt_prog_compiler_pic='--shared' 2738 lt_prog_compiler_pic='--shared'
2726 lt_prog_compiler_static='--static' 2739 lt_prog_compiler_static='--static'
2727 ;; 2740 ;;
@@ -2734,7 +2747,7 @@ index be4b81c..6606a5f 100755
2734 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 2747 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
2735 # Portland Group compilers (*not* the Pentium gcc compiler, 2748 # Portland Group compilers (*not* the Pentium gcc compiler,
2736 # which looks to be a dead project) 2749 # which looks to be a dead project)
2737@@ -8487,7 +8991,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 2750@@ -8489,7 +8993,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2738 lt_prog_compiler_pic='-KPIC' 2751 lt_prog_compiler_pic='-KPIC'
2739 lt_prog_compiler_static='-Bstatic' 2752 lt_prog_compiler_static='-Bstatic'
2740 case $cc_basename in 2753 case $cc_basename in
@@ -2743,7 +2756,7 @@ index be4b81c..6606a5f 100755
2743 lt_prog_compiler_wl='-Qoption ld ';; 2756 lt_prog_compiler_wl='-Qoption ld ';;
2744 *) 2757 *)
2745 lt_prog_compiler_wl='-Wl,';; 2758 lt_prog_compiler_wl='-Wl,';;
2746@@ -8544,13 +9048,17 @@ case $host_os in 2759@@ -8546,13 +9050,17 @@ case $host_os in
2747 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 2760 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
2748 ;; 2761 ;;
2749 esac 2762 esac
@@ -2767,7 +2780,7 @@ index be4b81c..6606a5f 100755
2767 2780
2768 # 2781 #
2769 # Check to make sure the PIC flag actually works. 2782 # Check to make sure the PIC flag actually works.
2770@@ -8611,6 +9119,11 @@ fi 2783@@ -8613,6 +9121,11 @@ fi
2771 2784
2772 2785
2773 2786
@@ -2779,7 +2792,7 @@ index be4b81c..6606a5f 100755
2779 # 2792 #
2780 # Check to make sure the static flag actually works. 2793 # Check to make sure the static flag actually works.
2781 # 2794 #
2782@@ -8961,7 +9474,8 @@ _LT_EOF 2795@@ -8963,7 +9476,8 @@ _LT_EOF
2783 allow_undefined_flag=unsupported 2796 allow_undefined_flag=unsupported
2784 always_export_symbols=no 2797 always_export_symbols=no
2785 enable_shared_with_static_runtimes=yes 2798 enable_shared_with_static_runtimes=yes
@@ -2789,16 +2802,7 @@ index be4b81c..6606a5f 100755
2789 2802
2790 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 2803 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
2791 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 2804 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
2792@@ -9009,7 +9523,7 @@ _LT_EOF 2805@@ -9062,12 +9576,12 @@ _LT_EOF
2793 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
2794 && test "$tmp_diet" = no
2795 then
2796- tmp_addflag=
2797+ tmp_addflag=' $pic_flag'
2798 tmp_sharedflag='-shared'
2799 case $cc_basename,$host_cpu in
2800 pgcc*) # Portland Group C compiler
2801@@ -9060,12 +9574,12 @@ _LT_EOF
2802 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 2806 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
2803 hardcode_libdir_flag_spec= 2807 hardcode_libdir_flag_spec=
2804 hardcode_libdir_flag_spec_ld='-rpath $libdir' 2808 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -2813,7 +2817,7 @@ index be4b81c..6606a5f 100755
2813 fi 2817 fi
2814 ;; 2818 ;;
2815 esac 2819 esac
2816@@ -9079,8 +9593,8 @@ _LT_EOF 2820@@ -9081,8 +9595,8 @@ _LT_EOF
2817 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 2821 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
2818 wlarc= 2822 wlarc=
2819 else 2823 else
@@ -2824,7 +2828,7 @@ index be4b81c..6606a5f 100755
2824 fi 2828 fi
2825 ;; 2829 ;;
2826 2830
2827@@ -9098,8 +9612,8 @@ _LT_EOF 2831@@ -9100,8 +9614,8 @@ _LT_EOF
2828 2832
2829 _LT_EOF 2833 _LT_EOF
2830 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 2834 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -2835,7 +2839,7 @@ index be4b81c..6606a5f 100755
2835 else 2839 else
2836 ld_shlibs=no 2840 ld_shlibs=no
2837 fi 2841 fi
2838@@ -9145,8 +9659,8 @@ _LT_EOF 2842@@ -9147,8 +9661,8 @@ _LT_EOF
2839 2843
2840 *) 2844 *)
2841 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 2845 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -2846,7 +2850,7 @@ index be4b81c..6606a5f 100755
2846 else 2850 else
2847 ld_shlibs=no 2851 ld_shlibs=no
2848 fi 2852 fi
2849@@ -9276,7 +9790,13 @@ _LT_EOF 2853@@ -9278,7 +9792,13 @@ _LT_EOF
2850 allow_undefined_flag='-berok' 2854 allow_undefined_flag='-berok'
2851 # Determine the default libpath from the value encoded in an 2855 # Determine the default libpath from the value encoded in an
2852 # empty executable. 2856 # empty executable.
@@ -2861,7 +2865,7 @@ index be4b81c..6606a5f 100755
2861 /* end confdefs.h. */ 2865 /* end confdefs.h. */
2862 2866
2863 int 2867 int
2864@@ -9289,22 +9809,29 @@ main () 2868@@ -9291,22 +9811,29 @@ main ()
2865 _ACEOF 2869 _ACEOF
2866 if ac_fn_c_try_link "$LINENO"; then : 2870 if ac_fn_c_try_link "$LINENO"; then :
2867 2871
@@ -2904,7 +2908,7 @@ index be4b81c..6606a5f 100755
2904 2908
2905 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 2909 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
2906 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" 2910 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"
2907@@ -9316,7 +9843,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 2911@@ -9318,7 +9845,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
2908 else 2912 else
2909 # Determine the default libpath from the value encoded in an 2913 # Determine the default libpath from the value encoded in an
2910 # empty executable. 2914 # empty executable.
@@ -2919,7 +2923,7 @@ index be4b81c..6606a5f 100755
2919 /* end confdefs.h. */ 2923 /* end confdefs.h. */
2920 2924
2921 int 2925 int
2922@@ -9329,22 +9862,29 @@ main () 2926@@ -9331,22 +9864,29 @@ main ()
2923 _ACEOF 2927 _ACEOF
2924 if ac_fn_c_try_link "$LINENO"; then : 2928 if ac_fn_c_try_link "$LINENO"; then :
2925 2929
@@ -2962,7 +2966,7 @@ index be4b81c..6606a5f 100755
2962 2966
2963 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 2967 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
2964 # Warning - without using the other run time loading flags, 2968 # Warning - without using the other run time loading flags,
2965@@ -9389,20 +9929,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 2969@@ -9391,20 +9931,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
2966 # Microsoft Visual C++. 2970 # Microsoft Visual C++.
2967 # hardcode_libdir_flag_spec is actually meaningless, as there is 2971 # hardcode_libdir_flag_spec is actually meaningless, as there is
2968 # no search path for DLLs. 2972 # no search path for DLLs.
@@ -3040,7 +3044,7 @@ index be4b81c..6606a5f 100755
3040 ;; 3044 ;;
3041 3045
3042 darwin* | rhapsody*) 3046 darwin* | rhapsody*)
3043@@ -9463,7 +10046,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3047@@ -9465,7 +10048,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3044 3048
3045 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 3049 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
3046 freebsd* | dragonfly*) 3050 freebsd* | dragonfly*)
@@ -3049,7 +3053,7 @@ index be4b81c..6606a5f 100755
3049 hardcode_libdir_flag_spec='-R$libdir' 3053 hardcode_libdir_flag_spec='-R$libdir'
3050 hardcode_direct=yes 3054 hardcode_direct=yes
3051 hardcode_shlibpath_var=no 3055 hardcode_shlibpath_var=no
3052@@ -9471,7 +10054,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3056@@ -9473,7 +10056,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3053 3057
3054 hpux9*) 3058 hpux9*)
3055 if test "$GCC" = yes; then 3059 if test "$GCC" = yes; then
@@ -3058,7 +3062,7 @@ index be4b81c..6606a5f 100755
3058 else 3062 else
3059 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' 3063 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'
3060 fi 3064 fi
3061@@ -9487,7 +10070,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3065@@ -9489,7 +10072,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3062 3066
3063 hpux10*) 3067 hpux10*)
3064 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 3068 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -3067,7 +3071,7 @@ index be4b81c..6606a5f 100755
3067 else 3071 else
3068 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 3072 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
3069 fi 3073 fi
3070@@ -9511,10 +10094,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3074@@ -9513,10 +10096,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3071 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 3075 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
3072 ;; 3076 ;;
3073 ia64*) 3077 ia64*)
@@ -3080,7 +3084,7 @@ index be4b81c..6606a5f 100755
3080 ;; 3084 ;;
3081 esac 3085 esac
3082 else 3086 else
3083@@ -9593,23 +10176,36 @@ fi 3087@@ -9595,23 +10178,36 @@ fi
3084 3088
3085 irix5* | irix6* | nonstopux*) 3089 irix5* | irix6* | nonstopux*)
3086 if test "$GCC" = yes; then 3090 if test "$GCC" = yes; then
@@ -3125,7 +3129,7 @@ index be4b81c..6606a5f 100755
3125 else 3129 else
3126 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' 3130 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'
3127 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' 3131 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'
3128@@ -9694,7 +10290,7 @@ rm -f core conftest.err conftest.$ac_objext \ 3132@@ -9696,7 +10292,7 @@ rm -f core conftest.err conftest.$ac_objext \
3129 osf4* | osf5*) # as osf3* with the addition of -msym flag 3133 osf4* | osf5*) # as osf3* with the addition of -msym flag
3130 if test "$GCC" = yes; then 3134 if test "$GCC" = yes; then
3131 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 3135 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -3134,7 +3138,7 @@ index be4b81c..6606a5f 100755
3134 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 3138 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
3135 else 3139 else
3136 allow_undefined_flag=' -expect_unresolved \*' 3140 allow_undefined_flag=' -expect_unresolved \*'
3137@@ -9713,9 +10309,9 @@ rm -f core conftest.err conftest.$ac_objext \ 3141@@ -9715,9 +10311,9 @@ rm -f core conftest.err conftest.$ac_objext \
3138 no_undefined_flag=' -z defs' 3142 no_undefined_flag=' -z defs'
3139 if test "$GCC" = yes; then 3143 if test "$GCC" = yes; then
3140 wlarc='${wl}' 3144 wlarc='${wl}'
@@ -3146,7 +3150,7 @@ index be4b81c..6606a5f 100755
3146 else 3150 else
3147 case `$CC -V 2>&1` in 3151 case `$CC -V 2>&1` in
3148 *"Compilers 5.0"*) 3152 *"Compilers 5.0"*)
3149@@ -10291,8 +10887,9 @@ cygwin* | mingw* | pw32* | cegcc*) 3153@@ -10293,8 +10889,9 @@ cygwin* | mingw* | pw32* | cegcc*)
3150 need_version=no 3154 need_version=no
3151 need_lib_prefix=no 3155 need_lib_prefix=no
3152 3156
@@ -3158,7 +3162,7 @@ index be4b81c..6606a5f 100755
3158 library_names_spec='$libname.dll.a' 3162 library_names_spec='$libname.dll.a'
3159 # DLL is installed to $(libdir)/../bin by postinstall_cmds 3163 # DLL is installed to $(libdir)/../bin by postinstall_cmds
3160 postinstall_cmds='base_file=`basename \${file}`~ 3164 postinstall_cmds='base_file=`basename \${file}`~
3161@@ -10325,13 +10922,71 @@ cygwin* | mingw* | pw32* | cegcc*) 3165@@ -10327,13 +10924,71 @@ cygwin* | mingw* | pw32* | cegcc*)
3162 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 3166 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
3163 ;; 3167 ;;
3164 esac 3168 esac
@@ -3231,7 +3235,7 @@ index be4b81c..6606a5f 100755
3231 # FIXME: first we should search . and the directory the executable is in 3235 # FIXME: first we should search . and the directory the executable is in
3232 shlibpath_var=PATH 3236 shlibpath_var=PATH
3233 ;; 3237 ;;
3234@@ -10423,7 +11078,7 @@ haiku*) 3238@@ -10425,7 +11080,7 @@ haiku*)
3235 soname_spec='${libname}${release}${shared_ext}$major' 3239 soname_spec='${libname}${release}${shared_ext}$major'
3236 shlibpath_var=LIBRARY_PATH 3240 shlibpath_var=LIBRARY_PATH
3237 shlibpath_overrides_runpath=yes 3241 shlibpath_overrides_runpath=yes
@@ -3240,7 +3244,16 @@ index be4b81c..6606a5f 100755
3240 hardcode_into_libs=yes 3244 hardcode_into_libs=yes
3241 ;; 3245 ;;
3242 3246
3243@@ -11263,10 +11918,10 @@ else 3247@@ -11221,7 +11876,7 @@ else
3248 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
3249 lt_status=$lt_dlunknown
3250 cat > conftest.$ac_ext <<_LT_EOF
3251-#line 11224 "configure"
3252+#line $LINENO "configure"
3253 #include "confdefs.h"
3254
3255 #if HAVE_DLFCN_H
3256@@ -11265,10 +11920,10 @@ else
3244 /* When -fvisbility=hidden is used, assume the code has been annotated 3257 /* When -fvisbility=hidden is used, assume the code has been annotated
3245 correspondingly for the symbols needed. */ 3258 correspondingly for the symbols needed. */
3246 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 3259 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -3253,7 +3266,16 @@ index be4b81c..6606a5f 100755
3253 int main () 3266 int main ()
3254 { 3267 {
3255 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 3268 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
3256@@ -11369,10 +12024,10 @@ else 3269@@ -11327,7 +11982,7 @@ else
3270 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
3271 lt_status=$lt_dlunknown
3272 cat > conftest.$ac_ext <<_LT_EOF
3273-#line 11330 "configure"
3274+#line $LINENO "configure"
3275 #include "confdefs.h"
3276
3277 #if HAVE_DLFCN_H
3278@@ -11371,10 +12026,10 @@ else
3257 /* When -fvisbility=hidden is used, assume the code has been annotated 3279 /* When -fvisbility=hidden is used, assume the code has been annotated
3258 correspondingly for the symbols needed. */ 3280 correspondingly for the symbols needed. */
3259 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 3281 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -3266,7 +3288,7 @@ index be4b81c..6606a5f 100755
3266 int main () 3288 int main ()
3267 { 3289 {
3268 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 3290 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
3269@@ -15373,13 +16028,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 3291@@ -15354,13 +16009,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
3270 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 3292 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
3271 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 3293 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
3272 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 3294 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -3287,7 +3309,7 @@ index be4b81c..6606a5f 100755
3287 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 3309 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
3288 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 3310 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
3289 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 3311 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
3290@@ -15394,14 +16056,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 3312@@ -15375,14 +16037,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
3291 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 3313 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
3292 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 3314 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
3293 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"`' 3315 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"`'
@@ -3306,7 +3328,7 @@ index be4b81c..6606a5f 100755
3306 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 3328 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
3307 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 3329 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
3308 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 3330 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
3309@@ -15434,12 +16099,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 3331@@ -15415,12 +16080,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
3310 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 3332 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
3311 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 3333 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
3312 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 3334 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -3320,7 +3342,7 @@ index be4b81c..6606a5f 100755
3320 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 3342 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
3321 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 3343 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
3322 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 3344 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
3323@@ -15494,8 +16159,13 @@ reload_flag \ 3345@@ -15475,8 +16140,13 @@ reload_flag \
3324 OBJDUMP \ 3346 OBJDUMP \
3325 deplibs_check_method \ 3347 deplibs_check_method \
3326 file_magic_cmd \ 3348 file_magic_cmd \
@@ -3334,7 +3356,7 @@ index be4b81c..6606a5f 100755
3334 STRIP \ 3356 STRIP \
3335 RANLIB \ 3357 RANLIB \
3336 CC \ 3358 CC \
3337@@ -15505,12 +16175,14 @@ lt_cv_sys_global_symbol_pipe \ 3359@@ -15486,12 +16156,14 @@ lt_cv_sys_global_symbol_pipe \
3338 lt_cv_sys_global_symbol_to_cdecl \ 3360 lt_cv_sys_global_symbol_to_cdecl \
3339 lt_cv_sys_global_symbol_to_c_name_address \ 3361 lt_cv_sys_global_symbol_to_c_name_address \
3340 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 3362 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -3350,7 +3372,7 @@ index be4b81c..6606a5f 100755
3350 DSYMUTIL \ 3372 DSYMUTIL \
3351 NMEDIT \ 3373 NMEDIT \
3352 LIPO \ 3374 LIPO \
3353@@ -15526,7 +16198,6 @@ no_undefined_flag \ 3375@@ -15507,7 +16179,6 @@ no_undefined_flag \
3354 hardcode_libdir_flag_spec \ 3376 hardcode_libdir_flag_spec \
3355 hardcode_libdir_flag_spec_ld \ 3377 hardcode_libdir_flag_spec_ld \
3356 hardcode_libdir_separator \ 3378 hardcode_libdir_separator \
@@ -3358,7 +3380,7 @@ index be4b81c..6606a5f 100755
3358 exclude_expsyms \ 3380 exclude_expsyms \
3359 include_expsyms \ 3381 include_expsyms \
3360 file_list_spec \ 3382 file_list_spec \
3361@@ -15562,6 +16233,7 @@ module_cmds \ 3383@@ -15543,6 +16214,7 @@ module_cmds \
3362 module_expsym_cmds \ 3384 module_expsym_cmds \
3363 export_symbols_cmds \ 3385 export_symbols_cmds \
3364 prelink_cmds \ 3386 prelink_cmds \
@@ -3366,7 +3388,7 @@ index be4b81c..6606a5f 100755
3366 postinstall_cmds \ 3388 postinstall_cmds \
3367 postuninstall_cmds \ 3389 postuninstall_cmds \
3368 finish_cmds \ 3390 finish_cmds \
3369@@ -16319,7 +16991,8 @@ $as_echo X"$file" | 3391@@ -16300,7 +16972,8 @@ $as_echo X"$file" |
3370 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 3392 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
3371 # 3393 #
3372 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 3394 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -3376,7 +3398,7 @@ index be4b81c..6606a5f 100755
3376 # Written by Gordon Matzigkeit, 1996 3398 # Written by Gordon Matzigkeit, 1996
3377 # 3399 #
3378 # This file is part of GNU Libtool. 3400 # This file is part of GNU Libtool.
3379@@ -16422,19 +17095,42 @@ SP2NL=$lt_lt_SP2NL 3401@@ -16403,19 +17076,42 @@ SP2NL=$lt_lt_SP2NL
3380 # turn newlines into spaces. 3402 # turn newlines into spaces.
3381 NL2SP=$lt_lt_NL2SP 3403 NL2SP=$lt_lt_NL2SP
3382 3404
@@ -3420,7 +3442,7 @@ index be4b81c..6606a5f 100755
3420 # A symbol stripping program. 3442 # A symbol stripping program.
3421 STRIP=$lt_STRIP 3443 STRIP=$lt_STRIP
3422 3444
3423@@ -16464,6 +17160,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 3445@@ -16445,6 +17141,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
3424 # Transform the output of nm in a C name address pair when lib prefix is needed. 3446 # Transform the output of nm in a C name address pair when lib prefix is needed.
3425 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 3447 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
3426 3448
@@ -3433,7 +3455,7 @@ index be4b81c..6606a5f 100755
3433 # The name of the directory that contains temporary libtool files. 3455 # The name of the directory that contains temporary libtool files.
3434 objdir=$objdir 3456 objdir=$objdir
3435 3457
3436@@ -16473,6 +17175,9 @@ MAGIC_CMD=$MAGIC_CMD 3458@@ -16454,6 +17156,9 @@ MAGIC_CMD=$MAGIC_CMD
3437 # Must we lock files when doing compilation? 3459 # Must we lock files when doing compilation?
3438 need_locks=$lt_need_locks 3460 need_locks=$lt_need_locks
3439 3461
@@ -3443,7 +3465,7 @@ index be4b81c..6606a5f 100755
3443 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 3465 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
3444 DSYMUTIL=$lt_DSYMUTIL 3466 DSYMUTIL=$lt_DSYMUTIL
3445 3467
3446@@ -16587,12 +17292,12 @@ with_gcc=$GCC 3468@@ -16568,12 +17273,12 @@ with_gcc=$GCC
3447 # Compiler flag to turn off builtin functions. 3469 # Compiler flag to turn off builtin functions.
3448 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 3470 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
3449 3471
@@ -3459,7 +3481,7 @@ index be4b81c..6606a5f 100755
3459 # Compiler flag to prevent dynamic linking. 3481 # Compiler flag to prevent dynamic linking.
3460 link_static_flag=$lt_lt_prog_compiler_static 3482 link_static_flag=$lt_lt_prog_compiler_static
3461 3483
3462@@ -16679,9 +17384,6 @@ inherit_rpath=$inherit_rpath 3484@@ -16660,9 +17365,6 @@ inherit_rpath=$inherit_rpath
3463 # Whether libtool must link a program against all its dependency libraries. 3485 # Whether libtool must link a program against all its dependency libraries.
3464 link_all_deplibs=$link_all_deplibs 3486 link_all_deplibs=$link_all_deplibs
3465 3487
@@ -3469,7 +3491,7 @@ index be4b81c..6606a5f 100755
3469 # Set to "yes" if exported symbols are required. 3491 # Set to "yes" if exported symbols are required.
3470 always_export_symbols=$always_export_symbols 3492 always_export_symbols=$always_export_symbols
3471 3493
3472@@ -16697,6 +17399,9 @@ include_expsyms=$lt_include_expsyms 3494@@ -16678,6 +17380,9 @@ include_expsyms=$lt_include_expsyms
3473 # Commands necessary for linking programs (against libraries) with templates. 3495 # Commands necessary for linking programs (against libraries) with templates.
3474 prelink_cmds=$lt_prelink_cmds 3496 prelink_cmds=$lt_prelink_cmds
3475 3497
@@ -3479,7 +3501,7 @@ index be4b81c..6606a5f 100755
3479 # Specify filename containing input files. 3501 # Specify filename containing input files.
3480 file_list_spec=$lt_file_list_spec 3502 file_list_spec=$lt_file_list_spec
3481 3503
3482@@ -16729,210 +17434,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 3504@@ -16710,210 +17415,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
3483 # if finds mixed CR/LF and LF-only lines. Since sed operates in 3505 # if finds mixed CR/LF and LF-only lines. Since sed operates in
3484 # text mode, it properly converts lines to CR/LF. This bash problem 3506 # text mode, it properly converts lines to CR/LF. This bash problem
3485 # is reportedly fixed, but why not run on old versions too? 3507 # is reportedly fixed, but why not run on old versions too?
@@ -3854,23 +3876,32 @@ index be4b81c..6606a5f 100755
3854 chmod +x "$ofile" 3876 chmod +x "$ofile"
3855 3877
3856diff --git a/configure b/configure 3878diff --git a/configure b/configure
3857index e9f2f13..cbccb18 100755 3879index 85414ab..34b66f7 100755
3858--- a/configure 3880--- a/configure
3859+++ b/configure 3881+++ b/configure
3860@@ -8041,7 +8041,7 @@ case " $build_configdirs " in 3882@@ -3445,7 +3445,7 @@ case "${target}" in
3861 # For an installed makeinfo, we require it to be from texinfo 4.7 or 3883 ;;
3862 # higher, else we use the "missing" dummy. 3884 s390-*-* | s390x-*-*)
3863 if ${MAKEINFO} --version \ 3885 ;;
3864- | egrep 'texinfo[^0-9]*(4\.([7-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then 3886- sh*-*-* | sh[34]*-*-*)
3865+ | egrep 'texinfo[^0-9]*([1-3][0-9]|4.[4-9]|4.[1-9][0-9]+|[5-9])' >/dev/null 2>&1; then 3887+ sh-*-* | sh[34]*-*-*)
3866 : 3888 ;;
3867 else 3889 sh64-*-* | sh5*-*-*)
3868 MAKEINFO="$MISSING makeinfo" 3890 ;;
3891@@ -3939,7 +3939,7 @@ case "${target}" in
3892 or1k*-*-*)
3893 noconfigdirs="$noconfigdirs gdb"
3894 ;;
3895- sh*-*-* | sh64-*-*)
3896+ sh-*-* | sh64-*-*)
3897 case "${target}" in
3898 sh*-*-elf)
3899 ;;
3869diff --git a/gas/configure b/gas/configure 3900diff --git a/gas/configure b/gas/configure
3870index e9ba550..074886f 100755 3901index f2864b7..1c2a665 100755
3871--- a/gas/configure 3902--- a/gas/configure
3872+++ b/gas/configure 3903+++ b/gas/configure
3873@@ -645,8 +645,11 @@ OTOOL 3904@@ -647,8 +647,11 @@ OTOOL
3874 LIPO 3905 LIPO
3875 NMEDIT 3906 NMEDIT
3876 DSYMUTIL 3907 DSYMUTIL
@@ -3882,7 +3913,7 @@ index e9ba550..074886f 100755
3882 OBJDUMP 3913 OBJDUMP
3883 LN_S 3914 LN_S
3884 NM 3915 NM
3885@@ -757,6 +760,7 @@ enable_static 3916@@ -759,6 +762,7 @@ enable_static
3886 with_pic 3917 with_pic
3887 enable_fast_install 3918 enable_fast_install
3888 with_gnu_ld 3919 with_gnu_ld
@@ -3890,16 +3921,16 @@ index e9ba550..074886f 100755
3890 enable_libtool_lock 3921 enable_libtool_lock
3891 enable_plugins 3922 enable_plugins
3892 enable_largefile 3923 enable_largefile
3893@@ -1422,6 +1426,8 @@ Optional Packages: 3924@@ -1427,6 +1431,8 @@ Optional Packages:
3894 --with-pic try to use only PIC/non-PIC objects [default=use 3925 --with-pic try to use only PIC/non-PIC objects [default=use
3895 both] 3926 both]
3896 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 3927 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
3897+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR 3928+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
3898+ (or the compiler's sysroot if not specified). 3929+ (or the compiler's sysroot if not specified).
3899 --with-zlib include zlib support (auto/yes/no) default=auto 3930 --with-system-zlib use installed libz
3900 3931
3901 Some influential environment variables: 3932 Some influential environment variables:
3902@@ -4901,8 +4907,8 @@ esac 3933@@ -4906,8 +4912,8 @@ esac
3903 3934
3904 3935
3905 3936
@@ -3910,7 +3941,7 @@ index e9ba550..074886f 100755
3910 3941
3911 3942
3912 3943
3913@@ -4942,7 +4948,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 3944@@ -4947,7 +4953,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
3914 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 3945 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
3915 $as_echo_n "checking how to print strings... " >&6; } 3946 $as_echo_n "checking how to print strings... " >&6; }
3916 # Test print first, because it will be a builtin if present. 3947 # Test print first, because it will be a builtin if present.
@@ -3919,7 +3950,7 @@ index e9ba550..074886f 100755
3919 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 3950 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
3920 ECHO='print -r --' 3951 ECHO='print -r --'
3921 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 3952 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
3922@@ -5628,8 +5634,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 3953@@ -5633,8 +5639,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
3923 # Try some XSI features 3954 # Try some XSI features
3924 xsi_shell=no 3955 xsi_shell=no
3925 ( _lt_dummy="a/b/c" 3956 ( _lt_dummy="a/b/c"
@@ -3930,7 +3961,7 @@ index e9ba550..074886f 100755
3930 && eval 'test $(( 1 + 1 )) -eq 2 \ 3961 && eval 'test $(( 1 + 1 )) -eq 2 \
3931 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 3962 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
3932 && xsi_shell=yes 3963 && xsi_shell=yes
3933@@ -5678,6 +5684,80 @@ esac 3964@@ -5683,6 +5689,80 @@ esac
3934 3965
3935 3966
3936 3967
@@ -4011,7 +4042,7 @@ index e9ba550..074886f 100755
4011 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 4042 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
4012 $as_echo_n "checking for $LD option to reload object files... " >&6; } 4043 $as_echo_n "checking for $LD option to reload object files... " >&6; }
4013 if test "${lt_cv_ld_reload_flag+set}" = set; then : 4044 if test "${lt_cv_ld_reload_flag+set}" = set; then :
4014@@ -5694,6 +5774,11 @@ case $reload_flag in 4045@@ -5699,6 +5779,11 @@ case $reload_flag in
4015 esac 4046 esac
4016 reload_cmds='$LD$reload_flag -o $output$reload_objs' 4047 reload_cmds='$LD$reload_flag -o $output$reload_objs'
4017 case $host_os in 4048 case $host_os in
@@ -4023,7 +4054,7 @@ index e9ba550..074886f 100755
4023 darwin*) 4054 darwin*)
4024 if test "$GCC" = yes; then 4055 if test "$GCC" = yes; then
4025 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 4056 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
4026@@ -5862,7 +5947,8 @@ mingw* | pw32*) 4057@@ -5867,7 +5952,8 @@ mingw* | pw32*)
4027 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 4058 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
4028 lt_cv_file_magic_cmd='func_win32_libid' 4059 lt_cv_file_magic_cmd='func_win32_libid'
4029 else 4060 else
@@ -4033,7 +4064,7 @@ index e9ba550..074886f 100755
4033 lt_cv_file_magic_cmd='$OBJDUMP -f' 4064 lt_cv_file_magic_cmd='$OBJDUMP -f'
4034 fi 4065 fi
4035 ;; 4066 ;;
4036@@ -6016,6 +6102,21 @@ esac 4067@@ -6021,6 +6107,21 @@ esac
4037 fi 4068 fi
4038 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 4069 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
4039 $as_echo "$lt_cv_deplibs_check_method" >&6; } 4070 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -4055,7 +4086,7 @@ index e9ba550..074886f 100755
4055 file_magic_cmd=$lt_cv_file_magic_cmd 4086 file_magic_cmd=$lt_cv_file_magic_cmd
4056 deplibs_check_method=$lt_cv_deplibs_check_method 4087 deplibs_check_method=$lt_cv_deplibs_check_method
4057 test -z "$deplibs_check_method" && deplibs_check_method=unknown 4088 test -z "$deplibs_check_method" && deplibs_check_method=unknown
4058@@ -6031,9 +6132,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 4089@@ -6036,9 +6137,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
4059 4090
4060 4091
4061 4092
@@ -4220,7 +4251,7 @@ index e9ba550..074886f 100755
4220 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4251 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4221 $as_echo_n "checking for $ac_word... " >&6; } 4252 $as_echo_n "checking for $ac_word... " >&6; }
4222 if test "${ac_cv_prog_AR+set}" = set; then : 4253 if test "${ac_cv_prog_AR+set}" = set; then :
4223@@ -6049,7 +6303,7 @@ do 4254@@ -6054,7 +6308,7 @@ do
4224 test -z "$as_dir" && as_dir=. 4255 test -z "$as_dir" && as_dir=.
4225 for ac_exec_ext in '' $ac_executable_extensions; do 4256 for ac_exec_ext in '' $ac_executable_extensions; do
4226 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 4257 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -4229,7 +4260,7 @@ index e9ba550..074886f 100755
4229 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4260 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4230 break 2 4261 break 2
4231 fi 4262 fi
4232@@ -6069,11 +6323,15 @@ $as_echo "no" >&6; } 4263@@ -6074,11 +6328,15 @@ $as_echo "no" >&6; }
4233 fi 4264 fi
4234 4265
4235 4266
@@ -4248,7 +4279,7 @@ index e9ba550..074886f 100755
4248 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4279 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4249 $as_echo_n "checking for $ac_word... " >&6; } 4280 $as_echo_n "checking for $ac_word... " >&6; }
4250 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : 4281 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
4251@@ -6089,7 +6347,7 @@ do 4282@@ -6094,7 +6352,7 @@ do
4252 test -z "$as_dir" && as_dir=. 4283 test -z "$as_dir" && as_dir=.
4253 for ac_exec_ext in '' $ac_executable_extensions; do 4284 for ac_exec_ext in '' $ac_executable_extensions; do
4254 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 4285 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -4257,7 +4288,7 @@ index e9ba550..074886f 100755
4257 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4288 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4258 break 2 4289 break 2
4259 fi 4290 fi
4260@@ -6108,6 +6366,10 @@ else 4291@@ -6113,6 +6371,10 @@ else
4261 $as_echo "no" >&6; } 4292 $as_echo "no" >&6; }
4262 fi 4293 fi
4263 4294
@@ -4268,7 +4299,7 @@ index e9ba550..074886f 100755
4268 if test "x$ac_ct_AR" = x; then 4299 if test "x$ac_ct_AR" = x; then
4269 AR="false" 4300 AR="false"
4270 else 4301 else
4271@@ -6119,12 +6381,10 @@ ac_tool_warned=yes ;; 4302@@ -6124,12 +6386,10 @@ ac_tool_warned=yes ;;
4272 esac 4303 esac
4273 AR=$ac_ct_AR 4304 AR=$ac_ct_AR
4274 fi 4305 fi
@@ -4283,7 +4314,7 @@ index e9ba550..074886f 100755
4283 4314
4284 4315
4285 4316
4286@@ -6136,6 +6396,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 4317@@ -6141,6 +6401,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
4287 4318
4288 4319
4289 4320
@@ -4348,7 +4379,7 @@ index e9ba550..074886f 100755
4348 if test -n "$ac_tool_prefix"; then 4379 if test -n "$ac_tool_prefix"; then
4349 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 4380 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
4350 set dummy ${ac_tool_prefix}strip; ac_word=$2 4381 set dummy ${ac_tool_prefix}strip; ac_word=$2
4351@@ -6470,8 +6788,8 @@ esac 4382@@ -6475,8 +6793,8 @@ esac
4352 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 4383 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
4353 4384
4354 # Transform an extracted symbol line into symbol name and symbol address 4385 # Transform an extracted symbol line into symbol name and symbol address
@@ -4359,7 +4390,7 @@ index e9ba550..074886f 100755
4359 4390
4360 # Handle CRLF in mingw tool chain 4391 # Handle CRLF in mingw tool chain
4361 opt_cr= 4392 opt_cr=
4362@@ -6507,6 +6825,7 @@ for ac_symprfx in "" "_"; do 4393@@ -6512,6 +6830,7 @@ for ac_symprfx in "" "_"; do
4363 else 4394 else
4364 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 4395 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
4365 fi 4396 fi
@@ -4367,7 +4398,7 @@ index e9ba550..074886f 100755
4367 4398
4368 # Check to see that the pipe works correctly. 4399 # Check to see that the pipe works correctly.
4369 pipe_works=no 4400 pipe_works=no
4370@@ -6548,6 +6867,18 @@ _LT_EOF 4401@@ -6553,6 +6872,18 @@ _LT_EOF
4371 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 4402 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
4372 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 4403 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
4373 cat <<_LT_EOF > conftest.$ac_ext 4404 cat <<_LT_EOF > conftest.$ac_ext
@@ -4386,7 +4417,7 @@ index e9ba550..074886f 100755
4386 #ifdef __cplusplus 4417 #ifdef __cplusplus
4387 extern "C" { 4418 extern "C" {
4388 #endif 4419 #endif
4389@@ -6559,7 +6890,7 @@ _LT_EOF 4420@@ -6564,7 +6895,7 @@ _LT_EOF
4390 cat <<_LT_EOF >> conftest.$ac_ext 4421 cat <<_LT_EOF >> conftest.$ac_ext
4391 4422
4392 /* The mapping between symbol names and symbols. */ 4423 /* The mapping between symbol names and symbols. */
@@ -4395,7 +4426,7 @@ index e9ba550..074886f 100755
4395 const char *name; 4426 const char *name;
4396 void *address; 4427 void *address;
4397 } 4428 }
4398@@ -6585,8 +6916,8 @@ static const void *lt_preloaded_setup() { 4429@@ -6590,8 +6921,8 @@ static const void *lt_preloaded_setup() {
4399 _LT_EOF 4430 _LT_EOF
4400 # Now try linking the two files. 4431 # Now try linking the two files.
4401 mv conftest.$ac_objext conftstm.$ac_objext 4432 mv conftest.$ac_objext conftstm.$ac_objext
@@ -4406,7 +4437,7 @@ index e9ba550..074886f 100755
4406 LIBS="conftstm.$ac_objext" 4437 LIBS="conftstm.$ac_objext"
4407 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 4438 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
4408 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 4439 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
4409@@ -6596,8 +6927,8 @@ _LT_EOF 4440@@ -6601,8 +6932,8 @@ _LT_EOF
4410 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 4441 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
4411 pipe_works=yes 4442 pipe_works=yes
4412 fi 4443 fi
@@ -4417,7 +4448,7 @@ index e9ba550..074886f 100755
4417 else 4448 else
4418 echo "cannot find nm_test_func in $nlist" >&5 4449 echo "cannot find nm_test_func in $nlist" >&5
4419 fi 4450 fi
4420@@ -6634,6 +6965,21 @@ else 4451@@ -6639,6 +6970,21 @@ else
4421 $as_echo "ok" >&6; } 4452 $as_echo "ok" >&6; }
4422 fi 4453 fi
4423 4454
@@ -4439,7 +4470,7 @@ index e9ba550..074886f 100755
4439 4470
4440 4471
4441 4472
4442@@ -6652,6 +6998,40 @@ fi 4473@@ -6657,6 +7003,40 @@ fi
4443 4474
4444 4475
4445 4476
@@ -4480,7 +4511,7 @@ index e9ba550..074886f 100755
4480 4511
4481 4512
4482 4513
4483@@ -6861,6 +7241,123 @@ esac 4514@@ -6866,6 +7246,123 @@ esac
4484 4515
4485 need_locks="$enable_libtool_lock" 4516 need_locks="$enable_libtool_lock"
4486 4517
@@ -4604,7 +4635,7 @@ index e9ba550..074886f 100755
4604 4635
4605 case $host_os in 4636 case $host_os in
4606 rhapsody* | darwin*) 4637 rhapsody* | darwin*)
4607@@ -7424,6 +7921,8 @@ _LT_EOF 4638@@ -7429,6 +7926,8 @@ _LT_EOF
4608 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 4639 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
4609 echo "$AR cru libconftest.a conftest.o" >&5 4640 echo "$AR cru libconftest.a conftest.o" >&5
4610 $AR cru libconftest.a conftest.o 2>&5 4641 $AR cru libconftest.a conftest.o 2>&5
@@ -4613,7 +4644,7 @@ index e9ba550..074886f 100755
4613 cat > conftest.c << _LT_EOF 4644 cat > conftest.c << _LT_EOF
4614 int main() { return 0;} 4645 int main() { return 0;}
4615 _LT_EOF 4646 _LT_EOF
4616@@ -7619,7 +8118,8 @@ fi 4647@@ -7624,7 +8123,8 @@ fi
4617 LIBTOOL_DEPS="$ltmain" 4648 LIBTOOL_DEPS="$ltmain"
4618 4649
4619 # Always use our own libtool. 4650 # Always use our own libtool.
@@ -4623,7 +4654,7 @@ index e9ba550..074886f 100755
4623 4654
4624 4655
4625 4656
4626@@ -7708,7 +8208,7 @@ aix3*) 4657@@ -7713,7 +8213,7 @@ aix3*)
4627 esac 4658 esac
4628 4659
4629 # Global variables: 4660 # Global variables:
@@ -4632,7 +4663,7 @@ index e9ba550..074886f 100755
4632 can_build_shared=yes 4663 can_build_shared=yes
4633 4664
4634 # All known linkers require a `.a' archive for static linking (except MSVC, 4665 # All known linkers require a `.a' archive for static linking (except MSVC,
4635@@ -8006,8 +8506,6 @@ fi 4666@@ -8011,8 +8511,6 @@ fi
4636 lt_prog_compiler_pic= 4667 lt_prog_compiler_pic=
4637 lt_prog_compiler_static= 4668 lt_prog_compiler_static=
4638 4669
@@ -4641,7 +4672,7 @@ index e9ba550..074886f 100755
4641 4672
4642 if test "$GCC" = yes; then 4673 if test "$GCC" = yes; then
4643 lt_prog_compiler_wl='-Wl,' 4674 lt_prog_compiler_wl='-Wl,'
4644@@ -8173,6 +8671,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 4675@@ -8178,6 +8676,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
4645 lt_prog_compiler_pic='--shared' 4676 lt_prog_compiler_pic='--shared'
4646 lt_prog_compiler_static='--static' 4677 lt_prog_compiler_static='--static'
4647 ;; 4678 ;;
@@ -4654,7 +4685,7 @@ index e9ba550..074886f 100755
4654 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 4685 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
4655 # Portland Group compilers (*not* the Pentium gcc compiler, 4686 # Portland Group compilers (*not* the Pentium gcc compiler,
4656 # which looks to be a dead project) 4687 # which looks to be a dead project)
4657@@ -8235,7 +8739,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 4688@@ -8240,7 +8744,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
4658 lt_prog_compiler_pic='-KPIC' 4689 lt_prog_compiler_pic='-KPIC'
4659 lt_prog_compiler_static='-Bstatic' 4690 lt_prog_compiler_static='-Bstatic'
4660 case $cc_basename in 4691 case $cc_basename in
@@ -4663,7 +4694,7 @@ index e9ba550..074886f 100755
4663 lt_prog_compiler_wl='-Qoption ld ';; 4694 lt_prog_compiler_wl='-Qoption ld ';;
4664 *) 4695 *)
4665 lt_prog_compiler_wl='-Wl,';; 4696 lt_prog_compiler_wl='-Wl,';;
4666@@ -8292,13 +8796,17 @@ case $host_os in 4697@@ -8297,13 +8801,17 @@ case $host_os in
4667 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 4698 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
4668 ;; 4699 ;;
4669 esac 4700 esac
@@ -4687,7 +4718,7 @@ index e9ba550..074886f 100755
4687 4718
4688 # 4719 #
4689 # Check to make sure the PIC flag actually works. 4720 # Check to make sure the PIC flag actually works.
4690@@ -8359,6 +8867,11 @@ fi 4721@@ -8364,6 +8872,11 @@ fi
4691 4722
4692 4723
4693 4724
@@ -4699,7 +4730,7 @@ index e9ba550..074886f 100755
4699 # 4730 #
4700 # Check to make sure the static flag actually works. 4731 # Check to make sure the static flag actually works.
4701 # 4732 #
4702@@ -8709,7 +9222,8 @@ _LT_EOF 4733@@ -8714,7 +9227,8 @@ _LT_EOF
4703 allow_undefined_flag=unsupported 4734 allow_undefined_flag=unsupported
4704 always_export_symbols=no 4735 always_export_symbols=no
4705 enable_shared_with_static_runtimes=yes 4736 enable_shared_with_static_runtimes=yes
@@ -4709,16 +4740,7 @@ index e9ba550..074886f 100755
4709 4740
4710 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 4741 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
4711 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 4742 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
4712@@ -8757,7 +9271,7 @@ _LT_EOF 4743@@ -8813,12 +9327,12 @@ _LT_EOF
4713 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
4714 && test "$tmp_diet" = no
4715 then
4716- tmp_addflag=
4717+ tmp_addflag=' $pic_flag'
4718 tmp_sharedflag='-shared'
4719 case $cc_basename,$host_cpu in
4720 pgcc*) # Portland Group C compiler
4721@@ -8808,12 +9322,12 @@ _LT_EOF
4722 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 4744 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
4723 hardcode_libdir_flag_spec= 4745 hardcode_libdir_flag_spec=
4724 hardcode_libdir_flag_spec_ld='-rpath $libdir' 4746 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -4733,7 +4755,7 @@ index e9ba550..074886f 100755
4733 fi 4755 fi
4734 ;; 4756 ;;
4735 esac 4757 esac
4736@@ -8827,8 +9341,8 @@ _LT_EOF 4758@@ -8832,8 +9346,8 @@ _LT_EOF
4737 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 4759 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
4738 wlarc= 4760 wlarc=
4739 else 4761 else
@@ -4744,7 +4766,7 @@ index e9ba550..074886f 100755
4744 fi 4766 fi
4745 ;; 4767 ;;
4746 4768
4747@@ -8846,8 +9360,8 @@ _LT_EOF 4769@@ -8851,8 +9365,8 @@ _LT_EOF
4748 4770
4749 _LT_EOF 4771 _LT_EOF
4750 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 4772 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -4755,7 +4777,7 @@ index e9ba550..074886f 100755
4755 else 4777 else
4756 ld_shlibs=no 4778 ld_shlibs=no
4757 fi 4779 fi
4758@@ -8893,8 +9407,8 @@ _LT_EOF 4780@@ -8898,8 +9412,8 @@ _LT_EOF
4759 4781
4760 *) 4782 *)
4761 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 4783 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -4766,7 +4788,7 @@ index e9ba550..074886f 100755
4766 else 4788 else
4767 ld_shlibs=no 4789 ld_shlibs=no
4768 fi 4790 fi
4769@@ -9024,7 +9538,13 @@ _LT_EOF 4791@@ -9029,7 +9543,13 @@ _LT_EOF
4770 allow_undefined_flag='-berok' 4792 allow_undefined_flag='-berok'
4771 # Determine the default libpath from the value encoded in an 4793 # Determine the default libpath from the value encoded in an
4772 # empty executable. 4794 # empty executable.
@@ -4781,7 +4803,7 @@ index e9ba550..074886f 100755
4781 /* end confdefs.h. */ 4803 /* end confdefs.h. */
4782 4804
4783 int 4805 int
4784@@ -9037,22 +9557,29 @@ main () 4806@@ -9042,22 +9562,29 @@ main ()
4785 _ACEOF 4807 _ACEOF
4786 if ac_fn_c_try_link "$LINENO"; then : 4808 if ac_fn_c_try_link "$LINENO"; then :
4787 4809
@@ -4824,7 +4846,7 @@ index e9ba550..074886f 100755
4824 4846
4825 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 4847 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
4826 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" 4848 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
4827@@ -9064,7 +9591,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4849@@ -9069,7 +9596,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4828 else 4850 else
4829 # Determine the default libpath from the value encoded in an 4851 # Determine the default libpath from the value encoded in an
4830 # empty executable. 4852 # empty executable.
@@ -4839,7 +4861,7 @@ index e9ba550..074886f 100755
4839 /* end confdefs.h. */ 4861 /* end confdefs.h. */
4840 4862
4841 int 4863 int
4842@@ -9077,22 +9610,29 @@ main () 4864@@ -9082,22 +9615,29 @@ main ()
4843 _ACEOF 4865 _ACEOF
4844 if ac_fn_c_try_link "$LINENO"; then : 4866 if ac_fn_c_try_link "$LINENO"; then :
4845 4867
@@ -4882,7 +4904,7 @@ index e9ba550..074886f 100755
4882 4904
4883 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 4905 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
4884 # Warning - without using the other run time loading flags, 4906 # Warning - without using the other run time loading flags,
4885@@ -9137,20 +9677,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4907@@ -9142,20 +9682,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4886 # Microsoft Visual C++. 4908 # Microsoft Visual C++.
4887 # hardcode_libdir_flag_spec is actually meaningless, as there is 4909 # hardcode_libdir_flag_spec is actually meaningless, as there is
4888 # no search path for DLLs. 4910 # no search path for DLLs.
@@ -4960,7 +4982,7 @@ index e9ba550..074886f 100755
4960 ;; 4982 ;;
4961 4983
4962 darwin* | rhapsody*) 4984 darwin* | rhapsody*)
4963@@ -9211,7 +9794,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4985@@ -9216,7 +9799,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4964 4986
4965 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 4987 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
4966 freebsd* | dragonfly*) 4988 freebsd* | dragonfly*)
@@ -4969,7 +4991,7 @@ index e9ba550..074886f 100755
4969 hardcode_libdir_flag_spec='-R$libdir' 4991 hardcode_libdir_flag_spec='-R$libdir'
4970 hardcode_direct=yes 4992 hardcode_direct=yes
4971 hardcode_shlibpath_var=no 4993 hardcode_shlibpath_var=no
4972@@ -9219,7 +9802,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4994@@ -9224,7 +9807,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4973 4995
4974 hpux9*) 4996 hpux9*)
4975 if test "$GCC" = yes; then 4997 if test "$GCC" = yes; then
@@ -4978,7 +5000,7 @@ index e9ba550..074886f 100755
4978 else 5000 else
4979 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' 5001 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
4980 fi 5002 fi
4981@@ -9235,7 +9818,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 5003@@ -9240,7 +9823,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4982 5004
4983 hpux10*) 5005 hpux10*)
4984 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 5006 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -4987,7 +5009,7 @@ index e9ba550..074886f 100755
4987 else 5009 else
4988 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 5010 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
4989 fi 5011 fi
4990@@ -9259,10 +9842,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 5012@@ -9264,10 +9847,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4991 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 5013 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
4992 ;; 5014 ;;
4993 ia64*) 5015 ia64*)
@@ -5000,7 +5022,7 @@ index e9ba550..074886f 100755
5000 ;; 5022 ;;
5001 esac 5023 esac
5002 else 5024 else
5003@@ -9341,23 +9924,36 @@ fi 5025@@ -9346,23 +9929,36 @@ fi
5004 5026
5005 irix5* | irix6* | nonstopux*) 5027 irix5* | irix6* | nonstopux*)
5006 if test "$GCC" = yes; then 5028 if test "$GCC" = yes; then
@@ -5045,7 +5067,7 @@ index e9ba550..074886f 100755
5045 else 5067 else
5046 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' 5068 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
5047 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' 5069 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
5048@@ -9442,7 +10038,7 @@ rm -f core conftest.err conftest.$ac_objext \ 5070@@ -9447,7 +10043,7 @@ rm -f core conftest.err conftest.$ac_objext \
5049 osf4* | osf5*) # as osf3* with the addition of -msym flag 5071 osf4* | osf5*) # as osf3* with the addition of -msym flag
5050 if test "$GCC" = yes; then 5072 if test "$GCC" = yes; then
5051 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 5073 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -5054,7 +5076,7 @@ index e9ba550..074886f 100755
5054 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 5076 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
5055 else 5077 else
5056 allow_undefined_flag=' -expect_unresolved \*' 5078 allow_undefined_flag=' -expect_unresolved \*'
5057@@ -9461,9 +10057,9 @@ rm -f core conftest.err conftest.$ac_objext \ 5079@@ -9466,9 +10062,9 @@ rm -f core conftest.err conftest.$ac_objext \
5058 no_undefined_flag=' -z defs' 5080 no_undefined_flag=' -z defs'
5059 if test "$GCC" = yes; then 5081 if test "$GCC" = yes; then
5060 wlarc='${wl}' 5082 wlarc='${wl}'
@@ -5066,7 +5088,7 @@ index e9ba550..074886f 100755
5066 else 5088 else
5067 case `$CC -V 2>&1` in 5089 case `$CC -V 2>&1` in
5068 *"Compilers 5.0"*) 5090 *"Compilers 5.0"*)
5069@@ -10039,8 +10635,9 @@ cygwin* | mingw* | pw32* | cegcc*) 5091@@ -10044,8 +10640,9 @@ cygwin* | mingw* | pw32* | cegcc*)
5070 need_version=no 5092 need_version=no
5071 need_lib_prefix=no 5093 need_lib_prefix=no
5072 5094
@@ -5078,7 +5100,7 @@ index e9ba550..074886f 100755
5078 library_names_spec='$libname.dll.a' 5100 library_names_spec='$libname.dll.a'
5079 # DLL is installed to $(libdir)/../bin by postinstall_cmds 5101 # DLL is installed to $(libdir)/../bin by postinstall_cmds
5080 postinstall_cmds='base_file=`basename \${file}`~ 5102 postinstall_cmds='base_file=`basename \${file}`~
5081@@ -10073,13 +10670,71 @@ cygwin* | mingw* | pw32* | cegcc*) 5103@@ -10078,13 +10675,71 @@ cygwin* | mingw* | pw32* | cegcc*)
5082 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 5104 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
5083 ;; 5105 ;;
5084 esac 5106 esac
@@ -5151,7 +5173,7 @@ index e9ba550..074886f 100755
5151 # FIXME: first we should search . and the directory the executable is in 5173 # FIXME: first we should search . and the directory the executable is in
5152 shlibpath_var=PATH 5174 shlibpath_var=PATH
5153 ;; 5175 ;;
5154@@ -10171,7 +10826,7 @@ haiku*) 5176@@ -10176,7 +10831,7 @@ haiku*)
5155 soname_spec='${libname}${release}${shared_ext}$major' 5177 soname_spec='${libname}${release}${shared_ext}$major'
5156 shlibpath_var=LIBRARY_PATH 5178 shlibpath_var=LIBRARY_PATH
5157 shlibpath_overrides_runpath=yes 5179 shlibpath_overrides_runpath=yes
@@ -5160,7 +5182,16 @@ index e9ba550..074886f 100755
5160 hardcode_into_libs=yes 5182 hardcode_into_libs=yes
5161 ;; 5183 ;;
5162 5184
5163@@ -11011,10 +11666,10 @@ else 5185@@ -10972,7 +11627,7 @@ else
5186 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
5187 lt_status=$lt_dlunknown
5188 cat > conftest.$ac_ext <<_LT_EOF
5189-#line 10975 "configure"
5190+#line $LINENO "configure"
5191 #include "confdefs.h"
5192
5193 #if HAVE_DLFCN_H
5194@@ -11016,10 +11671,10 @@ else
5164 /* When -fvisbility=hidden is used, assume the code has been annotated 5195 /* When -fvisbility=hidden is used, assume the code has been annotated
5165 correspondingly for the symbols needed. */ 5196 correspondingly for the symbols needed. */
5166 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 5197 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -5173,7 +5204,16 @@ index e9ba550..074886f 100755
5173 int main () 5204 int main ()
5174 { 5205 {
5175 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 5206 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
5176@@ -11117,10 +11772,10 @@ else 5207@@ -11078,7 +11733,7 @@ else
5208 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
5209 lt_status=$lt_dlunknown
5210 cat > conftest.$ac_ext <<_LT_EOF
5211-#line 11081 "configure"
5212+#line $LINENO "configure"
5213 #include "confdefs.h"
5214
5215 #if HAVE_DLFCN_H
5216@@ -11122,10 +11777,10 @@ else
5177 /* When -fvisbility=hidden is used, assume the code has been annotated 5217 /* When -fvisbility=hidden is used, assume the code has been annotated
5178 correspondingly for the symbols needed. */ 5218 correspondingly for the symbols needed. */
5179 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 5219 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -5186,7 +5226,7 @@ index e9ba550..074886f 100755
5186 int main () 5226 int main ()
5187 { 5227 {
5188 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 5228 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
5189@@ -15274,13 +15929,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 5229@@ -15241,13 +15896,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
5190 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 5230 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
5191 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 5231 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
5192 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 5232 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -5207,7 +5247,7 @@ index e9ba550..074886f 100755
5207 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 5247 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
5208 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 5248 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
5209 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 5249 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
5210@@ -15295,14 +15957,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 5250@@ -15262,14 +15924,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
5211 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 5251 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
5212 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 5252 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
5213 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"`' 5253 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"`'
@@ -5226,7 +5266,7 @@ index e9ba550..074886f 100755
5226 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 5266 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
5227 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 5267 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
5228 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 5268 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
5229@@ -15335,12 +16000,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 5269@@ -15302,12 +15967,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
5230 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 5270 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
5231 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 5271 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
5232 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 5272 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -5240,7 +5280,7 @@ index e9ba550..074886f 100755
5240 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 5280 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
5241 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 5281 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
5242 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 5282 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
5243@@ -15395,8 +16060,13 @@ reload_flag \ 5283@@ -15362,8 +16027,13 @@ reload_flag \
5244 OBJDUMP \ 5284 OBJDUMP \
5245 deplibs_check_method \ 5285 deplibs_check_method \
5246 file_magic_cmd \ 5286 file_magic_cmd \
@@ -5254,7 +5294,7 @@ index e9ba550..074886f 100755
5254 STRIP \ 5294 STRIP \
5255 RANLIB \ 5295 RANLIB \
5256 CC \ 5296 CC \
5257@@ -15406,12 +16076,14 @@ lt_cv_sys_global_symbol_pipe \ 5297@@ -15373,12 +16043,14 @@ lt_cv_sys_global_symbol_pipe \
5258 lt_cv_sys_global_symbol_to_cdecl \ 5298 lt_cv_sys_global_symbol_to_cdecl \
5259 lt_cv_sys_global_symbol_to_c_name_address \ 5299 lt_cv_sys_global_symbol_to_c_name_address \
5260 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 5300 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -5270,7 +5310,7 @@ index e9ba550..074886f 100755
5270 DSYMUTIL \ 5310 DSYMUTIL \
5271 NMEDIT \ 5311 NMEDIT \
5272 LIPO \ 5312 LIPO \
5273@@ -15427,7 +16099,6 @@ no_undefined_flag \ 5313@@ -15394,7 +16066,6 @@ no_undefined_flag \
5274 hardcode_libdir_flag_spec \ 5314 hardcode_libdir_flag_spec \
5275 hardcode_libdir_flag_spec_ld \ 5315 hardcode_libdir_flag_spec_ld \
5276 hardcode_libdir_separator \ 5316 hardcode_libdir_separator \
@@ -5278,7 +5318,7 @@ index e9ba550..074886f 100755
5278 exclude_expsyms \ 5318 exclude_expsyms \
5279 include_expsyms \ 5319 include_expsyms \
5280 file_list_spec \ 5320 file_list_spec \
5281@@ -15463,6 +16134,7 @@ module_cmds \ 5321@@ -15430,6 +16101,7 @@ module_cmds \
5282 module_expsym_cmds \ 5322 module_expsym_cmds \
5283 export_symbols_cmds \ 5323 export_symbols_cmds \
5284 prelink_cmds \ 5324 prelink_cmds \
@@ -5286,7 +5326,7 @@ index e9ba550..074886f 100755
5286 postinstall_cmds \ 5326 postinstall_cmds \
5287 postuninstall_cmds \ 5327 postuninstall_cmds \
5288 finish_cmds \ 5328 finish_cmds \
5289@@ -16227,7 +16899,8 @@ $as_echo X"$file" | 5329@@ -16194,7 +16866,8 @@ $as_echo X"$file" |
5290 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 5330 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
5291 # 5331 #
5292 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 5332 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -5296,7 +5336,7 @@ index e9ba550..074886f 100755
5296 # Written by Gordon Matzigkeit, 1996 5336 # Written by Gordon Matzigkeit, 1996
5297 # 5337 #
5298 # This file is part of GNU Libtool. 5338 # This file is part of GNU Libtool.
5299@@ -16330,19 +17003,42 @@ SP2NL=$lt_lt_SP2NL 5339@@ -16297,19 +16970,42 @@ SP2NL=$lt_lt_SP2NL
5300 # turn newlines into spaces. 5340 # turn newlines into spaces.
5301 NL2SP=$lt_lt_NL2SP 5341 NL2SP=$lt_lt_NL2SP
5302 5342
@@ -5340,7 +5380,7 @@ index e9ba550..074886f 100755
5340 # A symbol stripping program. 5380 # A symbol stripping program.
5341 STRIP=$lt_STRIP 5381 STRIP=$lt_STRIP
5342 5382
5343@@ -16372,6 +17068,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 5383@@ -16339,6 +17035,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
5344 # Transform the output of nm in a C name address pair when lib prefix is needed. 5384 # Transform the output of nm in a C name address pair when lib prefix is needed.
5345 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 5385 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
5346 5386
@@ -5353,7 +5393,7 @@ index e9ba550..074886f 100755
5353 # The name of the directory that contains temporary libtool files. 5393 # The name of the directory that contains temporary libtool files.
5354 objdir=$objdir 5394 objdir=$objdir
5355 5395
5356@@ -16381,6 +17083,9 @@ MAGIC_CMD=$MAGIC_CMD 5396@@ -16348,6 +17050,9 @@ MAGIC_CMD=$MAGIC_CMD
5357 # Must we lock files when doing compilation? 5397 # Must we lock files when doing compilation?
5358 need_locks=$lt_need_locks 5398 need_locks=$lt_need_locks
5359 5399
@@ -5363,7 +5403,7 @@ index e9ba550..074886f 100755
5363 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 5403 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
5364 DSYMUTIL=$lt_DSYMUTIL 5404 DSYMUTIL=$lt_DSYMUTIL
5365 5405
5366@@ -16495,12 +17200,12 @@ with_gcc=$GCC 5406@@ -16462,12 +17167,12 @@ with_gcc=$GCC
5367 # Compiler flag to turn off builtin functions. 5407 # Compiler flag to turn off builtin functions.
5368 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 5408 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
5369 5409
@@ -5379,7 +5419,7 @@ index e9ba550..074886f 100755
5379 # Compiler flag to prevent dynamic linking. 5419 # Compiler flag to prevent dynamic linking.
5380 link_static_flag=$lt_lt_prog_compiler_static 5420 link_static_flag=$lt_lt_prog_compiler_static
5381 5421
5382@@ -16587,9 +17292,6 @@ inherit_rpath=$inherit_rpath 5422@@ -16554,9 +17259,6 @@ inherit_rpath=$inherit_rpath
5383 # Whether libtool must link a program against all its dependency libraries. 5423 # Whether libtool must link a program against all its dependency libraries.
5384 link_all_deplibs=$link_all_deplibs 5424 link_all_deplibs=$link_all_deplibs
5385 5425
@@ -5389,7 +5429,7 @@ index e9ba550..074886f 100755
5389 # Set to "yes" if exported symbols are required. 5429 # Set to "yes" if exported symbols are required.
5390 always_export_symbols=$always_export_symbols 5430 always_export_symbols=$always_export_symbols
5391 5431
5392@@ -16605,6 +17307,9 @@ include_expsyms=$lt_include_expsyms 5432@@ -16572,6 +17274,9 @@ include_expsyms=$lt_include_expsyms
5393 # Commands necessary for linking programs (against libraries) with templates. 5433 # Commands necessary for linking programs (against libraries) with templates.
5394 prelink_cmds=$lt_prelink_cmds 5434 prelink_cmds=$lt_prelink_cmds
5395 5435
@@ -5399,7 +5439,7 @@ index e9ba550..074886f 100755
5399 # Specify filename containing input files. 5439 # Specify filename containing input files.
5400 file_list_spec=$lt_file_list_spec 5440 file_list_spec=$lt_file_list_spec
5401 5441
5402@@ -16637,210 +17342,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 5442@@ -16604,210 +17309,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
5403 # if finds mixed CR/LF and LF-only lines. Since sed operates in 5443 # if finds mixed CR/LF and LF-only lines. Since sed operates in
5404 # text mode, it properly converts lines to CR/LF. This bash problem 5444 # text mode, it properly converts lines to CR/LF. This bash problem
5405 # is reportedly fixed, but why not run on old versions too? 5445 # is reportedly fixed, but why not run on old versions too?
@@ -5774,7 +5814,7 @@ index e9ba550..074886f 100755
5774 chmod +x "$ofile" 5814 chmod +x "$ofile"
5775 5815
5776diff --git a/gprof/configure b/gprof/configure 5816diff --git a/gprof/configure b/gprof/configure
5777index 79961c5..c4f6ac9 100755 5817index 7dcd141..45b2592 100755
5778--- a/gprof/configure 5818--- a/gprof/configure
5779+++ b/gprof/configure 5819+++ b/gprof/configure
5780@@ -629,8 +629,11 @@ OTOOL 5820@@ -629,8 +629,11 @@ OTOOL
@@ -6628,15 +6668,6 @@ index 79961c5..c4f6ac9 100755
6628 6668
6629 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 6669 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
6630 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 6670 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
6631@@ -8692,7 +9201,7 @@ _LT_EOF
6632 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
6633 && test "$tmp_diet" = no
6634 then
6635- tmp_addflag=
6636+ tmp_addflag=' $pic_flag'
6637 tmp_sharedflag='-shared'
6638 case $cc_basename,$host_cpu in
6639 pgcc*) # Portland Group C compiler
6640@@ -8743,12 +9252,12 @@ _LT_EOF 6671@@ -8743,12 +9252,12 @@ _LT_EOF
6641 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 6672 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
6642 hardcode_libdir_flag_spec= 6673 hardcode_libdir_flag_spec=
@@ -7079,6 +7110,15 @@ index 79961c5..c4f6ac9 100755
7079 hardcode_into_libs=yes 7110 hardcode_into_libs=yes
7080 ;; 7111 ;;
7081 7112
7113@@ -10902,7 +11552,7 @@ else
7114 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
7115 lt_status=$lt_dlunknown
7116 cat > conftest.$ac_ext <<_LT_EOF
7117-#line 10900 "configure"
7118+#line $LINENO "configure"
7119 #include "confdefs.h"
7120
7121 #if HAVE_DLFCN_H
7082@@ -10946,10 +11596,10 @@ else 7122@@ -10946,10 +11596,10 @@ else
7083 /* When -fvisbility=hidden is used, assume the code has been annotated 7123 /* When -fvisbility=hidden is used, assume the code has been annotated
7084 correspondingly for the symbols needed. */ 7124 correspondingly for the symbols needed. */
@@ -7092,6 +7132,15 @@ index 79961c5..c4f6ac9 100755
7092 int main () 7132 int main ()
7093 { 7133 {
7094 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 7134 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
7135@@ -11008,7 +11658,7 @@ else
7136 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
7137 lt_status=$lt_dlunknown
7138 cat > conftest.$ac_ext <<_LT_EOF
7139-#line 11006 "configure"
7140+#line $LINENO "configure"
7141 #include "confdefs.h"
7142
7143 #if HAVE_DLFCN_H
7095@@ -11052,10 +11702,10 @@ else 7144@@ -11052,10 +11702,10 @@ else
7096 /* When -fvisbility=hidden is used, assume the code has been annotated 7145 /* When -fvisbility=hidden is used, assume the code has been annotated
7097 correspondingly for the symbols needed. */ 7146 correspondingly for the symbols needed. */
@@ -7693,10 +7742,10 @@ index 79961c5..c4f6ac9 100755
7693 chmod +x "$ofile" 7742 chmod +x "$ofile"
7694 7743
7695diff --git a/ld/configure b/ld/configure 7744diff --git a/ld/configure b/ld/configure
7696index 4408b0d..2fbaebf 100755 7745index b900175..7a20e4e 100755
7697--- a/ld/configure 7746--- a/ld/configure
7698+++ b/ld/configure 7747+++ b/ld/configure
7699@@ -654,8 +654,11 @@ OTOOL 7748@@ -657,8 +657,11 @@ OTOOL
7700 LIPO 7749 LIPO
7701 NMEDIT 7750 NMEDIT
7702 DSYMUTIL 7751 DSYMUTIL
@@ -7708,7 +7757,7 @@ index 4408b0d..2fbaebf 100755
7708 OBJDUMP 7757 OBJDUMP
7709 LN_S 7758 LN_S
7710 NM 7759 NM
7711@@ -776,6 +779,7 @@ enable_static 7760@@ -779,6 +782,7 @@ enable_static
7712 with_pic 7761 with_pic
7713 enable_fast_install 7762 enable_fast_install
7714 with_gnu_ld 7763 with_gnu_ld
@@ -7716,7 +7765,7 @@ index 4408b0d..2fbaebf 100755
7716 enable_libtool_lock 7765 enable_libtool_lock
7717 enable_plugins 7766 enable_plugins
7718 enable_largefile 7767 enable_largefile
7719@@ -1453,6 +1457,8 @@ Optional Packages: 7768@@ -1458,6 +1462,8 @@ Optional Packages:
7720 --with-pic try to use only PIC/non-PIC objects [default=use 7769 --with-pic try to use only PIC/non-PIC objects [default=use
7721 both] 7770 both]
7722 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 7771 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -7724,8 +7773,8 @@ index 4408b0d..2fbaebf 100755
7724+ (or the compiler's sysroot if not specified). 7773+ (or the compiler's sysroot if not specified).
7725 --with-lib-path=dir1:dir2... set default LIB_PATH 7774 --with-lib-path=dir1:dir2... set default LIB_PATH
7726 --with-sysroot=DIR Search for usr/lib et al within DIR. 7775 --with-sysroot=DIR Search for usr/lib et al within DIR.
7727 --with-zlib include zlib support (auto/yes/no) default=auto 7776
7728@@ -5645,8 +5651,8 @@ esac 7777@@ -5649,8 +5655,8 @@ esac
7729 7778
7730 7779
7731 7780
@@ -7736,7 +7785,7 @@ index 4408b0d..2fbaebf 100755
7736 7785
7737 7786
7738 7787
7739@@ -5686,7 +5692,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 7788@@ -5690,7 +5696,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
7740 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 7789 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
7741 $as_echo_n "checking how to print strings... " >&6; } 7790 $as_echo_n "checking how to print strings... " >&6; }
7742 # Test print first, because it will be a builtin if present. 7791 # Test print first, because it will be a builtin if present.
@@ -7745,7 +7794,7 @@ index 4408b0d..2fbaebf 100755
7745 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 7794 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
7746 ECHO='print -r --' 7795 ECHO='print -r --'
7747 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 7796 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
7748@@ -6372,8 +6378,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 7797@@ -6376,8 +6382,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
7749 # Try some XSI features 7798 # Try some XSI features
7750 xsi_shell=no 7799 xsi_shell=no
7751 ( _lt_dummy="a/b/c" 7800 ( _lt_dummy="a/b/c"
@@ -7756,7 +7805,7 @@ index 4408b0d..2fbaebf 100755
7756 && eval 'test $(( 1 + 1 )) -eq 2 \ 7805 && eval 'test $(( 1 + 1 )) -eq 2 \
7757 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 7806 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
7758 && xsi_shell=yes 7807 && xsi_shell=yes
7759@@ -6422,6 +6428,80 @@ esac 7808@@ -6426,6 +6432,80 @@ esac
7760 7809
7761 7810
7762 7811
@@ -7837,7 +7886,7 @@ index 4408b0d..2fbaebf 100755
7837 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 7886 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
7838 $as_echo_n "checking for $LD option to reload object files... " >&6; } 7887 $as_echo_n "checking for $LD option to reload object files... " >&6; }
7839 if test "${lt_cv_ld_reload_flag+set}" = set; then : 7888 if test "${lt_cv_ld_reload_flag+set}" = set; then :
7840@@ -6438,6 +6518,11 @@ case $reload_flag in 7889@@ -6442,6 +6522,11 @@ case $reload_flag in
7841 esac 7890 esac
7842 reload_cmds='$LD$reload_flag -o $output$reload_objs' 7891 reload_cmds='$LD$reload_flag -o $output$reload_objs'
7843 case $host_os in 7892 case $host_os in
@@ -7849,7 +7898,7 @@ index 4408b0d..2fbaebf 100755
7849 darwin*) 7898 darwin*)
7850 if test "$GCC" = yes; then 7899 if test "$GCC" = yes; then
7851 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 7900 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
7852@@ -6606,7 +6691,8 @@ mingw* | pw32*) 7901@@ -6610,7 +6695,8 @@ mingw* | pw32*)
7853 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 7902 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
7854 lt_cv_file_magic_cmd='func_win32_libid' 7903 lt_cv_file_magic_cmd='func_win32_libid'
7855 else 7904 else
@@ -7859,7 +7908,7 @@ index 4408b0d..2fbaebf 100755
7859 lt_cv_file_magic_cmd='$OBJDUMP -f' 7908 lt_cv_file_magic_cmd='$OBJDUMP -f'
7860 fi 7909 fi
7861 ;; 7910 ;;
7862@@ -6760,6 +6846,21 @@ esac 7911@@ -6764,6 +6850,21 @@ esac
7863 fi 7912 fi
7864 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 7913 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
7865 $as_echo "$lt_cv_deplibs_check_method" >&6; } 7914 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -7881,7 +7930,7 @@ index 4408b0d..2fbaebf 100755
7881 file_magic_cmd=$lt_cv_file_magic_cmd 7930 file_magic_cmd=$lt_cv_file_magic_cmd
7882 deplibs_check_method=$lt_cv_deplibs_check_method 7931 deplibs_check_method=$lt_cv_deplibs_check_method
7883 test -z "$deplibs_check_method" && deplibs_check_method=unknown 7932 test -z "$deplibs_check_method" && deplibs_check_method=unknown
7884@@ -6775,9 +6876,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 7933@@ -6779,9 +6880,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
7885 7934
7886 7935
7887 7936
@@ -8046,7 +8095,7 @@ index 4408b0d..2fbaebf 100755
8046 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8095 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8047 $as_echo_n "checking for $ac_word... " >&6; } 8096 $as_echo_n "checking for $ac_word... " >&6; }
8048 if test "${ac_cv_prog_AR+set}" = set; then : 8097 if test "${ac_cv_prog_AR+set}" = set; then :
8049@@ -6793,7 +7047,7 @@ do 8098@@ -6797,7 +7051,7 @@ do
8050 test -z "$as_dir" && as_dir=. 8099 test -z "$as_dir" && as_dir=.
8051 for ac_exec_ext in '' $ac_executable_extensions; do 8100 for ac_exec_ext in '' $ac_executable_extensions; do
8052 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 8101 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -8055,7 +8104,7 @@ index 4408b0d..2fbaebf 100755
8055 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 8104 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8056 break 2 8105 break 2
8057 fi 8106 fi
8058@@ -6813,11 +7067,15 @@ $as_echo "no" >&6; } 8107@@ -6817,11 +7071,15 @@ $as_echo "no" >&6; }
8059 fi 8108 fi
8060 8109
8061 8110
@@ -8074,7 +8123,7 @@ index 4408b0d..2fbaebf 100755
8074 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8123 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8075 $as_echo_n "checking for $ac_word... " >&6; } 8124 $as_echo_n "checking for $ac_word... " >&6; }
8076 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : 8125 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
8077@@ -6833,7 +7091,7 @@ do 8126@@ -6837,7 +7095,7 @@ do
8078 test -z "$as_dir" && as_dir=. 8127 test -z "$as_dir" && as_dir=.
8079 for ac_exec_ext in '' $ac_executable_extensions; do 8128 for ac_exec_ext in '' $ac_executable_extensions; do
8080 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 8129 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -8083,7 +8132,7 @@ index 4408b0d..2fbaebf 100755
8083 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 8132 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8084 break 2 8133 break 2
8085 fi 8134 fi
8086@@ -6852,6 +7110,10 @@ else 8135@@ -6856,6 +7114,10 @@ else
8087 $as_echo "no" >&6; } 8136 $as_echo "no" >&6; }
8088 fi 8137 fi
8089 8138
@@ -8094,7 +8143,7 @@ index 4408b0d..2fbaebf 100755
8094 if test "x$ac_ct_AR" = x; then 8143 if test "x$ac_ct_AR" = x; then
8095 AR="false" 8144 AR="false"
8096 else 8145 else
8097@@ -6863,12 +7125,12 @@ ac_tool_warned=yes ;; 8146@@ -6867,12 +7129,12 @@ ac_tool_warned=yes ;;
8098 esac 8147 esac
8099 AR=$ac_ct_AR 8148 AR=$ac_ct_AR
8100 fi 8149 fi
@@ -8111,7 +8160,7 @@ index 4408b0d..2fbaebf 100755
8111 8160
8112 8161
8113 8162
8114@@ -6878,6 +7140,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 8163@@ -6882,6 +7144,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
8115 8164
8116 8165
8117 8166
@@ -8174,7 +8223,7 @@ index 4408b0d..2fbaebf 100755
8174 8223
8175 8224
8176 if test -n "$ac_tool_prefix"; then 8225 if test -n "$ac_tool_prefix"; then
8177@@ -7214,8 +7532,8 @@ esac 8226@@ -7218,8 +7536,8 @@ esac
8178 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 8227 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
8179 8228
8180 # Transform an extracted symbol line into symbol name and symbol address 8229 # Transform an extracted symbol line into symbol name and symbol address
@@ -8185,7 +8234,7 @@ index 4408b0d..2fbaebf 100755
8185 8234
8186 # Handle CRLF in mingw tool chain 8235 # Handle CRLF in mingw tool chain
8187 opt_cr= 8236 opt_cr=
8188@@ -7251,6 +7569,7 @@ for ac_symprfx in "" "_"; do 8237@@ -7255,6 +7573,7 @@ for ac_symprfx in "" "_"; do
8189 else 8238 else
8190 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 8239 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
8191 fi 8240 fi
@@ -8193,7 +8242,7 @@ index 4408b0d..2fbaebf 100755
8193 8242
8194 # Check to see that the pipe works correctly. 8243 # Check to see that the pipe works correctly.
8195 pipe_works=no 8244 pipe_works=no
8196@@ -7292,6 +7611,18 @@ _LT_EOF 8245@@ -7296,6 +7615,18 @@ _LT_EOF
8197 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 8246 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
8198 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 8247 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
8199 cat <<_LT_EOF > conftest.$ac_ext 8248 cat <<_LT_EOF > conftest.$ac_ext
@@ -8212,7 +8261,7 @@ index 4408b0d..2fbaebf 100755
8212 #ifdef __cplusplus 8261 #ifdef __cplusplus
8213 extern "C" { 8262 extern "C" {
8214 #endif 8263 #endif
8215@@ -7303,7 +7634,7 @@ _LT_EOF 8264@@ -7307,7 +7638,7 @@ _LT_EOF
8216 cat <<_LT_EOF >> conftest.$ac_ext 8265 cat <<_LT_EOF >> conftest.$ac_ext
8217 8266
8218 /* The mapping between symbol names and symbols. */ 8267 /* The mapping between symbol names and symbols. */
@@ -8221,7 +8270,7 @@ index 4408b0d..2fbaebf 100755
8221 const char *name; 8270 const char *name;
8222 void *address; 8271 void *address;
8223 } 8272 }
8224@@ -7329,8 +7660,8 @@ static const void *lt_preloaded_setup() { 8273@@ -7333,8 +7664,8 @@ static const void *lt_preloaded_setup() {
8225 _LT_EOF 8274 _LT_EOF
8226 # Now try linking the two files. 8275 # Now try linking the two files.
8227 mv conftest.$ac_objext conftstm.$ac_objext 8276 mv conftest.$ac_objext conftstm.$ac_objext
@@ -8232,7 +8281,7 @@ index 4408b0d..2fbaebf 100755
8232 LIBS="conftstm.$ac_objext" 8281 LIBS="conftstm.$ac_objext"
8233 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 8282 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
8234 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 8283 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
8235@@ -7340,8 +7671,8 @@ _LT_EOF 8284@@ -7344,8 +7675,8 @@ _LT_EOF
8236 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 8285 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
8237 pipe_works=yes 8286 pipe_works=yes
8238 fi 8287 fi
@@ -8243,7 +8292,7 @@ index 4408b0d..2fbaebf 100755
8243 else 8292 else
8244 echo "cannot find nm_test_func in $nlist" >&5 8293 echo "cannot find nm_test_func in $nlist" >&5
8245 fi 8294 fi
8246@@ -7378,6 +7709,19 @@ else 8295@@ -7382,6 +7713,19 @@ else
8247 $as_echo "ok" >&6; } 8296 $as_echo "ok" >&6; }
8248 fi 8297 fi
8249 8298
@@ -8263,7 +8312,7 @@ index 4408b0d..2fbaebf 100755
8263 8312
8264 8313
8265 8314
8266@@ -7398,6 +7742,42 @@ fi 8315@@ -7402,6 +7746,42 @@ fi
8267 8316
8268 8317
8269 8318
@@ -8306,7 +8355,7 @@ index 4408b0d..2fbaebf 100755
8306 8355
8307 # Check whether --enable-libtool-lock was given. 8356 # Check whether --enable-libtool-lock was given.
8308 if test "${enable_libtool_lock+set}" = set; then : 8357 if test "${enable_libtool_lock+set}" = set; then :
8309@@ -7605,6 +7985,123 @@ esac 8358@@ -7609,6 +7989,123 @@ esac
8310 8359
8311 need_locks="$enable_libtool_lock" 8360 need_locks="$enable_libtool_lock"
8312 8361
@@ -8430,7 +8479,7 @@ index 4408b0d..2fbaebf 100755
8430 8479
8431 case $host_os in 8480 case $host_os in
8432 rhapsody* | darwin*) 8481 rhapsody* | darwin*)
8433@@ -8168,6 +8665,8 @@ _LT_EOF 8482@@ -8172,6 +8669,8 @@ _LT_EOF
8434 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 8483 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
8435 echo "$AR cru libconftest.a conftest.o" >&5 8484 echo "$AR cru libconftest.a conftest.o" >&5
8436 $AR cru libconftest.a conftest.o 2>&5 8485 $AR cru libconftest.a conftest.o 2>&5
@@ -8439,7 +8488,7 @@ index 4408b0d..2fbaebf 100755
8439 cat > conftest.c << _LT_EOF 8488 cat > conftest.c << _LT_EOF
8440 int main() { return 0;} 8489 int main() { return 0;}
8441 _LT_EOF 8490 _LT_EOF
8442@@ -8236,6 +8735,16 @@ done 8491@@ -8240,6 +8739,16 @@ done
8443 8492
8444 8493
8445 8494
@@ -8456,7 +8505,7 @@ index 4408b0d..2fbaebf 100755
8456 8505
8457 8506
8458 # Set options 8507 # Set options
8459@@ -8364,7 +8873,8 @@ fi 8508@@ -8368,7 +8877,8 @@ fi
8460 LIBTOOL_DEPS="$ltmain" 8509 LIBTOOL_DEPS="$ltmain"
8461 8510
8462 # Always use our own libtool. 8511 # Always use our own libtool.
@@ -8466,7 +8515,7 @@ index 4408b0d..2fbaebf 100755
8466 8515
8467 8516
8468 8517
8469@@ -8453,7 +8963,7 @@ aix3*) 8518@@ -8457,7 +8967,7 @@ aix3*)
8470 esac 8519 esac
8471 8520
8472 # Global variables: 8521 # Global variables:
@@ -8475,7 +8524,7 @@ index 4408b0d..2fbaebf 100755
8475 can_build_shared=yes 8524 can_build_shared=yes
8476 8525
8477 # All known linkers require a `.a' archive for static linking (except MSVC, 8526 # All known linkers require a `.a' archive for static linking (except MSVC,
8478@@ -8751,8 +9261,6 @@ fi 8527@@ -8755,8 +9265,6 @@ fi
8479 lt_prog_compiler_pic= 8528 lt_prog_compiler_pic=
8480 lt_prog_compiler_static= 8529 lt_prog_compiler_static=
8481 8530
@@ -8484,7 +8533,7 @@ index 4408b0d..2fbaebf 100755
8484 8533
8485 if test "$GCC" = yes; then 8534 if test "$GCC" = yes; then
8486 lt_prog_compiler_wl='-Wl,' 8535 lt_prog_compiler_wl='-Wl,'
8487@@ -8918,6 +9426,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 8536@@ -8922,6 +9430,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8488 lt_prog_compiler_pic='--shared' 8537 lt_prog_compiler_pic='--shared'
8489 lt_prog_compiler_static='--static' 8538 lt_prog_compiler_static='--static'
8490 ;; 8539 ;;
@@ -8497,7 +8546,7 @@ index 4408b0d..2fbaebf 100755
8497 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 8546 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
8498 # Portland Group compilers (*not* the Pentium gcc compiler, 8547 # Portland Group compilers (*not* the Pentium gcc compiler,
8499 # which looks to be a dead project) 8548 # which looks to be a dead project)
8500@@ -8980,7 +9494,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 8549@@ -8984,7 +9498,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8501 lt_prog_compiler_pic='-KPIC' 8550 lt_prog_compiler_pic='-KPIC'
8502 lt_prog_compiler_static='-Bstatic' 8551 lt_prog_compiler_static='-Bstatic'
8503 case $cc_basename in 8552 case $cc_basename in
@@ -8506,7 +8555,7 @@ index 4408b0d..2fbaebf 100755
8506 lt_prog_compiler_wl='-Qoption ld ';; 8555 lt_prog_compiler_wl='-Qoption ld ';;
8507 *) 8556 *)
8508 lt_prog_compiler_wl='-Wl,';; 8557 lt_prog_compiler_wl='-Wl,';;
8509@@ -9037,13 +9551,17 @@ case $host_os in 8558@@ -9041,13 +9555,17 @@ case $host_os in
8510 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 8559 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
8511 ;; 8560 ;;
8512 esac 8561 esac
@@ -8530,7 +8579,7 @@ index 4408b0d..2fbaebf 100755
8530 8579
8531 # 8580 #
8532 # Check to make sure the PIC flag actually works. 8581 # Check to make sure the PIC flag actually works.
8533@@ -9104,6 +9622,11 @@ fi 8582@@ -9108,6 +9626,11 @@ fi
8534 8583
8535 8584
8536 8585
@@ -8542,7 +8591,7 @@ index 4408b0d..2fbaebf 100755
8542 # 8591 #
8543 # Check to make sure the static flag actually works. 8592 # Check to make sure the static flag actually works.
8544 # 8593 #
8545@@ -9454,7 +9977,8 @@ _LT_EOF 8594@@ -9458,7 +9981,8 @@ _LT_EOF
8546 allow_undefined_flag=unsupported 8595 allow_undefined_flag=unsupported
8547 always_export_symbols=no 8596 always_export_symbols=no
8548 enable_shared_with_static_runtimes=yes 8597 enable_shared_with_static_runtimes=yes
@@ -8552,16 +8601,7 @@ index 4408b0d..2fbaebf 100755
8552 8601
8553 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 8602 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
8554 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 8603 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
8555@@ -9502,7 +10026,7 @@ _LT_EOF 8604@@ -9557,12 +10081,12 @@ _LT_EOF
8556 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
8557 && test "$tmp_diet" = no
8558 then
8559- tmp_addflag=
8560+ tmp_addflag=' $pic_flag'
8561 tmp_sharedflag='-shared'
8562 case $cc_basename,$host_cpu in
8563 pgcc*) # Portland Group C compiler
8564@@ -9553,12 +10077,12 @@ _LT_EOF
8565 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 8605 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
8566 hardcode_libdir_flag_spec= 8606 hardcode_libdir_flag_spec=
8567 hardcode_libdir_flag_spec_ld='-rpath $libdir' 8607 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -8576,7 +8616,7 @@ index 4408b0d..2fbaebf 100755
8576 fi 8616 fi
8577 ;; 8617 ;;
8578 esac 8618 esac
8579@@ -9572,8 +10096,8 @@ _LT_EOF 8619@@ -9576,8 +10100,8 @@ _LT_EOF
8580 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 8620 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
8581 wlarc= 8621 wlarc=
8582 else 8622 else
@@ -8587,7 +8627,7 @@ index 4408b0d..2fbaebf 100755
8587 fi 8627 fi
8588 ;; 8628 ;;
8589 8629
8590@@ -9591,8 +10115,8 @@ _LT_EOF 8630@@ -9595,8 +10119,8 @@ _LT_EOF
8591 8631
8592 _LT_EOF 8632 _LT_EOF
8593 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 8633 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -8598,7 +8638,7 @@ index 4408b0d..2fbaebf 100755
8598 else 8638 else
8599 ld_shlibs=no 8639 ld_shlibs=no
8600 fi 8640 fi
8601@@ -9638,8 +10162,8 @@ _LT_EOF 8641@@ -9642,8 +10166,8 @@ _LT_EOF
8602 8642
8603 *) 8643 *)
8604 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 8644 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -8609,7 +8649,7 @@ index 4408b0d..2fbaebf 100755
8609 else 8649 else
8610 ld_shlibs=no 8650 ld_shlibs=no
8611 fi 8651 fi
8612@@ -9769,7 +10293,13 @@ _LT_EOF 8652@@ -9773,7 +10297,13 @@ _LT_EOF
8613 allow_undefined_flag='-berok' 8653 allow_undefined_flag='-berok'
8614 # Determine the default libpath from the value encoded in an 8654 # Determine the default libpath from the value encoded in an
8615 # empty executable. 8655 # empty executable.
@@ -8624,7 +8664,7 @@ index 4408b0d..2fbaebf 100755
8624 /* end confdefs.h. */ 8664 /* end confdefs.h. */
8625 8665
8626 int 8666 int
8627@@ -9782,22 +10312,29 @@ main () 8667@@ -9786,22 +10316,29 @@ main ()
8628 _ACEOF 8668 _ACEOF
8629 if ac_fn_c_try_link "$LINENO"; then : 8669 if ac_fn_c_try_link "$LINENO"; then :
8630 8670
@@ -8667,7 +8707,7 @@ index 4408b0d..2fbaebf 100755
8667 8707
8668 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 8708 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8669 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" 8709 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"
8670@@ -9809,7 +10346,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8710@@ -9813,7 +10350,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8671 else 8711 else
8672 # Determine the default libpath from the value encoded in an 8712 # Determine the default libpath from the value encoded in an
8673 # empty executable. 8713 # empty executable.
@@ -8682,7 +8722,7 @@ index 4408b0d..2fbaebf 100755
8682 /* end confdefs.h. */ 8722 /* end confdefs.h. */
8683 8723
8684 int 8724 int
8685@@ -9822,22 +10365,29 @@ main () 8725@@ -9826,22 +10369,29 @@ main ()
8686 _ACEOF 8726 _ACEOF
8687 if ac_fn_c_try_link "$LINENO"; then : 8727 if ac_fn_c_try_link "$LINENO"; then :
8688 8728
@@ -8725,7 +8765,7 @@ index 4408b0d..2fbaebf 100755
8725 8765
8726 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 8766 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8727 # Warning - without using the other run time loading flags, 8767 # Warning - without using the other run time loading flags,
8728@@ -9881,21 +10431,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8768@@ -9885,21 +10435,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8729 # When not using gcc, we currently assume that we are using 8769 # When not using gcc, we currently assume that we are using
8730 # Microsoft Visual C++. 8770 # Microsoft Visual C++.
8731 # hardcode_libdir_flag_spec is actually meaningless, as there is 8771 # hardcode_libdir_flag_spec is actually meaningless, as there is
@@ -8805,7 +8845,7 @@ index 4408b0d..2fbaebf 100755
8805 ;; 8845 ;;
8806 8846
8807 darwin* | rhapsody*) 8847 darwin* | rhapsody*)
8808@@ -9956,7 +10549,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8848@@ -9960,7 +10553,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8809 8849
8810 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 8850 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
8811 freebsd* | dragonfly*) 8851 freebsd* | dragonfly*)
@@ -8814,7 +8854,7 @@ index 4408b0d..2fbaebf 100755
8814 hardcode_libdir_flag_spec='-R$libdir' 8854 hardcode_libdir_flag_spec='-R$libdir'
8815 hardcode_direct=yes 8855 hardcode_direct=yes
8816 hardcode_shlibpath_var=no 8856 hardcode_shlibpath_var=no
8817@@ -9964,7 +10557,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8857@@ -9968,7 +10561,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8818 8858
8819 hpux9*) 8859 hpux9*)
8820 if test "$GCC" = yes; then 8860 if test "$GCC" = yes; then
@@ -8823,7 +8863,7 @@ index 4408b0d..2fbaebf 100755
8823 else 8863 else
8824 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' 8864 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'
8825 fi 8865 fi
8826@@ -9980,7 +10573,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8866@@ -9984,7 +10577,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8827 8867
8828 hpux10*) 8868 hpux10*)
8829 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 8869 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -8832,7 +8872,7 @@ index 4408b0d..2fbaebf 100755
8832 else 8872 else
8833 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 8873 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
8834 fi 8874 fi
8835@@ -10004,10 +10597,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8875@@ -10008,10 +10601,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8836 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 8876 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
8837 ;; 8877 ;;
8838 ia64*) 8878 ia64*)
@@ -8845,7 +8885,7 @@ index 4408b0d..2fbaebf 100755
8845 ;; 8885 ;;
8846 esac 8886 esac
8847 else 8887 else
8848@@ -10086,23 +10679,36 @@ fi 8888@@ -10090,23 +10683,36 @@ fi
8849 8889
8850 irix5* | irix6* | nonstopux*) 8890 irix5* | irix6* | nonstopux*)
8851 if test "$GCC" = yes; then 8891 if test "$GCC" = yes; then
@@ -8890,7 +8930,7 @@ index 4408b0d..2fbaebf 100755
8890 else 8930 else
8891 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' 8931 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'
8892 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' 8932 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'
8893@@ -10187,7 +10793,7 @@ rm -f core conftest.err conftest.$ac_objext \ 8933@@ -10191,7 +10797,7 @@ rm -f core conftest.err conftest.$ac_objext \
8894 osf4* | osf5*) # as osf3* with the addition of -msym flag 8934 osf4* | osf5*) # as osf3* with the addition of -msym flag
8895 if test "$GCC" = yes; then 8935 if test "$GCC" = yes; then
8896 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 8936 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -8899,7 +8939,7 @@ index 4408b0d..2fbaebf 100755
8899 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 8939 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
8900 else 8940 else
8901 allow_undefined_flag=' -expect_unresolved \*' 8941 allow_undefined_flag=' -expect_unresolved \*'
8902@@ -10206,9 +10812,9 @@ rm -f core conftest.err conftest.$ac_objext \ 8942@@ -10210,9 +10816,9 @@ rm -f core conftest.err conftest.$ac_objext \
8903 no_undefined_flag=' -z defs' 8943 no_undefined_flag=' -z defs'
8904 if test "$GCC" = yes; then 8944 if test "$GCC" = yes; then
8905 wlarc='${wl}' 8945 wlarc='${wl}'
@@ -8911,7 +8951,7 @@ index 4408b0d..2fbaebf 100755
8911 else 8951 else
8912 case `$CC -V 2>&1` in 8952 case `$CC -V 2>&1` in
8913 *"Compilers 5.0"*) 8953 *"Compilers 5.0"*)
8914@@ -10784,8 +11390,9 @@ cygwin* | mingw* | pw32* | cegcc*) 8954@@ -10788,8 +11394,9 @@ cygwin* | mingw* | pw32* | cegcc*)
8915 need_version=no 8955 need_version=no
8916 need_lib_prefix=no 8956 need_lib_prefix=no
8917 8957
@@ -8923,7 +8963,7 @@ index 4408b0d..2fbaebf 100755
8923 library_names_spec='$libname.dll.a' 8963 library_names_spec='$libname.dll.a'
8924 # DLL is installed to $(libdir)/../bin by postinstall_cmds 8964 # DLL is installed to $(libdir)/../bin by postinstall_cmds
8925 postinstall_cmds='base_file=`basename \${file}`~ 8965 postinstall_cmds='base_file=`basename \${file}`~
8926@@ -10818,13 +11425,71 @@ cygwin* | mingw* | pw32* | cegcc*) 8966@@ -10822,13 +11429,71 @@ cygwin* | mingw* | pw32* | cegcc*)
8927 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 8967 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
8928 ;; 8968 ;;
8929 esac 8969 esac
@@ -8996,7 +9036,7 @@ index 4408b0d..2fbaebf 100755
8996 # FIXME: first we should search . and the directory the executable is in 9036 # FIXME: first we should search . and the directory the executable is in
8997 shlibpath_var=PATH 9037 shlibpath_var=PATH
8998 ;; 9038 ;;
8999@@ -10916,7 +11581,7 @@ haiku*) 9039@@ -10920,7 +11585,7 @@ haiku*)
9000 soname_spec='${libname}${release}${shared_ext}$major' 9040 soname_spec='${libname}${release}${shared_ext}$major'
9001 shlibpath_var=LIBRARY_PATH 9041 shlibpath_var=LIBRARY_PATH
9002 shlibpath_overrides_runpath=yes 9042 shlibpath_overrides_runpath=yes
@@ -9005,16 +9045,16 @@ index 4408b0d..2fbaebf 100755
9005 hardcode_into_libs=yes 9045 hardcode_into_libs=yes
9006 ;; 9046 ;;
9007 9047
9008@@ -11712,7 +12377,7 @@ else 9048@@ -11716,7 +12381,7 @@ else
9009 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 9049 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
9010 lt_status=$lt_dlunknown 9050 lt_status=$lt_dlunknown
9011 cat > conftest.$ac_ext <<_LT_EOF 9051 cat > conftest.$ac_ext <<_LT_EOF
9012-#line 11715 "configure" 9052-#line 11719 "configure"
9013+#line $LINENO "configure" 9053+#line $LINENO "configure"
9014 #include "confdefs.h" 9054 #include "confdefs.h"
9015 9055
9016 #if HAVE_DLFCN_H 9056 #if HAVE_DLFCN_H
9017@@ -11756,10 +12421,10 @@ else 9057@@ -11760,10 +12425,10 @@ else
9018 /* When -fvisbility=hidden is used, assume the code has been annotated 9058 /* When -fvisbility=hidden is used, assume the code has been annotated
9019 correspondingly for the symbols needed. */ 9059 correspondingly for the symbols needed. */
9020 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 9060 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -9027,16 +9067,16 @@ index 4408b0d..2fbaebf 100755
9027 int main () 9067 int main ()
9028 { 9068 {
9029 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 9069 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
9030@@ -11818,7 +12483,7 @@ else 9070@@ -11822,7 +12487,7 @@ else
9031 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 9071 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
9032 lt_status=$lt_dlunknown 9072 lt_status=$lt_dlunknown
9033 cat > conftest.$ac_ext <<_LT_EOF 9073 cat > conftest.$ac_ext <<_LT_EOF
9034-#line 11821 "configure" 9074-#line 11825 "configure"
9035+#line $LINENO "configure" 9075+#line $LINENO "configure"
9036 #include "confdefs.h" 9076 #include "confdefs.h"
9037 9077
9038 #if HAVE_DLFCN_H 9078 #if HAVE_DLFCN_H
9039@@ -11862,10 +12527,10 @@ else 9079@@ -11866,10 +12531,10 @@ else
9040 /* When -fvisbility=hidden is used, assume the code has been annotated 9080 /* When -fvisbility=hidden is used, assume the code has been annotated
9041 correspondingly for the symbols needed. */ 9081 correspondingly for the symbols needed. */
9042 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 9082 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -9049,7 +9089,7 @@ index 4408b0d..2fbaebf 100755
9049 int main () 9089 int main ()
9050 { 9090 {
9051 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 9091 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
9052@@ -12257,6 +12922,7 @@ $RM -r conftest* 9092@@ -12261,6 +12926,7 @@ $RM -r conftest*
9053 9093
9054 # Allow CC to be a program name with arguments. 9094 # Allow CC to be a program name with arguments.
9055 lt_save_CC=$CC 9095 lt_save_CC=$CC
@@ -9057,7 +9097,7 @@ index 4408b0d..2fbaebf 100755
9057 lt_save_LD=$LD 9097 lt_save_LD=$LD
9058 lt_save_GCC=$GCC 9098 lt_save_GCC=$GCC
9059 GCC=$GXX 9099 GCC=$GXX
9060@@ -12274,6 +12940,7 @@ $RM -r conftest* 9100@@ -12278,6 +12944,7 @@ $RM -r conftest*
9061 fi 9101 fi
9062 test -z "${LDCXX+set}" || LD=$LDCXX 9102 test -z "${LDCXX+set}" || LD=$LDCXX
9063 CC=${CXX-"c++"} 9103 CC=${CXX-"c++"}
@@ -9065,18 +9105,7 @@ index 4408b0d..2fbaebf 100755
9065 compiler=$CC 9105 compiler=$CC
9066 compiler_CXX=$CC 9106 compiler_CXX=$CC
9067 for cc_temp in $compiler""; do 9107 for cc_temp in $compiler""; do
9068@@ -12413,8 +13080,8 @@ with_gnu_ld=$lt_cv_prog_gnu_ld 9108@@ -12560,7 +13227,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
9069 # Check if GNU C++ uses GNU ld as the underlying linker, since the
9070 # archiving commands below assume that GNU ld is being used.
9071 if test "$with_gnu_ld" = yes; then
9072- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
9073- archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
9074+ archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
9075+ archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
9076
9077 hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
9078 export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
9079@@ -12556,7 +13223,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
9080 allow_undefined_flag_CXX='-berok' 9109 allow_undefined_flag_CXX='-berok'
9081 # Determine the default libpath from the value encoded in an empty 9110 # Determine the default libpath from the value encoded in an empty
9082 # executable. 9111 # executable.
@@ -9091,7 +9120,7 @@ index 4408b0d..2fbaebf 100755
9091 /* end confdefs.h. */ 9120 /* end confdefs.h. */
9092 9121
9093 int 9122 int
9094@@ -12569,22 +13242,29 @@ main () 9123@@ -12573,22 +13246,29 @@ main ()
9095 _ACEOF 9124 _ACEOF
9096 if ac_fn_cxx_try_link "$LINENO"; then : 9125 if ac_fn_cxx_try_link "$LINENO"; then :
9097 9126
@@ -9134,7 +9163,7 @@ index 4408b0d..2fbaebf 100755
9134 9163
9135 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" 9164 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
9136 9165
9137@@ -12597,7 +13277,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9166@@ -12601,7 +13281,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9138 else 9167 else
9139 # Determine the default libpath from the value encoded in an 9168 # Determine the default libpath from the value encoded in an
9140 # empty executable. 9169 # empty executable.
@@ -9149,7 +9178,7 @@ index 4408b0d..2fbaebf 100755
9149 /* end confdefs.h. */ 9178 /* end confdefs.h. */
9150 9179
9151 int 9180 int
9152@@ -12610,22 +13296,29 @@ main () 9181@@ -12614,22 +13300,29 @@ main ()
9153 _ACEOF 9182 _ACEOF
9154 if ac_fn_cxx_try_link "$LINENO"; then : 9183 if ac_fn_cxx_try_link "$LINENO"; then :
9155 9184
@@ -9192,7 +9221,7 @@ index 4408b0d..2fbaebf 100755
9192 9221
9193 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" 9222 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
9194 # Warning - without using the other run time loading flags, 9223 # Warning - without using the other run time loading flags,
9195@@ -12668,29 +13361,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9224@@ -12672,29 +13365,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9196 ;; 9225 ;;
9197 9226
9198 cygwin* | mingw* | pw32* | cegcc*) 9227 cygwin* | mingw* | pw32* | cegcc*)
@@ -9291,7 +9320,7 @@ index 4408b0d..2fbaebf 100755
9291 darwin* | rhapsody*) 9320 darwin* | rhapsody*)
9292 9321
9293 9322
9294@@ -12796,7 +13535,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9323@@ -12800,7 +13539,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9295 ;; 9324 ;;
9296 *) 9325 *)
9297 if test "$GXX" = yes; then 9326 if test "$GXX" = yes; then
@@ -9300,7 +9329,7 @@ index 4408b0d..2fbaebf 100755
9300 else 9329 else
9301 # FIXME: insert proper C++ library support 9330 # FIXME: insert proper C++ library support
9302 ld_shlibs_CXX=no 9331 ld_shlibs_CXX=no
9303@@ -12867,10 +13606,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9332@@ -12871,10 +13610,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9304 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 9333 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9305 ;; 9334 ;;
9306 ia64*) 9335 ia64*)
@@ -9313,7 +9342,7 @@ index 4408b0d..2fbaebf 100755
9313 ;; 9342 ;;
9314 esac 9343 esac
9315 fi 9344 fi
9316@@ -12911,9 +13650,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9345@@ -12915,9 +13654,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9317 *) 9346 *)
9318 if test "$GXX" = yes; then 9347 if test "$GXX" = yes; then
9319 if test "$with_gnu_ld" = no; then 9348 if test "$with_gnu_ld" = no; then
@@ -9325,7 +9354,7 @@ index 4408b0d..2fbaebf 100755
9325 fi 9354 fi
9326 fi 9355 fi
9327 link_all_deplibs_CXX=yes 9356 link_all_deplibs_CXX=yes
9328@@ -12983,20 +13722,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9357@@ -12987,20 +13726,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9329 prelink_cmds_CXX='tpldir=Template.dir~ 9358 prelink_cmds_CXX='tpldir=Template.dir~
9330 rm -rf $tpldir~ 9359 rm -rf $tpldir~
9331 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ 9360 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
@@ -9350,7 +9379,7 @@ index 4408b0d..2fbaebf 100755
9350 ;; 9379 ;;
9351 *) # Version 6 and above use weak symbols 9380 *) # Version 6 and above use weak symbols
9352 archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' 9381 archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
9353@@ -13191,7 +13930,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9382@@ -13195,7 +13934,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9354 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' 9383 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'
9355 ;; 9384 ;;
9356 *) 9385 *)
@@ -9359,7 +9388,7 @@ index 4408b0d..2fbaebf 100755
9359 ;; 9388 ;;
9360 esac 9389 esac
9361 9390
9362@@ -13237,7 +13976,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9391@@ -13241,7 +13980,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9363 9392
9364 solaris*) 9393 solaris*)
9365 case $cc_basename in 9394 case $cc_basename in
@@ -9368,7 +9397,7 @@ index 4408b0d..2fbaebf 100755
9368 # Sun C++ 4.2, 5.x and Centerline C++ 9397 # Sun C++ 4.2, 5.x and Centerline C++
9369 archive_cmds_need_lc_CXX=yes 9398 archive_cmds_need_lc_CXX=yes
9370 no_undefined_flag_CXX=' -zdefs' 9399 no_undefined_flag_CXX=' -zdefs'
9371@@ -13278,9 +14017,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9400@@ -13282,9 +14021,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9372 if test "$GXX" = yes && test "$with_gnu_ld" = no; then 9401 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
9373 no_undefined_flag_CXX=' ${wl}-z ${wl}defs' 9402 no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
9374 if $CC --version | $GREP -v '^2\.7' > /dev/null; then 9403 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
@@ -9380,7 +9409,7 @@ index 4408b0d..2fbaebf 100755
9380 9409
9381 # Commands to make compiler produce verbose output that lists 9410 # Commands to make compiler produce verbose output that lists
9382 # what "hidden" libraries, object files and flags are used when 9411 # what "hidden" libraries, object files and flags are used when
9383@@ -13415,6 +14154,13 @@ private: 9412@@ -13419,6 +14158,13 @@ private:
9384 }; 9413 };
9385 _LT_EOF 9414 _LT_EOF
9386 9415
@@ -9394,7 +9423,7 @@ index 4408b0d..2fbaebf 100755
9394 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9423 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9395 (eval $ac_compile) 2>&5 9424 (eval $ac_compile) 2>&5
9396 ac_status=$? 9425 ac_status=$?
9397@@ -13428,7 +14174,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9426@@ -13432,7 +14178,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9398 pre_test_object_deps_done=no 9427 pre_test_object_deps_done=no
9399 9428
9400 for p in `eval "$output_verbose_link_cmd"`; do 9429 for p in `eval "$output_verbose_link_cmd"`; do
@@ -9403,7 +9432,7 @@ index 4408b0d..2fbaebf 100755
9403 9432
9404 -L* | -R* | -l*) 9433 -L* | -R* | -l*)
9405 # Some compilers place space between "-{L,R}" and the path. 9434 # Some compilers place space between "-{L,R}" and the path.
9406@@ -13437,13 +14183,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9435@@ -13441,13 +14187,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9407 test $p = "-R"; then 9436 test $p = "-R"; then
9408 prev=$p 9437 prev=$p
9409 continue 9438 continue
@@ -9430,7 +9459,7 @@ index 4408b0d..2fbaebf 100755
9430 # Internal compiler library paths should come after those 9459 # Internal compiler library paths should come after those
9431 # provided the user. The postdeps already come after the 9460 # provided the user. The postdeps already come after the
9432 # user supplied libs so there is no need to process them. 9461 # user supplied libs so there is no need to process them.
9433@@ -13463,8 +14218,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9462@@ -13467,8 +14222,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9434 postdeps_CXX="${postdeps_CXX} ${prev}${p}" 9463 postdeps_CXX="${postdeps_CXX} ${prev}${p}"
9435 fi 9464 fi
9436 fi 9465 fi
@@ -9441,7 +9470,7 @@ index 4408b0d..2fbaebf 100755
9441 *.$objext) 9470 *.$objext)
9442 # This assumes that the test object file only shows up 9471 # This assumes that the test object file only shows up
9443 # once in the compiler output. 9472 # once in the compiler output.
9444@@ -13500,6 +14257,7 @@ else 9473@@ -13504,6 +14261,7 @@ else
9445 fi 9474 fi
9446 9475
9447 $RM -f confest.$objext 9476 $RM -f confest.$objext
@@ -9449,7 +9478,7 @@ index 4408b0d..2fbaebf 100755
9449 9478
9450 # PORTME: override above test on systems where it is broken 9479 # PORTME: override above test on systems where it is broken
9451 case $host_os in 9480 case $host_os in
9452@@ -13535,7 +14293,7 @@ linux*) 9481@@ -13539,7 +14297,7 @@ linux*)
9453 9482
9454 solaris*) 9483 solaris*)
9455 case $cc_basename in 9484 case $cc_basename in
@@ -9458,7 +9487,7 @@ index 4408b0d..2fbaebf 100755
9458 # The more standards-conforming stlport4 library is 9487 # The more standards-conforming stlport4 library is
9459 # incompatible with the Cstd library. Avoid specifying 9488 # incompatible with the Cstd library. Avoid specifying
9460 # it if it's in CXXFLAGS. Ignore libCrun as 9489 # it if it's in CXXFLAGS. Ignore libCrun as
9461@@ -13600,8 +14358,6 @@ fi 9490@@ -13604,8 +14362,6 @@ fi
9462 lt_prog_compiler_pic_CXX= 9491 lt_prog_compiler_pic_CXX=
9463 lt_prog_compiler_static_CXX= 9492 lt_prog_compiler_static_CXX=
9464 9493
@@ -9467,7 +9496,7 @@ index 4408b0d..2fbaebf 100755
9467 9496
9468 # C++ specific cases for pic, static, wl, etc. 9497 # C++ specific cases for pic, static, wl, etc.
9469 if test "$GXX" = yes; then 9498 if test "$GXX" = yes; then
9470@@ -13706,6 +14462,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 9499@@ -13710,6 +14466,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9471 ;; 9500 ;;
9472 esac 9501 esac
9473 ;; 9502 ;;
@@ -9479,7 +9508,7 @@ index 4408b0d..2fbaebf 100755
9479 dgux*) 9508 dgux*)
9480 case $cc_basename in 9509 case $cc_basename in
9481 ec++*) 9510 ec++*)
9482@@ -13858,7 +14619,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 9511@@ -13862,7 +14623,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9483 ;; 9512 ;;
9484 solaris*) 9513 solaris*)
9485 case $cc_basename in 9514 case $cc_basename in
@@ -9488,7 +9517,7 @@ index 4408b0d..2fbaebf 100755
9488 # Sun C++ 4.2, 5.x and Centerline C++ 9517 # Sun C++ 4.2, 5.x and Centerline C++
9489 lt_prog_compiler_pic_CXX='-KPIC' 9518 lt_prog_compiler_pic_CXX='-KPIC'
9490 lt_prog_compiler_static_CXX='-Bstatic' 9519 lt_prog_compiler_static_CXX='-Bstatic'
9491@@ -13923,10 +14684,17 @@ case $host_os in 9520@@ -13927,10 +14688,17 @@ case $host_os in
9492 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" 9521 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
9493 ;; 9522 ;;
9494 esac 9523 esac
@@ -9509,7 +9538,7 @@ index 4408b0d..2fbaebf 100755
9509 9538
9510 # 9539 #
9511 # Check to make sure the PIC flag actually works. 9540 # Check to make sure the PIC flag actually works.
9512@@ -13984,6 +14752,8 @@ fi 9541@@ -13988,6 +14756,8 @@ fi
9513 9542
9514 9543
9515 9544
@@ -9518,7 +9547,7 @@ index 4408b0d..2fbaebf 100755
9518 # 9547 #
9519 # Check to make sure the static flag actually works. 9548 # Check to make sure the static flag actually works.
9520 # 9549 #
9521@@ -14161,6 +14931,7 @@ fi 9550@@ -14165,6 +14935,7 @@ fi
9522 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } 9551 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
9523 9552
9524 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 9553 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -9526,7 +9555,7 @@ index 4408b0d..2fbaebf 100755
9526 case $host_os in 9555 case $host_os in
9527 aix[4-9]*) 9556 aix[4-9]*)
9528 # If we're using GNU nm, then we don't want the "-C" option. 9557 # If we're using GNU nm, then we don't want the "-C" option.
9529@@ -14175,15 +14946,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie 9558@@ -14179,15 +14950,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
9530 ;; 9559 ;;
9531 pw32*) 9560 pw32*)
9532 export_symbols_cmds_CXX="$ltdll_cmds" 9561 export_symbols_cmds_CXX="$ltdll_cmds"
@@ -9552,7 +9581,7 @@ index 4408b0d..2fbaebf 100755
9552 9581
9553 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 9582 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
9554 $as_echo "$ld_shlibs_CXX" >&6; } 9583 $as_echo "$ld_shlibs_CXX" >&6; }
9555@@ -14446,8 +15222,9 @@ cygwin* | mingw* | pw32* | cegcc*) 9584@@ -14450,8 +15226,9 @@ cygwin* | mingw* | pw32* | cegcc*)
9556 need_version=no 9585 need_version=no
9557 need_lib_prefix=no 9586 need_lib_prefix=no
9558 9587
@@ -9564,7 +9593,7 @@ index 4408b0d..2fbaebf 100755
9564 library_names_spec='$libname.dll.a' 9593 library_names_spec='$libname.dll.a'
9565 # DLL is installed to $(libdir)/../bin by postinstall_cmds 9594 # DLL is installed to $(libdir)/../bin by postinstall_cmds
9566 postinstall_cmds='base_file=`basename \${file}`~ 9595 postinstall_cmds='base_file=`basename \${file}`~
9567@@ -14479,13 +15256,71 @@ cygwin* | mingw* | pw32* | cegcc*) 9596@@ -14483,13 +15260,71 @@ cygwin* | mingw* | pw32* | cegcc*)
9568 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 9597 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
9569 ;; 9598 ;;
9570 esac 9599 esac
@@ -9637,7 +9666,7 @@ index 4408b0d..2fbaebf 100755
9637 # FIXME: first we should search . and the directory the executable is in 9666 # FIXME: first we should search . and the directory the executable is in
9638 shlibpath_var=PATH 9667 shlibpath_var=PATH
9639 ;; 9668 ;;
9640@@ -14576,7 +15411,7 @@ haiku*) 9669@@ -14580,7 +15415,7 @@ haiku*)
9641 soname_spec='${libname}${release}${shared_ext}$major' 9670 soname_spec='${libname}${release}${shared_ext}$major'
9642 shlibpath_var=LIBRARY_PATH 9671 shlibpath_var=LIBRARY_PATH
9643 shlibpath_overrides_runpath=yes 9672 shlibpath_overrides_runpath=yes
@@ -9646,7 +9675,7 @@ index 4408b0d..2fbaebf 100755
9646 hardcode_into_libs=yes 9675 hardcode_into_libs=yes
9647 ;; 9676 ;;
9648 9677
9649@@ -15035,6 +15870,7 @@ fi 9678@@ -15039,6 +15874,7 @@ fi
9650 fi # test -n "$compiler" 9679 fi # test -n "$compiler"
9651 9680
9652 CC=$lt_save_CC 9681 CC=$lt_save_CC
@@ -9654,7 +9683,7 @@ index 4408b0d..2fbaebf 100755
9654 LDCXX=$LD 9683 LDCXX=$LD
9655 LD=$lt_save_LD 9684 LD=$lt_save_LD
9656 GCC=$lt_save_GCC 9685 GCC=$lt_save_GCC
9657@@ -17807,13 +18643,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 9686@@ -17952,13 +18788,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
9658 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 9687 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
9659 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 9688 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
9660 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 9689 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -9675,7 +9704,7 @@ index 4408b0d..2fbaebf 100755
9675 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 9704 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
9676 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 9705 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
9677 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 9706 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
9678@@ -17828,14 +18671,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 9707@@ -17973,14 +18816,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
9679 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 9708 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
9680 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 9709 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
9681 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"`' 9710 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"`'
@@ -9694,7 +9723,7 @@ index 4408b0d..2fbaebf 100755
9694 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 9723 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
9695 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 9724 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
9696 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 9725 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
9697@@ -17868,12 +18714,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 9726@@ -18013,12 +18859,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
9698 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 9727 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
9699 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 9728 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
9700 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 9729 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -9708,7 +9737,7 @@ index 4408b0d..2fbaebf 100755
9708 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 9737 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
9709 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 9738 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
9710 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 9739 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
9711@@ -17912,8 +18758,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote 9740@@ -18057,8 +18903,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote
9712 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' 9741 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
9713 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' 9742 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
9714 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' 9743 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
@@ -9718,7 +9747,7 @@ index 4408b0d..2fbaebf 100755
9718 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' 9747 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
9719 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' 9748 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
9720 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' 9749 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
9721@@ -17940,12 +18786,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ 9750@@ -18085,12 +18931,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_
9722 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' 9751 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
9723 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' 9752 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
9724 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' 9753 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
@@ -9732,7 +9761,7 @@ index 4408b0d..2fbaebf 100755
9732 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' 9761 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
9733 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' 9762 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
9734 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' 9763 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
9735@@ -17983,8 +18829,13 @@ reload_flag \ 9764@@ -18128,8 +18974,13 @@ reload_flag \
9736 OBJDUMP \ 9765 OBJDUMP \
9737 deplibs_check_method \ 9766 deplibs_check_method \
9738 file_magic_cmd \ 9767 file_magic_cmd \
@@ -9746,7 +9775,7 @@ index 4408b0d..2fbaebf 100755
9746 STRIP \ 9775 STRIP \
9747 RANLIB \ 9776 RANLIB \
9748 CC \ 9777 CC \
9749@@ -17994,12 +18845,14 @@ lt_cv_sys_global_symbol_pipe \ 9778@@ -18139,12 +18990,14 @@ lt_cv_sys_global_symbol_pipe \
9750 lt_cv_sys_global_symbol_to_cdecl \ 9779 lt_cv_sys_global_symbol_to_cdecl \
9751 lt_cv_sys_global_symbol_to_c_name_address \ 9780 lt_cv_sys_global_symbol_to_c_name_address \
9752 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 9781 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -9762,7 +9791,7 @@ index 4408b0d..2fbaebf 100755
9762 DSYMUTIL \ 9791 DSYMUTIL \
9763 NMEDIT \ 9792 NMEDIT \
9764 LIPO \ 9793 LIPO \
9765@@ -18015,7 +18868,6 @@ no_undefined_flag \ 9794@@ -18160,7 +19013,6 @@ no_undefined_flag \
9766 hardcode_libdir_flag_spec \ 9795 hardcode_libdir_flag_spec \
9767 hardcode_libdir_flag_spec_ld \ 9796 hardcode_libdir_flag_spec_ld \
9768 hardcode_libdir_separator \ 9797 hardcode_libdir_separator \
@@ -9770,7 +9799,7 @@ index 4408b0d..2fbaebf 100755
9770 exclude_expsyms \ 9799 exclude_expsyms \
9771 include_expsyms \ 9800 include_expsyms \
9772 file_list_spec \ 9801 file_list_spec \
9773@@ -18037,8 +18889,8 @@ LD_CXX \ 9802@@ -18182,8 +19034,8 @@ LD_CXX \
9774 reload_flag_CXX \ 9803 reload_flag_CXX \
9775 compiler_CXX \ 9804 compiler_CXX \
9776 lt_prog_compiler_no_builtin_flag_CXX \ 9805 lt_prog_compiler_no_builtin_flag_CXX \
@@ -9780,7 +9809,7 @@ index 4408b0d..2fbaebf 100755
9780 lt_prog_compiler_static_CXX \ 9809 lt_prog_compiler_static_CXX \
9781 lt_cv_prog_compiler_c_o_CXX \ 9810 lt_cv_prog_compiler_c_o_CXX \
9782 export_dynamic_flag_spec_CXX \ 9811 export_dynamic_flag_spec_CXX \
9783@@ -18050,7 +18902,6 @@ no_undefined_flag_CXX \ 9812@@ -18195,7 +19047,6 @@ no_undefined_flag_CXX \
9784 hardcode_libdir_flag_spec_CXX \ 9813 hardcode_libdir_flag_spec_CXX \
9785 hardcode_libdir_flag_spec_ld_CXX \ 9814 hardcode_libdir_flag_spec_ld_CXX \
9786 hardcode_libdir_separator_CXX \ 9815 hardcode_libdir_separator_CXX \
@@ -9788,7 +9817,7 @@ index 4408b0d..2fbaebf 100755
9788 exclude_expsyms_CXX \ 9817 exclude_expsyms_CXX \
9789 include_expsyms_CXX \ 9818 include_expsyms_CXX \
9790 file_list_spec_CXX \ 9819 file_list_spec_CXX \
9791@@ -18084,6 +18935,7 @@ module_cmds \ 9820@@ -18229,6 +19080,7 @@ module_cmds \
9792 module_expsym_cmds \ 9821 module_expsym_cmds \
9793 export_symbols_cmds \ 9822 export_symbols_cmds \
9794 prelink_cmds \ 9823 prelink_cmds \
@@ -9796,7 +9825,7 @@ index 4408b0d..2fbaebf 100755
9796 postinstall_cmds \ 9825 postinstall_cmds \
9797 postuninstall_cmds \ 9826 postuninstall_cmds \
9798 finish_cmds \ 9827 finish_cmds \
9799@@ -18098,7 +18950,8 @@ archive_expsym_cmds_CXX \ 9828@@ -18243,7 +19095,8 @@ archive_expsym_cmds_CXX \
9800 module_cmds_CXX \ 9829 module_cmds_CXX \
9801 module_expsym_cmds_CXX \ 9830 module_expsym_cmds_CXX \
9802 export_symbols_cmds_CXX \ 9831 export_symbols_cmds_CXX \
@@ -9806,7 +9835,7 @@ index 4408b0d..2fbaebf 100755
9806 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in 9835 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
9807 *[\\\\\\\`\\"\\\$]*) 9836 *[\\\\\\\`\\"\\\$]*)
9808 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" 9837 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
9809@@ -18891,7 +19744,8 @@ $as_echo X"$file" | 9838@@ -19036,7 +19889,8 @@ $as_echo X"$file" |
9810 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 9839 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
9811 # 9840 #
9812 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 9841 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -9816,7 +9845,7 @@ index 4408b0d..2fbaebf 100755
9816 # Written by Gordon Matzigkeit, 1996 9845 # Written by Gordon Matzigkeit, 1996
9817 # 9846 #
9818 # This file is part of GNU Libtool. 9847 # This file is part of GNU Libtool.
9819@@ -18994,19 +19848,42 @@ SP2NL=$lt_lt_SP2NL 9848@@ -19139,19 +19993,42 @@ SP2NL=$lt_lt_SP2NL
9820 # turn newlines into spaces. 9849 # turn newlines into spaces.
9821 NL2SP=$lt_lt_NL2SP 9850 NL2SP=$lt_lt_NL2SP
9822 9851
@@ -9860,7 +9889,7 @@ index 4408b0d..2fbaebf 100755
9860 # A symbol stripping program. 9889 # A symbol stripping program.
9861 STRIP=$lt_STRIP 9890 STRIP=$lt_STRIP
9862 9891
9863@@ -19036,6 +19913,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 9892@@ -19181,6 +20058,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
9864 # Transform the output of nm in a C name address pair when lib prefix is needed. 9893 # Transform the output of nm in a C name address pair when lib prefix is needed.
9865 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 9894 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
9866 9895
@@ -9873,7 +9902,7 @@ index 4408b0d..2fbaebf 100755
9873 # The name of the directory that contains temporary libtool files. 9902 # The name of the directory that contains temporary libtool files.
9874 objdir=$objdir 9903 objdir=$objdir
9875 9904
9876@@ -19045,6 +19928,9 @@ MAGIC_CMD=$MAGIC_CMD 9905@@ -19190,6 +20073,9 @@ MAGIC_CMD=$MAGIC_CMD
9877 # Must we lock files when doing compilation? 9906 # Must we lock files when doing compilation?
9878 need_locks=$lt_need_locks 9907 need_locks=$lt_need_locks
9879 9908
@@ -9883,7 +9912,7 @@ index 4408b0d..2fbaebf 100755
9883 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 9912 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
9884 DSYMUTIL=$lt_DSYMUTIL 9913 DSYMUTIL=$lt_DSYMUTIL
9885 9914
9886@@ -19159,12 +20045,12 @@ with_gcc=$GCC 9915@@ -19304,12 +20190,12 @@ with_gcc=$GCC
9887 # Compiler flag to turn off builtin functions. 9916 # Compiler flag to turn off builtin functions.
9888 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 9917 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
9889 9918
@@ -9899,7 +9928,7 @@ index 4408b0d..2fbaebf 100755
9899 # Compiler flag to prevent dynamic linking. 9928 # Compiler flag to prevent dynamic linking.
9900 link_static_flag=$lt_lt_prog_compiler_static 9929 link_static_flag=$lt_lt_prog_compiler_static
9901 9930
9902@@ -19251,9 +20137,6 @@ inherit_rpath=$inherit_rpath 9931@@ -19396,9 +20282,6 @@ inherit_rpath=$inherit_rpath
9903 # Whether libtool must link a program against all its dependency libraries. 9932 # Whether libtool must link a program against all its dependency libraries.
9904 link_all_deplibs=$link_all_deplibs 9933 link_all_deplibs=$link_all_deplibs
9905 9934
@@ -9909,7 +9938,7 @@ index 4408b0d..2fbaebf 100755
9909 # Set to "yes" if exported symbols are required. 9938 # Set to "yes" if exported symbols are required.
9910 always_export_symbols=$always_export_symbols 9939 always_export_symbols=$always_export_symbols
9911 9940
9912@@ -19269,6 +20152,9 @@ include_expsyms=$lt_include_expsyms 9941@@ -19414,6 +20297,9 @@ include_expsyms=$lt_include_expsyms
9913 # Commands necessary for linking programs (against libraries) with templates. 9942 # Commands necessary for linking programs (against libraries) with templates.
9914 prelink_cmds=$lt_prelink_cmds 9943 prelink_cmds=$lt_prelink_cmds
9915 9944
@@ -9919,7 +9948,7 @@ index 4408b0d..2fbaebf 100755
9919 # Specify filename containing input files. 9948 # Specify filename containing input files.
9920 file_list_spec=$lt_file_list_spec 9949 file_list_spec=$lt_file_list_spec
9921 9950
9922@@ -19315,210 +20201,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 9951@@ -19460,210 +20346,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
9923 # if finds mixed CR/LF and LF-only lines. Since sed operates in 9952 # if finds mixed CR/LF and LF-only lines. Since sed operates in
9924 # text mode, it properly converts lines to CR/LF. This bash problem 9953 # text mode, it properly converts lines to CR/LF. This bash problem
9925 # is reportedly fixed, but why not run on old versions too? 9954 # is reportedly fixed, but why not run on old versions too?
@@ -10293,7 +10322,7 @@ index 4408b0d..2fbaebf 100755
10293 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 10322 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
10294 chmod +x "$ofile" 10323 chmod +x "$ofile"
10295 10324
10296@@ -19546,12 +20391,12 @@ with_gcc=$GCC_CXX 10325@@ -19691,12 +20536,12 @@ with_gcc=$GCC_CXX
10297 # Compiler flag to turn off builtin functions. 10326 # Compiler flag to turn off builtin functions.
10298 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX 10327 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
10299 10328
@@ -10309,7 +10338,7 @@ index 4408b0d..2fbaebf 100755
10309 # Compiler flag to prevent dynamic linking. 10338 # Compiler flag to prevent dynamic linking.
10310 link_static_flag=$lt_lt_prog_compiler_static_CXX 10339 link_static_flag=$lt_lt_prog_compiler_static_CXX
10311 10340
10312@@ -19638,9 +20483,6 @@ inherit_rpath=$inherit_rpath_CXX 10341@@ -19783,9 +20628,6 @@ inherit_rpath=$inherit_rpath_CXX
10313 # Whether libtool must link a program against all its dependency libraries. 10342 # Whether libtool must link a program against all its dependency libraries.
10314 link_all_deplibs=$link_all_deplibs_CXX 10343 link_all_deplibs=$link_all_deplibs_CXX
10315 10344
@@ -10319,7 +10348,7 @@ index 4408b0d..2fbaebf 100755
10319 # Set to "yes" if exported symbols are required. 10348 # Set to "yes" if exported symbols are required.
10320 always_export_symbols=$always_export_symbols_CXX 10349 always_export_symbols=$always_export_symbols_CXX
10321 10350
10322@@ -19656,6 +20498,9 @@ include_expsyms=$lt_include_expsyms_CXX 10351@@ -19801,6 +20643,9 @@ include_expsyms=$lt_include_expsyms_CXX
10323 # Commands necessary for linking programs (against libraries) with templates. 10352 # Commands necessary for linking programs (against libraries) with templates.
10324 prelink_cmds=$lt_prelink_cmds_CXX 10353 prelink_cmds=$lt_prelink_cmds_CXX
10325 10354
@@ -10330,7 +10359,7 @@ index 4408b0d..2fbaebf 100755
10330 file_list_spec=$lt_file_list_spec_CXX 10359 file_list_spec=$lt_file_list_spec_CXX
10331 10360
10332diff --git a/libtool.m4 b/libtool.m4 10361diff --git a/libtool.m4 b/libtool.m4
10333index 797468f..02b15b3 100644 10362index 4b2d30a..008d331 100644
10334--- a/libtool.m4 10363--- a/libtool.m4
10335+++ b/libtool.m4 10364+++ b/libtool.m4
10336@@ -1,7 +1,8 @@ 10365@@ -1,7 +1,8 @@
@@ -11052,15 +11081,6 @@ index 797468f..02b15b3 100644
11052 11081
11053 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 11082 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
11054 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 11083 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
11055@@ -4459,7 +4731,7 @@ _LT_EOF
11056 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
11057 && test "$tmp_diet" = no
11058 then
11059- tmp_addflag=
11060+ tmp_addflag=' $pic_flag'
11061 tmp_sharedflag='-shared'
11062 case $cc_basename,$host_cpu in
11063 pgcc*) # Portland Group C compiler
11064@@ -4510,12 +4782,12 @@ _LT_EOF 11084@@ -4510,12 +4782,12 @@ _LT_EOF
11065 _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' 11085 _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
11066 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= 11086 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
@@ -11347,17 +11367,6 @@ index 797468f..02b15b3 100644
11347 compiler=$CC 11367 compiler=$CC
11348 _LT_TAGVAR(compiler, $1)=$CC 11368 _LT_TAGVAR(compiler, $1)=$CC
11349 _LT_CC_BASENAME([$compiler]) 11369 _LT_CC_BASENAME([$compiler])
11350@@ -5525,8 +5858,8 @@ if test "$_lt_caught_CXX_error" != yes; then
11351 # Check if GNU C++ uses GNU ld as the underlying linker, since the
11352 # archiving commands below assume that GNU ld is being used.
11353 if test "$with_gnu_ld" = yes; then
11354- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
11355- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11356+ _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
11357+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11358
11359 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
11360 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
11361@@ -5667,7 +6000,7 @@ if test "$_lt_caught_CXX_error" != yes; then 11370@@ -5667,7 +6000,7 @@ if test "$_lt_caught_CXX_error" != yes; then
11362 _LT_TAGVAR(allow_undefined_flag, $1)='-berok' 11371 _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
11363 # Determine the default libpath from the value encoded in an empty 11372 # Determine the default libpath from the value encoded in an empty
@@ -17433,7 +17442,7 @@ index bf92b5e..c573da9 100644
17433 # These exist entirely to fool aclocal when bootstrapping libtool. 17442 # These exist entirely to fool aclocal when bootstrapping libtool.
17434 # 17443 #
17435diff --git a/opcodes/configure b/opcodes/configure 17444diff --git a/opcodes/configure b/opcodes/configure
17436index c9c04ce..31141d9 100755 17445index 1ff66fa..d20abf3 100755
17437--- a/opcodes/configure 17446--- a/opcodes/configure
17438+++ b/opcodes/configure 17447+++ b/opcodes/configure
17439@@ -648,6 +648,9 @@ OTOOL 17448@@ -648,6 +648,9 @@ OTOOL
@@ -18270,15 +18279,6 @@ index c9c04ce..31141d9 100755
18270 18279
18271 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 18280 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
18272 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 18281 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
18273@@ -8936,7 +9450,7 @@ _LT_EOF
18274 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
18275 && test "$tmp_diet" = no
18276 then
18277- tmp_addflag=
18278+ tmp_addflag=' $pic_flag'
18279 tmp_sharedflag='-shared'
18280 case $cc_basename,$host_cpu in
18281 pgcc*) # Portland Group C compiler
18282@@ -8987,12 +9501,12 @@ _LT_EOF 18282@@ -8987,12 +9501,12 @@ _LT_EOF
18283 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 18283 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
18284 hardcode_libdir_flag_spec= 18284 hardcode_libdir_flag_spec=
@@ -18721,6 +18721,15 @@ index c9c04ce..31141d9 100755
18721 hardcode_into_libs=yes 18721 hardcode_into_libs=yes
18722 ;; 18722 ;;
18723 18723
18724@@ -11146,7 +11801,7 @@ else
18725 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
18726 lt_status=$lt_dlunknown
18727 cat > conftest.$ac_ext <<_LT_EOF
18728-#line 11149 "configure"
18729+#line $LINENO "configure"
18730 #include "confdefs.h"
18731
18732 #if HAVE_DLFCN_H
18724@@ -11190,10 +11845,10 @@ else 18733@@ -11190,10 +11845,10 @@ else
18725 /* When -fvisbility=hidden is used, assume the code has been annotated 18734 /* When -fvisbility=hidden is used, assume the code has been annotated
18726 correspondingly for the symbols needed. */ 18735 correspondingly for the symbols needed. */
@@ -18734,6 +18743,15 @@ index c9c04ce..31141d9 100755
18734 int main () 18743 int main ()
18735 { 18744 {
18736 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 18745 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
18746@@ -11252,7 +11907,7 @@ else
18747 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
18748 lt_status=$lt_dlunknown
18749 cat > conftest.$ac_ext <<_LT_EOF
18750-#line 11255 "configure"
18751+#line $LINENO "configure"
18752 #include "confdefs.h"
18753
18754 #if HAVE_DLFCN_H
18737@@ -11296,10 +11951,10 @@ else 18755@@ -11296,10 +11951,10 @@ else
18738 /* When -fvisbility=hidden is used, assume the code has been annotated 18756 /* When -fvisbility=hidden is used, assume the code has been annotated
18739 correspondingly for the symbols needed. */ 18757 correspondingly for the symbols needed. */
@@ -18747,7 +18765,7 @@ index c9c04ce..31141d9 100755
18747 int main () 18765 int main ()
18748 { 18766 {
18749 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 18767 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
18750@@ -12450,7 +13105,7 @@ if test "$enable_shared" = "yes"; then 18768@@ -12462,7 +13117,7 @@ if test "$enable_shared" = "yes"; then
18751 # since libbfd may not pull in the entirety of libiberty. 18769 # since libbfd may not pull in the entirety of libiberty.
18752 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` 18770 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
18753 if test -n "$x"; then 18771 if test -n "$x"; then
@@ -18756,7 +18774,7 @@ index c9c04ce..31141d9 100755
18756 fi 18774 fi
18757 18775
18758 case "${host}" in 18776 case "${host}" in
18759@@ -13422,13 +14077,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 18777@@ -13436,13 +14091,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
18760 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 18778 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
18761 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 18779 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
18762 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 18780 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -18777,7 +18795,7 @@ index c9c04ce..31141d9 100755
18777 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 18795 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
18778 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 18796 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
18779 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 18797 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
18780@@ -13443,14 +14105,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 18798@@ -13457,14 +14119,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
18781 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 18799 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
18782 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 18800 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
18783 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"`' 18801 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"`'
@@ -18796,7 +18814,7 @@ index c9c04ce..31141d9 100755
18796 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 18814 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
18797 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 18815 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
18798 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 18816 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
18799@@ -13483,12 +14148,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 18817@@ -13497,12 +14162,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
18800 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 18818 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
18801 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 18819 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
18802 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 18820 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -18810,7 +18828,7 @@ index c9c04ce..31141d9 100755
18810 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 18828 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
18811 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 18829 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
18812 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 18830 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
18813@@ -13543,8 +14208,13 @@ reload_flag \ 18831@@ -13557,8 +14222,13 @@ reload_flag \
18814 OBJDUMP \ 18832 OBJDUMP \
18815 deplibs_check_method \ 18833 deplibs_check_method \
18816 file_magic_cmd \ 18834 file_magic_cmd \
@@ -18824,7 +18842,7 @@ index c9c04ce..31141d9 100755
18824 STRIP \ 18842 STRIP \
18825 RANLIB \ 18843 RANLIB \
18826 CC \ 18844 CC \
18827@@ -13554,12 +14224,14 @@ lt_cv_sys_global_symbol_pipe \ 18845@@ -13568,12 +14238,14 @@ lt_cv_sys_global_symbol_pipe \
18828 lt_cv_sys_global_symbol_to_cdecl \ 18846 lt_cv_sys_global_symbol_to_cdecl \
18829 lt_cv_sys_global_symbol_to_c_name_address \ 18847 lt_cv_sys_global_symbol_to_c_name_address \
18830 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 18848 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -18840,7 +18858,7 @@ index c9c04ce..31141d9 100755
18840 DSYMUTIL \ 18858 DSYMUTIL \
18841 NMEDIT \ 18859 NMEDIT \
18842 LIPO \ 18860 LIPO \
18843@@ -13575,7 +14247,6 @@ no_undefined_flag \ 18861@@ -13589,7 +14261,6 @@ no_undefined_flag \
18844 hardcode_libdir_flag_spec \ 18862 hardcode_libdir_flag_spec \
18845 hardcode_libdir_flag_spec_ld \ 18863 hardcode_libdir_flag_spec_ld \
18846 hardcode_libdir_separator \ 18864 hardcode_libdir_separator \
@@ -18848,7 +18866,7 @@ index c9c04ce..31141d9 100755
18848 exclude_expsyms \ 18866 exclude_expsyms \
18849 include_expsyms \ 18867 include_expsyms \
18850 file_list_spec \ 18868 file_list_spec \
18851@@ -13611,6 +14282,7 @@ module_cmds \ 18869@@ -13625,6 +14296,7 @@ module_cmds \
18852 module_expsym_cmds \ 18870 module_expsym_cmds \
18853 export_symbols_cmds \ 18871 export_symbols_cmds \
18854 prelink_cmds \ 18872 prelink_cmds \
@@ -18856,7 +18874,7 @@ index c9c04ce..31141d9 100755
18856 postinstall_cmds \ 18874 postinstall_cmds \
18857 postuninstall_cmds \ 18875 postuninstall_cmds \
18858 finish_cmds \ 18876 finish_cmds \
18859@@ -14367,7 +15039,8 @@ $as_echo X"$file" | 18877@@ -14381,7 +15053,8 @@ $as_echo X"$file" |
18860 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 18878 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
18861 # 18879 #
18862 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 18880 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -18866,7 +18884,7 @@ index c9c04ce..31141d9 100755
18866 # Written by Gordon Matzigkeit, 1996 18884 # Written by Gordon Matzigkeit, 1996
18867 # 18885 #
18868 # This file is part of GNU Libtool. 18886 # This file is part of GNU Libtool.
18869@@ -14470,19 +15143,42 @@ SP2NL=$lt_lt_SP2NL 18887@@ -14484,19 +15157,42 @@ SP2NL=$lt_lt_SP2NL
18870 # turn newlines into spaces. 18888 # turn newlines into spaces.
18871 NL2SP=$lt_lt_NL2SP 18889 NL2SP=$lt_lt_NL2SP
18872 18890
@@ -18910,7 +18928,7 @@ index c9c04ce..31141d9 100755
18910 # A symbol stripping program. 18928 # A symbol stripping program.
18911 STRIP=$lt_STRIP 18929 STRIP=$lt_STRIP
18912 18930
18913@@ -14512,6 +15208,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 18931@@ -14526,6 +15222,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
18914 # Transform the output of nm in a C name address pair when lib prefix is needed. 18932 # Transform the output of nm in a C name address pair when lib prefix is needed.
18915 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 18933 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
18916 18934
@@ -18923,7 +18941,7 @@ index c9c04ce..31141d9 100755
18923 # The name of the directory that contains temporary libtool files. 18941 # The name of the directory that contains temporary libtool files.
18924 objdir=$objdir 18942 objdir=$objdir
18925 18943
18926@@ -14521,6 +15223,9 @@ MAGIC_CMD=$MAGIC_CMD 18944@@ -14535,6 +15237,9 @@ MAGIC_CMD=$MAGIC_CMD
18927 # Must we lock files when doing compilation? 18945 # Must we lock files when doing compilation?
18928 need_locks=$lt_need_locks 18946 need_locks=$lt_need_locks
18929 18947
@@ -18933,7 +18951,7 @@ index c9c04ce..31141d9 100755
18933 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 18951 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
18934 DSYMUTIL=$lt_DSYMUTIL 18952 DSYMUTIL=$lt_DSYMUTIL
18935 18953
18936@@ -14635,12 +15340,12 @@ with_gcc=$GCC 18954@@ -14649,12 +15354,12 @@ with_gcc=$GCC
18937 # Compiler flag to turn off builtin functions. 18955 # Compiler flag to turn off builtin functions.
18938 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 18956 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
18939 18957
@@ -18949,7 +18967,7 @@ index c9c04ce..31141d9 100755
18949 # Compiler flag to prevent dynamic linking. 18967 # Compiler flag to prevent dynamic linking.
18950 link_static_flag=$lt_lt_prog_compiler_static 18968 link_static_flag=$lt_lt_prog_compiler_static
18951 18969
18952@@ -14727,9 +15432,6 @@ inherit_rpath=$inherit_rpath 18970@@ -14741,9 +15446,6 @@ inherit_rpath=$inherit_rpath
18953 # Whether libtool must link a program against all its dependency libraries. 18971 # Whether libtool must link a program against all its dependency libraries.
18954 link_all_deplibs=$link_all_deplibs 18972 link_all_deplibs=$link_all_deplibs
18955 18973
@@ -18959,7 +18977,7 @@ index c9c04ce..31141d9 100755
18959 # Set to "yes" if exported symbols are required. 18977 # Set to "yes" if exported symbols are required.
18960 always_export_symbols=$always_export_symbols 18978 always_export_symbols=$always_export_symbols
18961 18979
18962@@ -14745,6 +15447,9 @@ include_expsyms=$lt_include_expsyms 18980@@ -14759,6 +15461,9 @@ include_expsyms=$lt_include_expsyms
18963 # Commands necessary for linking programs (against libraries) with templates. 18981 # Commands necessary for linking programs (against libraries) with templates.
18964 prelink_cmds=$lt_prelink_cmds 18982 prelink_cmds=$lt_prelink_cmds
18965 18983
@@ -18969,7 +18987,7 @@ index c9c04ce..31141d9 100755
18969 # Specify filename containing input files. 18987 # Specify filename containing input files.
18970 file_list_spec=$lt_file_list_spec 18988 file_list_spec=$lt_file_list_spec
18971 18989
18972@@ -14777,210 +15482,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 18990@@ -14791,210 +15496,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
18973 # if finds mixed CR/LF and LF-only lines. Since sed operates in 18991 # if finds mixed CR/LF and LF-only lines. Since sed operates in
18974 # text mode, it properly converts lines to CR/LF. This bash problem 18992 # text mode, it properly converts lines to CR/LF. This bash problem
18975 # is reportedly fixed, but why not run on old versions too? 18993 # is reportedly fixed, but why not run on old versions too?
@@ -19344,7 +19362,7 @@ index c9c04ce..31141d9 100755
19344 chmod +x "$ofile" 19362 chmod +x "$ofile"
19345 19363
19346diff --git a/opcodes/configure.ac b/opcodes/configure.ac 19364diff --git a/opcodes/configure.ac b/opcodes/configure.ac
19347index b93e855..43ba976 100644 19365index 07e3162..c0c75d4 100644
19348--- a/opcodes/configure.ac 19366--- a/opcodes/configure.ac
19349+++ b/opcodes/configure.ac 19367+++ b/opcodes/configure.ac
19350@@ -167,7 +167,7 @@ changequote(,)dnl 19368@@ -167,7 +167,7 @@ changequote(,)dnl
@@ -19356,6 +19374,1922 @@ index b93e855..43ba976 100644
19356 fi 19374 fi
19357 19375
19358 case "${host}" in 19376 case "${host}" in
19377diff --git a/zlib/configure b/zlib/configure
19378index 8378857..7584940 100755
19379--- a/zlib/configure
19380+++ b/zlib/configure
19381@@ -614,8 +614,11 @@ OTOOL
19382 LIPO
19383 NMEDIT
19384 DSYMUTIL
19385+MANIFEST_TOOL
19386 RANLIB
19387+ac_ct_AR
19388 AR
19389+DLLTOOL
19390 OBJDUMP
19391 LN_S
19392 NM
19393@@ -736,6 +739,7 @@ enable_static
19394 with_pic
19395 enable_fast_install
19396 with_gnu_ld
19397+with_libtool_sysroot
19398 enable_libtool_lock
19399 enable_host_shared
19400 '
19401@@ -1384,6 +1388,8 @@ Optional Packages:
19402 --with-pic try to use only PIC/non-PIC objects [default=use
19403 both]
19404 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
19405+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
19406+ (or the compiler's sysroot if not specified).
19407
19408 Some influential environment variables:
19409 CC C compiler command
19410@@ -3907,8 +3913,8 @@ esac
19411
19412
19413
19414-macro_version='2.2.7a'
19415-macro_revision='1.3134'
19416+macro_version='2.4'
19417+macro_revision='1.3293'
19418
19419
19420
19421@@ -3948,7 +3954,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
19422 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
19423 $as_echo_n "checking how to print strings... " >&6; }
19424 # Test print first, because it will be a builtin if present.
19425-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
19426+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
19427 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
19428 ECHO='print -r --'
19429 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
19430@@ -4764,8 +4770,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
19431 # Try some XSI features
19432 xsi_shell=no
19433 ( _lt_dummy="a/b/c"
19434- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
19435- = c,a/b,, \
19436+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
19437+ = c,a/b,b/c, \
19438 && eval 'test $(( 1 + 1 )) -eq 2 \
19439 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
19440 && xsi_shell=yes
19441@@ -4814,6 +4820,80 @@ esac
19442
19443
19444
19445+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
19446+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
19447+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
19448+ $as_echo_n "(cached) " >&6
19449+else
19450+ case $host in
19451+ *-*-mingw* )
19452+ case $build in
19453+ *-*-mingw* ) # actually msys
19454+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
19455+ ;;
19456+ *-*-cygwin* )
19457+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
19458+ ;;
19459+ * ) # otherwise, assume *nix
19460+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
19461+ ;;
19462+ esac
19463+ ;;
19464+ *-*-cygwin* )
19465+ case $build in
19466+ *-*-mingw* ) # actually msys
19467+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
19468+ ;;
19469+ *-*-cygwin* )
19470+ lt_cv_to_host_file_cmd=func_convert_file_noop
19471+ ;;
19472+ * ) # otherwise, assume *nix
19473+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
19474+ ;;
19475+ esac
19476+ ;;
19477+ * ) # unhandled hosts (and "normal" native builds)
19478+ lt_cv_to_host_file_cmd=func_convert_file_noop
19479+ ;;
19480+esac
19481+
19482+fi
19483+
19484+to_host_file_cmd=$lt_cv_to_host_file_cmd
19485+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
19486+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
19487+
19488+
19489+
19490+
19491+
19492+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
19493+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
19494+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
19495+ $as_echo_n "(cached) " >&6
19496+else
19497+ #assume ordinary cross tools, or native build.
19498+lt_cv_to_tool_file_cmd=func_convert_file_noop
19499+case $host in
19500+ *-*-mingw* )
19501+ case $build in
19502+ *-*-mingw* ) # actually msys
19503+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
19504+ ;;
19505+ esac
19506+ ;;
19507+esac
19508+
19509+fi
19510+
19511+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
19512+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
19513+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
19514+
19515+
19516+
19517+
19518+
19519 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
19520 $as_echo_n "checking for $LD option to reload object files... " >&6; }
19521 if test "${lt_cv_ld_reload_flag+set}" = set; then :
19522@@ -4830,6 +4910,11 @@ case $reload_flag in
19523 esac
19524 reload_cmds='$LD$reload_flag -o $output$reload_objs'
19525 case $host_os in
19526+ cygwin* | mingw* | pw32* | cegcc*)
19527+ if test "$GCC" != yes; then
19528+ reload_cmds=false
19529+ fi
19530+ ;;
19531 darwin*)
19532 if test "$GCC" = yes; then
19533 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
19534@@ -4998,7 +5083,8 @@ mingw* | pw32*)
19535 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
19536 lt_cv_file_magic_cmd='func_win32_libid'
19537 else
19538- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
19539+ # Keep this pattern in sync with the one in func_win32_libid.
19540+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
19541 lt_cv_file_magic_cmd='$OBJDUMP -f'
19542 fi
19543 ;;
19544@@ -5152,6 +5238,21 @@ esac
19545 fi
19546 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
19547 $as_echo "$lt_cv_deplibs_check_method" >&6; }
19548+
19549+file_magic_glob=
19550+want_nocaseglob=no
19551+if test "$build" = "$host"; then
19552+ case $host_os in
19553+ mingw* | pw32*)
19554+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
19555+ want_nocaseglob=yes
19556+ else
19557+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
19558+ fi
19559+ ;;
19560+ esac
19561+fi
19562+
19563 file_magic_cmd=$lt_cv_file_magic_cmd
19564 deplibs_check_method=$lt_cv_deplibs_check_method
19565 test -z "$deplibs_check_method" && deplibs_check_method=unknown
19566@@ -5167,9 +5268,163 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
19567
19568
19569
19570+
19571+
19572+
19573+
19574+
19575+
19576+
19577+
19578+
19579+
19580 if test -n "$ac_tool_prefix"; then
19581- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
19582-set dummy ${ac_tool_prefix}ar; ac_word=$2
19583+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
19584+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
19585+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19586+$as_echo_n "checking for $ac_word... " >&6; }
19587+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
19588+ $as_echo_n "(cached) " >&6
19589+else
19590+ if test -n "$DLLTOOL"; then
19591+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
19592+else
19593+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19594+for as_dir in $PATH
19595+do
19596+ IFS=$as_save_IFS
19597+ test -z "$as_dir" && as_dir=.
19598+ for ac_exec_ext in '' $ac_executable_extensions; do
19599+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19600+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
19601+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19602+ break 2
19603+ fi
19604+done
19605+ done
19606+IFS=$as_save_IFS
19607+
19608+fi
19609+fi
19610+DLLTOOL=$ac_cv_prog_DLLTOOL
19611+if test -n "$DLLTOOL"; then
19612+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
19613+$as_echo "$DLLTOOL" >&6; }
19614+else
19615+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19616+$as_echo "no" >&6; }
19617+fi
19618+
19619+
19620+fi
19621+if test -z "$ac_cv_prog_DLLTOOL"; then
19622+ ac_ct_DLLTOOL=$DLLTOOL
19623+ # Extract the first word of "dlltool", so it can be a program name with args.
19624+set dummy dlltool; ac_word=$2
19625+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19626+$as_echo_n "checking for $ac_word... " >&6; }
19627+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
19628+ $as_echo_n "(cached) " >&6
19629+else
19630+ if test -n "$ac_ct_DLLTOOL"; then
19631+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
19632+else
19633+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19634+for as_dir in $PATH
19635+do
19636+ IFS=$as_save_IFS
19637+ test -z "$as_dir" && as_dir=.
19638+ for ac_exec_ext in '' $ac_executable_extensions; do
19639+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19640+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
19641+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19642+ break 2
19643+ fi
19644+done
19645+ done
19646+IFS=$as_save_IFS
19647+
19648+fi
19649+fi
19650+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
19651+if test -n "$ac_ct_DLLTOOL"; then
19652+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
19653+$as_echo "$ac_ct_DLLTOOL" >&6; }
19654+else
19655+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19656+$as_echo "no" >&6; }
19657+fi
19658+
19659+ if test "x$ac_ct_DLLTOOL" = x; then
19660+ DLLTOOL="false"
19661+ else
19662+ case $cross_compiling:$ac_tool_warned in
19663+yes:)
19664+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
19665+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
19666+ac_tool_warned=yes ;;
19667+esac
19668+ DLLTOOL=$ac_ct_DLLTOOL
19669+ fi
19670+else
19671+ DLLTOOL="$ac_cv_prog_DLLTOOL"
19672+fi
19673+
19674+test -z "$DLLTOOL" && DLLTOOL=dlltool
19675+
19676+
19677+
19678+
19679+
19680+
19681+
19682+
19683+
19684+
19685+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
19686+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
19687+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
19688+ $as_echo_n "(cached) " >&6
19689+else
19690+ lt_cv_sharedlib_from_linklib_cmd='unknown'
19691+
19692+case $host_os in
19693+cygwin* | mingw* | pw32* | cegcc*)
19694+ # two different shell functions defined in ltmain.sh
19695+ # decide which to use based on capabilities of $DLLTOOL
19696+ case `$DLLTOOL --help 2>&1` in
19697+ *--identify-strict*)
19698+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
19699+ ;;
19700+ *)
19701+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
19702+ ;;
19703+ esac
19704+ ;;
19705+*)
19706+ # fallback: assume linklib IS sharedlib
19707+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
19708+ ;;
19709+esac
19710+
19711+fi
19712+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
19713+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
19714+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
19715+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
19716+
19717+
19718+
19719+
19720+
19721+
19722+
19723+
19724+if test -n "$ac_tool_prefix"; then
19725+ for ac_prog in ar
19726+ do
19727+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
19728+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
19729 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19730 $as_echo_n "checking for $ac_word... " >&6; }
19731 if test "${ac_cv_prog_AR+set}" = set; then :
19732@@ -5185,7 +5440,7 @@ do
19733 test -z "$as_dir" && as_dir=.
19734 for ac_exec_ext in '' $ac_executable_extensions; do
19735 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19736- ac_cv_prog_AR="${ac_tool_prefix}ar"
19737+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
19738 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19739 break 2
19740 fi
19741@@ -5205,11 +5460,15 @@ $as_echo "no" >&6; }
19742 fi
19743
19744
19745+ test -n "$AR" && break
19746+ done
19747 fi
19748-if test -z "$ac_cv_prog_AR"; then
19749+if test -z "$AR"; then
19750 ac_ct_AR=$AR
19751- # Extract the first word of "ar", so it can be a program name with args.
19752-set dummy ar; ac_word=$2
19753+ for ac_prog in ar
19754+do
19755+ # Extract the first word of "$ac_prog", so it can be a program name with args.
19756+set dummy $ac_prog; ac_word=$2
19757 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19758 $as_echo_n "checking for $ac_word... " >&6; }
19759 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
19760@@ -5225,7 +5484,7 @@ do
19761 test -z "$as_dir" && as_dir=.
19762 for ac_exec_ext in '' $ac_executable_extensions; do
19763 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19764- ac_cv_prog_ac_ct_AR="ar"
19765+ ac_cv_prog_ac_ct_AR="$ac_prog"
19766 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19767 break 2
19768 fi
19769@@ -5244,6 +5503,10 @@ else
19770 $as_echo "no" >&6; }
19771 fi
19772
19773+
19774+ test -n "$ac_ct_AR" && break
19775+done
19776+
19777 if test "x$ac_ct_AR" = x; then
19778 AR="false"
19779 else
19780@@ -5255,16 +5518,72 @@ ac_tool_warned=yes ;;
19781 esac
19782 AR=$ac_ct_AR
19783 fi
19784-else
19785- AR="$ac_cv_prog_AR"
19786 fi
19787
19788-test -z "$AR" && AR=ar
19789-test -z "$AR_FLAGS" && AR_FLAGS=cru
19790+: ${AR=ar}
19791+: ${AR_FLAGS=cru}
19792+
19793+
19794+
19795+
19796+
19797+
19798+
19799+
19800+
19801+
19802+
19803+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
19804+$as_echo_n "checking for archiver @FILE support... " >&6; }
19805+if test "${lt_cv_ar_at_file+set}" = set; then :
19806+ $as_echo_n "(cached) " >&6
19807+else
19808+ lt_cv_ar_at_file=no
19809+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
19810+/* end confdefs.h. */
19811+
19812+int
19813+main ()
19814+{
19815
19816+ ;
19817+ return 0;
19818+}
19819+_ACEOF
19820+if ac_fn_c_try_compile "$LINENO"; then :
19821+ echo conftest.$ac_objext > conftest.lst
19822+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
19823+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
19824+ (eval $lt_ar_try) 2>&5
19825+ ac_status=$?
19826+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
19827+ test $ac_status = 0; }
19828+ if test "$ac_status" -eq 0; then
19829+ # Ensure the archiver fails upon bogus file names.
19830+ rm -f conftest.$ac_objext libconftest.a
19831+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
19832+ (eval $lt_ar_try) 2>&5
19833+ ac_status=$?
19834+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
19835+ test $ac_status = 0; }
19836+ if test "$ac_status" -ne 0; then
19837+ lt_cv_ar_at_file=@
19838+ fi
19839+ fi
19840+ rm -f conftest.* libconftest.a
19841
19842+fi
19843+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
19844
19845+fi
19846+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
19847+$as_echo "$lt_cv_ar_at_file" >&6; }
19848
19849+if test "x$lt_cv_ar_at_file" = xno; then
19850+ archiver_list_spec=
19851+else
19852+ archiver_list_spec=$lt_cv_ar_at_file
19853+fi
19854
19855
19856
19857@@ -5606,8 +5925,8 @@ esac
19858 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
19859
19860 # Transform an extracted symbol line into symbol name and symbol address
19861-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
19862-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
19863+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
19864+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
19865
19866 # Handle CRLF in mingw tool chain
19867 opt_cr=
19868@@ -5643,6 +5962,7 @@ for ac_symprfx in "" "_"; do
19869 else
19870 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
19871 fi
19872+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
19873
19874 # Check to see that the pipe works correctly.
19875 pipe_works=no
19876@@ -5684,6 +6004,18 @@ _LT_EOF
19877 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
19878 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
19879 cat <<_LT_EOF > conftest.$ac_ext
19880+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
19881+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
19882+/* DATA imports from DLLs on WIN32 con't be const, because runtime
19883+ relocations are performed -- see ld's documentation on pseudo-relocs. */
19884+# define LT_DLSYM_CONST
19885+#elif defined(__osf__)
19886+/* This system does not cope well with relocations in const data. */
19887+# define LT_DLSYM_CONST
19888+#else
19889+# define LT_DLSYM_CONST const
19890+#endif
19891+
19892 #ifdef __cplusplus
19893 extern "C" {
19894 #endif
19895@@ -5695,7 +6027,7 @@ _LT_EOF
19896 cat <<_LT_EOF >> conftest.$ac_ext
19897
19898 /* The mapping between symbol names and symbols. */
19899-const struct {
19900+LT_DLSYM_CONST struct {
19901 const char *name;
19902 void *address;
19903 }
19904@@ -5721,8 +6053,8 @@ static const void *lt_preloaded_setup() {
19905 _LT_EOF
19906 # Now try linking the two files.
19907 mv conftest.$ac_objext conftstm.$ac_objext
19908- lt_save_LIBS="$LIBS"
19909- lt_save_CFLAGS="$CFLAGS"
19910+ lt_globsym_save_LIBS=$LIBS
19911+ lt_globsym_save_CFLAGS=$CFLAGS
19912 LIBS="conftstm.$ac_objext"
19913 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
19914 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
19915@@ -5732,8 +6064,8 @@ _LT_EOF
19916 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
19917 pipe_works=yes
19918 fi
19919- LIBS="$lt_save_LIBS"
19920- CFLAGS="$lt_save_CFLAGS"
19921+ LIBS=$lt_globsym_save_LIBS
19922+ CFLAGS=$lt_globsym_save_CFLAGS
19923 else
19924 echo "cannot find nm_test_func in $nlist" >&5
19925 fi
19926@@ -5770,6 +6102,19 @@ else
19927 $as_echo "ok" >&6; }
19928 fi
19929
19930+# Response file support.
19931+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
19932+ nm_file_list_spec='@'
19933+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
19934+ nm_file_list_spec='@'
19935+fi
19936+
19937+
19938+
19939+
19940+
19941+
19942+
19943
19944
19945
19946@@ -5790,6 +6135,41 @@ fi
19947
19948
19949
19950+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
19951+$as_echo_n "checking for sysroot... " >&6; }
19952+
19953+# Check whether --with-libtool-sysroot was given.
19954+if test "${with_libtool_sysroot+set}" = set; then :
19955+ withval=$with_libtool_sysroot;
19956+else
19957+ with_libtool_sysroot=no
19958+fi
19959+
19960+
19961+lt_sysroot=
19962+case ${with_libtool_sysroot} in #(
19963+ yes)
19964+ if test "$GCC" = yes; then
19965+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
19966+ fi
19967+ ;; #(
19968+ /*)
19969+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
19970+ ;; #(
19971+ no|'')
19972+ ;; #(
19973+ *)
19974+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
19975+$as_echo "${with_libtool_sysroot}" >&6; }
19976+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
19977+ ;;
19978+esac
19979+
19980+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
19981+$as_echo "${lt_sysroot:-no}" >&6; }
19982+
19983+
19984+
19985
19986
19987 # Check whether --enable-libtool-lock was given.
19988@@ -6001,6 +6381,123 @@ esac
19989
19990 need_locks="$enable_libtool_lock"
19991
19992+if test -n "$ac_tool_prefix"; then
19993+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
19994+set dummy ${ac_tool_prefix}mt; ac_word=$2
19995+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19996+$as_echo_n "checking for $ac_word... " >&6; }
19997+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
19998+ $as_echo_n "(cached) " >&6
19999+else
20000+ if test -n "$MANIFEST_TOOL"; then
20001+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
20002+else
20003+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
20004+for as_dir in $PATH
20005+do
20006+ IFS=$as_save_IFS
20007+ test -z "$as_dir" && as_dir=.
20008+ for ac_exec_ext in '' $ac_executable_extensions; do
20009+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
20010+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
20011+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
20012+ break 2
20013+ fi
20014+done
20015+ done
20016+IFS=$as_save_IFS
20017+
20018+fi
20019+fi
20020+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
20021+if test -n "$MANIFEST_TOOL"; then
20022+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
20023+$as_echo "$MANIFEST_TOOL" >&6; }
20024+else
20025+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
20026+$as_echo "no" >&6; }
20027+fi
20028+
20029+
20030+fi
20031+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
20032+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
20033+ # Extract the first word of "mt", so it can be a program name with args.
20034+set dummy mt; ac_word=$2
20035+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
20036+$as_echo_n "checking for $ac_word... " >&6; }
20037+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
20038+ $as_echo_n "(cached) " >&6
20039+else
20040+ if test -n "$ac_ct_MANIFEST_TOOL"; then
20041+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
20042+else
20043+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
20044+for as_dir in $PATH
20045+do
20046+ IFS=$as_save_IFS
20047+ test -z "$as_dir" && as_dir=.
20048+ for ac_exec_ext in '' $ac_executable_extensions; do
20049+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
20050+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
20051+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
20052+ break 2
20053+ fi
20054+done
20055+ done
20056+IFS=$as_save_IFS
20057+
20058+fi
20059+fi
20060+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
20061+if test -n "$ac_ct_MANIFEST_TOOL"; then
20062+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
20063+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
20064+else
20065+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
20066+$as_echo "no" >&6; }
20067+fi
20068+
20069+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
20070+ MANIFEST_TOOL=":"
20071+ else
20072+ case $cross_compiling:$ac_tool_warned in
20073+yes:)
20074+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
20075+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
20076+ac_tool_warned=yes ;;
20077+esac
20078+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
20079+ fi
20080+else
20081+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
20082+fi
20083+
20084+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
20085+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
20086+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
20087+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
20088+ $as_echo_n "(cached) " >&6
20089+else
20090+ lt_cv_path_mainfest_tool=no
20091+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
20092+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
20093+ cat conftest.err >&5
20094+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
20095+ lt_cv_path_mainfest_tool=yes
20096+ fi
20097+ rm -f conftest*
20098+fi
20099+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
20100+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
20101+if test "x$lt_cv_path_mainfest_tool" != xyes; then
20102+ MANIFEST_TOOL=:
20103+fi
20104+
20105+
20106+
20107+
20108+
20109
20110 case $host_os in
20111 rhapsody* | darwin*)
20112@@ -6567,6 +7064,8 @@ _LT_EOF
20113 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
20114 echo "$AR cru libconftest.a conftest.o" >&5
20115 $AR cru libconftest.a conftest.o 2>&5
20116+ echo "$RANLIB libconftest.a" >&5
20117+ $RANLIB libconftest.a 2>&5
20118 cat > conftest.c << _LT_EOF
20119 int main() { return 0;}
20120 _LT_EOF
20121@@ -7030,7 +7529,8 @@ fi
20122 LIBTOOL_DEPS="$ltmain"
20123
20124 # Always use our own libtool.
20125-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
20126+LIBTOOL='$(SHELL) $(top_builddir)'
20127+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
20128
20129
20130
20131@@ -7119,7 +7619,7 @@ aix3*)
20132 esac
20133
20134 # Global variables:
20135-ofile=libtool
20136+ofile=${host_alias}-libtool
20137 can_build_shared=yes
20138
20139 # All known linkers require a `.a' archive for static linking (except MSVC,
20140@@ -7417,8 +7917,6 @@ fi
20141 lt_prog_compiler_pic=
20142 lt_prog_compiler_static=
20143
20144-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
20145-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
20146
20147 if test "$GCC" = yes; then
20148 lt_prog_compiler_wl='-Wl,'
20149@@ -7584,6 +8082,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
20150 lt_prog_compiler_pic='--shared'
20151 lt_prog_compiler_static='--static'
20152 ;;
20153+ nagfor*)
20154+ # NAG Fortran compiler
20155+ lt_prog_compiler_wl='-Wl,-Wl,,'
20156+ lt_prog_compiler_pic='-PIC'
20157+ lt_prog_compiler_static='-Bstatic'
20158+ ;;
20159 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
20160 # Portland Group compilers (*not* the Pentium gcc compiler,
20161 # which looks to be a dead project)
20162@@ -7646,7 +8150,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
20163 lt_prog_compiler_pic='-KPIC'
20164 lt_prog_compiler_static='-Bstatic'
20165 case $cc_basename in
20166- f77* | f90* | f95*)
20167+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
20168 lt_prog_compiler_wl='-Qoption ld ';;
20169 *)
20170 lt_prog_compiler_wl='-Wl,';;
20171@@ -7703,13 +8207,17 @@ case $host_os in
20172 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
20173 ;;
20174 esac
20175-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
20176-$as_echo "$lt_prog_compiler_pic" >&6; }
20177-
20178-
20179-
20180-
20181
20182+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
20183+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
20184+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
20185+ $as_echo_n "(cached) " >&6
20186+else
20187+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
20188+fi
20189+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
20190+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
20191+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
20192
20193 #
20194 # Check to make sure the PIC flag actually works.
20195@@ -7770,6 +8278,11 @@ fi
20196
20197
20198
20199+
20200+
20201+
20202+
20203+
20204 #
20205 # Check to make sure the static flag actually works.
20206 #
20207@@ -8120,7 +8633,8 @@ _LT_EOF
20208 allow_undefined_flag=unsupported
20209 always_export_symbols=no
20210 enable_shared_with_static_runtimes=yes
20211- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
20212+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
20213+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
20214
20215 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
20216 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
20217@@ -8219,12 +8733,12 @@ _LT_EOF
20218 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
20219 hardcode_libdir_flag_spec=
20220 hardcode_libdir_flag_spec_ld='-rpath $libdir'
20221- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
20222+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
20223 if test "x$supports_anon_versioning" = xyes; then
20224 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
20225 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
20226 echo "local: *; };" >> $output_objdir/$libname.ver~
20227- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
20228+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
20229 fi
20230 ;;
20231 esac
20232@@ -8238,8 +8752,8 @@ _LT_EOF
20233 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
20234 wlarc=
20235 else
20236- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
20237- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20238+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
20239+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20240 fi
20241 ;;
20242
20243@@ -8257,8 +8771,8 @@ _LT_EOF
20244
20245 _LT_EOF
20246 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
20247- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
20248- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20249+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
20250+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20251 else
20252 ld_shlibs=no
20253 fi
20254@@ -8304,8 +8818,8 @@ _LT_EOF
20255
20256 *)
20257 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
20258- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
20259- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20260+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
20261+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
20262 else
20263 ld_shlibs=no
20264 fi
20265@@ -8435,7 +8949,13 @@ _LT_EOF
20266 allow_undefined_flag='-berok'
20267 # Determine the default libpath from the value encoded in an
20268 # empty executable.
20269- if test x$gcc_no_link = xyes; then
20270+ if test "${lt_cv_aix_libpath+set}" = set; then
20271+ aix_libpath=$lt_cv_aix_libpath
20272+else
20273+ if test "${lt_cv_aix_libpath_+set}" = set; then :
20274+ $as_echo_n "(cached) " >&6
20275+else
20276+ if test x$gcc_no_link = xyes; then
20277 as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
20278 fi
20279 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
20280@@ -8451,22 +8971,29 @@ main ()
20281 _ACEOF
20282 if ac_fn_c_try_link "$LINENO"; then :
20283
20284-lt_aix_libpath_sed='
20285- /Import File Strings/,/^$/ {
20286- /^0/ {
20287- s/^0 *\(.*\)$/\1/
20288- p
20289- }
20290- }'
20291-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20292-# Check for a 64-bit object if we didn't find anything.
20293-if test -z "$aix_libpath"; then
20294- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20295-fi
20296+ lt_aix_libpath_sed='
20297+ /Import File Strings/,/^$/ {
20298+ /^0/ {
20299+ s/^0 *\([^ ]*\) *$/\1/
20300+ p
20301+ }
20302+ }'
20303+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20304+ # Check for a 64-bit object if we didn't find anything.
20305+ if test -z "$lt_cv_aix_libpath_"; then
20306+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20307+ fi
20308 fi
20309 rm -f core conftest.err conftest.$ac_objext \
20310 conftest$ac_exeext conftest.$ac_ext
20311-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20312+ if test -z "$lt_cv_aix_libpath_"; then
20313+ lt_cv_aix_libpath_="/usr/lib:/lib"
20314+ fi
20315+
20316+fi
20317+
20318+ aix_libpath=$lt_cv_aix_libpath_
20319+fi
20320
20321 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
20322 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"
20323@@ -8478,7 +9005,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20324 else
20325 # Determine the default libpath from the value encoded in an
20326 # empty executable.
20327- if test x$gcc_no_link = xyes; then
20328+ if test "${lt_cv_aix_libpath+set}" = set; then
20329+ aix_libpath=$lt_cv_aix_libpath
20330+else
20331+ if test "${lt_cv_aix_libpath_+set}" = set; then :
20332+ $as_echo_n "(cached) " >&6
20333+else
20334+ if test x$gcc_no_link = xyes; then
20335 as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
20336 fi
20337 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
20338@@ -8494,22 +9027,29 @@ main ()
20339 _ACEOF
20340 if ac_fn_c_try_link "$LINENO"; then :
20341
20342-lt_aix_libpath_sed='
20343- /Import File Strings/,/^$/ {
20344- /^0/ {
20345- s/^0 *\(.*\)$/\1/
20346- p
20347- }
20348- }'
20349-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20350-# Check for a 64-bit object if we didn't find anything.
20351-if test -z "$aix_libpath"; then
20352- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20353-fi
20354+ lt_aix_libpath_sed='
20355+ /Import File Strings/,/^$/ {
20356+ /^0/ {
20357+ s/^0 *\([^ ]*\) *$/\1/
20358+ p
20359+ }
20360+ }'
20361+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20362+ # Check for a 64-bit object if we didn't find anything.
20363+ if test -z "$lt_cv_aix_libpath_"; then
20364+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
20365+ fi
20366 fi
20367 rm -f core conftest.err conftest.$ac_objext \
20368 conftest$ac_exeext conftest.$ac_ext
20369-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20370+ if test -z "$lt_cv_aix_libpath_"; then
20371+ lt_cv_aix_libpath_="/usr/lib:/lib"
20372+ fi
20373+
20374+fi
20375+
20376+ aix_libpath=$lt_cv_aix_libpath_
20377+fi
20378
20379 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
20380 # Warning - without using the other run time loading flags,
20381@@ -8554,20 +9094,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20382 # Microsoft Visual C++.
20383 # hardcode_libdir_flag_spec is actually meaningless, as there is
20384 # no search path for DLLs.
20385- hardcode_libdir_flag_spec=' '
20386- allow_undefined_flag=unsupported
20387- # Tell ltmain to make .lib files, not .a files.
20388- libext=lib
20389- # Tell ltmain to make .dll files, not .so files.
20390- shrext_cmds=".dll"
20391- # FIXME: Setting linknames here is a bad hack.
20392- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
20393- # The linker will automatically build a .lib file if we build a DLL.
20394- old_archive_from_new_cmds='true'
20395- # FIXME: Should let the user specify the lib program.
20396- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
20397- fix_srcfile_path='`cygpath -w "$srcfile"`'
20398- enable_shared_with_static_runtimes=yes
20399+ case $cc_basename in
20400+ cl*)
20401+ # Native MSVC
20402+ hardcode_libdir_flag_spec=' '
20403+ allow_undefined_flag=unsupported
20404+ always_export_symbols=yes
20405+ file_list_spec='@'
20406+ # Tell ltmain to make .lib files, not .a files.
20407+ libext=lib
20408+ # Tell ltmain to make .dll files, not .so files.
20409+ shrext_cmds=".dll"
20410+ # FIXME: Setting linknames here is a bad hack.
20411+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
20412+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
20413+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
20414+ else
20415+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
20416+ fi~
20417+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
20418+ linknames='
20419+ # The linker will not automatically build a static lib if we build a DLL.
20420+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
20421+ enable_shared_with_static_runtimes=yes
20422+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
20423+ # Don't use ranlib
20424+ old_postinstall_cmds='chmod 644 $oldlib'
20425+ postlink_cmds='lt_outputfile="@OUTPUT@"~
20426+ lt_tool_outputfile="@TOOL_OUTPUT@"~
20427+ case $lt_outputfile in
20428+ *.exe|*.EXE) ;;
20429+ *)
20430+ lt_outputfile="$lt_outputfile.exe"
20431+ lt_tool_outputfile="$lt_tool_outputfile.exe"
20432+ ;;
20433+ esac~
20434+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
20435+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
20436+ $RM "$lt_outputfile.manifest";
20437+ fi'
20438+ ;;
20439+ *)
20440+ # Assume MSVC wrapper
20441+ hardcode_libdir_flag_spec=' '
20442+ allow_undefined_flag=unsupported
20443+ # Tell ltmain to make .lib files, not .a files.
20444+ libext=lib
20445+ # Tell ltmain to make .dll files, not .so files.
20446+ shrext_cmds=".dll"
20447+ # FIXME: Setting linknames here is a bad hack.
20448+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
20449+ # The linker will automatically build a .lib file if we build a DLL.
20450+ old_archive_from_new_cmds='true'
20451+ # FIXME: Should let the user specify the lib program.
20452+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
20453+ enable_shared_with_static_runtimes=yes
20454+ ;;
20455+ esac
20456 ;;
20457
20458 darwin* | rhapsody*)
20459@@ -8628,7 +9211,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20460
20461 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
20462 freebsd* | dragonfly*)
20463- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
20464+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
20465 hardcode_libdir_flag_spec='-R$libdir'
20466 hardcode_direct=yes
20467 hardcode_shlibpath_var=no
20468@@ -8636,7 +9219,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20469
20470 hpux9*)
20471 if test "$GCC" = yes; then
20472- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
20473+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
20474 else
20475 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'
20476 fi
20477@@ -8652,7 +9235,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20478
20479 hpux10*)
20480 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
20481- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
20482+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
20483 else
20484 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
20485 fi
20486@@ -8676,10 +9259,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20487 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
20488 ;;
20489 ia64*)
20490- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
20491+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
20492 ;;
20493 *)
20494- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
20495+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
20496 ;;
20497 esac
20498 else
20499@@ -8758,26 +9341,39 @@ fi
20500
20501 irix5* | irix6* | nonstopux*)
20502 if test "$GCC" = yes; then
20503- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
20504+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
20505 # Try to use the -exported_symbol ld option, if it does not
20506 # work, assume that -exports_file does not work either and
20507 # implicitly export all symbols.
20508- save_LDFLAGS="$LDFLAGS"
20509- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
20510- if test x$gcc_no_link = xyes; then
20511+ # This should be the same for all languages, so no per-tag cache variable.
20512+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
20513+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
20514+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
20515+ $as_echo_n "(cached) " >&6
20516+else
20517+ save_LDFLAGS="$LDFLAGS"
20518+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
20519+ if test x$gcc_no_link = xyes; then
20520 as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
20521 fi
20522 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
20523 /* end confdefs.h. */
20524-int foo(void) {}
20525+int foo (void) { return 0; }
20526 _ACEOF
20527 if ac_fn_c_try_link "$LINENO"; then :
20528- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
20529-
20530+ lt_cv_irix_exported_symbol=yes
20531+else
20532+ lt_cv_irix_exported_symbol=no
20533 fi
20534 rm -f core conftest.err conftest.$ac_objext \
20535 conftest$ac_exeext conftest.$ac_ext
20536- LDFLAGS="$save_LDFLAGS"
20537+ LDFLAGS="$save_LDFLAGS"
20538+fi
20539+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
20540+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
20541+ if test "$lt_cv_irix_exported_symbol" = yes; then
20542+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
20543+ fi
20544 else
20545 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'
20546 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'
20547@@ -8862,7 +9458,7 @@ rm -f core conftest.err conftest.$ac_objext \
20548 osf4* | osf5*) # as osf3* with the addition of -msym flag
20549 if test "$GCC" = yes; then
20550 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
20551- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
20552+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
20553 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
20554 else
20555 allow_undefined_flag=' -expect_unresolved \*'
20556@@ -8881,9 +9477,9 @@ rm -f core conftest.err conftest.$ac_objext \
20557 no_undefined_flag=' -z defs'
20558 if test "$GCC" = yes; then
20559 wlarc='${wl}'
20560- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
20561+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
20562 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
20563- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
20564+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
20565 else
20566 case `$CC -V 2>&1` in
20567 *"Compilers 5.0"*)
20568@@ -9459,8 +10055,9 @@ cygwin* | mingw* | pw32* | cegcc*)
20569 need_version=no
20570 need_lib_prefix=no
20571
20572- case $GCC,$host_os in
20573- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
20574+ case $GCC,$cc_basename in
20575+ yes,*)
20576+ # gcc
20577 library_names_spec='$libname.dll.a'
20578 # DLL is installed to $(libdir)/../bin by postinstall_cmds
20579 postinstall_cmds='base_file=`basename \${file}`~
20580@@ -9493,13 +10090,71 @@ cygwin* | mingw* | pw32* | cegcc*)
20581 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
20582 ;;
20583 esac
20584+ dynamic_linker='Win32 ld.exe'
20585+ ;;
20586+
20587+ *,cl*)
20588+ # Native MSVC
20589+ libname_spec='$name'
20590+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
20591+ library_names_spec='${libname}.dll.lib'
20592+
20593+ case $build_os in
20594+ mingw*)
20595+ sys_lib_search_path_spec=
20596+ lt_save_ifs=$IFS
20597+ IFS=';'
20598+ for lt_path in $LIB
20599+ do
20600+ IFS=$lt_save_ifs
20601+ # Let DOS variable expansion print the short 8.3 style file name.
20602+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
20603+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
20604+ done
20605+ IFS=$lt_save_ifs
20606+ # Convert to MSYS style.
20607+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
20608+ ;;
20609+ cygwin*)
20610+ # Convert to unix form, then to dos form, then back to unix form
20611+ # but this time dos style (no spaces!) so that the unix form looks
20612+ # like /cygdrive/c/PROGRA~1:/cygdr...
20613+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
20614+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
20615+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
20616+ ;;
20617+ *)
20618+ sys_lib_search_path_spec="$LIB"
20619+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
20620+ # It is most probably a Windows format PATH.
20621+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
20622+ else
20623+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
20624+ fi
20625+ # FIXME: find the short name or the path components, as spaces are
20626+ # common. (e.g. "Program Files" -> "PROGRA~1")
20627+ ;;
20628+ esac
20629+
20630+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
20631+ postinstall_cmds='base_file=`basename \${file}`~
20632+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
20633+ dldir=$destdir/`dirname \$dlpath`~
20634+ test -d \$dldir || mkdir -p \$dldir~
20635+ $install_prog $dir/$dlname \$dldir/$dlname'
20636+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
20637+ dlpath=$dir/\$dldll~
20638+ $RM \$dlpath'
20639+ shlibpath_overrides_runpath=yes
20640+ dynamic_linker='Win32 link.exe'
20641 ;;
20642
20643 *)
20644+ # Assume MSVC wrapper
20645 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
20646+ dynamic_linker='Win32 ld.exe'
20647 ;;
20648 esac
20649- dynamic_linker='Win32 ld.exe'
20650 # FIXME: first we should search . and the directory the executable is in
20651 shlibpath_var=PATH
20652 ;;
20653@@ -9591,7 +10246,7 @@ haiku*)
20654 soname_spec='${libname}${release}${shared_ext}$major'
20655 shlibpath_var=LIBRARY_PATH
20656 shlibpath_overrides_runpath=yes
20657- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
20658+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
20659 hardcode_into_libs=yes
20660 ;;
20661
20662@@ -10405,7 +11060,7 @@ else
20663 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
20664 lt_status=$lt_dlunknown
20665 cat > conftest.$ac_ext <<_LT_EOF
20666-#line 10408 "configure"
20667+#line $LINENO "configure"
20668 #include "confdefs.h"
20669
20670 #if HAVE_DLFCN_H
20671@@ -10449,10 +11104,10 @@ else
20672 /* When -fvisbility=hidden is used, assume the code has been annotated
20673 correspondingly for the symbols needed. */
20674 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
20675-void fnord () __attribute__((visibility("default")));
20676+int fnord () __attribute__((visibility("default")));
20677 #endif
20678
20679-void fnord () { int i=42; }
20680+int fnord () { return 42; }
20681 int main ()
20682 {
20683 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
20684@@ -10511,7 +11166,7 @@ else
20685 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
20686 lt_status=$lt_dlunknown
20687 cat > conftest.$ac_ext <<_LT_EOF
20688-#line 10514 "configure"
20689+#line $LINENO "configure"
20690 #include "confdefs.h"
20691
20692 #if HAVE_DLFCN_H
20693@@ -10555,10 +11210,10 @@ else
20694 /* When -fvisbility=hidden is used, assume the code has been annotated
20695 correspondingly for the symbols needed. */
20696 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
20697-void fnord () __attribute__((visibility("default")));
20698+int fnord () __attribute__((visibility("default")));
20699 #endif
20700
20701-void fnord () { int i=42; }
20702+int fnord () { return 42; }
20703 int main ()
20704 {
20705 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
20706@@ -11990,13 +12645,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
20707 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
20708 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
20709 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
20710+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
20711+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
20712 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
20713 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
20714 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
20715 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
20716 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
20717+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
20718+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
20719+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
20720+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
20721 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
20722 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
20723+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
20724 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
20725 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
20726 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
20727@@ -12011,14 +12673,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
20728 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
20729 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
20730 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"`'
20731+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
20732+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
20733 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
20734 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
20735 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
20736-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
20737 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
20738+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
20739 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
20740 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
20741 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
20742+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
20743 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
20744 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
20745 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
20746@@ -12051,12 +12716,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
20747 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
20748 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
20749 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
20750-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
20751 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
20752 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
20753 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
20754 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
20755 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
20756+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
20757 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
20758 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
20759 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
20760@@ -12111,8 +12776,13 @@ reload_flag \
20761 OBJDUMP \
20762 deplibs_check_method \
20763 file_magic_cmd \
20764+file_magic_glob \
20765+want_nocaseglob \
20766+DLLTOOL \
20767+sharedlib_from_linklib_cmd \
20768 AR \
20769 AR_FLAGS \
20770+archiver_list_spec \
20771 STRIP \
20772 RANLIB \
20773 CC \
20774@@ -12122,12 +12792,14 @@ lt_cv_sys_global_symbol_pipe \
20775 lt_cv_sys_global_symbol_to_cdecl \
20776 lt_cv_sys_global_symbol_to_c_name_address \
20777 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
20778+nm_file_list_spec \
20779 lt_prog_compiler_no_builtin_flag \
20780-lt_prog_compiler_wl \
20781 lt_prog_compiler_pic \
20782+lt_prog_compiler_wl \
20783 lt_prog_compiler_static \
20784 lt_cv_prog_compiler_c_o \
20785 need_locks \
20786+MANIFEST_TOOL \
20787 DSYMUTIL \
20788 NMEDIT \
20789 LIPO \
20790@@ -12143,7 +12815,6 @@ no_undefined_flag \
20791 hardcode_libdir_flag_spec \
20792 hardcode_libdir_flag_spec_ld \
20793 hardcode_libdir_separator \
20794-fix_srcfile_path \
20795 exclude_expsyms \
20796 include_expsyms \
20797 file_list_spec \
20798@@ -12179,6 +12850,7 @@ module_cmds \
20799 module_expsym_cmds \
20800 export_symbols_cmds \
20801 prelink_cmds \
20802+postlink_cmds \
20803 postinstall_cmds \
20804 postuninstall_cmds \
20805 finish_cmds \
20806@@ -12768,7 +13440,8 @@ $as_echo X"$file" |
20807 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
20808 #
20809 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
20810-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
20811+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
20812+# Inc.
20813 # Written by Gordon Matzigkeit, 1996
20814 #
20815 # This file is part of GNU Libtool.
20816@@ -12871,19 +13544,42 @@ SP2NL=$lt_lt_SP2NL
20817 # turn newlines into spaces.
20818 NL2SP=$lt_lt_NL2SP
20819
20820+# convert \$build file names to \$host format.
20821+to_host_file_cmd=$lt_cv_to_host_file_cmd
20822+
20823+# convert \$build files to toolchain format.
20824+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
20825+
20826 # An object symbol dumper.
20827 OBJDUMP=$lt_OBJDUMP
20828
20829 # Method to check whether dependent libraries are shared objects.
20830 deplibs_check_method=$lt_deplibs_check_method
20831
20832-# Command to use when deplibs_check_method == "file_magic".
20833+# Command to use when deplibs_check_method = "file_magic".
20834 file_magic_cmd=$lt_file_magic_cmd
20835
20836+# How to find potential files when deplibs_check_method = "file_magic".
20837+file_magic_glob=$lt_file_magic_glob
20838+
20839+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
20840+want_nocaseglob=$lt_want_nocaseglob
20841+
20842+# DLL creation program.
20843+DLLTOOL=$lt_DLLTOOL
20844+
20845+# Command to associate shared and link libraries.
20846+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
20847+
20848 # The archiver.
20849 AR=$lt_AR
20850+
20851+# Flags to create an archive.
20852 AR_FLAGS=$lt_AR_FLAGS
20853
20854+# How to feed a file listing to the archiver.
20855+archiver_list_spec=$lt_archiver_list_spec
20856+
20857 # A symbol stripping program.
20858 STRIP=$lt_STRIP
20859
20860@@ -12913,6 +13609,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
20861 # Transform the output of nm in a C name address pair when lib prefix is needed.
20862 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
20863
20864+# Specify filename containing input files for \$NM.
20865+nm_file_list_spec=$lt_nm_file_list_spec
20866+
20867+# The root where to search for dependent libraries,and in which our libraries should be installed.
20868+lt_sysroot=$lt_sysroot
20869+
20870 # The name of the directory that contains temporary libtool files.
20871 objdir=$objdir
20872
20873@@ -12922,6 +13624,9 @@ MAGIC_CMD=$MAGIC_CMD
20874 # Must we lock files when doing compilation?
20875 need_locks=$lt_need_locks
20876
20877+# Manifest tool.
20878+MANIFEST_TOOL=$lt_MANIFEST_TOOL
20879+
20880 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
20881 DSYMUTIL=$lt_DSYMUTIL
20882
20883@@ -13036,12 +13741,12 @@ with_gcc=$GCC
20884 # Compiler flag to turn off builtin functions.
20885 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
20886
20887-# How to pass a linker flag through the compiler.
20888-wl=$lt_lt_prog_compiler_wl
20889-
20890 # Additional compiler flags for building library objects.
20891 pic_flag=$lt_lt_prog_compiler_pic
20892
20893+# How to pass a linker flag through the compiler.
20894+wl=$lt_lt_prog_compiler_wl
20895+
20896 # Compiler flag to prevent dynamic linking.
20897 link_static_flag=$lt_lt_prog_compiler_static
20898
20899@@ -13128,9 +13833,6 @@ inherit_rpath=$inherit_rpath
20900 # Whether libtool must link a program against all its dependency libraries.
20901 link_all_deplibs=$link_all_deplibs
20902
20903-# Fix the shell variable \$srcfile for the compiler.
20904-fix_srcfile_path=$lt_fix_srcfile_path
20905-
20906 # Set to "yes" if exported symbols are required.
20907 always_export_symbols=$always_export_symbols
20908
20909@@ -13146,6 +13848,9 @@ include_expsyms=$lt_include_expsyms
20910 # Commands necessary for linking programs (against libraries) with templates.
20911 prelink_cmds=$lt_prelink_cmds
20912
20913+# Commands necessary for finishing linking programs.
20914+postlink_cmds=$lt_postlink_cmds
20915+
20916 # Specify filename containing input files.
20917 file_list_spec=$lt_file_list_spec
20918
20919@@ -13178,210 +13883,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
20920 # if finds mixed CR/LF and LF-only lines. Since sed operates in
20921 # text mode, it properly converts lines to CR/LF. This bash problem
20922 # is reportedly fixed, but why not run on old versions too?
20923- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
20924- || (rm -f "$cfgfile"; exit 1)
20925-
20926- case $xsi_shell in
20927- yes)
20928- cat << \_LT_EOF >> "$cfgfile"
20929-
20930-# func_dirname file append nondir_replacement
20931-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
20932-# otherwise set result to NONDIR_REPLACEMENT.
20933-func_dirname ()
20934-{
20935- case ${1} in
20936- */*) func_dirname_result="${1%/*}${2}" ;;
20937- * ) func_dirname_result="${3}" ;;
20938- esac
20939-}
20940-
20941-# func_basename file
20942-func_basename ()
20943-{
20944- func_basename_result="${1##*/}"
20945-}
20946-
20947-# func_dirname_and_basename file append nondir_replacement
20948-# perform func_basename and func_dirname in a single function
20949-# call:
20950-# dirname: Compute the dirname of FILE. If nonempty,
20951-# add APPEND to the result, otherwise set result
20952-# to NONDIR_REPLACEMENT.
20953-# value returned in "$func_dirname_result"
20954-# basename: Compute filename of FILE.
20955-# value retuned in "$func_basename_result"
20956-# Implementation must be kept synchronized with func_dirname
20957-# and func_basename. For efficiency, we do not delegate to
20958-# those functions but instead duplicate the functionality here.
20959-func_dirname_and_basename ()
20960-{
20961- case ${1} in
20962- */*) func_dirname_result="${1%/*}${2}" ;;
20963- * ) func_dirname_result="${3}" ;;
20964- esac
20965- func_basename_result="${1##*/}"
20966-}
20967-
20968-# func_stripname prefix suffix name
20969-# strip PREFIX and SUFFIX off of NAME.
20970-# PREFIX and SUFFIX must not contain globbing or regex special
20971-# characters, hashes, percent signs, but SUFFIX may contain a leading
20972-# dot (in which case that matches only a dot).
20973-func_stripname ()
20974-{
20975- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
20976- # positional parameters, so assign one to ordinary parameter first.
20977- func_stripname_result=${3}
20978- func_stripname_result=${func_stripname_result#"${1}"}
20979- func_stripname_result=${func_stripname_result%"${2}"}
20980-}
20981-
20982-# func_opt_split
20983-func_opt_split ()
20984-{
20985- func_opt_split_opt=${1%%=*}
20986- func_opt_split_arg=${1#*=}
20987-}
20988-
20989-# func_lo2o object
20990-func_lo2o ()
20991-{
20992- case ${1} in
20993- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
20994- *) func_lo2o_result=${1} ;;
20995- esac
20996-}
20997-
20998-# func_xform libobj-or-source
20999-func_xform ()
21000-{
21001- func_xform_result=${1%.*}.lo
21002-}
21003-
21004-# func_arith arithmetic-term...
21005-func_arith ()
21006-{
21007- func_arith_result=$(( $* ))
21008-}
21009-
21010-# func_len string
21011-# STRING may not start with a hyphen.
21012-func_len ()
21013-{
21014- func_len_result=${#1}
21015-}
21016-
21017-_LT_EOF
21018- ;;
21019- *) # Bourne compatible functions.
21020- cat << \_LT_EOF >> "$cfgfile"
21021-
21022-# func_dirname file append nondir_replacement
21023-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
21024-# otherwise set result to NONDIR_REPLACEMENT.
21025-func_dirname ()
21026-{
21027- # Extract subdirectory from the argument.
21028- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
21029- if test "X$func_dirname_result" = "X${1}"; then
21030- func_dirname_result="${3}"
21031- else
21032- func_dirname_result="$func_dirname_result${2}"
21033- fi
21034-}
21035-
21036-# func_basename file
21037-func_basename ()
21038-{
21039- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
21040-}
21041-
21042-
21043-# func_stripname prefix suffix name
21044-# strip PREFIX and SUFFIX off of NAME.
21045-# PREFIX and SUFFIX must not contain globbing or regex special
21046-# characters, hashes, percent signs, but SUFFIX may contain a leading
21047-# dot (in which case that matches only a dot).
21048-# func_strip_suffix prefix name
21049-func_stripname ()
21050-{
21051- case ${2} in
21052- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
21053- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
21054- esac
21055-}
21056-
21057-# sed scripts:
21058-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
21059-my_sed_long_arg='1s/^-[^=]*=//'
21060-
21061-# func_opt_split
21062-func_opt_split ()
21063-{
21064- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
21065- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
21066-}
21067-
21068-# func_lo2o object
21069-func_lo2o ()
21070-{
21071- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
21072-}
21073-
21074-# func_xform libobj-or-source
21075-func_xform ()
21076-{
21077- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
21078-}
21079-
21080-# func_arith arithmetic-term...
21081-func_arith ()
21082-{
21083- func_arith_result=`expr "$@"`
21084-}
21085-
21086-# func_len string
21087-# STRING may not start with a hyphen.
21088-func_len ()
21089-{
21090- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
21091-}
21092-
21093-_LT_EOF
21094-esac
21095-
21096-case $lt_shell_append in
21097- yes)
21098- cat << \_LT_EOF >> "$cfgfile"
21099-
21100-# func_append var value
21101-# Append VALUE to the end of shell variable VAR.
21102-func_append ()
21103-{
21104- eval "$1+=\$2"
21105-}
21106-_LT_EOF
21107- ;;
21108- *)
21109- cat << \_LT_EOF >> "$cfgfile"
21110-
21111-# func_append var value
21112-# Append VALUE to the end of shell variable VAR.
21113-func_append ()
21114-{
21115- eval "$1=\$$1\$2"
21116-}
21117-
21118-_LT_EOF
21119- ;;
21120- esac
21121-
21122-
21123- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
21124- || (rm -f "$cfgfile"; exit 1)
21125-
21126- mv -f "$cfgfile" "$ofile" ||
21127+ sed '$q' "$ltmain" >> "$cfgfile" \
21128+ || (rm -f "$cfgfile"; exit 1)
21129+
21130+ if test x"$xsi_shell" = xyes; then
21131+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
21132+func_dirname ()\
21133+{\
21134+\ case ${1} in\
21135+\ */*) func_dirname_result="${1%/*}${2}" ;;\
21136+\ * ) func_dirname_result="${3}" ;;\
21137+\ esac\
21138+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
21139+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21140+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21141+test 0 -eq $? || _lt_function_replace_fail=:
21142+
21143+
21144+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
21145+func_basename ()\
21146+{\
21147+\ func_basename_result="${1##*/}"\
21148+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
21149+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21150+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21151+test 0 -eq $? || _lt_function_replace_fail=:
21152+
21153+
21154+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
21155+func_dirname_and_basename ()\
21156+{\
21157+\ case ${1} in\
21158+\ */*) func_dirname_result="${1%/*}${2}" ;;\
21159+\ * ) func_dirname_result="${3}" ;;\
21160+\ esac\
21161+\ func_basename_result="${1##*/}"\
21162+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
21163+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21164+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21165+test 0 -eq $? || _lt_function_replace_fail=:
21166+
21167+
21168+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
21169+func_stripname ()\
21170+{\
21171+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
21172+\ # positional parameters, so assign one to ordinary parameter first.\
21173+\ func_stripname_result=${3}\
21174+\ func_stripname_result=${func_stripname_result#"${1}"}\
21175+\ func_stripname_result=${func_stripname_result%"${2}"}\
21176+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
21177+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21178+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21179+test 0 -eq $? || _lt_function_replace_fail=:
21180+
21181+
21182+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
21183+func_split_long_opt ()\
21184+{\
21185+\ func_split_long_opt_name=${1%%=*}\
21186+\ func_split_long_opt_arg=${1#*=}\
21187+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
21188+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21189+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21190+test 0 -eq $? || _lt_function_replace_fail=:
21191+
21192+
21193+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
21194+func_split_short_opt ()\
21195+{\
21196+\ func_split_short_opt_arg=${1#??}\
21197+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
21198+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
21199+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21200+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21201+test 0 -eq $? || _lt_function_replace_fail=:
21202+
21203+
21204+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
21205+func_lo2o ()\
21206+{\
21207+\ case ${1} in\
21208+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
21209+\ *) func_lo2o_result=${1} ;;\
21210+\ esac\
21211+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
21212+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21213+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21214+test 0 -eq $? || _lt_function_replace_fail=:
21215+
21216+
21217+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
21218+func_xform ()\
21219+{\
21220+ func_xform_result=${1%.*}.lo\
21221+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
21222+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21223+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21224+test 0 -eq $? || _lt_function_replace_fail=:
21225+
21226+
21227+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
21228+func_arith ()\
21229+{\
21230+ func_arith_result=$(( $* ))\
21231+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
21232+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21233+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21234+test 0 -eq $? || _lt_function_replace_fail=:
21235+
21236+
21237+ sed -e '/^func_len ()$/,/^} # func_len /c\
21238+func_len ()\
21239+{\
21240+ func_len_result=${#1}\
21241+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
21242+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21243+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21244+test 0 -eq $? || _lt_function_replace_fail=:
21245+
21246+fi
21247+
21248+if test x"$lt_shell_append" = xyes; then
21249+ sed -e '/^func_append ()$/,/^} # func_append /c\
21250+func_append ()\
21251+{\
21252+ eval "${1}+=\\${2}"\
21253+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
21254+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21255+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21256+test 0 -eq $? || _lt_function_replace_fail=:
21257+
21258+
21259+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
21260+func_append_quoted ()\
21261+{\
21262+\ func_quote_for_eval "${2}"\
21263+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
21264+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
21265+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21266+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21267+test 0 -eq $? || _lt_function_replace_fail=:
21268+
21269+
21270+ # Save a `func_append' function call where possible by direct use of '+='
21271+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
21272+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21273+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21274+ test 0 -eq $? || _lt_function_replace_fail=:
21275+else
21276+ # Save a `func_append' function call even when '+=' is not available
21277+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
21278+ && mv -f "$cfgfile.tmp" "$cfgfile" \
21279+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
21280+ test 0 -eq $? || _lt_function_replace_fail=:
21281+fi
21282+
21283+if test x"$_lt_function_replace_fail" = x":"; then
21284+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
21285+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
21286+fi
21287+
21288+
21289+ mv -f "$cfgfile" "$ofile" ||
21290 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
21291 chmod +x "$ofile"
21292
19359-- 21293--
193602.1.4 212942.7.0
19361 21295
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-10 01:58:57 +0000