[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[hunspell] 37/98: Imported Debian patch 1.1.8-1



This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository hunspell.

commit 51d8e5a108da618286a5069b61feb59cce018dd3
Merge: f710d1f e01549c
Author: Rene Engelhard <rene@debian.org>
Date:   Tue Jul 17 09:49:04 2007 +0200

    Imported Debian patch 1.1.8-1

 ChangeLog                            |  62 ++++-
 NEWS                                 |   8 +
 README                               |   2 +
 THANKS                               |   2 +
 aclocal.m4                           | 500 +++++++++++++++++++++++++----------
 configure                            |  20 +-
 configure.ac                         |   4 +-
 debian/changelog                     |   6 +
 debian/control                       |   2 +-
 debian/rules                         |   2 +-
 ltmain.sh                            | 233 ++++++++++------
 src/hunspell/affentry.cxx            |   5 +-
 src/hunspell/affixmgr.cxx            |   2 +-
 src/hunspell/atypes.hxx              |   2 +-
 src/hunspell/csutil.cxx              |  28 +-
 src/hunspell/dictmgr.cxx             |  18 +-
 src/hunspell/hashmgr.cxx             |  48 +++-
 src/hunspell/hunspell.cxx            |  28 +-
 src/hunspell/hunspell.hxx            |  16 +-
 src/hunspell/suggestmgr.cxx          |  15 +-
 src/tools/hunspell.cxx               |  26 +-
 src/win_api/hunspelldll.c            |   8 +-
 src/win_api/hunspelldll.h            |  10 +-
 tests/Makefile.am                    |   7 +
 tests/Makefile.in                    |   7 +
 tests/base.aff                       |   2 +-
 tests/base.dic                       |   3 +-
 tests/base.good                      |   7 +-
 tests/base.sug                       |   1 +
 tests/base.wrong                     |   2 +-
 tests/{base.aff => base_utf.aff}     |   5 +-
 tests/{base.dic => base_utf.dic}     |   3 +-
 tests/{base.good => base_utf.good}   |   7 +-
 tests/{base.sug => base_utf.sug}     |   1 +
 tests/base_utf.test                  |   4 +
 tests/{base.wrong => base_utf.wrong} |   2 +-
 tests/test.sh                        |   4 +-
 37 files changed, 778 insertions(+), 324 deletions(-)

diff --cc aclocal.m4
index 7e125f2,b083ae0..dfe20c1
--- a/aclocal.m4
+++ b/aclocal.m4
@@@ -13,7 -13,7 +13,7 @@@
  
  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
  
- # serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
 -# serial 48 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 +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,8 +263,9 @@@ cc_basename=`$echo "X$cc_temp" | $Xsed 
  # 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 -276,8 +277,9 @@@
  # 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 -293,12 +295,20 @@@
  # 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 -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 -552,6 +566,9 @@@
        ;;
      *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 -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 -664,11 +681,12 @@@ f
  # ------------------------------------------------------------
  # 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 -782,24 +800,27 @@@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [
      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 -1026,7 +1047,8 @@@ f
  # ---------------------------------
  # 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 -1034,7 +1056,7 @@@
     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 -1174,6 +1196,7 @@@ els
     darwin*)
         if test -n "$STRIP" ; then
           striplib="$STRIP -x"
++         old_striplib="$STRIP -S"
           AC_MSG_RESULT([yes])
         else
    AC_MSG_RESULT([no])
@@@ -1191,7 -1191,7 +1214,8 @@@ f
  # -----------------------------
  # 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 -1205,20 +1229,58 @@@ shlibpath_overrides_runpath=unknow
  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 -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 -1446,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 -1509,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
@@@ -1566,10 -1578,27 +1624,10 @@@ linux* | k*bsd*-gnu
    # before this can be enabled.
    hardcode_into_libs=yes
  
 -  # find out which ABI we are using
 -  libsuff=
 -  case "$host_cpu" in
 -  x86_64*|s390x*|powerpc64*)
 -    echo '[#]line __oline__ "configure"' > conftest.$ac_ext
 -    if AC_TRY_EVAL(ac_compile); then
 -      case `/usr/bin/file conftest.$ac_objext` in
 -      *64-bit*)
 -        libsuff=64
 -        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
 -        ;;
 -      esac
 -    fi
 -    rm -rf conftest*
 -    ;;
 -  esac
 -
    # 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/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
 -    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
++    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
  
    # We used to test for /lib/ld.so.1 and disable shared libraries on
@@@ -1674,6 -1703,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 -1808,7 +1841,8 @@@ f
  # _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 -2069,7 +2103,7 @@@ m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([A
  
  # 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 -2132,7 +2166,7 @@@ f
  
  # 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 -2279,7 +2313,7 @@@ esa
  # 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 -2318,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 -2365,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 -2415,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 -2467,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 -2683,10 +2727,10 @@@ objext=
  _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 -2788,10 +2832,10 @@@ objext=
  _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 -2937,7 +2981,7 @@@ case $host_os i
  	   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 -3096,10 +3140,10 @@@
        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 -3182,9 +3226,7 @@@
        _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 -3252,7 +3294,7 @@@
  	;;
      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 -3372,6 +3414,29 @@@
  	# 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 -3410,16 +3475,20 @@@
      _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 -3581,15 +3650,10 @@@
  	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 -3636,6 +3700,12 @@@
  	  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 -3879,7 +3949,7 @@@ $rm -f confest.$objex
  # 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 -3887,13 +3957,46 @@@
    _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 -3942,10 +4045,17 @@@ objext=
  _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 -4024,10 +4134,10 @@@ objext=
  _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 -4080,7 +4190,7 @@@ objext=
  _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 -4169,6 +4279,7 @@@ if test -f "$ltmain"; the
      _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 -4215,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 -4543,7 +4651,7 @@@ sys_lib_search_path_spec=$lt_sys_lib_se
  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 -4626,6 +4734,7 @@@ f
  # ---------------------------------
  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 -4852,12 +4961,14 @@@ AC_MSG_CHECKING([for $compiler option t
        # 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 -4869,7 +4980,7 @@@
        # 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 -5005,6 +5116,14 @@@
  	    _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 -5125,13 +5244,15 @@@
        _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 -5141,7 +5262,7 @@@
        _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 -5199,7 +5320,7 @@@
         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 -5251,6 +5372,22 @@@
          # 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 -5260,6 +5397,10 @@@
        _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 -5354,7 +5495,8 @@@ AC_LIBTOOL_LINKER_OPTION([if $compiler 
  # ------------------------------------
  # 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,10 -5371,7 +5513,10 @@@
      _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
    ;;
    *)
      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@@ -5481,7 -5510,7 +5655,7 @@@ EO
        _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 -5528,7 +5673,7 @@@
        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 -5543,7 +5688,7 @@@
        _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)
 -    linux*)
++    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,15 -5561,14 +5706,24 @@@
  	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'
++	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
  	fi
 +	_LT_AC_TAGVAR(link_all_deplibs, $1)=no
        else
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
@@@ -5579,7 -5607,7 +5762,7 @@@ EO
  
      sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
        case `$LD -v 2>&1` in
--        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) 
++        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
  	cat <<_LT_EOF 1>&2
  
@@@ -5698,7 -5726,7 +5881,7 @@@ _LT_EO
    	   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
@@@ -5791,7 -5819,7 +5974,7 @@@
        # The linker will automatically build a .lib file if we build a DLL.
        _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
        # FIXME: Should let the user specify the lib program.
--      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
++      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
        _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
        _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
        ;;
@@@ -5833,10 -5861,10 +6016,10 @@@
        case $cc_basename in
          xlc*)
           output_verbose_link_cmd='echo'
--         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $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 $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 $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 $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}'
            ;;
         *)
@@@ -5998,24 -6026,24 +6181,28 @@@
        ;;
  
      openbsd*)
--      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
--	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++      if test -f /usr/libexec/ld.so; then
++	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
++	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++	else
++	  case $host_os in
++	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
++	     _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++	     ;;
++	   *)
++	     _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	     ;;
++	  esac
++        fi
        else
--       case $host_os in
--	 openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
--	   _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
--	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
--	   ;;
--	 *)
--	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
--	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
--	   ;;
--       esac
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
        ;;
  
@@@ -6074,17 -6102,17 +6261,16 @@@
        case $host_os in
        solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
        *)
-- 	# The compiler driver will combine linker options so we
-- 	# cannot just pass the convience library names through
-- 	# without $wl, iff we do not link with $LD.
-- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
++	# The compiler driver will combine and reorder linker options,
++	# but understands `-z linker_flag'.  GCC discards it without `$wl',
++	# but is careful enough not to reorder.
   	# Supported since Solaris 2.6 (maybe 2.5.1?)
-- 	case $wlarc in
-- 	'')
-- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
-- 	*)
-- 	  _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' ;;
-- 	esac ;;
++	if test "$GCC" = yes; then
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	else
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
++	fi
++	;;
        esac
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
        ;;
@@@ -6141,7 -6169,7 +6327,7 @@@
        fi
        ;;
  
--    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
++    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
        _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
        _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
@@@ -6216,7 -6244,7 +6402,7 @@@ x|xyes
        # to ld, don't add -lc before -lgcc.
        AC_MSG_CHECKING([whether -lc should be explicitly linked in])
        $rm conftest*
--      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
  
        if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
          soname=conftest
@@@ -6319,6 -6347,6 +6505,30 @@@ AC_DEFUN([LT_AC_PROG_RC]
  [AC_CHECK_TOOL(RC, windres, no)
  ])
  
++
++# Cheap backport of AS_EXECUTABLE_P and required macros
++# from Autoconf 2.59; we should not use $as_executable_p directly.
++
++# _AS_TEST_PREPARE
++# ----------------
++m4_ifndef([_AS_TEST_PREPARE],
++[m4_defun([_AS_TEST_PREPARE],
++[if test -x / >/dev/null 2>&1; then
++  as_executable_p='test -x'
++else
++  as_executable_p='test -f'
++fi
++])])# _AS_TEST_PREPARE
++
++# AS_EXECUTABLE_P
++# ---------------
++# Check whether a file is executable.
++m4_ifndef([AS_EXECUTABLE_P],
++[m4_defun([AS_EXECUTABLE_P],
++[AS_REQUIRE([_AS_TEST_PREPARE])dnl
++$as_executable_p $1[]dnl
++])])# AS_EXECUTABLE_P
++
  # NOTE: This macro has been submitted for inclusion into   #
  #  GNU Autoconf as AC_PROG_SED.  When it is available in   #
  #  a released version of Autoconf we should remove this    #
@@@ -6339,7 -6367,7 +6549,7 @@@ d
    test -z "$as_dir" && as_dir=.
    for lt_ac_prog in sed gsed; do
      for ac_exec_ext in '' $ac_executable_extensions; do
--      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
++      if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
          lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
        fi
      done
diff --cc debian/changelog
index c502eb7,0000000..fe45e0a
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,190 -1,0 +1,196 @@@
++hunspell (1.1.8-1) unstable; urgency=low
++
++  * New upstream release
++
++ -- Rene Engelhard <rene@debian.org>  Tue, 17 Jul 2007 09:49:04 +0200
++
 +hunspell (1.1.7-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Rene Engelhard <rene@debian.org>  Sun, 08 Jul 2007 23:56:51 +0200
 +
 +hunspell (1.1.6-1) unstable; urgency=low
 +
 +  * New upstream release
 +    - the hunspell program has now input encoding support (closes: #350022)
 +
 + -- Rene Engelhard <rene@debian.org>  Mon, 02 Jul 2007 13:39:33 +0200
 +
 +hunspell (1.1.5-6) unstable; urgency=low
 +
 +  * add (normally not needed) conflicts against old experimentals OOo
 +    (see #416711)
 +
 + -- Rene Engelhard <rene@debian.org>  Fri, 13 Apr 2007 15:07:53 +0200
 +
 +hunspell (1.1.5-5) unstable; urgency=low
 +
 +  * add info to hunspell(4) from SF tracker #1610863 how to convert aspell
 +    dicts (closes: #324639)
 +
 + -- Rene Engelhard <rene@debian.org>  Wed, 11 Apr 2007 16:11:04 +0200
 +
 +hunspell (1.1.5-4) unstable; urgency=low
 +
 +  * upload to unstable 
 +
 + -- Rene Engelhard <rene@debian.org>  Sun,  8 Apr 2007 12:25:23 +0200
 +
 +hunspell (1.1.5-3) experimental; urgency=low
 +
 +  * add new hunspell-tools package superseding libmyspell-devs tools
 +    (package not built anymore)
 +    - add ispellaff2myspell from libmyspell-dev here
 +    - install munch and unmunch
 +    - conflict and replace (against) libmyspell-dev
 +  * install src/tools/example.cxx 
 +
 + -- Rene Engelhard <rene@debian.org>  Wed, 28 Mar 2007 16:29:52 +0200
 +
 +hunspell (1.1.5-2) experimental; urgency=low
 +
 +  * fix hunspell.hxx
 +
 + -- Rene Engelhard <rene@debian.org>  Tue, 20 Mar 2007 16:19:18 +0100
 +
 +hunspell (1.1.5-1) experimental; urgency=low
 +
 +  * New upstream release
 +  * debian/libhunspell-1.1-0.shlibs: bump, C API got added
 +  * debian/patches/12_get_csconv.diff: temporary(?) buildfix,
 +    the hunspell client needs get_csconv() still.
 +
 + -- Rene Engelhard <rene@debian.org>  Tue, 20 Mar 2007 13:21:54 +0100
 +
 +hunspell (1.1.4-8) experimental; urgency=low
 +
 +  * add pkg-config file 
 +
 + -- Rene Engelhard <rene@debian.org>  Wed, 21 Feb 2007 19:33:31 +0100
 +
 +hunspell (1.1.4-7) experimental; urgency=low
 +
 +  * fix 02_usr_share_myspell_dicts.dpatch to not define
 +    LIBDIR as /usr/share/hunspell _yet_, oops
 +
 + -- Rene Engelhard <rene@debian.org>  Sun,  7 Jan 2007 18:43:26 +0100
 +
 +hunspell (1.1.4-6) experimental; urgency=low
 +
 +  * fix tail usage in tests.sh
 +  * take patch from Fedora to build shared lib (libhunspell-1.1.so.0)
 +    (closes: #324637); stop building _pic versions; build-depend on
 +    libtool and automake1.9
 +
 + -- Rene Engelhard <rene@debian.org>  Mon,  1 Jan 2007 03:44:11 +0100
 +
 +hunspell (1.1.4-5) unstable; urgency=high
 +
 +  * add full MPL to debian/copyright (closes: #402324) 
 +
 + -- Rene Engelhard <rene@debian.org>  Sat,  9 Dec 2006 16:49:02 +0100
 +
 +hunspell (1.1.4-4) unstable; urgency=medium
 +
 +  * move fixes from last NMU to proper patches.
 +  * make w_char structure tightly packed, needed on arm, thanks
 +    Steinar H. Gunderson and remove XFAILED= from configure.ac
 +    since the tests now fail because of unexpected passes.
 +    (closes: #396528)
 +
 + -- Rene Engelhard <rene@debian.org>  Thu, 16 Nov 2006 15:52:53 +0100
 +
 +hunspell (1.1.4-3.1) unstable; urgency=medium
 +
 +  * Non-maintainer upload.
 +  * Set LANG=C at the top of tests/test.sh; fixes FTBFS when LANG is not C
 +    during build (since sed behaves differently).
 +  * Ensure we are working on signed characters when converting to and from
 +    UTF-8 internally; should fix test failures and FTBFS on arm.
 +    (Closes: #396528)
 +
 + -- Steinar H. Gunderson <sesse@debian.org>  Wed, 15 Nov 2006 20:06:28 +0100
 +
 +hunspell (1.1.4-3) unstable; urgency=low
 +
 +  * allow hunspell-dictionary-de in hunspells Depends:, thanks
 +    Gerfried Fucks (closes: #359628)
 +
 + -- Rene Engelhard <rene@debian.org>  Tue, 28 Mar 2006 20:08:34 +0200
 +
 +hunspell (1.1.4-2) unstable; urgency=low
 +
 +  * set LIBDIR to /usr/share/myspell/dicts (closes: #357249) 
 +
 + -- Rene Engelhard <rene@debian.org>  Thu, 16 Mar 2006 17:09:50 +0100
 +
 +hunspell (1.1.4-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * update debian/copyright for new GPL/LGPL/MPL tri-licensing
 +  * add libncursesw5-dev builddep 
 +
 + -- Rene Engelhard <rene@debian.org>  Thu,  2 Feb 2006 16:46:12 +0100
 +
 +hunspell (1.1.2-1) unstable; urgency=low
 +
 +  * New upstream release
 +    - should fix the infinite loops at the compound checks (closes: #338482)
 +  * debian/patches/01_pic_versions.dpatch: autoreconf
 +  * enable NLS again
 +
 + -- Rene Engelhard <rene@debian.org>  Fri, 11 Nov 2005 14:23:40 +0100
 +
 +hunspell (1.1.1-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Rene Engelhard <rene@debian.org>  Wed,  9 Nov 2005 18:24:48 +0100
 +
 +hunspell (1.1.0-2) unstable; urgency=low
 +
 +  * upload to unstable. 
 +
 + -- Rene Engelhard <rene@debian.org>  Thu, 20 Oct 2005 01:13:42 +0200
 +
 +hunspell (1.1.0-1) experimental; urgency=low
 +
 +  * New upstream release
 +  * run make check
 +
 + -- Rene Engelhard <rene@debian.org>  Mon, 19 Sep 2005 23:48:20 +0200
 +
 +hunspell (1.0.9-1) experimental; urgency=low
 +
 +  * New upstream release
 +  * Standards-Version: 3.6.2 (no changes needed)
 +  * grr. I hate automake. temporarily disable NLS
 +
 + -- Rene Engelhard <rene@debian.org>  Sat, 27 Aug 2005 00:30:58 +0200
 +
 +hunspell (1.0.8-3) experimental; urgency=low
 +
 +  * add patch to build PIC versions of the libraries
 +  * we don't ship unmuch, so don't ship unmunch.h 
 +
 + -- Rene Engelhard <rene@debian.org>  Mon,  8 Aug 2005 04:02:41 +0200
 +
 +hunspell (1.0.8-2) experimental; urgency=low
 +
 +  * don't install unmunch, conflicts with libmyspell-dev
 +
 + -- Rene Engelhard <rene@debian.org>  Wed,  3 Aug 2005 22:29:49 +0200
 +
 +hunspell (1.0.8-1) experimental; urgency=low
 +
 +  * New upstream release
 +
 + -- Rene Engelhard <rene@debian.org>  Tue,  2 Aug 2005 18:48:19 +0200
 +
 +hunspell (1.0.7-1) experimental; urgency=low
 +
 +  * Initial release.
 +
 + -- Rene Engelhard <rene@debian.org>  Tue, 26 Jul 2005 12:11:52 +0200
 +
diff --cc debian/control
index 6c6f292,0000000..168492f
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,108 -1,0 +1,108 @@@
 +Source: hunspell
 +Priority: optional
 +Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
 +Uploaders: Rene Engelhard <rene@debian.org>, Chris Halls <halls@debian.org>
 +Build-Depends: debhelper (>= 4.0.0), libreadline5-dev, libncurses5-dev, libncursesw5-dev, dpatch, autotools-dev, autoconf, libtool, automake1.9
 +Standards-Version: 3.6.2
 +Section: text
 +
 +Package: libhunspell-dev
 +Section: libdevel
 +Architecture: any
- Depends: ${shlibs:Depends}, libhunspell-1.1-0 (= ${Source-Version})
++Depends: ${shlibs:Depends}, libhunspell-1.1-0 (= ${source:Version})
 +Description: spell checker and morphological analyzer (development)
 + Hunspell is a spell checker and morphological analyzer library and program
 + designed for languages with rich morphology and complex word compounding or
 + character encoding. It is based on MySpell and features an Ispell-like
 + terminal interface using Curses library, an Ispell pipe interface and an
 + OpenOffice.org UNO module.
 + .
 + Main features:
 +  - Unicode support (first 65535 Unicode character)
 +  - morphological analysis (in custom item and arrangement style)
 +  - Max. 65535 affix classes and twofold affix stripping (for agglutinative
 +    languages, like Azeri, Basque, Estonian, Finnish, Hungarian, Turkish, etc.)
 +  - Support complex compoundings (for example, Hungarian and German)
 +  - Support language specific algorithms (for example, handling Azeri
 +    and Turkish dotted i, or German sharp s)
 +  - Handling conditional affixes, circumfixes, fogemorphemes,
 +    forbidden words, pseudoroots and homonyms.
 + .
 + This package contains the headers and the static library.
 +
 +Package: libhunspell-1.1-0
 +Section: libs
 +Architecture: any
 +Depends: ${shlibs:Depends}
 +Conflicts: openoffice.org-core (= 2.2.0~rc2-1)
 +Description: spell checker and morphological analyzer (shared library)
 + Hunspell is a spell checker and morphological analyzer library and program
 + designed for languages with rich morphology and complex word compounding or
 + character encoding. It is based on MySpell and features an Ispell-like
 + terminal interface using Curses library, an Ispell pipe interface and an
 + OpenOffice.org UNO module.
 + .
 + Main features:
 +  - Unicode support (first 65535 Unicode character)
 +  - morphological analysis (in custom item and arrangement style)
 +  - Max. 65535 affix classes and twofold affix stripping (for agglutinative
 +    languages, like Azeri, Basque, Estonian, Finnish, Hungarian, Turkish, etc.)
 +  - Support complex compoundings (for example, Hungarian and German)
 +  - Support language specific algorithms (for example, handling Azeri
 +    and Turkish dotted i, or German sharp s)
 +  - Handling conditional affixes, circumfixes, fogemorphemes,
 +    forbidden words, pseudoroots and homonyms.
 + .
 + This package contains the shared library.
 +
 +Package: hunspell
 +Architecture: any
 +Depends: ${shlibs:Depends}, ${misc:Depends}, myspell-en-us | myspell-dictionary | hunspell-dictionary
 +Description: spell checker and morphological analyzer (program)
 + Hunspell is a spell checker and morphological analyzer library and program
 + designed for languages with rich morphology and complex word compounding or
 + character encoding. It is based on MySpell and features an Ispell-like
 + terminal interface using Curses library, an Ispell pipe interface and an
 + OpenOffice.org UNO module.
 + .
 + Main features:
 +  - Unicode support (first 65535 Unicode character)
 +  - morphological analysis (in custom item and arrangement style)
 +  - Max. 65535 affix classes and twofold affix stripping (for agglutinative
 +    languages, like Azeri, Basque, Estonian, Finnish, Hungarian, Turkish, etc.)
 +  - Support complex compoundings (for example, Hungarian and German)
 +  - Support language specific algorithms (for example, handling Azeri
 +    and Turkish dotted i, or German sharp s)
 +  - Handling conditional affixes, circumfixes, fogemorphemes,
 +    forbidden words, pseudoroots and homonyms.
 + .
 + This package contains the program with the Ispell-like terminal and pipe
 + interfaces.
 +
 +Package: hunspell-tools
 +Architecture: any
 +Depends: ${shlibs:Depends}, ${perl:Depends}
 +Conflicts: libmyspell-dev
 +Replaces: libmyspell-dev
 +Description: tools for hunspell
 + Hunspell is a spell checker and morphological analyzer library and program
 + designed for languages with rich morphology and complex word compounding or
 + character encoding. It is based on MySpell and features an Ispell-like
 + terminal interface using Curses library, an Ispell pipe interface and an
 + OpenOffice.org UNO module.
 + .
 + Main features:
 +  - Unicode support (first 65535 Unicode character)
 +  - morphological analysis (in custom item and arrangement style)
 +  - Max. 65535 affix classes and twofold affix stripping (for agglutinative
 +    languages, like Azeri, Basque, Estonian, Finnish, Hungarian, Turkish, etc.)
 +  - Support complex compoundings (for example, Hungarian and German)
 +  - Support language specific algorithms (for example, handling Azeri
 +    and Turkish dotted i, or German sharp s)
 +  - Handling conditional affixes, circumfixes, fogemorphemes,
 +    forbidden words, pseudoroots and homonyms.
 + .
 + This package contains a the munch/unmunch tools of hunspell and
 + ispellaff2myspell for converting ispell affix files for myspell/hunspell
 + format.
 +
diff --cc debian/rules
index 252ff27,0000000..3cf0395
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,98 -1,0 +1,98 @@@
 +#!/usr/bin/make -f
 +# -*- makefile -*-
 +# Sample debian/rules that uses debhelper.
 +# This file was originally written by Joey Hess and Craig Small.
 +# As a special exception, when this file is copied by dh-make into a
 +# dh-make output file, you may use that output file without restriction.
 +# This special exception was added by Craig Small in version 0.37 of dh-make.
 +
 +# Uncomment this to turn on verbose mode.
 +#export DH_VERBOSE=1
 +
 +
 +# These are used for cross-compiling and for saving the configure script
 +# from having to guess our platform (since we know it already)
 +DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 +DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 +
 +include /usr/share/dpatch/dpatch.make
 +
 +CFLAGS = -Wall -g
 +
 +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 +	CFLAGS += -O0
 +else
 +	CFLAGS += -O2
 +endif
 +
 +# shared library versions, option 1
 +version=2.0.5
 +major=2
 +# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
 +#version=`ls src/.libs/lib*.so.* | \
 +# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
 +#major=`ls src/.libs/lib*.so.* | \
 +# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
 +
 +config.status: patch-stamp configure
 +	dh_testdir
 +	# Add here commands to configure the package.
 +	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
 +		--with-ui --with-readline
 +
 +build: build-stamp
 +build-stamp:  config.status
 +	dh_testdir
 +
 +	$(MAKE)
 +	$(MAKE) check
 +	pod2man debian/ispellaff2myspell \
 +		> debian/ispellaff2myspell.1
 +
 +	touch build-stamp
 +
 +clean:
 +	dh_testdir
 +	dh_testroot
 +	rm -f build-stamp 
 +
- 	-$(MAKE) distclean
++	[ ! -f Makefile ] || $(MAKE) distclean
 +	./debian/rules unpatch
 +	rm -f debian/ispellaff2myspell.1
 +	rm -f config.log
 +
 +	dh_clean 
 +
 +install: build
 +	dh_testdir
 +	dh_testroot
 +	dh_clean -k 
 +	dh_installdirs
 +
 +	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 +	dh_install
 +		
 +binary-indep: build install
 +
 +binary-arch: build install
 +	dh_testdir
 +	dh_testroot
 +	dh_installchangelogs ChangeLog
 +	dh_installdocs
 +	dh_installexamples src/tools/example.cxx
 +	dh_install
 +	dh_installman
 +	dh_link
 +	dh_strip
 +	dh_compress
 +	dh_fixperms
 +	dh_makeshlibs
 +	dh_installdeb
 +	dh_shlibdeps
 +	dh_perl
 +	dh_gencontrol
 +	dh_md5sums
 +	dh_builddeb
 +
 +binary: binary-indep binary-arch
 +.PHONY: build clean binary-indep binary-arch binary install 
diff --cc ltmain.sh
index c715b59,6828dc0..f924d30
--- a/ltmain.sh
+++ b/ltmain.sh
@@@ -1,8 -1,8 +1,8 @@@
  # ltmain.sh - Provide generalized library-building support services.
  # NOTE: Changing this file will not affect anything until you rerun configure.
  #
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004
--# Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
++# 2007  Free Software Foundation, Inc.
  # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
  #
  # This program is free software; you can redistribute it and/or modify
@@@ -43,14 -46,9 +43,22 @@@ EXIT_FAILURE=
  
  PROGRAM=ltmain.sh
  PACKAGE=libtool
- VERSION="1.5.22 Debian 1.5.22-4"
- TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
 -VERSION=1.5.6
 -TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42)"
--
- # See if we are running on zsh, and set the options which allow our
- # commands through without removal of \ escapes.
- if test -n "${ZSH_VERSION+set}" ; then
++VERSION="1.5.24 Debian 1.5.24-1"
++TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
++
++# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++  emulate sh
++  NULLCMD=:
++  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '${1+"$@"}'='"$@"'
 +  setopt NO_GLOB_SUBST
++else
++  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
 +fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
++DUALCASE=1; export DUALCASE # for MKS sh
  
  # Check that we have a working $echo.
  if test "X$1" = X--no-reexec; then
@@@ -105,17 -102,16 +113,19 @@@ esa
  # These must not be set unconditionally because not all systems understand
  # e.g. LANG=C (notably SCO).
  # We save the old values to restore during execute mode.
--if test "${LC_ALL+set}" = set; then
--  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
--fi
--if test "${LANG+set}" = set; then
--  save_LANG="$LANG"; LANG=C; export LANG
--fi
++for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
++do
++  eval "if test \"\${$lt_var+set}\" = set; then
++	  save_$lt_var=\$$lt_var
++	  $lt_var=C
++	  export $lt_var
++	fi"
++done
  
  # Make sure IFS has a sensible default
 -: ${IFS=" 	
 -"}
 +lt_nl='
 +'
 +IFS=" 	$lt_nl"
  
  if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
    $echo "$modename: not configured to build any kind of library" 1>&2
@@@ -132,10 -128,8 +142,12 @@@ run
  show="$echo"
  show_help=
  execute_dlfiles=
 +duplicate_deps=no
 +preserve_args=
  lo2o="s/\\.lo\$/.${objext}/"
  o2lo="s/\\.${objext}\$/.lo/"
++extracted_archives=
++extracted_serial=0
  
  #####################################
  # Shell function definitions:
@@@ -196,11 -152,12 +208,17 @@@ func_win32_libid (
      if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
        $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
        win32_nmres=`eval $NM -f posix -A $1 | \
- 	$SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
 -	sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
 -      if test "X$win32_nmres" = "Ximport" ; then
 -        win32_libid_type="x86 archive import"
 -      else
 -        win32_libid_type="x86 archive static"
 -      fi
++	$SED -n -e '1,100{
++		/ I /{
++			s,.*,import,
++			p
++			q
++			}
++		}'`
 +      case $win32_nmres in
 +      import*)  win32_libid_type="x86 archive import";;
 +      *)        win32_libid_type="x86 archive static";;
 +      esac
      fi
      ;;
    *DLL*)
@@@ -282,108 -238,6 +300,118 @@@ func_infer_tag (
        esac
      fi
  }
 +
 +
 +# func_extract_an_archive dir oldlib
 +func_extract_an_archive ()
 +{
 +    f_ex_an_ar_dir="$1"; shift
 +    f_ex_an_ar_oldlib="$1"
 +
 +    $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
 +    $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
 +    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
 +     :
 +    else
 +      $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
 +      exit $EXIT_FAILURE
 +    fi
 +}
 +
 +# func_extract_archives gentop oldlib ...
 +func_extract_archives ()
 +{
 +    my_gentop="$1"; shift
 +    my_oldlibs=${1+"$@"}
 +    my_oldobjs=""
 +    my_xlib=""
 +    my_xabs=""
 +    my_xdir=""
 +    my_status=""
 +
 +    $show "${rm}r $my_gentop"
 +    $run ${rm}r "$my_gentop"
 +    $show "$mkdir $my_gentop"
 +    $run $mkdir "$my_gentop"
 +    my_status=$?
 +    if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
 +      exit $my_status
 +    fi
 +
 +    for my_xlib in $my_oldlibs; do
 +      # Extract the objects.
 +      case $my_xlib in
 +	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
 +	*) my_xabs=`pwd`"/$my_xlib" ;;
 +      esac
 +      my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-       my_xdir="$my_gentop/$my_xlib"
++      my_xlib_u=$my_xlib
++      while :; do
++        case " $extracted_archives " in
++	*" $my_xlib_u "*)
++	  extracted_serial=`expr $extracted_serial + 1`
++	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
++	*) break ;;
++	esac
++      done
++      extracted_archives="$extracted_archives $my_xlib_u"
++      my_xdir="$my_gentop/$my_xlib_u"
 +
 +      $show "${rm}r $my_xdir"
 +      $run ${rm}r "$my_xdir"
 +      $show "$mkdir $my_xdir"
 +      $run $mkdir "$my_xdir"
 +      exit_status=$?
 +      if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then
 +	exit $exit_status
 +      fi
 +      case $host in
 +      *-darwin*)
 +	$show "Extracting $my_xabs"
 +	# Do not bother doing anything if just a dry run
 +	if test -z "$run"; then
 +	  darwin_orig_dir=`pwd`
 +	  cd $my_xdir || exit $?
 +	  darwin_archive=$my_xabs
 +	  darwin_curdir=`pwd`
 +	  darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
 +	  darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
 +	  if test -n "$darwin_arches"; then 
 +	    darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
 +	    darwin_arch=
 +	    $show "$darwin_base_archive has multiple architectures $darwin_arches"
 +	    for darwin_arch in  $darwin_arches ; do
 +	      mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
 +	      lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
 +	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
 +	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
 +	      cd "$darwin_curdir"
 +	      $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
 +	    done # $darwin_arches
 +      ## Okay now we have a bunch of thin objects, gotta fatten them up :)
 +	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
 +	    darwin_file=
 +	    darwin_files=
 +	    for darwin_file in $darwin_filelist; do
 +	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
 +	      lipo -create -output "$darwin_file" $darwin_files
 +	    done # $darwin_filelist
 +	    ${rm}r unfat-$$
 +	    cd "$darwin_orig_dir"
 +	  else
 +	    cd "$darwin_orig_dir"
 + 	    func_extract_an_archive "$my_xdir" "$my_xabs"
 +	  fi # $darwin_arches
 +	fi # $run
 +	;;
 +      *)
 +        func_extract_an_archive "$my_xdir" "$my_xabs"
 +        ;;
 +      esac
 +      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
 +    done
 +    func_extract_archives_result="$my_oldobjs"
 +}
  # End of Shell function definitions
  #####################################
  
@@@ -454,12 -316,12 +482,13 @@@ d
      ;;
  
    --version)
--    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
--    $echo
-     $echo "Copyright (C) 2005  Free Software Foundation, Inc."
 -    $echo "Copyright (C) 2003  Free Software Foundation, Inc."
--    $echo "This is free software; see the source for copying conditions.  There is NO"
--    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 -    exit $EXIT_SUCCESS
++    echo "\
++$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
++
++Copyright (C) 2007  Free Software Foundation, Inc.
++This is free software; see the source for copying conditions.  There is NO
++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 +    exit $?
      ;;
  
    --config)
@@@ -755,9 -598,9 +784,10 @@@ if test -z "$show_help"; the
      *.class) xform=class ;;
      *.cpp) xform=cpp ;;
      *.cxx) xform=cxx ;;
--    *.f90) xform=f90 ;;
++    *.[fF][09]?) xform=[fF][09]. ;;
      *.for) xform=for ;;
      *.java) xform=java ;;
++    *.obj) xform=obj ;;
      esac
  
      libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@@@ -1138,23 -967,22 +1168,32 @@@ EO
      for arg
      do
        case $arg in
--      -all-static | -static)
--	if test "X$arg" = "X-all-static"; then
++      -all-static | -static | -static-libtool-libs)
++	case $arg in
++	-all-static)
  	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
  	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
  	  fi
  	  if test -n "$link_static_flag"; then
  	    dlopen_self=$dlopen_self_static
  	  fi
 -	else
 +	  prefer_static_libs=yes
- 	else
++	  ;;
++	-static)
  	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
  	    dlopen_self=$dlopen_self_static
  	  fi
 -	fi
 +	  prefer_static_libs=built
- 	fi
++	  ;;
++	-static-libtool-libs)
++	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
++	    dlopen_self=$dlopen_self_static
++	  fi
++	  prefer_static_libs=yes
++	  ;;
++	esac
  	build_libtool_libs=no
  	build_old_libs=yes
 -	prefer_static_libs=yes
  	break
  	;;
        esac
@@@ -1590,20 -1379,8 +1629,20 @@@
  	continue
  	;;
  
 -     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
 -	deplibs="$deplibs $arg"
 +      # Tru64 UNIX uses -model [arg] to determine the layout of C++
 +      # classes, name mangling, and exception handling.
 +      -model)
 +	compile_command="$compile_command $arg"
 +	compiler_flags="$compiler_flags $arg"
 +	finalize_command="$finalize_command $arg"
 +	prev=xcompiler
 +	continue
 +	;;
 +
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
++     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
 +	compiler_flags="$compiler_flags $arg"
 +	compile_command="$compile_command $arg"
 +	finalize_command="$finalize_command $arg"
  	continue
  	;;
  
@@@ -1612,19 -1389,13 +1651,20 @@@
  	continue
  	;;
  
 -      # gcc -m* arguments should be passed to the linker via $compiler_flags
 -      # in order to pass architecture information to the linker
 -      # (e.g. 32 vs 64-bit).  This may also be accomplished via -Wl,-mfoo
 -      # but this is not reliable with gcc because gcc may use -mfoo to
 -      # select a different linker, different libraries, etc, while
 -      # -Wl,-mfoo simply passes -mfoo to the linker.
 -      -m*)
 +      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
 +      # -r[0-9][0-9]* specifies the processor on the SGI compiler
 +      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
 +      # +DA*, +DD* enable 64-bit mode on the HP compiler
 +      # -q* pass through compiler args for the IBM compiler
 +      # -m* pass through architecture-specific compiler args for GCC
 +      # -m*, -t[45]*, -txscale* pass through architecture-specific
 +      # compiler args for GCC
-       # -pg pass through profiling flag for GCC
++      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
++      # -F/path gives path to uninstalled frameworks, gcc on darwin
 +      # @file GCC response files
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
-       -t[45]*|-txscale*|@*)
++      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
++      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
 +
  	# Unknown arguments in both finalize_command and compile_command need
  	# to be aesthetically quoted because they are evaled later.
  	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
@@@ -1651,9 -1424,9 +1691,9 @@@
  
        -no-install)
  	case $host in
--	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
++	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
  	  # The PATH hackery in wrapper scripts is required on Windows
--	  # in order for the loader to find any dlls it needs.
++	  # and Darwin in order for the loader to find any dlls it needs.
  	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
  	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
  	  fast_install=no
@@@ -1712,7 -1485,7 +1752,7 @@@
  	continue
  	;;
  
--      -static)
++      -static | -static-libtool-libs)
  	# The effects of -static are defined in a previous loop.
  	# We used to do the same as -all-static on platforms that
  	# didn't have a PIC flag, but the assumption that the effects
@@@ -2097,7 -1863,7 +2137,7 @@@
  	lib=
  	found=no
  	case $deplib in
--	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
++	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
  	  if test "$linkmode,$pass" = "prog,link"; then
  	    compile_deplibs="$deplib $compile_deplibs"
  	    finalize_deplibs="$deplib $finalize_deplibs"
@@@ -2493,9 -2238,9 +2533,11 @@@
  
  	if test "$linkmode,$pass" = "prog,link"; then
  	  if test -n "$library_names" &&
--	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
++	     { { test "$prefer_static_libs" = no ||
++		 test "$prefer_static_libs,$installed" = "built,yes"; } ||
++	       test -z "$old_library"; }; then
  	    # We need to hardcode the library path
 -	    if test -n "$shlibpath_var"; then
 +	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
  	      # Make sure the rpath contains only unique directories.
  	      case "$temp_rpath " in
  	      *" $dir "*) ;;
@@@ -3189,7 -2928,7 +3231,7 @@@
  	  # which has an extra 1 added just for fun
  	  #
  	  case $version_type in
--	  darwin|linux|osf|windows)
++	  darwin|linux|osf|windows|none)
  	    current=`expr $number_major + $number_minor`
  	    age="$number_minor"
  	    revision="$number_revision"
@@@ -3200,14 -2939,9 +3242,15 @@@
  	    age="0"
  	    ;;
  	  irix|nonstopux)
--	    current=`expr $number_major + $number_minor - 1`
++	    current=`expr $number_major + $number_minor`
  	    age="$number_minor"
  	    revision="$number_minor"
++	    lt_irix_increment=no
 +	    ;;
 +	  *)
 +	    $echo "$modename: unknown library version type \`$version_type'" 1>&2
 +	    $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
 +	    exit $EXIT_FAILURE
  	    ;;
  	  esac
  	  ;;
@@@ -3266,7 -3000,7 +3309,8 @@@
  	  versuffix="$major.$age.$revision"
  	  # Darwin ld doesn't like 0 for these options...
  	  minor_current=`expr $current + 1`
- 	  verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
++	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+ 	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
  	  ;;
  
  	freebsd-aout)
@@@ -3280,8 -3014,8 +3324,11 @@@
  	  ;;
  
  	irix | nonstopux)
--	  major=`expr $current - $age + 1`
--
++	  if test "X$lt_irix_increment" = "Xno"; then
++	    major=`expr $current - $age`
++	  else
++	    major=`expr $current - $age + 1`
++	  fi
  	  case $version_type in
  	    nonstopux) verstring_prefix=nonstopux ;;
  	    *)         verstring_prefix=sgi ;;
@@@ -3418,11 -3152,11 +3465,11 @@@
        fi
  
        # Eliminate all temporary directories.
--      for path in $notinst_path; do
- 	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
- 	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
- 	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
 -	lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
 -	deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
 -	dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
--      done
++      #for path in $notinst_path; do
++      #	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
++      #	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
++      #	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
++      #done
  
        if test -n "$xrpath"; then
  	# If the user specified any rpath flags, then add them.
@@@ -3523,13 -3252,13 +3570,12 @@@
  	  int main() { return 0; }
  EOF
  	  $rm conftest
- 	  $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
 -	  $LTCC -o conftest conftest.c $deplibs
--	  if test "$?" -eq 0 ; then
++	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
  	    ldd_output=`ldd conftest`
  	    for i in $deplibs; do
 -	      name="`expr $i : '-l\(.*\)'`"
 +	      name=`expr $i : '-l\(.*\)'`
  	      # If $name is empty we are operating on a -L argument.
--              if test "$name" != "" && test "$name" -ne "0"; then
++              if test "$name" != "" && test "$name" != "0"; then
  		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
  		  case " $predeps $postdeps " in
  		  *" $i "*)
@@@ -3568,9 -3297,9 +3614,7 @@@
  	      # If $name is empty we are operating on a -L argument.
                if test "$name" != "" && test "$name" != "0"; then
  		$rm conftest
- 		$LTCC $LTCFLAGS -o conftest conftest.c $i
 -		$LTCC -o conftest conftest.c $i
--		# Did it work?
--		if test "$?" -eq 0 ; then
++		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
  		  ldd_output=`ldd conftest`
  		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
  		    case " $predeps $postdeps " in
@@@ -3602,7 -3331,7 +3646,7 @@@
  		  droppeddeps=yes
  		  $echo
  		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
--		  $echo "***  make it link in!  You will probably need to install it or some"
++		  $echo "*** make it link in!  You will probably need to install it or some"
  		  $echo "*** library that it depends on before this library will be fully"
  		  $echo "*** functional.  Installing it before continuing would be even better."
  		fi
@@@ -3888,7 -3588,7 +3932,10 @@@
  	     test -n "$hardcode_libdirs"; then
  	    libdir="$hardcode_libdirs"
  	    if test -n "$hardcode_libdir_flag_spec_ld"; then
--	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
++	      case $archive_cmds in
++	      *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
++	      *)      eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
++	      esac
  	    else
  	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
  	    fi
@@@ -4247,18 -3986,72 +4294,20 @@@
        reload_conv_objs=
        gentop=
        # reload_cmds runs $LD directly, so let us get rid of
--      # -Wl from whole_archive_flag_spec
++      # -Wl from whole_archive_flag_spec and hope we can get by with
++      # turning comma into space..
        wl=
  
        if test -n "$convenience"; then
  	if test -n "$whole_archive_flag_spec"; then
--	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
++	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
++	  reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
  	else
  	  gentop="$output_objdir/${obj}x"
 -	  $show "${rm}r $gentop"
 -	  $run ${rm}r "$gentop"
 -	  $show "$mkdir $gentop"
 -	  $run $mkdir "$gentop"
 -	  status=$?
 -	  if test "$status" -ne 0 && test ! -d "$gentop"; then
 -	    exit $status
 -	  fi
  	  generated="$generated $gentop"
  
 -	  for xlib in $convenience; do
 -	    # Extract the objects.
 -	    case $xlib in
 -	    [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
 -	    *) xabs=`pwd`"/$xlib" ;;
 -	    esac
 -	    xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
 -	    xdir="$gentop/$xlib"
 -
 -	    $show "${rm}r $xdir"
 -	    $run ${rm}r "$xdir"
 -	    $show "$mkdir $xdir"
 -	    $run $mkdir "$xdir"
 -	    status=$?
 -	    if test "$status" -ne 0 && test ! -d "$xdir"; then
 -	      exit $status
 -	    fi
 -	    # We will extract separately just the conflicting names and we will no
 -	    # longer touch any unique names. It is faster to leave these extract
 -	    # automatically by $AR in one run.
 -	    $show "(cd $xdir && $AR x $xabs)"
 -	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
 -	    if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
 -	      :
 -	    else
 -	      $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
 -	      $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
 -	      $AR t "$xabs" | sort | uniq -cd | while read -r count name
 -	      do
 -		i=1
 -		while test "$i" -le "$count"
 -		do
 -		 # Put our $i before any first dot (extension)
 -		 # Never overwrite any file
 -		 name_to="$name"
 -		 while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
 -		 do
 -		   name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
 -		 done
 -		 $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
 -		 $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
 -		 i=`expr $i + 1`
 -		done
 -	      done
 -	    fi
 -
 -	    reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
 -	  done
 +	  func_extract_archives $gentop $convenience
 +	  reload_conv_objs="$reload_objs $func_extract_archives_result"
  	fi
        fi
  
@@@ -4697,21 -4425,8 +4746,21 @@@ static const void *lt_preloaded_setup(
  	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
  
  	  # Transform the symbol file into the correct name.
 -	  compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
 -	  finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
 +          case $host in
 +          *cygwin* | *mingw* )
 +            if test -f "$output_objdir/${outputname}.def" ; then
-               compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
-               finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
++              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
++              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
 +            else
-               compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-               finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
++              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
 +             fi
 +            ;;
 +          * )
-             compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-             finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++            compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
++            finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
 +            ;;
 +          esac
  	  ;;
  	*)
  	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
@@@ -4724,13 -4439,13 +4773,13 @@@
  	# really was required.
  
  	# Nullify the symbol file.
--	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
--	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
++	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
++	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
        fi
  
        if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
  	# Replace the output file specification.
--	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
++	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
  	link_command="$compile_command$compile_rpath"
  
  	# We have no uninstalled library dependencies, so finalize right now.
@@@ -4817,7 -4532,7 +4866,7 @@@
  	if test "$fast_install" != no; then
  	  link_command="$finalize_var$compile_command$finalize_rpath"
  	  if test "$fast_install" = yes; then
--	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
++	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
  	  else
  	    # fast_install is set to needless
  	    relink_command=
@@@ -4854,7 -4569,7 +4903,7 @@@
  	  fi
  	done
  	relink_command="(cd `pwd`; $relink_command)"
--	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
++	relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
        fi
  
        # Quote $echo for shipping.
@@@ -5261,9 -4830,9 +5310,23 @@@ EO
  Xsed='${SED} -e 1s/^X//'
  sed_quote_subst='$sed_quote_subst'
  
++# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
++if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
++  emulate sh
++  NULLCMD=:
++  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '\${1+\"\$@\"}'='\"\$@\"'
++  setopt NO_GLOB_SUBST
++else
++  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
++fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
++DUALCASE=1; export DUALCASE # for MKS sh
++
  # The HP-UX ksh and POSIX shell print the target directory to stdout
  # if CDPATH is set.
 -if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
 +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
  
  relink_command=\"$relink_command\"
  
@@@ -5403,7 -4972,7 +5466,7 @@@ els
  	  ;;
  	esac
  	$echo >> $output "\
--      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
++      \$echo \"\$0: cannot exec \$program \$*\"
        exit $EXIT_FAILURE
      fi
    else
@@@ -5589,7 -5169,7 +5652,7 @@@ fi
        done
        # Quote the link command for shipping.
        relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
--      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
++      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
        if test "$hardcode_automatic" = yes ; then
  	relink_command=
        fi
@@@ -5934,9 -5511,9 +5997,9 @@@ relink_command=\"$relink_command\"
  
  	  if test -n "$inst_prefix_dir"; then
  	    # Stick the inst_prefix_dir data into the link command.
--	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
++	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
  	  else
--	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
++	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
  	  fi
  
  	  $echo "$modename: warning: relinking \`$file'" 1>&2
@@@ -6145,7 -5725,7 +6208,7 @@@
  	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
  	      outputname="$tmpdir/$file"
  	      # Replace the output file specification.
--	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
++	      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
  
  	      $show "$relink_command"
  	      if $run eval "$relink_command"; then :
@@@ -6356,8 -5936,8 +6419,10 @@@
  	if test -f "$dir/$objdir/$dlname"; then
  	  dir="$dir/$objdir"
  	else
--	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
--	  exit $EXIT_FAILURE
++	  if test ! -f "$dir/$dlname"; then
++	    $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
++	    exit $EXIT_FAILURE
++	  fi
  	fi
  	;;
  
@@@ -6421,12 -6001,12 +6486,12 @@@
        fi
  
        # Restore saved environment variables
--      if test "${save_LC_ALL+set}" = set; then
--	LC_ALL="$save_LC_ALL"; export LC_ALL
--      fi
--      if test "${save_LANG+set}" = set; then
--	LANG="$save_LANG"; export LANG
--      fi
++      for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
++      do
++	eval "if test \"\${save_$lt_var+set}\" = set; then
++		$lt_var=\$save_$lt_var; export $lt_var
++	      fi"
++      done
  
        # Now prepare to actually exec the command.
        exec_cmd="\$cmd$args"
@@@ -6783,9 -6354,9 +6848,9 @@@ The following components of LINK-COMMAN
    -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
    -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
    -export-symbols SYMFILE
--		    try to export only the symbols listed in SYMFILE
++                    try to export only the symbols listed in SYMFILE
    -export-symbols-regex REGEX
--		    try to export only the symbols matching REGEX
++                    try to export only the symbols matching REGEX
    -LLIBDIR          search LIBDIR for required installed libraries
    -lNAME            OUTPUT-FILE requires the installed library libNAME
    -module           build a library that can dlopened
@@@ -6799,9 -6370,9 +6864,11 @@@
    -release RELEASE  specify package release information
    -rpath LIBDIR     the created library will eventually be installed in LIBDIR
    -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
--  -static           do not do any dynamic linking of libtool libraries
++  -static           do not do any dynamic linking of uninstalled libtool libraries
++  -static-libtool-libs
++                    do not do any dynamic linking of libtool libraries
    -version-info CURRENT[:REVISION[:AGE]]
--		    specify library version info [each variable defaults to 0]
++                    specify library version info [each variable defaults to 0]
  
  All other options (arguments beginning with \`-') are ignored.
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/hunspell.git


Reply to: