@@ -1,3 +1,8 @@

+Fri Sep  7 15:28:54 CEST 2007 (tk)

+----------------------------------

+  * libclamav, clamd, clamscan: move hardware acceleration code to

+				contrib/hwaccel/hwaccel.patch

+

 Thu Sep  6 17:18:01 BST 2007 (njh)

 ----------------------------------

   * libclamav/pdf.c:	Ensure consistency with other archivers when attempted

@@ -186,6 +186,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@

 PACKAGE_VERSION = @PACKAGE_VERSION@

 PATH_SEPARATOR = @PATH_SEPARATOR@

 RANLIB = @RANLIB@

+SED = @SED@

 SET_MAKE = @SET_MAKE@

 SHELL = @SHELL@

 STRIP = @STRIP@

@@ -13,7 +13,7 @@

 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-

-# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL

+# serial 51 Debian 1.5.24-1 AC_PROG_LIBTOOL

 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)

@@ -176,7 +176,7 @@ test -z "$STRIP" && STRIP=:

 test -z "$ac_objext" && ac_objext=o

 # Determine commands to create old-style static archives.

-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'

+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'

 old_postinstall_cmds='chmod 644 $oldlib'

 old_postuninstall_cmds=

@@ -263,8 +263,9 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`

 # Check for compiler boilerplate output or warnings with

 # the simple compiler test code.

 AC_DEFUN([_LT_COMPILER_BOILERPLATE],

-[ac_outfile=conftest.$ac_objext

-printf "$lt_simple_compile_test_code" >conftest.$ac_ext

+[AC_REQUIRE([LT_AC_PROG_SED])dnl

+ac_outfile=conftest.$ac_objext

+echo "$lt_simple_compile_test_code" >conftest.$ac_ext

 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err

 _lt_compiler_boilerplate=`cat conftest.err`

 $rm conftest*

@@ -276,8 +277,9 @@ $rm conftest*

 # Check for linker boilerplate output or warnings with

 # the simple link test code.

 AC_DEFUN([_LT_LINKER_BOILERPLATE],

-[ac_outfile=conftest.$ac_objext

-printf "$lt_simple_link_test_code" >conftest.$ac_ext

+[AC_REQUIRE([LT_AC_PROG_SED])dnl

+ac_outfile=conftest.$ac_objext

+echo "$lt_simple_link_test_code" >conftest.$ac_ext

 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err

 _lt_linker_boilerplate=`cat conftest.err`

 $rm conftest*

@@ -293,12 +295,20 @@ $rm conftest*

 # If we don't find anything, use the default library path according

 # to the aix ld manual.

 AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],

-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[

-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }

-}'`

+[AC_REQUIRE([LT_AC_PROG_SED])dnl

+AC_LINK_IFELSE(AC_LANG_PROGRAM,[

+lt_aix_libpath_sed='

+    /Import File Strings/,/^$/ {

+	/^0/ {

+	    s/^0  *\(.*\)$/\1/

+	    p

+	}

+    }'

+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

 # Check for a 64-bit object if we didn't find anything.

-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }

-}'`; fi],[])

+if test -z "$aix_libpath"; then

+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

+fi],[])

 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

 ])# _LT_AC_SYS_LIBPATH_AIX

@@ -529,13 +539,17 @@ ia64-*-hpux*)

   rm -rf conftest*

   ;;

-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)

+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \

+s390*-*linux*|sparc*-*linux*)

   # Find out which ABI we are using.

   echo 'int i;' > conftest.$ac_ext

   if AC_TRY_EVAL(ac_compile); then

     case `/usr/bin/file conftest.o` in

     *32-bit*)

       case $host in

+        x86_64-*kfreebsd*-gnu)

+          LD="${LD-ld} -m elf_i386_fbsd"

+          ;;

         x86_64-*linux*)

           LD="${LD-ld} -m elf_i386"

           ;;

@@ -552,6 +566,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)

       ;;

     *64-bit*)

       case $host in

+        x86_64-*kfreebsd*-gnu)

+          LD="${LD-ld} -m elf_x86_64_fbsd"

+          ;;

         x86_64-*linux*)

           LD="${LD-ld} -m elf_x86_64"

           ;;

@@ -623,7 +640,7 @@ AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],

 AC_CACHE_CHECK([$1], [$2],

   [$2=no

   ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])

-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext

+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext

    lt_compiler_flag="$3"

    # Insert the option either (1) after the last *FLAGS variable, or

    # (2) before a word containing "conftest.", or (3) at the end.

@@ -664,11 +681,12 @@ fi

 # ------------------------------------------------------------

 # Check whether the given compiler option works

 AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],

-[AC_CACHE_CHECK([$1], [$2],

+[AC_REQUIRE([LT_AC_PROG_SED])dnl

+AC_CACHE_CHECK([$1], [$2],

   [$2=no

    save_LDFLAGS="$LDFLAGS"

    LDFLAGS="$LDFLAGS $3"

-   printf "$lt_simple_link_test_code" > conftest.$ac_ext

+   echo "$lt_simple_link_test_code" > conftest.$ac_ext

    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then

      # The linker can only warn and ignore the option if not recognized

      # So say no if there are warnings

@@ -782,24 +800,27 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl

     fi

     ;;

   *)

-    # If test is not a shell built-in, we'll probably end up computing a

-    # maximum length that is only half of the actual maximum length, but

-    # we can't tell.

-    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}

-    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \

+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`

+    if test -n "$lt_cv_sys_max_cmd_len"; then

+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`

+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`

+    else

+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}

+      while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \

 	       = "XX$teststring") >/dev/null 2>&1 &&

-	    new_result=`expr "X$teststring" : ".*" 2>&1` &&

-	    lt_cv_sys_max_cmd_len=$new_result &&

-	    test $i != 17 # 1/2 MB should be enough

-    do

-      i=`expr $i + 1`

-      teststring=$teststring$teststring

-    done

-    teststring=

-    # Add a significant safety factor because C++ compilers can tack on massive

-    # amounts of additional arguments before passing them to the linker.

-    # It appears as though 1/2 is a usable value.

-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`

+	      new_result=`expr "X$teststring" : ".*" 2>&1` &&

+	      lt_cv_sys_max_cmd_len=$new_result &&

+	      test $i != 17 # 1/2 MB should be enough

+      do

+        i=`expr $i + 1`

+        teststring=$teststring$teststring

+      done

+      teststring=

+      # Add a significant safety factor because C++ compilers can tack on massive

+      # amounts of additional arguments before passing them to the linker.

+      # It appears as though 1/2 is a usable value.

+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`

+    fi

     ;;

   esac

 ])

@@ -1026,7 +1047,8 @@ fi

 # ---------------------------------

 # Check to see if options -c and -o are simultaneously supported by compiler

 AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],

-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl

+[AC_REQUIRE([LT_AC_PROG_SED])dnl

+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl

 AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],

   [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],

   [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no

@@ -1034,7 +1056,7 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],

    mkdir conftest

    cd conftest

    mkdir out

-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext

+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext

    lt_compiler_flag="-o out/conftest2.$ac_objext"

    # Insert the option either (1) after the last *FLAGS variable, or

@@ -1174,6 +1196,7 @@ else

    darwin*)

        if test -n "$STRIP" ; then

          striplib="$STRIP -x"

+         old_striplib="$STRIP -S"

          AC_MSG_RESULT([yes])

        else

   AC_MSG_RESULT([no])

@@ -1191,7 +1214,8 @@ fi

 # -----------------------------

 # PORTME Fill in your ld.so characteristics

 AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],

-[AC_MSG_CHECKING([dynamic linker characteristics])

+[AC_REQUIRE([LT_AC_PROG_SED])dnl

+AC_MSG_CHECKING([dynamic linker characteristics])

 library_names_spec=

 libname_spec='lib$name'

 soname_spec=

@@ -1205,20 +1229,58 @@ shlibpath_overrides_runpath=unknown

 version_type=none

 dynamic_linker="$host_os ld.so"

 sys_lib_dlsearch_path_spec="/lib /usr/lib"

+m4_if($1,[],[

 if test "$GCC" = yes; then

-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`

-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then

+  case $host_os in

+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;

+    *) lt_awk_arg="/^libraries:/" ;;

+  esac

+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`

+  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then

     # if the path contains ";" then we assume it to be the separator

     # otherwise default to the standard path separator (i.e. ":") - it is

     # assumed that no part of a normal pathname contains ";" but that should

     # okay in the real world where ";" in dirpaths is itself problematic.

-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`

+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`

   else

-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`

+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`

   fi

+  # Ok, now we have the path, separated by spaces, we can step through it

+  # and add multilib dir if necessary.

+  lt_tmp_lt_search_path_spec=

+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`

+  for lt_sys_path in $lt_search_path_spec; do

+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then

+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"

+    else

+      test -d "$lt_sys_path" && \

+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"

+    fi

+  done

+  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '

+BEGIN {RS=" "; FS="/|\n";} {

+  lt_foo="";

+  lt_count=0;

+  for (lt_i = NF; lt_i > 0; lt_i--) {

+    if ($lt_i != "" && $lt_i != ".") {

+      if ($lt_i == "..") {

+        lt_count++;

+      } else {

+        if (lt_count == 0) {

+          lt_foo="/" $lt_i lt_foo;

+        } else {

+          lt_count--;

+        }

+      }

+    }

+  }

+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }

+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }

+}'`

+  sys_lib_search_path_spec=`echo $lt_search_path_spec`

 else

   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"

-fi

+fi])

 need_lib_prefix=unknown

 hardcode_into_libs=no

@@ -1375,12 +1437,8 @@ darwin* | rhapsody*)

   shlibpath_overrides_runpath=yes

   shlibpath_var=DYLD_LIBRARY_PATH

   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'

-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.

-  if test "$GCC" = yes; then

-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`

-  else

-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'

-  fi

+  m4_if([$1], [],[

+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) 

   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'

   ;;

@@ -1434,7 +1492,7 @@ freebsd* | dragonfly*)

     shlibpath_overrides_runpath=no

     hardcode_into_libs=yes

     ;;

-  freebsd*) # from 4.6 on

+  *) # from 4.6 on, and DragonFly

     shlibpath_overrides_runpath=yes

     hardcode_into_libs=yes

     ;;

@@ -1497,7 +1555,7 @@ hpux9* | hpux10* | hpux11*)

   postinstall_cmds='chmod 555 $lib'

   ;;

-interix3*)

+interix[[3-9]]*)

   version_type=linux

   need_lib_prefix=no

   need_version=no

@@ -1568,7 +1626,7 @@ linux* | k*bsd*-gnu)

   # Append ld.so.conf contents to the search path

   if test -f /etc/ld.so.conf; then

-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`

+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`

     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"

   fi

@@ -1674,6 +1732,10 @@ osf3* | osf4* | osf5*)

   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"

   ;;

+rdos*)

+  dynamic_linker=no

+  ;;

+

 solaris*)

   version_type=linux

   need_lib_prefix=no

@@ -1779,7 +1841,8 @@ fi

 # _LT_AC_TAGCONFIG

 # ----------------

 AC_DEFUN([_LT_AC_TAGCONFIG],

-[AC_ARG_WITH([tags],

+[AC_REQUIRE([LT_AC_PROG_SED])dnl

+AC_ARG_WITH([tags],

     [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],

         [include additional configurations @<:@automatic@:>@])],

     [tagnames="$withval"])

@@ -2040,7 +2103,7 @@ m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],

 # AC_PATH_TOOL_PREFIX

 # -------------------

-# find a file program which can recognise shared library

+# find a file program which can recognize shared library

 AC_DEFUN([AC_PATH_TOOL_PREFIX],

 [AC_REQUIRE([AC_PROG_EGREP])dnl

 AC_MSG_CHECKING([for $1])

@@ -2103,7 +2166,7 @@ fi

 # AC_PATH_MAGIC

 # -------------

-# find a file program which can recognise a shared library

+# find a file program which can recognize a shared library

 AC_DEFUN([AC_PATH_MAGIC],

 [AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)

 if test -z "$lt_cv_path_MAGIC_CMD"; then

@@ -2250,7 +2313,7 @@ esac

 # how to check for library dependencies

 #  -- PORTME fill in with the dynamic library characteristics

 AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],

-[AC_CACHE_CHECK([how to recognise dependent libraries],

+[AC_CACHE_CHECK([how to recognize dependent libraries],

 lt_cv_deplibs_check_method,

 [lt_cv_file_magic_cmd='$MAGIC_CMD'

 lt_cv_file_magic_test_file=

@@ -2289,9 +2352,15 @@ cygwin*)

 mingw* | pw32*)

   # Base MSYS/MinGW do not provide the 'file' command needed by

-  # func_win32_libid shell function, so use a weaker test based on 'objdump'.

-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'

-  lt_cv_file_magic_cmd='$OBJDUMP -f'

+  # func_win32_libid shell function, so use a weaker test based on 'objdump',

+  # unless we find 'file', for example because we are cross-compiling.

+  if ( file / ) >/dev/null 2>&1; then

+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'

+    lt_cv_file_magic_cmd='func_win32_libid'

+  else

+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'

+    lt_cv_file_magic_cmd='$OBJDUMP -f'

+  fi

   ;;

 darwin* | rhapsody*)

@@ -2336,7 +2405,7 @@ hpux10.20* | hpux11*)

   esac

   ;;

-interix3*)

+interix[[3-9]]*)

   # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here

   lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'

   ;;

@@ -2386,6 +2455,10 @@ osf3* | osf4* | osf5*)

   lt_cv_deplibs_check_method=pass_all

   ;;

+rdos*)

+  lt_cv_deplibs_check_method=pass_all

+  ;;

+

 solaris*)

   lt_cv_deplibs_check_method=pass_all

   ;;

@@ -2438,7 +2511,7 @@ AC_DEFUN([AC_PROG_NM],

   lt_cv_path_NM="$NM"

 else

   lt_nm_to_check="${ac_tool_prefix}nm"

-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then 

+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then

     lt_nm_to_check="$lt_nm_to_check nm"

   fi

   for lt_tmp_nm in $lt_nm_to_check; do

@@ -2654,10 +2727,10 @@ objext=o

 _LT_AC_TAGVAR(objext, $1)=$objext

 # Code to be used in simple compile tests

-lt_simple_compile_test_code="int some_variable = 0;\n"

+lt_simple_compile_test_code="int some_variable = 0;"

 # Code to be used in simple link tests

-lt_simple_link_test_code='int main(){return(0);}\n'

+lt_simple_link_test_code='int main(){return(0);}'

 _LT_AC_SYS_COMPILER

@@ -2759,10 +2832,10 @@ objext=o

 _LT_AC_TAGVAR(objext, $1)=$objext

 # Code to be used in simple compile tests

-lt_simple_compile_test_code="int some_variable = 0;\n"

+lt_simple_compile_test_code="int some_variable = 0;"

 # Code to be used in simple link tests

-lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'

+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'

 # ltmain only uses $CC for tagged configurations so make sure $CC is set.

 _LT_AC_SYS_COMPILER

@@ -2908,7 +2981,7 @@ case $host_os in

 	   strings "$collect2name" | grep resolve_lib_name >/dev/null

 	then

 	  # We have reworked collect2

-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes

+	  :

 	else

 	  # We have old collect2

 	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported

@@ -3067,10 +3140,10 @@ case $host_os in

       case $cc_basename in

         xlc*)

          output_verbose_link_cmd='echo'

-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'

+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'

           _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'

           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds

-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

           _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

           ;;

        *)

@@ -3153,9 +3226,7 @@ case $host_os in

       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:

       case $host_cpu in

-      hppa*64*|ia64*)

-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'

-        ;;

+      hppa*64*|ia64*) ;;

       *)

 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'

         ;;

@@ -3223,7 +3294,7 @@ case $host_os in

 	;;

     esac

     ;;

-  interix3*)

+  interix[[3-9]]*)

     _LT_AC_TAGVAR(hardcode_direct, $1)=no

     _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no

     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'

@@ -3343,6 +3414,29 @@ case $host_os in

 	# dependencies.

 	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'

 	;;

+      *)

+	case `$CC -V 2>&1 | sed 5q` in

+	*Sun\ C*)

+	  # Sun C++ 5.9

+	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'

+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'

+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'

+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'

+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'

+

+	  # Not sure whether something based on

+	  # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1

+	  # would be better.

+	  output_verbose_link_cmd='echo'

+

+	  # Archives containing C++ object files must be created using

+	  # "CC -xar", where "CC" is the Sun C++ compiler.  This is

+	  # necessary to make sure instantiated templates are included

+	  # in the archive.

+	  _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'

+	  ;;

+	esac

+	;;

     esac

     ;;

   lynxos*)

@@ -3381,16 +3475,20 @@ case $host_os in

     _LT_AC_TAGVAR(ld_shlibs, $1)=no

     ;;

   openbsd*)

-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes

-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no

-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'

-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'

-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then

-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'

-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'

-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'

+    if test -f /usr/libexec/ld.so; then

+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes

+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no

+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'

+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'

+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then

+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'

+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'

+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'

+      fi

+      output_verbose_link_cmd='echo'

+    else

+      _LT_AC_TAGVAR(ld_shlibs, $1)=no

     fi

-    output_verbose_link_cmd='echo'

     ;;

   osf3*)

     case $cc_basename in

@@ -3552,15 +3650,10 @@ case $host_os in

 	case $host_os in

 	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;

 	  *)

-	    # The C++ compiler is used as linker so we must use $wl

-	    # flag to pass the commands to the underlying system

-	    # linker. We must also pass each convience library through

-	    # to the system linker between allextract/defaultextract.

-	    # The C++ compiler will combine linker options so we

-	    # cannot just pass the convience library names through

-	    # without $wl.

+	    # The compiler driver will combine and reorder linker options,

+	    # but understands `-z linker_flag'.

 	    # Supported since Solaris 2.6 (maybe 2.5.1?)

-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'

+	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'

 	    ;;

 	esac

 	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes

@@ -3607,6 +3700,12 @@ case $host_os in

 	  fi

 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'

+	  case $host_os in

+	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;

+	  *)

+	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'

+	    ;;

+	  esac

 	fi

 	;;

     esac

@@ -3850,7 +3949,7 @@ $rm -f confest.$objext

 # PORTME: override above test on systems where it is broken

 ifelse([$1],[CXX],

 [case $host_os in

-interix3*)

+interix[[3-9]]*)

   # Interix 3.5 installs completely hosed .la files for C++, so rather than

   # hack all around it, let's just trust "g++" to DTRT.

   _LT_AC_TAGVAR(predep_objects,$1)=

@@ -3858,13 +3957,46 @@ interix3*)

   _LT_AC_TAGVAR(postdeps,$1)=

   ;;

+linux*)

+  case `$CC -V 2>&1 | sed 5q` in

+  *Sun\ C*)

+    # Sun C++ 5.9

+    #

+    # The more standards-conforming stlport4 library is

+    # incompatible with the Cstd library. Avoid specifying

+    # it if it's in CXXFLAGS. Ignore libCrun as

+    # -library=stlport4 depends on it.

+    case " $CXX $CXXFLAGS " in

+    *" -library=stlport4 "*)

+      solaris_use_stlport4=yes

+      ;;

+    esac

+    if test "$solaris_use_stlport4" != yes; then

+      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'

+    fi

+    ;;

+  esac

+  ;;

+

 solaris*)

   case $cc_basename in

   CC*)

+    # The more standards-conforming stlport4 library is

+    # incompatible with the Cstd library. Avoid specifying

+    # it if it's in CXXFLAGS. Ignore libCrun as

+    # -library=stlport4 depends on it.

+    case " $CXX $CXXFLAGS " in

+    *" -library=stlport4 "*)

+      solaris_use_stlport4=yes

+      ;;

+    esac

+

     # Adding this requires a known-good setup of shared libraries for

     # Sun compiler versions before 5.6, else PIC objects from an old

     # archive will be linked into the output, leading to subtle bugs.

-    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'

+    if test "$solaris_use_stlport4" != yes; then

+      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'

+    fi

     ;;

   esac

   ;;

@@ -3913,10 +4045,17 @@ objext=o

 _LT_AC_TAGVAR(objext, $1)=$objext

 # Code to be used in simple compile tests

-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"

+lt_simple_compile_test_code="\

+      subroutine t

+      return

+      end

+"

 # Code to be used in simple link tests

-lt_simple_link_test_code="      program t\n      end\n"

+lt_simple_link_test_code="\

+      program t

+      end

+"

 # ltmain only uses $CC for tagged configurations so make sure $CC is set.

 _LT_AC_SYS_COMPILER

@@ -3995,10 +4134,10 @@ objext=o

 _LT_AC_TAGVAR(objext, $1)=$objext

 # Code to be used in simple compile tests

-lt_simple_compile_test_code="class foo {}\n"

+lt_simple_compile_test_code="class foo {}"

 # Code to be used in simple link tests

-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'

+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'

 # ltmain only uses $CC for tagged configurations so make sure $CC is set.

 _LT_AC_SYS_COMPILER

@@ -4051,7 +4190,7 @@ objext=o

 _LT_AC_TAGVAR(objext, $1)=$objext

 # Code to be used in simple compile tests

-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'

+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'

 # Code to be used in simple link tests

 lt_simple_link_test_code="$lt_simple_compile_test_code"

@@ -4140,6 +4279,7 @@ if test -f "$ltmain"; then

     _LT_AC_TAGVAR(module_cmds, $1) \

     _LT_AC_TAGVAR(module_expsym_cmds, $1) \

     _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \

+    _LT_AC_TAGVAR(fix_srcfile_path, $1) \

     _LT_AC_TAGVAR(exclude_expsyms, $1) \

     _LT_AC_TAGVAR(include_expsyms, $1); do

@@ -4186,7 +4326,7 @@ ifelse([$1], [],

 # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)

 # NOTE: Changes made to this file will be lost: look at ltmain.sh.

 #

-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001

+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007

 # Free Software Foundation, Inc.

 #

 # This file is part of GNU Libtool:

@@ -4511,7 +4651,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec

 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec

 # Fix the shell variable \$srcfile for the compiler.

-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"

+fix_srcfile_path=$lt_fix_srcfile_path

 # Set to yes if exported symbols are required.

 always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)

@@ -4594,6 +4734,7 @@ fi

 # ---------------------------------

 AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],

 [AC_REQUIRE([AC_CANONICAL_HOST])

+AC_REQUIRE([LT_AC_PROG_SED])

 AC_REQUIRE([AC_PROG_NM])

 AC_REQUIRE([AC_OBJEXT])

 # Check for command to grab the raw symbol name followed by C symbol from nm.

@@ -4820,12 +4961,14 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])

       # like `-m68040'.

       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'

       ;;

-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)

+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)

       # PIC is the default for these OSes.

       ;;

-    mingw* | os2* | pw32*)

+    mingw* | cygwin* | os2* | pw32*)

       # This hack is so that the source file can tell whether it is being

       # built for inclusion in a dll (and should export symbols for example).

+      # Although the cygwin gcc ignores -fPIC, still need this for old-style

+      # (--disable-auto-import) libraries

       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'

       ;;

     darwin* | rhapsody*)

@@ -4837,7 +4980,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])

       # DJGPP does not support shared libraries at all

       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=

       ;;

-    interix3*)

+    interix[[3-9]]*)

       # Interix 3.x gcc -fpic/-fPIC options generate broken code.

       # Instead, we relocate shared libraries at runtime.

       ;;

@@ -4973,6 +5116,14 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])

 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'

 	    ;;

 	  *)

+	    case `$CC -V 2>&1 | sed 5q` in

+	    *Sun\ C*)

+	      # Sun C++ 5.9

+	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'

+	      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'

+	      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '

+	      ;;

+	    esac

 	    ;;

 	esac

 	;;

@@ -5093,13 +5244,15 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])

       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'

       ;;

-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)

+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)

       # PIC is the default for these OSes.

       ;;

-    mingw* | pw32* | os2*)

+    mingw* | cygwin* | pw32* | os2*)

       # This hack is so that the source file can tell whether it is being

       # built for inclusion in a dll (and should export symbols for example).

+      # Although the cygwin gcc ignores -fPIC, still need this for old-style

+      # (--disable-auto-import) libraries

       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'

       ;;

@@ -5109,7 +5262,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])

       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'

       ;;

-    interix3*)

+    interix[[3-9]]*)

       # Interix 3.x gcc -fpic/-fPIC options generate broken code.

       # Instead, we relocate shared libraries at runtime.

       ;;

@@ -5167,7 +5320,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])

        esac

        ;;

-    mingw* | pw32* | os2*)

+    mingw* | cygwin* | pw32* | os2*)

       # This hack is so that the source file can tell whether it is being

       # built for inclusion in a dll (and should export symbols for example).

       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'

@@ -5219,6 +5372,22 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])

         # All Alpha code is PIC.

         _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'

         ;;

+      *)

+        case `$CC -V 2>&1 | sed 5q` in

+	*Sun\ C*)

+	  # Sun C 5.9

+	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'

+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'

+	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'

+	  ;;

+	*Sun\ F*)

+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker

+	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'

+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'

+	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''

+	  ;;

+	esac

+	;;

       esac

       ;;

@@ -5228,6 +5397,10 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])

       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'

       ;;

+    rdos*)

+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'

+      ;;

+

     solaris*)

       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'

       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'

@@ -5322,7 +5495,8 @@ AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],

 # ------------------------------------

 # See if the linker supports building shared libraries.

 AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],

-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])

+[AC_REQUIRE([LT_AC_PROG_SED])dnl

+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])

 ifelse([$1],[CXX],[

   _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'

   case $host_os in

@@ -5339,7 +5513,7 @@ ifelse([$1],[CXX],[

     _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"

   ;;

   cygwin* | mingw*)

-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'

+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'

   ;;

   linux* | k*bsd*-gnu)

     _LT_AC_TAGVAR(link_all_deplibs, $1)=no

@@ -5481,7 +5655,7 @@ EOF

       _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported

       _LT_AC_TAGVAR(always_export_symbols, $1)=no

       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes

-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'

+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'

       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then

         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'

@@ -5499,7 +5673,7 @@ EOF

       fi

       ;;

-    interix3*)

+    interix[[3-9]]*)

       _LT_AC_TAGVAR(hardcode_direct, $1)=no

       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no

       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'

@@ -5514,7 +5688,7 @@ EOF

       _LT_AC_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'

       ;;

-    linux* | k*bsd*-gnu)

+    gnu* | linux* | k*bsd*-gnu)

       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then

 	tmp_addflag=

 	case $cc_basename,$host_cpu in

@@ -5532,13 +5706,22 @@ EOF

 	ifc* | ifort*)			# Intel Fortran compiler

 	  tmp_addflag=' -nofor_main' ;;

 	esac

-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

+	case `$CC -V 2>&1 | sed 5q` in

+	*Sun\ C*)			# Sun C 5.9

+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'

+	  tmp_sharedflag='-G' ;;

+	*Sun\ F*)			# Sun Fortran 8.3

+	  tmp_sharedflag='-G' ;;

+	*)

+	  tmp_sharedflag='-shared' ;;

+	esac

+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

 	if test $supports_anon_versioning = yes; then

 	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~

   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~

   $echo "local: *; };" >> $output_objdir/$libname.ver~

-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'