1. clamav-devel
  2. Commit 1b2396cabb09c2d5ab2079cafe1f11b43bfb9e5e
Browse code

Update to autoconf 2.65, and libtool 2.2.6b.

Török Edvin authored on 2009/12/12 01:11:56
Showing 12 changed files
config/ltmain.sh
History View file @ 1b2396c
... ... 
@@ -1,6 +1,6 @@
1 1 
 # Generated from ltmain.m4sh.
2 2
3 
-# ltmain.sh (GNU libtool) 2.2.6
3 
+# ltmain.sh (GNU libtool) 2.2.6b
4 4 
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
5 5
6 6 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
... ... 
@@ -65,7 +65,7 @@
65 65 
 #       compiler:		$LTCC
66 66 
 #       compiler flags:		$LTCFLAGS
67 67 
 #       linker:		$LD (gnu? $with_gnu_ld)
68 
-#       $progname:		(GNU libtool) 2.2.6 Debian-2.2.6a-4
68 
+#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2
69 69 
 #       automake:		$automake_version
70 70 
 #       autoconf:		$autoconf_version
71 71 
 #
... ... 
@@ -73,9 +73,9 @@
73 73
74 74 
 PROGRAM=ltmain.sh
75 75 
 PACKAGE=libtool
76 
-VERSION="2.2.6 Debian-2.2.6a-4"
76 
+VERSION="2.2.6b Debian-2.2.6b-2"
77 77 
 TIMESTAMP=""
78 
-package_revision=1.3012
78 
+package_revision=1.3017
79 79
80 80 
 # Be Bourne compatible
81 81 
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
configure
History View file @ 1b2396c
... ... 
@@ -3581,8 +3581,8 @@ esac
3581 3581
3582 3582
3583 3583
3584 
-macro_version='2.2.6'
3585 
-macro_revision='1.3012'
3584 
+macro_version='2.2.6b'
3585 
+macro_revision='1.3017'
3586 3586
3587 3587
3588 3588
... ... 
@@ -5623,7 +5623,7 @@ irix5* | irix6* | nonstopux*)
5623 5623 
   ;;
5624 5624
5625 5625 
 # This must be Linux ELF.
5626 
-linux* | k*bsd*-gnu)
5626 
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
5627 5627 
   lt_cv_deplibs_check_method=pass_all
5628 5628 
   ;;
5629 5629
... ... 
@@ -8060,7 +8060,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8060 8060 
       lt_prog_compiler_static='-non_shared'
8061 8061 
       ;;
8062 8062
8063 
-    linux* | k*bsd*-gnu)
8063 
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
8064 8064 
       case $cc_basename in
8065 8065 
       # old Intel for x86_64 which still supported -KPIC.
8066 8066 
       ecc*)
... ... 
@@ -8533,6 +8533,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
8533 8533 
     fi
8534 8534 
     supports_anon_versioning=no
8535 8535 
     case `$LD -v 2>&1` in
8536 
+      *GNU\ gold*) supports_anon_versioning=yes ;;
8536 8537 
       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
8537 8538 
       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
8538 8539 
       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
... ... 
@@ -8624,7 +8625,7 @@ _LT_EOF
8624 8624 
       archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
8625 8625 
       ;;
8626 8626
8627 
-    gnu* | linux* | tpf* | k*bsd*-gnu)
8627 
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
8628 8628 
       tmp_diet=no
8629 8629 
       if test "$host_os" = linux-dietlibc; then
8630 8630 
 	case $cc_basename in
... ... 
@@ -10086,7 +10087,7 @@ linux*oldld* | linux*aout* | linux*coff*)
10086 10086 
   ;;
10087 10087
10088 10088 
 # This must be Linux ELF.
10089 
-linux* | k*bsd*-gnu)
10089 
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
10090 10090 
   version_type=linux
10091 10091 
   need_lib_prefix=no
10092 10092 
   need_version=no
... ... 
@@ -10773,7 +10774,7 @@ else
10773 10773 
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
10774 10774 
   lt_status=$lt_dlunknown
10775 10775 
   cat > conftest.$ac_ext <<_LT_EOF
10776 
-#line 10776 "configure"
10776 
+#line 10777 "configure"
10777 10777 
 #include "confdefs.h"
10778 10778
10779 10779 
 #if HAVE_DLFCN_H
... ... 
@@ -10869,7 +10870,7 @@ else
10869 10869 
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
10870 10870 
   lt_status=$lt_dlunknown
10871 10871 
   cat > conftest.$ac_ext <<_LT_EOF
10872 
-#line 10872 "configure"
10872 
+#line 10873 "configure"
10873 10873 
 #include "confdefs.h"
10874 10874
10875 10875 
 #if HAVE_DLFCN_H
... ... 
@@ -11541,7 +11542,7 @@ else
11541 11541 
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
11542 11542 
   lt_status=$lt_dlunknown
11543 11543 
   cat > conftest.$ac_ext <<_LT_EOF
11544 
-#line 11544 "configure"
11544 
+#line 11545 "configure"
11545 11545 
 #include "confdefs.h"
11546 11546
11547 11547 
 #if HAVE_DLFCN_H
... ... 
@@ -11667,7 +11668,7 @@ else
11667 11667 
   freebsd* | dragonfly*)
11668 11668 
     lt_cv_sys_dlopen_deplibs=yes
11669 11669 
     ;;
11670 
-  gnu* | linux* | k*bsd*-gnu)
11670 
+  gnu* | linux* | k*bsd*-gnu | kopensolaris*-gnu)
11671 11671 
     # GNU and its variants, using gnu ld.so (Glibc)
11672 11672 
     lt_cv_sys_dlopen_deplibs=yes
11673 11673 
     ;;
libclamav/c++/config/ltmain.sh
History View file @ 1b2396c
... ... 
@@ -1,6 +1,6 @@
1 1 
 # Generated from ltmain.m4sh.
2 2
3 
-# ltmain.sh (GNU libtool) 2.2.6
3 
+# ltmain.sh (GNU libtool) 2.2.6b
4 4 
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
5 5
6 6 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
... ... 
@@ -65,7 +65,7 @@
65 65 
 #       compiler:		$LTCC
66 66 
 #       compiler flags:		$LTCFLAGS
67 67 
 #       linker:		$LD (gnu? $with_gnu_ld)
68 
-#       $progname:		(GNU libtool) 2.2.6 Debian-2.2.6a-4
68 
+#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2
69 69 
 #       automake:		$automake_version
70 70 
 #       autoconf:		$autoconf_version
71 71 
 #
... ... 
@@ -73,9 +73,9 @@
73 73
74 74 
 PROGRAM=ltmain.sh
75 75 
 PACKAGE=libtool
76 
-VERSION="2.2.6 Debian-2.2.6a-4"
76 
+VERSION="2.2.6b Debian-2.2.6b-2"
77 77 
 TIMESTAMP=""
78 
-package_revision=1.3012
78 
+package_revision=1.3017
79 79
80 80 
 # Be Bourne compatible
81 81 
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
libclamav/c++/configure
History View file @ 1b2396c
... ... 
@@ -3812,8 +3812,8 @@ esac
3812 3812
3813 3813
3814 3814
3815 
-macro_version='2.2.6'
3816 
-macro_revision='1.3012'
3815 
+macro_version='2.2.6b'
3816 
+macro_revision='1.3017'
3817 3817
3818 3818
3819 3819
... ... 
@@ -5552,7 +5552,7 @@ irix5* | irix6* | nonstopux*)
5552 5552 
   ;;
5553 5553
5554 5554 
 # This must be Linux ELF.
5555 
-linux* | k*bsd*-gnu)
5555 
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
5556 5556 
   lt_cv_deplibs_check_method=pass_all
5557 5557 
   ;;
5558 5558
... ... 
@@ -8517,7 +8517,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8517 8517 
       lt_prog_compiler_static='-non_shared'
8518 8518 
       ;;
8519 8519
8520 
-    linux* | k*bsd*-gnu)
8520 
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
8521 8521 
       case $cc_basename in
8522 8522 
       # old Intel for x86_64 which still supported -KPIC.
8523 8523 
       ecc*)
... ... 
@@ -8990,6 +8990,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
8990 8990 
     fi
8991 8991 
     supports_anon_versioning=no
8992 8992 
     case `$LD -v 2>&1` in
8993 
+      *GNU\ gold*) supports_anon_versioning=yes ;;
8993 8994 
       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
8994 8995 
       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
8995 8996 
       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
... ... 
@@ -9081,7 +9082,7 @@ _LT_EOF
9081 9081 
       archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
9082 9082 
       ;;
9083 9083
9084 
-    gnu* | linux* | tpf* | k*bsd*-gnu)
9084 
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
9085 9085 
       tmp_diet=no
9086 9086 
       if test "$host_os" = linux-dietlibc; then
9087 9087 
 	case $cc_basename in
... ... 
@@ -10543,7 +10544,7 @@ linux*oldld* | linux*aout* | linux*coff*)
10543 10543 
   ;;
10544 10544
10545 10545 
 # This must be Linux ELF.
10546 
-linux* | k*bsd*-gnu)
10546 
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
10547 10547 
   version_type=linux
10548 10548 
   need_lib_prefix=no
10549 10549 
   need_version=no
... ... 
@@ -11230,7 +11231,7 @@ else
11230 11230 
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
11231 11231 
   lt_status=$lt_dlunknown
11232 11232 
   cat > conftest.$ac_ext <<_LT_EOF
11233 
-#line 11233 "configure"
11233 
+#line 11234 "configure"
11234 11234 
 #include "confdefs.h"
11235 11235
11236 11236 
 #if HAVE_DLFCN_H
... ... 
@@ -11326,7 +11327,7 @@ else
11326 11326 
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
11327 11327 
   lt_status=$lt_dlunknown
11328 11328 
   cat > conftest.$ac_ext <<_LT_EOF
11329 
-#line 11329 "configure"
11329 
+#line 11330 "configure"
11330 11330 
 #include "confdefs.h"
11331 11331
11332 11332 
 #if HAVE_DLFCN_H
... ... 
@@ -12266,7 +12267,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
12266 12266 
         inherit_rpath_CXX=yes
12267 12267 
         ;;
12268 12268
12269 
-      linux* | k*bsd*-gnu)
12269 
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
12270 12270 
         case $cc_basename in
12271 12271 
           KCC*)
12272 12272 
 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
... ... 
@@ -13094,7 +13095,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
13094 13094 
 	    ;;
13095 13095 
 	esac
13096 13096 
 	;;
13097 
-      linux* | k*bsd*-gnu)
13097 
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
13098 13098 
 	case $cc_basename in
13099 13099 
 	  KCC*)
13100 13100 
 	    # KAI C++ Compiler
... ... 
@@ -13282,11 +13283,11 @@ else
13282 13282 
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
13283 13283 
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
13284 13284 
    -e 's:$: $lt_compiler_flag:'`
13285 
-   (eval echo "\"\$as_me:13285: $lt_compile\"" >&5)
13285 
+   (eval echo "\"\$as_me:13286: $lt_compile\"" >&5)
13286 13286 
    (eval "$lt_compile" 2>conftest.err)
13287 13287 
    ac_status=$?
13288 13288 
    cat conftest.err >&5
13289 
-   echo "$as_me:13289: \$? = $ac_status" >&5
13289 
+   echo "$as_me:13290: \$? = $ac_status" >&5
13290 13290 
    if (exit $ac_status) && test -s "$ac_outfile"; then
13291 13291 
      # The compiler can only warn and ignore the option if not recognized
13292 13292 
      # So say no if there are warnings other than the usual output.
... ... 
@@ -13381,11 +13382,11 @@ else
13381 13381 
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
13382 13382 
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
13383 13383 
    -e 's:$: $lt_compiler_flag:'`
13384 
-   (eval echo "\"\$as_me:13384: $lt_compile\"" >&5)
13384 
+   (eval echo "\"\$as_me:13385: $lt_compile\"" >&5)
13385 13385 
    (eval "$lt_compile" 2>out/conftest.err)
13386 13386 
    ac_status=$?
13387 13387 
    cat out/conftest.err >&5
13388 
-   echo "$as_me:13388: \$? = $ac_status" >&5
13388 
+   echo "$as_me:13389: \$? = $ac_status" >&5
13389 13389 
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
13390 13390 
    then
13391 13391 
      # The compiler can only warn and ignore the option if not recognized
... ... 
@@ -13433,11 +13434,11 @@ else
13433 13433 
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
13434 13434 
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
13435 13435 
    -e 's:$: $lt_compiler_flag:'`
13436 
-   (eval echo "\"\$as_me:13436: $lt_compile\"" >&5)
13436 
+   (eval echo "\"\$as_me:13437: $lt_compile\"" >&5)
13437 13437 
    (eval "$lt_compile" 2>out/conftest.err)
13438 13438 
    ac_status=$?
13439 13439 
    cat out/conftest.err >&5
13440 
-   echo "$as_me:13440: \$? = $ac_status" >&5
13440 
+   echo "$as_me:13441: \$? = $ac_status" >&5
13441 13441 
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
13442 13442 
    then
13443 13443 
      # The compiler can only warn and ignore the option if not recognized
... ... 
@@ -14011,7 +14012,7 @@ linux*oldld* | linux*aout* | linux*coff*)
14011 14011 
   ;;
14012 14012
14013 14013 
 # This must be Linux ELF.
14014 
-linux* | k*bsd*-gnu)
14014 
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
14015 14015 
   version_type=linux
14016 14016 
   need_lib_prefix=no
14017 14017 
   need_version=no
libclamav/c++/m4/libtool.m4
History View file @ 1b2396c
... ... 
@@ -2445,7 +2445,7 @@ linux*oldld* | linux*aout* | linux*coff*)
2445 2445 
   ;;
2446 2446
2447 2447 
 # This must be Linux ELF.
2448 
-linux* | k*bsd*-gnu)
2448 
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
2449 2449 
   version_type=linux
2450 2450 
   need_lib_prefix=no
2451 2451 
   need_version=no
... ... 
@@ -3084,7 +3084,7 @@ irix5* | irix6* | nonstopux*)
3084 3084 
   ;;
3085 3085
3086 3086 
 # This must be Linux ELF.
3087 
-linux* | k*bsd*-gnu)
3087 
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
3088 3088 
   lt_cv_deplibs_check_method=pass_all
3089 3089 
   ;;
3090 3090
... ... 
@@ -3705,7 +3705,7 @@ m4_if([$1], [CXX], [
3705 3705 
 	    ;;
3706 3706 
 	esac
3707 3707 
 	;;
3708 
-      linux* | k*bsd*-gnu)
3708 
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
3709 3709 
 	case $cc_basename in
3710 3710 
 	  KCC*)
3711 3711 
 	    # KAI C++ Compiler
... ... 
@@ -3989,7 +3989,7 @@ m4_if([$1], [CXX], [
3989 3989 
       _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
3990 3990 
       ;;
3991 3991
3992 
-    linux* | k*bsd*-gnu)
3992 
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
3993 3993 
       case $cc_basename in
3994 3994 
       # old Intel for x86_64 which still supported -KPIC.
3995 3995 
       ecc*)
... ... 
@@ -4285,6 +4285,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
4285 4285 
     fi
4286 4286 
     supports_anon_versioning=no
4287 4287 
     case `$LD -v 2>&1` in
4288 
+      *GNU\ gold*) supports_anon_versioning=yes ;;
4288 4289 
       *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
4289 4290 
       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
4290 4291 
       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
... ... 
@@ -4376,7 +4377,7 @@ _LT_EOF
4376 4376 
       _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
4377 4377 
       ;;
4378 4378
4379 
-    gnu* | linux* | tpf* | k*bsd*-gnu)
4379 
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
4380 4380 
       tmp_diet=no
4381 4381 
       if test "$host_os" = linux-dietlibc; then
4382 4382 
 	case $cc_basename in
... ... 
@@ -5860,7 +5861,7 @@ if test "$_lt_caught_CXX_error" != yes; then
5860 5860 
         _LT_TAGVAR(inherit_rpath, $1)=yes
5861 5861 
         ;;
5862 5862
5863 
-      linux* | k*bsd*-gnu)
5863 
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
5864 5864 
         case $cc_basename in
5865 5865 
           KCC*)
5866 5866 
 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
libclamav/c++/m4/ltversion.m4
History View file @ 1b2396c
... ... 
@@ -9,15 +9,15 @@
9 9
10 10 
 # Generated from ltversion.in.
11 11
12 
-# serial 3012 ltversion.m4
12 
+# serial 3017 ltversion.m4
13 13 
 # This file is part of GNU Libtool
14 14
15 
-m4_define([LT_PACKAGE_VERSION], [2.2.6])
16 
-m4_define([LT_PACKAGE_REVISION], [1.3012])
15 
+m4_define([LT_PACKAGE_VERSION], [2.2.6b])
16 
+m4_define([LT_PACKAGE_REVISION], [1.3017])
17 17
18 18 
 AC_DEFUN([LTVERSION_VERSION],
19 
-[macro_version='2.2.6'
20 
-macro_revision='1.3012'
19 
+[macro_version='2.2.6b'
20 
+macro_revision='1.3017'
21 21 
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
22 22 
 _LT_DECL(, macro_revision, 0)
23 23 
 ])
libltdl/Makefile.am
History View file @ 1b2396c
... ... 
@@ -50,7 +50,7 @@ AM_CPPFLAGS	       += -DLT_CONFIG_H='<$(LT_CONFIG_H)>' \
50 50 
 			  -DLTDL -I. -I$(srcdir) -Ilibltdl \
51 51 
 			  -I$(srcdir)/libltdl -I$(srcdir)/libltdl
52 52 
 AM_LDFLAGS	       += -no-undefined
53 
-LTDL_VERSION_INFO	= -version-info 9:0:2
53 
+LTDL_VERSION_INFO	= -version-info 9:1:2
54 54
55 55 
 noinst_LTLIBRARIES	+= $(LT_DLLOADERS)
56 56
libltdl/Makefile.in
History View file @ 1b2396c
... ... 
@@ -364,7 +364,7 @@ EXTRA_DIST = lt__dirent.c lt__strl.c COPYING.LIB README argz_.h argz.c
364 364 
 CLEANFILES = libltdl.la libltdlc.la libdlloader.la $(ltdl_LIBOBJS) \
365 365 
 	$(ltdl_LTLIBOBJS)
366 366 
 MOSTLYCLEANFILES = argz.h argz.h-t
367 
-LTDL_VERSION_INFO = -version-info 9:0:2
367 
+LTDL_VERSION_INFO = -version-info 9:1:2
368 368 
 @INSTALL_LTDL_TRUE@ltdlincludedir = $(includedir)/libltdl
369 369 
 @INSTALL_LTDL_TRUE@ltdlinclude_HEADERS = libltdl/lt_system.h \
370 370 
 @INSTALL_LTDL_TRUE@			  libltdl/lt_error.h \
libltdl/ltdl.c
History View file @ 1b2396c
... ... 
@@ -529,7 +529,8 @@ find_module (lt_dlhandle *handle, const char *dir, const char *libdir,
529 529 
   /* Try to open the old library first; if it was dlpreopened,
530 530 
      we want the preopened version of it, even if a dlopenable
531 531 
      module is available.  */
532 
-  if (old_name && tryall_dlopen (handle, old_name, advise, 0) == 0)
532 
+  if (old_name && tryall_dlopen (handle, old_name,
533 
+			  advise, lt_dlloader_find ("lt_preopen") ) == 0)
533 534 
     {
534 535 
       return 0;
535 536 
     }
... ... 
@@ -1345,7 +1346,7 @@ try_dlopen (lt_dlhandle *phandle, const char *filename, const char *ext,
1345 1345 
 	    }
1346 1346 
 #endif
1347 1347 
 	}
1348 
-      if (!file)
1348 
+      else
1349 1349 
 	{
1350 1350 
 	  file = fopen (attempt, LT_READTEXT_MODE);
1351 1351 
 	}
m4/libtool.m4
History View file @ 1b2396c
... ... 
@@ -2445,7 +2445,7 @@ linux*oldld* | linux*aout* | linux*coff*)
2445 2445 
   ;;
2446 2446
2447 2447 
 # This must be Linux ELF.
2448 
-linux* | k*bsd*-gnu)
2448 
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
2449 2449 
   version_type=linux
2450 2450 
   need_lib_prefix=no
2451 2451 
   need_version=no
... ... 
@@ -3084,7 +3084,7 @@ irix5* | irix6* | nonstopux*)
3084 3084 
   ;;
3085 3085
3086 3086 
 # This must be Linux ELF.
3087 
-linux* | k*bsd*-gnu)
3087 
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
3088 3088 
   lt_cv_deplibs_check_method=pass_all
3089 3089 
   ;;
3090 3090
... ... 
@@ -3705,7 +3705,7 @@ m4_if([$1], [CXX], [
3705 3705 
 	    ;;
3706 3706 
 	esac
3707 3707 
 	;;
3708 
-      linux* | k*bsd*-gnu)
3708 
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
3709 3709 
 	case $cc_basename in
3710 3710 
 	  KCC*)
3711 3711 
 	    # KAI C++ Compiler
... ... 
@@ -3989,7 +3989,7 @@ m4_if([$1], [CXX], [
3989 3989 
       _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
3990 3990 
       ;;
3991 3991
3992 
-    linux* | k*bsd*-gnu)
3992 
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
3993 3993 
       case $cc_basename in
3994 3994 
       # old Intel for x86_64 which still supported -KPIC.
3995 3995 
       ecc*)
... ... 
@@ -4285,6 +4285,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
4285 4285 
     fi
4286 4286 
     supports_anon_versioning=no
4287 4287 
     case `$LD -v 2>&1` in
4288 
+      *GNU\ gold*) supports_anon_versioning=yes ;;
4288 4289 
       *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
4289 4290 
       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
4290 4291 
       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
... ... 
@@ -4376,7 +4377,7 @@ _LT_EOF
4376 4376 
       _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
4377 4377 
       ;;
4378 4378
4379 
-    gnu* | linux* | tpf* | k*bsd*-gnu)
4379 
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
4380 4380 
       tmp_diet=no
4381 4381 
       if test "$host_os" = linux-dietlibc; then
4382 4382 
 	case $cc_basename in
... ... 
@@ -5860,7 +5861,7 @@ if test "$_lt_caught_CXX_error" != yes; then
5860 5860 
         _LT_TAGVAR(inherit_rpath, $1)=yes
5861 5861 
         ;;
5862 5862
5863 
-      linux* | k*bsd*-gnu)
5863 
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
5864 5864 
         case $cc_basename in
5865 5865 
           KCC*)
5866 5866 
 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
m4/ltdl.m4
History View file @ 1b2396c
... ... 
@@ -467,7 +467,7 @@ AC_CACHE_CHECK([whether deplibs are loaded by dlopen],
467 467 
   freebsd* | dragonfly*)
468 468 
     lt_cv_sys_dlopen_deplibs=yes
469 469 
     ;;
470 
-  gnu* | linux* | k*bsd*-gnu)
470 
+  gnu* | linux* | k*bsd*-gnu | kopensolaris*-gnu)
471 471 
     # GNU and its variants, using gnu ld.so (Glibc)
472 472 
     lt_cv_sys_dlopen_deplibs=yes
473 473 
     ;;
m4/ltversion.m4
History View file @ 1b2396c
... ... 
@@ -9,15 +9,15 @@
9 9
10 10 
 # Generated from ltversion.in.
11 11
12 
-# serial 3012 ltversion.m4
12 
+# serial 3017 ltversion.m4
13 13 
 # This file is part of GNU Libtool
14 14
15 
-m4_define([LT_PACKAGE_VERSION], [2.2.6])
16 
-m4_define([LT_PACKAGE_REVISION], [1.3012])
15 
+m4_define([LT_PACKAGE_VERSION], [2.2.6b])
16 
+m4_define([LT_PACKAGE_REVISION], [1.3017])
17 17
18 18 
 AC_DEFUN([LTVERSION_VERSION],
19 
-[macro_version='2.2.6'
20 
-macro_revision='1.3012'
19 
+[macro_version='2.2.6b'
20 
+macro_revision='1.3017'
21 21 
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
22 22 
 _LT_DECL(, macro_revision, 0)
23 23 
 ])