[hunspell] 47/98: Imported Debian patch 1.2.2~b2~20080401-1
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository hunspell.
commit 46068977ed57b54b2a79e49afd12b708cc66dc18
Merge: 94b95ca 0593209
Author: Rene Engelhard <rene@debian.org>
Date: Wed Apr 2 01:00:28 2008 +0200
Imported Debian patch 1.2.2~b2~20080401-1
BUGS | 4 +-
ChangeLog | 55 +-
INSTALL.bak.dpatch | 229 -
Makefile.in.bak.dpatch | 691 -
NEWS | 6 +-
aclocal.m4 | 215 +-
config.guess | 626 +-
config.guess.bak.dpatch | 1450 --
config.sub | 168 +-
config.sub.bak.dpatch | 1552 --
configure | 20 +-
configure.ac | 4 +-
configure.bak.dpatch | 25076 ---------------------
debian/changelog | 8 +
debian/hunspell-tools.install | 4 +
debian/hunspell.install | 2 +-
debian/patches/02_usr_share_myspell_dicts.dpatch | 34 +-
depcomp.bak.dpatch | 522 -
install-sh.bak.dpatch | 322 -
intl/Makefile.in.bak.dpatch | 337 -
ltmain.sh | 58 +-
m4/Makefile.in.bak.dpatch | 352 -
man/Makefile.in.bak.dpatch | 608 -
man/hu/Makefile.in.bak.dpatch | 452 -
man/hu/hunspell.4 | 847 +-
man/hunspell.1 | 12 +-
man/hunspell.4 | 26 +-
missing.bak.dpatch | 360 -
mkinstalldirs.bak.dpatch | 150 -
po/hu.gmo | Bin 7564 -> 7563 bytes
po/hu.po | 2 +-
src/Makefile.in.bak.dpatch | 505 -
src/hunspell/Makefile.am | 2 +-
src/hunspell/Makefile.in | 2 +-
src/hunspell/Makefile.in.bak.dpatch | 536 -
src/hunspell/affentry.cxx | 107 +-
src/hunspell/affixmgr.cxx | 41 +-
src/hunspell/affixmgr.hxx | 2 +
src/hunspell/atypes.hxx | 14 +-
src/hunspell/csutil.cxx | 12 +-
src/hunspell/csutil.hxx | 16 +-
src/hunspell/hashmgr.cxx | 2 +-
src/hunspell/htypes.hxx | 4 -
src/hunspell/hunspell.cxx | 12 +-
src/hunspell/hunspell.h | 35 +-
src/hunspell/hunspell.hxx | 5 +-
src/hunspell/hunzip.cxx | 17 +-
src/hunspell/phonet.cxx | 2 +-
src/hunspell/phonet.hxx | 4 +-
src/hunspell/suggestmgr.cxx | 3 +-
src/hunspell/w_char.hxx | 19 +
src/parsers/Makefile.in.bak.dpatch | 533 -
src/tools/Makefile.in.bak.dpatch | 613 -
src/tools/affixcompress | 13 +-
src/tools/analyze.cxx | 2 +-
src/tools/chmorph.cxx | 14 +-
src/tools/hunspell.cxx | 223 +-
src/tools/makealias | 34 +-
src/win_api/Hunspell.rc | 10 +-
src/win_api/Makefile.in.bak.dpatch | 351 -
src/win_api/config.h | 4 +-
src/win_api/libhunspell.vcproj | 20 +
tests/Makefile.in.bak.dpatch | 1091 -
tests/circumfix.morph | 4 +-
tests/rep.aff | 3 +-
tests/suggestiontest/Makefile.in.bak.dpatch | 354 -
66 files changed, 1581 insertions(+), 37220 deletions(-)
diff --cc aclocal.m4
index 68d0fea,b083ae0..55f1d80
--- a/aclocal.m4
+++ b/aclocal.m4
@@@ -13,7 -13,7 +13,7 @@@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
- # serial 51 Debian 1.5.24-2 AC_PROG_LIBTOOL
-# serial 48 AC_PROG_LIBTOOL
++# serial 52 Debian 1.5.26-2 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@@ -101,7 -101,7 +101,6 @@@ AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dn
AC_REQUIRE([AC_OBJEXT])dnl
AC_REQUIRE([AC_EXEEXT])dnl
dnl
--
AC_LIBTOOL_SYS_MAX_CMD_LEN
AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
AC_LIBTOOL_OBJDIR
@@@ -203,6 -203,6 +202,8 @@@ file_magic*
;;
esac
++_LT_REQUIRED_DARWIN_CHECKS
++
AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
enable_win32_dll=yes, enable_win32_dll=no)
@@@ -277,14 -276,13 +278,85 @@@ $rm conftest
# Check for linker boilerplate output or warnings with
# the simple link test code.
AC_DEFUN([_LT_LINKER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
--$rm conftest*
++$rm -r conftest*
])# _LT_LINKER_BOILERPLATE
++# _LT_REQUIRED_DARWIN_CHECKS
++# --------------------------
++# Check for some things on darwin
++AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
++ case $host_os in
++ rhapsody* | darwin*)
++ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
++ AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
++
++ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
++ [lt_cv_apple_cc_single_mod=no
++ if test -z "${LT_MULTI_MODULE}"; then
++ # By default we will add the -single_module flag. You can override
++ # by either setting the environment variable LT_MULTI_MODULE
++ # non-empty at configure time, or by adding -multi_module to the
++ # link flags.
++ echo "int foo(void){return 1;}" > conftest.c
++ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
++ -dynamiclib ${wl}-single_module conftest.c
++ if test -f libconftest.dylib; then
++ lt_cv_apple_cc_single_mod=yes
++ rm -rf libconftest.dylib*
++ fi
++ rm conftest.c
++ fi])
++ AC_CACHE_CHECK([for -exported_symbols_list linker flag],
++ [lt_cv_ld_exported_symbols_list],
++ [lt_cv_ld_exported_symbols_list=no
++ save_LDFLAGS=$LDFLAGS
++ echo "_main" > conftest.sym
++ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
++ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
++ [lt_cv_ld_exported_symbols_list=yes],
++ [lt_cv_ld_exported_symbols_list=no])
++ LDFLAGS="$save_LDFLAGS"
++ ])
++ case $host_os in
++ rhapsody* | darwin1.[[0123]])
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
++ darwin1.*)
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++ darwin*)
++ # if running on 10.5 or later, the deployment target defaults
++ # to the OS version, if on x86, and 10.4, the deployment
++ # target defaults to 10.4. Don't you love it?
++ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
++ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++ 10.[[012]]*)
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++ 10.*)
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++ esac
++ ;;
++ esac
++ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
++ _lt_dar_single_mod='$single_module'
++ fi
++ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
++ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
++ else
++ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
++ fi
++ if test "$DSYMUTIL" != ":"; then
++ _lt_dsymutil="~$DSYMUTIL \$lib || :"
++ else
++ _lt_dsymutil=
++ fi
++ ;;
++ esac
++])
# _LT_AC_SYS_LIBPATH_AIX
# ----------------------
@@@ -609,7 -592,7 +681,11 @@@ sparc*-*solaris*
*64-bit*)
case $lt_cv_prog_gnu_ld in
yes*) LD="${LD-ld} -m elf64_sparc" ;;
-- *) LD="${LD-ld} -64" ;;
++ *)
++ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
++ LD="${LD-ld} -64"
++ fi
++ ;;
esac
;;
esac
@@@ -702,7 -684,7 +778,7 @@@ AC_CACHE_CHECK([$1], [$2]
$2=yes
fi
fi
-- $rm conftest*
++ $rm -r conftest*
LDFLAGS="$save_LDFLAGS"
])
@@@ -973,7 -952,7 +1049,7 @@@ els
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
[AC_CHECK_LIB([dld], [shl_load],
-- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
++ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
[AC_CHECK_FUNC([dlopen],
[lt_cv_dlopen="dlopen"],
[AC_CHECK_LIB([dl], [dlopen],
@@@ -981,7 -960,7 +1057,7 @@@
[AC_CHECK_LIB([svld], [dlopen],
[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
[AC_CHECK_LIB([dld], [dld_link],
-- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
])
])
])
@@@ -1298,7 -1236,7 +1374,7 @@@ aix3*
soname_spec='${libname}${release}${shared_ext}$major'
;;
--aix4* | aix5*)
++aix[[4-9]]*)
version_type=linux
need_lib_prefix=no
need_version=no
@@@ -1831,6 -1798,6 +1907,13 @@@ esa
AC_MSG_RESULT([$dynamic_linker])
test "$dynamic_linker" = no && can_build_shared=no
++AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
++[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
++[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@@ -2330,7 -2296,7 +2413,7 @@@ lt_cv_deplibs_check_method='unknown
# whether `pass_all' will *always* work, you probably want this one.
case $host_os in
--aix4* | aix5*)
++aix[[4-9]]*)
lt_cv_deplibs_check_method=pass_all
;;
@@@ -2766,7 -2722,7 +2849,7 @@@ aix3*
fi
;;
--aix4* | aix5*)
++aix[[4-9]]*)
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
@@@ -2823,6 -2779,6 +2906,7 @@@ _LT_AC_TAGVAR(postdep_objects, $1)
_LT_AC_TAGVAR(predeps, $1)=
_LT_AC_TAGVAR(postdeps, $1)=
_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
++_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
# Source file extension for C++ test sources.
ac_ext=cpp
@@@ -2932,7 -2888,7 +3016,7 @@@ case $host_os i
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
-- aix4* | aix5*)
++ aix[[4-9]]*)
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
@@@ -2945,7 -2901,7 +3029,7 @@@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
-- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
for ld_flag in $LDFLAGS; do
case $ld_flag in
*-brtl*)
@@@ -3091,51 -3047,51 +3175,23 @@@
fi
;;
darwin* | rhapsody*)
-- case $host_os in
-- rhapsody* | darwin1.[[012]])
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-- ;;
-- *) # Darwin 1.3 on
-- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-- else
-- case ${MACOSX_DEPLOYMENT_TARGET} in
-- 10.[[012]])
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-- ;;
-- 10.*)
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-- ;;
-- esac
-- fi
-- ;;
-- esac
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
--
-- if test "$GXX" = yes ; then
-- lt_int_apple_cc_single_mod=no
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
++ if test "$GXX" = yes ; then
output_verbose_link_cmd='echo'
-- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-- lt_int_apple_cc_single_mod=yes
++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
++ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
fi
-- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-- else
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-- fi
-- _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
-- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- else
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- fi
-- _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}'
else
case $cc_basename in
xlc*)
@@@ -3386,7 -3344,7 +3442,7 @@@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
-- pgCC*)
++ pgCC* | pgcpp*)
# Portland Group C++ compiler
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
@@@ -3821,7 -3751,7 +3877,8 @@@ lt_cv_prog_gnu_ld=$lt_save_with_gnu_l
# compiler output when linking a shared library.
# Parse the compiler output and extract the necessary
# objects, libraries and library flags.
--AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
++AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
dnl we can't use the lt_simple_compile_test_code here,
dnl because it contains code intended for an executable,
dnl not a library. It's possible we should let each
@@@ -3946,6 -3876,6 +4003,11 @@@ f
$rm -f confest.$objext
++_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
++if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
++ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
++fi
++
# PORTME: override above test on systems where it is broken
ifelse([$1],[CXX],
[case $host_os in
@@@ -4002,7 -3899,7 +4064,6 @@@ solaris*
;;
esac
])
--
case " $_LT_AC_TAGVAR(postdeps, $1) " in
*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
esac
@@@ -4087,7 -3977,7 +4148,7 @@@ aix3*
postinstall_cmds='$RANLIB $lib'
fi
;;
--aix4* | aix5*)
++aix[[4-9]]*)
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
@@@ -4264,6 -4154,6 +4325,7 @@@ if test -f "$ltmain"; the
_LT_AC_TAGVAR(predeps, $1) \
_LT_AC_TAGVAR(postdeps, $1) \
_LT_AC_TAGVAR(compiler_lib_search_path, $1) \
++ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
_LT_AC_TAGVAR(archive_cmds, $1) \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) \
_LT_AC_TAGVAR(postinstall_cmds, $1) \
@@@ -4326,7 -4215,7 +4388,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, 2002, 2003, 2004, 2005, 2006, 2007
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
@@@ -4563,9 -4455,9 +4625,13 @@@ predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1
# shared library.
postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
++
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@@ -4912,7 -4803,7 +4978,7 @@@ EO
echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
cat conftest.$ac_ext >&5
fi
-- rm -f conftest* conftst*
++ rm -rf conftest* conftst*
# Do not use the global_symbol_pipe unless it works.
if test "$pipe_works" = yes; then
@@@ -4961,15 -4852,13 +5027,16 @@@ 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).
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+ # 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'
++ m4_if([$1], [GCJ], [],
++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
;;
darwin* | rhapsody*)
# PIC is the default on this platform
@@@ -5006,7 -4895,7 +5073,7 @@@
esac
else
case $host_os in
-- aix4* | aix5*)
++ aix[[4-9]]*)
# All AIX code is PIC.
if test "$host_cpu" = ia64; then
# AIX 5 now supports IA64 processor
@@@ -5102,7 -4991,7 +5169,7 @@@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
;;
-- pgCC*)
++ pgCC* | pgcpp*)
# Portland Group C++ compiler.
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
@@@ -5248,12 -5129,10 +5315,13 @@@
# 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).
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+ # 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'
++ m4_if([$1], [GCJ], [],
++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
;;
darwin* | rhapsody*)
@@@ -5320,10 -5199,10 +5388,11 @@@
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'
++ m4_if([$1], [GCJ], [],
++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
;;
hpux9* | hpux10* | hpux11*)
@@@ -5460,7 -5319,7 +5529,7 @@@ AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_c
#
if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
-- _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
++ _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
[$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
[case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
"" | " "*) ;;
@@@ -5484,7 -5343,7 +5553,7 @@@ esa
#
wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
++ _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
$lt_tmp_static_flag,
[],
[_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
@@@ -5500,7 -5358,7 +5569,7 @@@ AC_MSG_CHECKING([whether the $compiler
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
-- aix4* | aix5*)
++ aix[[4-9]]*)
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
@@@ -5522,6 -5377,6 +5591,7 @@@
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
esac
++ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
],[
runpath_var=
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
@@@ -5552,12 -5407,12 +5622,14 @@@
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
-- _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
++ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
# platforms (ab)use it in PIC code, but their linkers get confused if
# the symbol is explicitly referenced. Since portable code cannot
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
++ # Exclude shared library initialization/finalization symbols.
++dnl Note also adjust exclude_expsyms for C++ above.
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
_LT_CC_BASENAME([$compiler])
@@@ -5607,7 -5462,7 +5679,7 @@@
# See if GNU ld supports shared libraries.
case $host_os in
-- aix3* | aix4* | aix5*)
++ aix[[3-9]]*)
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@@ -5827,7 -5672,7 +5899,7 @@@ _LT_EO
fi
;;
-- aix4* | aix5*)
++ aix[[4-9]]*)
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
@@@ -5847,7 -5692,7 +5919,7 @@@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
-- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
@@@ -6007,11 -5852,11 +6079,10 @@@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-- _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 -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~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}'
++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
else
case $cc_basename in
xlc*)
diff --cc debian/changelog
index 34ac4f1,0000000..82e40ba
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,221 -1,0 +1,229 @@@
++hunspell (1.2.2~b2~20080401-1) experimental; urgency=low
++
++ * New upstream pre-release
++ * install analyze, chmorph and {h,hun}zip into hunspell-tools
++ (into /usr/lib/hunspell)
++
++ -- Rene Engelhard <rene@debian.org> Wed, 02 Apr 2008 01:00:28 +0200
++
+hunspell (1.2.2~b-1) experimental; urgency=low
+
+ * New upstream (beta) release
+
+ -- Rene Engelhard <rene@debian.org> Mon, 21 Jan 2008 00:30:52 +0100
+
+hunspell (1.2.1-1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Rene Engelhard <rene@debian.org> Thu, 01 Nov 2007 20:35:20 +0100
+
+hunspell (1.1.9-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Rene Engelhard <rene@debian.org> Mon, 30 Jul 2007 12:53:59 +0200
+
+hunspell (1.1.8-2) unstable; urgency=low
+
+ * libmyspell-dev: we need to depend on ${binary:Version}, not
+ ${source:Version}, thanks Lior Kaplan (closes: #433901)
+
+ -- Rene Engelhard <rene@debian.org> Fri, 20 Jul 2007 15:54:07 +0200
+
+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/hunspell-tools.install
index 6032946,0000000..a98374a
mode 100644,000000..100644
--- a/debian/hunspell-tools.install
+++ b/debian/hunspell-tools.install
@@@ -1,3 -1,0 +1,7 @@@
+debian/ispellaff2myspell usr/bin
+debian/ispellaff2myspell.1 usr/share/man/man1
+debian/tmp/usr/bin/*munch
++debian/tmp/usr/bin/hzip usr/lib/hunspell
++debian/tmp/usr/bin/hunzip usr/lib/hunspell
++debian/tmp/usr/bin/analyze usr/lib/hunspell
++debian/tmp/usr/bin/chmorph usr/lib/hunspell
diff --cc debian/hunspell.install
index 7f4827c,0000000..3e53f7c
mode 100644,000000..100644
--- a/debian/hunspell.install
+++ b/debian/hunspell.install
@@@ -1,2 -1,0 +1,2 @@@
- debian/tmp/usr/bin/hun*
++debian/tmp/usr/bin/hunspell
+debian/tmp/usr/share
diff --cc debian/patches/02_usr_share_myspell_dicts.dpatch
index a9d2fbb,0000000..e561b5b
mode 100644,000000..100644
--- a/debian/patches/02_usr_share_myspell_dicts.dpatch
+++ b/debian/patches/02_usr_share_myspell_dicts.dpatch
@@@ -1,23 -1,0 +1,25 @@@
+#! /bin/sh /usr/share/dpatch/dpatch-run
- ## 02_usr_share_myspell_dicts.dpatch by <rene@frodo>
++## 02_usr_share_myspell_dicts.dpatch by Rene Engelhard <rene@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
- diff -urNad hunspell-1.1.6~/src/tools/hunspell.cxx hunspell-1.1.6/src/tools/hunspell.cxx
- --- hunspell-1.1.6~/src/tools/hunspell.cxx 2007-07-02 13:13:13.000000000 +0200
- +++ hunspell-1.1.6/src/tools/hunspell.cxx 2007-07-02 13:13:47.000000000 +0200
- @@ -59,9 +59,10 @@
- #include "manparser.hxx"
- #include "firstparser.hxx"
++diff -urNad hunspell-1.2.2~/src/tools/hunspell.cxx hunspell-1.2.2/src/tools/hunspell.cxx
++--- hunspell-1.2.2~/src/tools/hunspell.cxx 2008-04-01 17:05:57.000000000 +0200
+++++ hunspell-1.2.2/src/tools/hunspell.cxx 2008-04-01 17:09:39.000000000 +0200
++@@ -64,11 +64,13 @@
+
- -#define LIBDIR "/usr/share/hunspell:/usr/share/myspell"
- +#define LIBDIR "/usr/share/myspell/dicts:/usr/share/hunspell:/usr/share/myspell"
- #define USEROOODIR ".openoffice.org2/user/wordbook"
- -#define OOODIR "/opt/openoffice.org2.3/share/dict/ooo:" \
- +#define OOODIR "/usr/lib/openoffice/share/dict/ooo:" \
- + "/opt/openoffice.org2.3/share/dict/ooo:" \
- "/usr/lib/openoffice.org2.3/share/dict/ooo:" \
- "/opt/openoffice.org2.2/share/dict/ooo:" \
- "/usr/lib/openoffice.org2.2/share/dict/ooo:" \
++ #define LIBDIR \
++ "/usr/share/hunspell:" \
++- "/usr/share/myspell"
+++ "/usr/share/myspell:" \
+++ "/usr/share/myspell/dicts"
++ #define USEROOODIR \
++ ".openoffice.org2/user/wordbook:" \
++ ".openoffice.org2.0/user/wordbook"
++ #define OOODIR \
+++ "/usr/lib/openoffice/share/dict/ooo:" \
++ "/opt/openoffice.org2.4/share/dict/ooo:" \
++ "/usr/lib/openoffice.org2.4/share/dict/ooo:" \
++ "/opt/openoffice.org2.3/share/dict/ooo:" \
diff --cc ltmain.sh
index 13c5494,6828dc0..b2f25d9
--- 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
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
- # 2007 Free Software Foundation, Inc.
++# 2007, 2008 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,22 -46,9 +43,22 @@@ EXIT_FAILURE=
PROGRAM=ltmain.sh
PACKAGE=libtool
- VERSION="1.5.24 Debian 1.5.24-2"
- TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
-VERSION=1.5.6
-TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42)"
-
++VERSION="1.5.26 Debian 1.5.26-2"
++TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
+
+# 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
@@@ -113,19 -102,16 +113,25 @@@ 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.
- for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-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
++lt_env=
++for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+ eval "if test \"\${$lt_var+set}\" = set; then
+ save_$lt_var=\$$lt_var
++ lt_env=\"$lt_var=\$$lt_var \$lt_env\"
+ $lt_var=C
+ export $lt_var
+ fi"
+done
+
++if test -n "$lt_env"; then
++ lt_env="env $lt_env"
+ fi
+
# 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
@@@ -482,13 -316,12 +488,13 @@@ d
;;
--version)
- $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
- $echo
- $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.
++Copyright (C) 2008 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)
@@@ -784,10 -598,9 +790,11 @@@ 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 ;;
++ *.sx) xform=sx ;;
esac
libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@@@ -956,7 -756,7 +963,7 @@@ EO
$run $rm "$lobj" "$output_obj"
$show "$command"
-- if $run eval "$command"; then :
++ if $run eval $lt_env "$command"; then :
else
test -n "$output_obj" && $run $rm $removelist
exit $EXIT_FAILURE
@@@ -1028,7 -828,7 +1035,7 @@@ EO
command="$command$suppress_output"
$run $rm "$obj" "$output_obj"
$show "$command"
-- if $run eval "$command"; then :
++ if $run eval $lt_env "$command"; then :
else
$run $rm $removelist
exit $EXIT_FAILURE
@@@ -1161,6 -960,6 +1168,7 @@@ EO
thread_safe=no
vinfo=
vinfo_number=no
++ single_module="${wl}-single_module"
func_infer_tag $base_compile
@@@ -1629,23 -1379,11 +1637,28 @@@
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|-threads)
+ compiler_flags="$compiler_flags $arg"
+ compile_command="$compile_command $arg"
+ finalize_command="$finalize_command $arg"
+ continue
+ ;;
+
++ -multi_module)
++ single_module="${wl}-multi_module"
+ continue
+ ;;
+
-module)
module=yes
continue
@@@ -2151,8 -1877,12 +2164,13 @@@
$echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
continue
fi
- if test "$pass" = conv; then
- deplibs="$deplib $deplibs"
- continue
- fi
name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-- for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
++ if test "$linkmode" = lib; then
++ searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
++ else
++ searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
++ fi
++ for searchdir in $searchdirs; do
for search_ext in .la $std_shrext .so .a; do
# Search the libtool library
lib="$searchdir/lib${name}${search_ext}"
@@@ -2948,12 -2645,12 +2966,18 @@@
# we do not want to link against static libs,
# but need to link against shared
eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
++ eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
if test -n "$deplibrary_names" ; then
for tmp in $deplibrary_names ; do
depdepl=$tmp
done
-- if test -f "$path/$depdepl" ; then
++ if test -f "$deplibdir/$depdepl" ; then
++ depdepl="$deplibdir/$depdepl"
++ elif test -f "$path/$depdepl" ; then
depdepl="$path/$depdepl"
++ else
++ # Can't find it, oh well...
++ depdepl=
fi
# do not add paths which are already there
case " $newlib_search_path " in
@@@ -3101,9 -2798,9 +3125,10 @@@
case $linkmode in
oldlib)
-- if test -n "$deplibs"; then
-- $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
-- fi
++ case " $deplibs" in
++ *\ -l* | *\ -L*)
++ $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
++ esac
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
@@@ -4245,9 -3937,9 +4270,10 @@@ EO
;;
obj)
-- if test -n "$deplibs"; then
-- $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
-- fi
++ case " $deplibs" in
++ *\ -l* | *\ -L*)
++ $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
++ esac
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
@@@ -6486,12 -6001,12 +6512,12 @@@ relink_command=\"$relink_command\"
fi
# Restore saved environment variables
- for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
- 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 LANGUAGE 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"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/hunspell.git
Reply to: