r45908 - in /packages/wordnet/trunk/debian: ./ patches/
tille at users.alioth.debian.org
tille at users.alioth.debian.org
Fri May 17 07:42:19 UTC 2013
Author: tille
Date: Fri May 17 07:42:18 2013
New Revision: 45908
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45908
Log:
DEP3 Comments for 51_overflows.patch + refreshed all patches
Modified:
packages/wordnet/trunk/debian/changelog
packages/wordnet/trunk/debian/patches/01_tcltk8.5.patch
packages/wordnet/trunk/debian/patches/10_wordnet_structures.patch
packages/wordnet/trunk/debian/patches/20_adj.all_fix.patch
packages/wordnet/trunk/debian/patches/20_doc_Makefile.in.patch
packages/wordnet/trunk/debian/patches/20_doc_man_wninput.patch
packages/wordnet/trunk/debian/patches/20_include_wn.h.patch
packages/wordnet/trunk/debian/patches/20_src_stubs_c.patch
packages/wordnet/trunk/debian/patches/20_src_wnb.patch
packages/wordnet/trunk/debian/patches/20_verb.social_fix.patch
packages/wordnet/trunk/debian/patches/30_src_grind.patch
packages/wordnet/trunk/debian/patches/40_doc_man_fix_names.patch
packages/wordnet/trunk/debian/patches/41_doc_man_fix_names.patch
packages/wordnet/trunk/debian/patches/50_CVE-2008-2149_buffer_overflows.patch
packages/wordnet/trunk/debian/patches/51_overflows.patch
packages/wordnet/trunk/debian/patches/51_overflows_memcpy.patch
packages/wordnet/trunk/debian/patches/60_gcc-4.6.patch
packages/wordnet/trunk/debian/patches/90_prevent_parallel_build.patch
Modified: packages/wordnet/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/changelog?rev=45908&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/changelog (original)
+++ packages/wordnet/trunk/debian/changelog Fri May 17 07:42:18 2013
@@ -1,3 +1,11 @@
+wordnet (1:3.0-30) UNRELEASED; urgency=low
+
+ * debian/patches/51_overflows.patch: DEP3 comments (thanks again to
+ Anton Gladky for fixing this problem
+ * debian/patches: refreshed all patches
+
+ -- Andreas Tille <tille at debian.org> Fri, 17 May 2013 09:39:14 +0200
+
wordnet (1:3.0-29) unstable; urgency=low
* Team upload.
Modified: packages/wordnet/trunk/debian/patches/01_tcltk8.5.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/patches/01_tcltk8.5.patch?rev=45908&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/patches/01_tcltk8.5.patch (original)
+++ packages/wordnet/trunk/debian/patches/01_tcltk8.5.patch Fri May 17 07:42:18 2013
@@ -4,8 +4,8 @@
Author: Andreas Tille <tille at debian.org>
Modified: Dmitry E. Oboukhov <unera at debian.org>
---- WordNet-3.0.orig/autogen.sh
-+++ WordNet-3.0/autogen.sh
+--- a/autogen.sh
++++ b/autogen.sh
@@ -45,7 +45,7 @@
aclocal $aclocalinclude; \
autoheader; automake --add-missing; autoconf)
@@ -15,8 +15,8 @@
echo
echo "Now type 'make' to compile $PROG."
---- WordNet-3.0.orig/config.h.in
-+++ WordNet-3.0/config.h.in
+--- a/config.h.in
++++ b/config.h.in
@@ -61,6 +61,9 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
@@ -27,9 +27,9 @@
/* Name of package */
#undef PACKAGE
---- WordNet-3.0.orig/configure
-+++ WordNet-3.0/configure
-@@ -831,12 +831,15 @@
+--- a/configure
++++ b/configure
+@@ -831,12 +831,15 @@ host
host_cpu
host_vendor
host_os
@@ -45,7 +45,7 @@
CPP
CXX
CXXFLAGS
-@@ -2886,6 +2889,135 @@
+@@ -2886,6 +2889,135 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -181,7 +181,7 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-@@ -3510,12 +3642,13 @@
+@@ -3510,12 +3642,13 @@ do
test -z "$as_dir" && as_dir=.
for lt_ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -196,7 +196,7 @@
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-@@ -3550,6 +3683,7 @@
+@@ -3550,6 +3683,7 @@ done
fi
SED=$lt_cv_path_SED
@@ -204,7 +204,7 @@
{ echo "$as_me:$LINENO: result: $SED" >&5
echo "${ECHO_T}$SED" >&6; }
-@@ -3911,8 +4045,8 @@
+@@ -3911,8 +4045,8 @@ else
echo "${ECHO_T}no, using $LN_S" >&6; }
fi
@@ -215,7 +215,7 @@
if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3931,7 +4065,7 @@
+@@ -3931,7 +4065,7 @@ lt_cv_deplibs_check_method='unknown'
# whether `pass_all' will *always* work, you probably want this one.
case $host_os in
@@ -224,7 +224,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -3953,9 +4087,15 @@
+@@ -3953,9 +4087,15 @@ cygwin*)
mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
@@ -241,7 +241,7 @@
;;
darwin* | rhapsody*)
-@@ -4000,7 +4140,7 @@
+@@ -4000,7 +4140,7 @@ hpux10.20* | hpux11*)
esac
;;
@@ -250,7 +250,7 @@
# 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)$'
;;
-@@ -4050,6 +4190,10 @@
+@@ -4050,6 +4190,10 @@ osf3* | osf4* | osf5*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -261,7 +261,7 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
;;
-@@ -4136,7 +4280,7 @@
+@@ -4136,7 +4280,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
@@ -270,7 +270,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -4171,7 +4315,8 @@
+@@ -4171,7 +4315,8 @@ ia64-*-hpux*)
rm -rf conftest*
;;
@@ -280,7 +280,7 @@
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -4182,6 +4327,9 @@
+@@ -4182,6 +4327,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
@@ -290,7 +290,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
-@@ -4198,6 +4346,9 @@
+@@ -4198,6 +4346,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li
;;
*64-bit*)
case $host in
@@ -300,7 +300,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
-@@ -4301,7 +4452,11 @@
+@@ -4301,7 +4452,11 @@ sparc*-*solaris*)
*64-bit*)
case $lt_cv_prog_gnu_ld in
yes*) LD="${LD-ld} -m elf64_sparc" ;;
@@ -313,7 +313,7 @@
esac
;;
esac
-@@ -5795,7 +5950,6 @@
+@@ -5795,7 +5950,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
@@ -321,7 +321,7 @@
# find the maximum length of command line arguments
{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
-@@ -5882,9 +6036,11 @@
+@@ -5882,9 +6036,11 @@ else
fi
;;
*)
@@ -336,7 +336,7 @@
SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
= "XX$teststring") >/dev/null 2>&1 &&
-@@ -5900,6 +6056,7 @@
+@@ -5900,6 +6056,7 @@ else
# 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`
@@ -344,7 +344,7 @@
;;
esac
-@@ -5916,6 +6073,7 @@
+@@ -5916,6 +6073,7 @@ fi
@@ -352,7 +352,7 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
-@@ -6106,7 +6264,7 @@
+@@ -6106,7 +6264,7 @@ EOF
echo "$progname: failed program was:" >&5
cat conftest.$ac_ext >&5
fi
@@ -361,7 +361,7 @@
# Do not use the global_symbol_pipe unless it works.
if test "$pipe_works" = yes; then
-@@ -6504,7 +6662,7 @@
+@@ -6504,7 +6662,7 @@ test -z "$STRIP" && STRIP=:
test -z "$ac_objext" && ac_objext=o
# Determine commands to create old-style static archives.
@@ -370,7 +370,7 @@
old_postinstall_cmds='chmod 644 $oldlib'
old_postuninstall_cmds=
-@@ -6662,9 +6820,321 @@
+@@ -6662,9 +6820,321 @@ fi
fi
fi
@@ -695,7 +695,7 @@
enable_dlopen=no
enable_win32_dll=no
-@@ -6704,10 +7174,10 @@
+@@ -6704,10 +7174,10 @@ objext=o
objext=$objext
# Code to be used in simple compile tests
@@ -708,7 +708,7 @@
# If no C compiler was specified, use CC.
-@@ -6722,16 +7192,16 @@
+@@ -6722,16 +7192,16 @@ compiler=$CC
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -728,7 +728,7 @@
-@@ -6748,7 +7218,7 @@
+@@ -6748,7 +7218,7 @@ if test "${lt_cv_prog_compiler_rtti_exce
else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
@@ -737,7 +737,7 @@
lt_compiler_flag="-fno-rtti -fno-exceptions"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -6759,11 +7229,11 @@
+@@ -6759,11 +7229,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -751,7 +751,7 @@
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -6814,13 +7284,15 @@
+@@ -6814,13 +7284,15 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
;;
@@ -769,7 +769,7 @@
lt_prog_compiler_pic='-DDLL_EXPORT'
;;
-@@ -6830,7 +7302,7 @@
+@@ -6830,7 +7302,7 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_pic='-fno-common'
;;
@@ -778,7 +778,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -6888,7 +7360,7 @@
+@@ -6888,7 +7360,7 @@ echo $ECHO_N "checking for $compiler opt
esac
;;
@@ -787,7 +787,7 @@
# 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_prog_compiler_pic='-DDLL_EXPORT'
-@@ -6940,6 +7412,22 @@
+@@ -6940,6 +7412,22 @@ echo $ECHO_N "checking for $compiler opt
# All Alpha code is PIC.
lt_prog_compiler_static='-non_shared'
;;
@@ -810,7 +810,7 @@
esac
;;
-@@ -6949,6 +7437,10 @@
+@@ -6949,6 +7437,10 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_static='-non_shared'
;;
@@ -821,7 +821,7 @@
solaris*)
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-@@ -7011,12 +7503,12 @@
+@@ -7011,12 +7503,12 @@ if test -n "$lt_prog_compiler_pic"; then
{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
@@ -837,7 +837,7 @@
lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -7027,27 +7519,27 @@
+@@ -7027,27 +7519,27 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -871,7 +871,7 @@
case $lt_prog_compiler_pic in
"" | " "*) ;;
*) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-@@ -7074,13 +7566,13 @@
+@@ -7074,13 +7566,13 @@ esac
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
@@ -888,7 +888,7 @@
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
-@@ -7090,20 +7582,20 @@
+@@ -7090,20 +7582,20 @@ else
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
@@ -915,7 +915,7 @@
:
else
lt_prog_compiler_static=
-@@ -7120,7 +7612,7 @@
+@@ -7120,7 +7612,7 @@ else
mkdir conftest
cd conftest
mkdir out
@@ -924,7 +924,7 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -7131,11 +7623,11 @@
+@@ -7131,11 +7623,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -938,7 +938,7 @@
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -7215,12 +7707,13 @@
+@@ -7215,12 +7707,13 @@ echo $ECHO_N "checking whether the $comp
# 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'.
@@ -953,7 +953,7 @@
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
-@@ -7279,7 +7772,7 @@
+@@ -7279,7 +7772,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -
# See if GNU ld supports shared libraries.
case $host_os in
@@ -962,7 +962,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs=no
-@@ -7327,7 +7820,7 @@
+@@ -7327,7 +7820,7 @@ EOF
allow_undefined_flag=unsupported
always_export_symbols=no
enable_shared_with_static_runtimes=yes
@@ -971,7 +971,7 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -7345,7 +7838,7 @@
+@@ -7345,7 +7838,7 @@ EOF
fi
;;
@@ -980,7 +980,7 @@
hardcode_direct=no
hardcode_shlibpath_var=no
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-@@ -7360,7 +7853,7 @@
+@@ -7360,7 +7853,7 @@ EOF
archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -989,7 +989,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -7378,13 +7871,22 @@
+@@ -7378,13 +7871,22 @@ EOF
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -1014,7 +1014,7 @@
fi
link_all_deplibs=no
else
-@@ -7490,7 +7992,7 @@
+@@ -7490,7 +7992,7 @@ _LT_EOF
fi
;;
@@ -1023,7 +1023,7 @@
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.
-@@ -7510,7 +8012,7 @@
+@@ -7510,7 +8012,7 @@ _LT_EOF
# 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.
@@ -1032,7 +1032,7 @@
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -7544,7 +8046,7 @@
+@@ -7544,7 +8046,7 @@ _LT_EOF
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -1041,7 +1041,7 @@
else
# We have old collect2
hardcode_direct=unsupported
-@@ -7618,11 +8120,18 @@
+@@ -7618,11 +8120,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -1064,7 +1064,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -7677,11 +8186,18 @@
+@@ -7677,11 +8186,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -1087,7 +1087,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -7735,7 +8251,7 @@
+@@ -7735,7 +8251,7 @@ if test -z "$aix_libpath"; then aix_libp
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds='true'
# FIXME: Should let the user specify the lib program.
@@ -1096,7 +1096,7 @@
fix_srcfile_path='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes=yes
;;
-@@ -7768,19 +8284,18 @@
+@@ -7768,19 +8284,18 @@ if test -z "$aix_libpath"; then aix_libp
link_all_deplibs=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -1122,7 +1122,7 @@
module_expsym_cmds='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}'
;;
*)
-@@ -7942,6 +8457,7 @@
+@@ -7942,6 +8457,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
openbsd*)
@@ -1130,7 +1130,7 @@
hardcode_direct=yes
hardcode_shlibpath_var=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -7961,6 +8477,9 @@
+@@ -7961,6 +8477,9 @@ if test -z "$aix_libpath"; then aix_libp
;;
esac
fi
@@ -1140,7 +1140,7 @@
;;
os2*)
-@@ -8018,17 +8537,16 @@
+@@ -8018,17 +8537,16 @@ if test -z "$aix_libpath"; then aix_libp
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -1167,7 +1167,7 @@
esac
link_all_deplibs=yes
;;
-@@ -8085,7 +8603,7 @@
+@@ -8085,7 +8603,7 @@ if test -z "$aix_libpath"; then aix_libp
fi
;;
@@ -1176,7 +1176,7 @@
no_undefined_flag='${wl}-z,text'
archive_cmds_need_lc=no
hardcode_shlibpath_var=no
-@@ -8162,7 +8680,7 @@
+@@ -8162,7 +8680,7 @@ x|xyes)
{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
@@ -1185,7 +1185,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -8220,17 +8738,55 @@
+@@ -8220,17 +8738,55 @@ shlibpath_overrides_runpath=unknown
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -1245,7 +1245,7 @@
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi
-@@ -8251,7 +8807,7 @@
+@@ -8251,7 +8807,7 @@ aix3*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -1254,7 +1254,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -8390,12 +8946,8 @@
+@@ -8390,12 +8946,8 @@ darwin* | rhapsody*)
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -1269,7 +1269,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -8449,7 +9001,7 @@
+@@ -8449,7 +9001,7 @@ freebsd* | dragonfly*)
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -1278,7 +1278,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -8512,7 +9064,7 @@
+@@ -8512,7 +9064,7 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
@@ -1287,7 +1287,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -8583,7 +9135,7 @@
+@@ -8583,7 +9135,7 @@ linux* | k*bsd*-gnu)
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -1296,7 +1296,7 @@
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -8689,6 +9241,10 @@
+@@ -8689,6 +9241,10 @@ osf3* | osf4* | osf5*)
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -1307,7 +1307,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -8785,6 +9341,21 @@
+@@ -8785,6 +9341,21 @@ esac
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -1329,7 +1329,7 @@
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"
-@@ -8842,6 +9413,7 @@
+@@ -8842,6 +9413,7 @@ else
darwin*)
if test -n "$STRIP" ; then
striplib="$STRIP -x"
@@ -1337,7 +1337,7 @@
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
else
-@@ -9103,7 +9675,7 @@
+@@ -9103,7 +9675,7 @@ fi
{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
if test $ac_cv_lib_dld_shl_load = yes; then
@@ -1346,7 +1346,7 @@
else
{ echo "$as_me:$LINENO: checking for dlopen" >&5
echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
-@@ -9379,7 +9951,7 @@
+@@ -9379,7 +9951,7 @@ fi
{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
if test $ac_cv_lib_dld_dld_link = yes; then
@@ -1355,7 +1355,7 @@
fi
-@@ -9428,7 +10000,7 @@
+@@ -9428,7 +10000,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
@@ -1364,7 +1364,7 @@
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -9528,7 +10100,7 @@
+@@ -9528,7 +10100,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
@@ -1373,7 +1373,7 @@
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -9655,7 +10227,7 @@
+@@ -9655,7 +10227,7 @@ aix3*)
fi
;;
@@ -1382,7 +1382,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -9711,6 +10283,7 @@
+@@ -9711,6 +10283,7 @@ if test -f "$ltmain"; then
predeps \
postdeps \
compiler_lib_search_path \
@@ -1390,7 +1390,7 @@
archive_cmds \
archive_expsym_cmds \
postinstall_cmds \
-@@ -9726,6 +10299,7 @@
+@@ -9726,6 +10299,7 @@ if test -f "$ltmain"; then
module_cmds \
module_expsym_cmds \
lt_cv_prog_compiler_c_o \
@@ -1398,7 +1398,7 @@
exclude_expsyms \
include_expsyms; do
-@@ -9770,7 +10344,7 @@
+@@ -9770,7 +10344,7 @@ echo "$as_me: creating $ofile" >&6;}
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
@@ -1407,7 +1407,7 @@
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
-@@ -10006,6 +10580,10 @@
+@@ -10006,6 +10580,10 @@ predeps=$lt_predeps
# shared library.
postdeps=$lt_postdeps
@@ -1418,7 +1418,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path
-@@ -10094,7 +10672,7 @@
+@@ -10094,7 +10672,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -1427,7 +1427,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols
-@@ -10254,6 +10832,7 @@
+@@ -10254,6 +10832,7 @@ postdep_objects_CXX=
predeps_CXX=
postdeps_CXX=
compiler_lib_search_path_CXX=
@@ -1435,7 +1435,7 @@
# Source file extension for C++ test sources.
ac_ext=cpp
-@@ -10263,10 +10842,10 @@
+@@ -10263,10 +10842,10 @@ objext=o
objext_CXX=$objext
# Code to be used in simple compile tests
@@ -1448,7 +1448,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -10282,16 +10861,16 @@
+@@ -10282,16 +10861,16 @@ compiler=$CC
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -1468,7 +1468,7 @@
# Allow CC to be a program name with arguments.
-@@ -10498,7 +11077,7 @@
+@@ -10498,7 +11077,7 @@ case $host_os in
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
@@ -1477,7 +1477,7 @@
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.
-@@ -10511,7 +11090,7 @@
+@@ -10511,7 +11090,7 @@ case $host_os in
# 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.
@@ -1486,7 +1486,7 @@
for ld_flag in $LDFLAGS; do
case $ld_flag in
*-brtl*)
-@@ -10547,7 +11126,7 @@
+@@ -10547,7 +11126,7 @@ case $host_os in
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -1495,7 +1495,7 @@
else
# We have old collect2
hardcode_direct_CXX=unsupported
-@@ -10621,11 +11200,18 @@
+@@ -10621,11 +11200,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -1518,7 +1518,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -10681,11 +11267,18 @@
+@@ -10681,11 +11267,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -1541,7 +1541,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -10752,62 +11345,34 @@
+@@ -10752,62 +11345,34 @@ if test -z "$aix_libpath"; then aix_libp
$CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
else
ld_shlibs_CXX=no
@@ -1615,7 +1615,7 @@
module_expsym_cmds_CXX='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}'
;;
*)
-@@ -10890,9 +11455,7 @@
+@@ -10890,9 +11455,7 @@ if test -z "$aix_libpath"; then aix_libp
hardcode_libdir_separator_CXX=:
case $host_cpu in
@@ -1626,7 +1626,7 @@
*)
export_dynamic_flag_spec_CXX='${wl}-E'
;;
-@@ -10960,7 +11523,7 @@
+@@ -10960,7 +11523,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
esac
;;
@@ -1635,7 +1635,7 @@
hardcode_direct_CXX=no
hardcode_shlibpath_var_CXX=no
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-@@ -11052,7 +11615,7 @@
+@@ -11052,7 +11615,7 @@ if test -z "$aix_libpath"; then aix_libp
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
@@ -1644,7 +1644,7 @@
# Portland Group C++ compiler
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
archive_expsym_cmds_CXX='$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'
-@@ -11080,6 +11643,29 @@
+@@ -11080,6 +11643,29 @@ if test -z "$aix_libpath"; then aix_libp
# 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'
;;
@@ -1674,7 +1674,7 @@
esac
;;
lynxos*)
-@@ -11118,6 +11704,7 @@
+@@ -11118,6 +11704,7 @@ if test -z "$aix_libpath"; then aix_libp
ld_shlibs_CXX=no
;;
openbsd*)
@@ -1682,7 +1682,7 @@
hardcode_direct_CXX=yes
hardcode_shlibpath_var_CXX=no
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-@@ -11128,6 +11715,9 @@
+@@ -11128,6 +11715,9 @@ if test -z "$aix_libpath"; then aix_libp
whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
fi
output_verbose_link_cmd='echo'
@@ -1692,7 +1692,7 @@
;;
osf3*)
case $cc_basename in
-@@ -11289,15 +11879,10 @@
+@@ -11289,15 +11879,10 @@ if test -z "$aix_libpath"; then aix_libp
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -1711,7 +1711,7 @@
;;
esac
link_all_deplibs_CXX=yes
-@@ -11344,6 +11929,12 @@
+@@ -11344,6 +11929,12 @@ if test -z "$aix_libpath"; then aix_libp
fi
hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
@@ -1724,7 +1724,7 @@
fi
;;
esac
-@@ -11431,7 +12022,6 @@
+@@ -11431,7 +12022,6 @@ test "$ld_shlibs_CXX" = no && can_build_
GCC_CXX="$GXX"
LD_CXX="$LD"
@@ -1732,7 +1732,7 @@
cat > conftest.$ac_ext <<EOF
class Foo
{
-@@ -11533,9 +12123,14 @@
+@@ -11533,9 +12123,14 @@ fi
$rm -f confest.$objext
@@ -1748,7 +1748,7 @@
# Interix 3.5 installs completely hosed .la files for C++, so rather than
# hack all around it, let's just trust "g++" to DTRT.
predep_objects_CXX=
-@@ -11543,19 +12138,51 @@
+@@ -11543,19 +12138,51 @@ interix3*)
postdeps_CXX=
;;
@@ -1802,7 +1802,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -11586,12 +12213,14 @@
+@@ -11586,12 +12213,14 @@ echo $ECHO_N "checking for $compiler opt
# like `-m68040'.
lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
;;
@@ -1819,7 +1819,7 @@
lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
;;
darwin* | rhapsody*)
-@@ -11603,7 +12232,7 @@
+@@ -11603,7 +12232,7 @@ echo $ECHO_N "checking for $compiler opt
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -1828,7 +1828,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -11629,7 +12258,7 @@
+@@ -11629,7 +12258,7 @@ echo $ECHO_N "checking for $compiler opt
esac
else
case $host_os in
@@ -1837,7 +1837,7 @@
# All AIX code is PIC.
if test "$host_cpu" = ia64; then
# AIX 5 now supports IA64 processor
-@@ -11725,7 +12354,7 @@
+@@ -11725,7 +12354,7 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_pic_CXX='-KPIC'
lt_prog_compiler_static_CXX='-static'
;;
@@ -1846,7 +1846,7 @@
# Portland Group C++ compiler.
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_pic_CXX='-fpic'
-@@ -11739,6 +12368,14 @@
+@@ -11739,6 +12368,14 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_static_CXX='-non_shared'
;;
*)
@@ -1861,7 +1861,7 @@
;;
esac
;;
-@@ -11848,12 +12485,12 @@
+@@ -11848,12 +12485,12 @@ if test -n "$lt_prog_compiler_pic_CXX";
{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
@@ -1877,7 +1877,7 @@
lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -11864,27 +12501,27 @@
+@@ -11864,27 +12501,27 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -1911,7 +1911,7 @@
case $lt_prog_compiler_pic_CXX in
"" | " "*) ;;
*) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
-@@ -11911,13 +12548,13 @@
+@@ -11911,13 +12548,13 @@ esac
wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
@@ -1928,7 +1928,7 @@
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
-@@ -11927,20 +12564,20 @@
+@@ -11927,20 +12564,20 @@ else
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
@@ -1955,7 +1955,7 @@
:
else
lt_prog_compiler_static_CXX=
-@@ -11957,7 +12594,7 @@
+@@ -11957,7 +12594,7 @@ else
mkdir conftest
cd conftest
mkdir out
@@ -1964,7 +1964,7 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -11968,11 +12605,11 @@
+@@ -11968,11 +12605,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -1978,7 +1978,7 @@
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -12025,7 +12662,7 @@
+@@ -12025,7 +12662,7 @@ echo $ECHO_N "checking whether the $comp
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
@@ -1987,7 +1987,7 @@
# 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
-@@ -12038,7 +12675,7 @@
+@@ -12038,7 +12675,7 @@ echo $ECHO_N "checking whether the $comp
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -1996,7 +1996,7 @@
;;
linux* | k*bsd*-gnu)
link_all_deplibs_CXX=no
-@@ -12047,6 +12684,7 @@
+@@ -12047,6 +12684,7 @@ echo $ECHO_N "checking whether the $comp
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
esac
@@ -2004,7 +2004,7 @@
{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
-@@ -12072,7 +12710,7 @@
+@@ -12072,7 +12710,7 @@ x|xyes)
{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
@@ -2013,7 +2013,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -12130,20 +12768,7 @@
+@@ -12130,20 +12768,7 @@ shlibpath_overrides_runpath=unknown
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -2035,7 +2035,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -12161,7 +12786,7 @@
+@@ -12161,7 +12786,7 @@ aix3*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -2044,7 +2044,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -12300,12 +12925,7 @@
+@@ -12300,12 +12925,7 @@ darwin* | rhapsody*)
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -2058,7 +2058,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -12359,7 +12979,7 @@
+@@ -12359,7 +12979,7 @@ freebsd* | dragonfly*)
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -2067,7 +2067,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -12422,7 +13042,7 @@
+@@ -12422,7 +13042,7 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
@@ -2076,7 +2076,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -12493,7 +13113,7 @@
+@@ -12493,7 +13113,7 @@ linux* | k*bsd*-gnu)
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -2085,7 +2085,7 @@
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -12599,6 +13219,10 @@
+@@ -12599,6 +13219,10 @@ osf3* | osf4* | osf5*)
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -2096,7 +2096,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -12695,6 +13319,21 @@
+@@ -12695,6 +13319,21 @@ esac
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -2118,7 +2118,7 @@
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"
-@@ -12778,6 +13417,7 @@
+@@ -12778,6 +13417,7 @@ if test -f "$ltmain"; then
predeps_CXX \
postdeps_CXX \
compiler_lib_search_path_CXX \
@@ -2126,7 +2126,7 @@
archive_cmds_CXX \
archive_expsym_cmds_CXX \
postinstall_cmds_CXX \
-@@ -12793,6 +13433,7 @@
+@@ -12793,6 +13433,7 @@ if test -f "$ltmain"; then
module_cmds_CXX \
module_expsym_cmds_CXX \
lt_cv_prog_compiler_c_o_CXX \
@@ -2134,7 +2134,7 @@
exclude_expsyms_CXX \
include_expsyms_CXX; do
-@@ -13025,6 +13666,10 @@
+@@ -13025,6 +13666,10 @@ predeps=$lt_predeps_CXX
# shared library.
postdeps=$lt_postdeps_CXX
@@ -2145,7 +2145,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-@@ -13113,7 +13758,7 @@
+@@ -13113,7 +13758,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -2154,7 +2154,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_CXX
-@@ -13204,10 +13849,17 @@
+@@ -13204,10 +13849,17 @@ objext=o
objext_F77=$objext
# Code to be used in simple compile tests
@@ -2174,7 +2174,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -13223,16 +13875,16 @@
+@@ -13223,16 +13875,16 @@ compiler=$CC
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -2194,7 +2194,7 @@
# Allow CC to be a program name with arguments.
-@@ -13270,7 +13922,7 @@
+@@ -13270,7 +13922,7 @@ aix3*)
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -2203,7 +2203,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -13316,13 +13968,15 @@
+@@ -13316,13 +13968,15 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
;;
@@ -2221,7 +2221,7 @@
lt_prog_compiler_pic_F77='-DDLL_EXPORT'
;;
-@@ -13332,7 +13986,7 @@
+@@ -13332,7 +13986,7 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_pic_F77='-fno-common'
;;
@@ -2230,7 +2230,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -13390,7 +14044,7 @@
+@@ -13390,7 +14044,7 @@ echo $ECHO_N "checking for $compiler opt
esac
;;
@@ -2239,7 +2239,7 @@
# 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_prog_compiler_pic_F77='-DDLL_EXPORT'
-@@ -13442,6 +14096,22 @@
+@@ -13442,6 +14096,22 @@ echo $ECHO_N "checking for $compiler opt
# All Alpha code is PIC.
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -2262,7 +2262,7 @@
esac
;;
-@@ -13451,6 +14121,10 @@
+@@ -13451,6 +14121,10 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -2273,7 +2273,7 @@
solaris*)
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -13513,12 +14187,12 @@
+@@ -13513,12 +14187,12 @@ if test -n "$lt_prog_compiler_pic_F77";
{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
@@ -2289,7 +2289,7 @@
lt_compiler_flag="$lt_prog_compiler_pic_F77"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -13529,27 +14203,27 @@
+@@ -13529,27 +14203,27 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -2323,7 +2323,7 @@
case $lt_prog_compiler_pic_F77 in
"" | " "*) ;;
*) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
-@@ -13576,13 +14250,13 @@
+@@ -13576,13 +14250,13 @@ esac
wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
@@ -2340,7 +2340,7 @@
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
-@@ -13592,20 +14266,20 @@
+@@ -13592,20 +14266,20 @@ else
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
@@ -2367,7 +2367,7 @@
:
else
lt_prog_compiler_static_F77=
-@@ -13622,7 +14296,7 @@
+@@ -13622,7 +14296,7 @@ else
mkdir conftest
cd conftest
mkdir out
@@ -2376,7 +2376,7 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -13633,11 +14307,11 @@
+@@ -13633,11 +14307,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -2390,7 +2390,7 @@
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -13717,12 +14391,13 @@
+@@ -13717,12 +14391,13 @@ echo $ECHO_N "checking whether the $comp
# 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'.
@@ -2405,7 +2405,7 @@
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
-@@ -13781,7 +14456,7 @@
+@@ -13781,7 +14456,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -
# See if GNU ld supports shared libraries.
case $host_os in
@@ -2414,7 +2414,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs_F77=no
-@@ -13829,7 +14504,7 @@
+@@ -13829,7 +14504,7 @@ EOF
allow_undefined_flag_F77=unsupported
always_export_symbols_F77=no
enable_shared_with_static_runtimes_F77=yes
@@ -2423,7 +2423,7 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -13847,7 +14522,7 @@
+@@ -13847,7 +14522,7 @@ EOF
fi
;;
@@ -2432,7 +2432,7 @@
hardcode_direct_F77=no
hardcode_shlibpath_var_F77=no
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-@@ -13862,7 +14537,7 @@
+@@ -13862,7 +14537,7 @@ EOF
archive_expsym_cmds_F77='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'
;;
@@ -2441,7 +2441,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -13880,13 +14555,22 @@
+@@ -13880,13 +14555,22 @@ EOF
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -2466,7 +2466,7 @@
fi
link_all_deplibs_F77=no
else
-@@ -13992,7 +14676,7 @@
+@@ -13992,7 +14676,7 @@ _LT_EOF
fi
;;
@@ -2475,7 +2475,7 @@
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.
-@@ -14012,7 +14696,7 @@
+@@ -14012,7 +14696,7 @@ _LT_EOF
# 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.
@@ -2484,7 +2484,7 @@
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -14046,7 +14730,7 @@
+@@ -14046,7 +14730,7 @@ _LT_EOF
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -2493,7 +2493,7 @@
else
# We have old collect2
hardcode_direct_F77=unsupported
-@@ -14110,11 +14794,18 @@
+@@ -14110,11 +14794,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -2516,7 +2516,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -14159,11 +14850,18 @@
+@@ -14159,11 +14850,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -2539,7 +2539,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -14217,7 +14915,7 @@
+@@ -14217,7 +14915,7 @@ if test -z "$aix_libpath"; then aix_libp
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds_F77='true'
# FIXME: Should let the user specify the lib program.
@@ -2548,7 +2548,7 @@
fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes_F77=yes
;;
-@@ -14250,19 +14948,18 @@
+@@ -14250,19 +14948,18 @@ if test -z "$aix_libpath"; then aix_libp
link_all_deplibs_F77=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -2574,7 +2574,7 @@
module_expsym_cmds_F77='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}'
;;
*)
-@@ -14424,6 +15121,7 @@
+@@ -14424,6 +15121,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
openbsd*)
@@ -2582,7 +2582,7 @@
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -14443,6 +15141,9 @@
+@@ -14443,6 +15141,9 @@ if test -z "$aix_libpath"; then aix_libp
;;
esac
fi
@@ -2592,7 +2592,7 @@
;;
os2*)
-@@ -14500,17 +15201,16 @@
+@@ -14500,17 +15201,16 @@ if test -z "$aix_libpath"; then aix_libp
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -2619,7 +2619,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -14567,7 +15267,7 @@
+@@ -14567,7 +15267,7 @@ if test -z "$aix_libpath"; then aix_libp
fi
;;
@@ -2628,7 +2628,7 @@
no_undefined_flag_F77='${wl}-z,text'
archive_cmds_need_lc_F77=no
hardcode_shlibpath_var_F77=no
-@@ -14644,7 +15344,7 @@
+@@ -14644,7 +15344,7 @@ x|xyes)
{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
@@ -2637,7 +2637,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -14702,20 +15402,7 @@
+@@ -14702,20 +15402,7 @@ shlibpath_overrides_runpath=unknown
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -2659,7 +2659,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14733,7 +15420,7 @@
+@@ -14733,7 +15420,7 @@ aix3*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -2668,7 +2668,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14872,12 +15559,7 @@
+@@ -14872,12 +15559,7 @@ darwin* | rhapsody*)
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -2682,7 +2682,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -14931,7 +15613,7 @@
+@@ -14931,7 +15613,7 @@ freebsd* | dragonfly*)
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -2691,7 +2691,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -14994,7 +15676,7 @@
+@@ -14994,7 +15676,7 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
@@ -2700,7 +2700,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -15065,7 +15747,7 @@
+@@ -15065,7 +15747,7 @@ linux* | k*bsd*-gnu)
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -2709,7 +2709,7 @@
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -15171,6 +15853,10 @@
+@@ -15171,6 +15853,10 @@ osf3* | osf4* | osf5*)
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -2720,7 +2720,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -15267,6 +15953,21 @@
+@@ -15267,6 +15953,21 @@ esac
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -2742,7 +2742,7 @@
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"
-@@ -15350,6 +16051,7 @@
+@@ -15350,6 +16051,7 @@ if test -f "$ltmain"; then
predeps_F77 \
postdeps_F77 \
compiler_lib_search_path_F77 \
@@ -2750,7 +2750,7 @@
archive_cmds_F77 \
archive_expsym_cmds_F77 \
postinstall_cmds_F77 \
-@@ -15365,6 +16067,7 @@
+@@ -15365,6 +16067,7 @@ if test -f "$ltmain"; then
module_cmds_F77 \
module_expsym_cmds_F77 \
lt_cv_prog_compiler_c_o_F77 \
@@ -2758,7 +2758,7 @@
exclude_expsyms_F77 \
include_expsyms_F77; do
-@@ -15597,6 +16300,10 @@
+@@ -15597,6 +16300,10 @@ predeps=$lt_predeps_F77
# shared library.
postdeps=$lt_postdeps_F77
@@ -2769,7 +2769,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_F77
-@@ -15685,7 +16392,7 @@
+@@ -15685,7 +16392,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -2778,7 +2778,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_F77
-@@ -15743,10 +16450,10 @@
+@@ -15743,10 +16450,10 @@ objext=o
objext_GCJ=$objext
# Code to be used in simple compile tests
@@ -2791,7 +2791,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -15762,16 +16469,16 @@
+@@ -15762,16 +16469,16 @@ compiler=$CC
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -2811,7 +2811,7 @@
# Allow CC to be a program name with arguments.
-@@ -15809,7 +16516,7 @@
+@@ -15809,7 +16516,7 @@ if test "${lt_cv_prog_compiler_rtti_exce
else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
@@ -2820,7 +2820,7 @@
lt_compiler_flag="-fno-rtti -fno-exceptions"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -15820,11 +16527,11 @@
+@@ -15820,11 +16527,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -2834,7 +2834,7 @@
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -15875,14 +16582,16 @@
+@@ -15875,14 +16582,16 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
;;
@@ -2854,7 +2854,7 @@
;;
darwin* | rhapsody*)
-@@ -15891,7 +16600,7 @@
+@@ -15891,7 +16600,7 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_pic_GCJ='-fno-common'
;;
@@ -2863,7 +2863,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -15949,10 +16658,10 @@
+@@ -15949,10 +16658,10 @@ echo $ECHO_N "checking for $compiler opt
esac
;;
@@ -2876,7 +2876,7 @@
;;
hpux9* | hpux10* | hpux11*)
-@@ -16001,6 +16710,22 @@
+@@ -16001,6 +16710,22 @@ echo $ECHO_N "checking for $compiler opt
# All Alpha code is PIC.
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -2899,7 +2899,7 @@
esac
;;
-@@ -16010,6 +16735,10 @@
+@@ -16010,6 +16735,10 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -2910,7 +2910,7 @@
solaris*)
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -16072,12 +16801,12 @@
+@@ -16072,12 +16801,12 @@ if test -n "$lt_prog_compiler_pic_GCJ";
{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
@@ -2926,7 +2926,7 @@
lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -16088,27 +16817,27 @@
+@@ -16088,27 +16817,27 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -2960,7 +2960,7 @@
case $lt_prog_compiler_pic_GCJ in
"" | " "*) ;;
*) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
-@@ -16135,13 +16864,13 @@
+@@ -16135,13 +16864,13 @@ esac
wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
@@ -2977,7 +2977,7 @@
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
-@@ -16151,20 +16880,20 @@
+@@ -16151,20 +16880,20 @@ else
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
@@ -3004,7 +3004,7 @@
:
else
lt_prog_compiler_static_GCJ=
-@@ -16181,7 +16910,7 @@
+@@ -16181,7 +16910,7 @@ else
mkdir conftest
cd conftest
mkdir out
@@ -3013,7 +3013,7 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -16192,11 +16921,11 @@
+@@ -16192,11 +16921,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -3027,7 +3027,7 @@
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -16276,12 +17005,13 @@
+@@ -16276,12 +17005,13 @@ echo $ECHO_N "checking whether the $comp
# 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'.
@@ -3042,7 +3042,7 @@
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
-@@ -16340,7 +17070,7 @@
+@@ -16340,7 +17070,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -
# See if GNU ld supports shared libraries.
case $host_os in
@@ -3051,7 +3051,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs_GCJ=no
-@@ -16388,7 +17118,7 @@
+@@ -16388,7 +17118,7 @@ EOF
allow_undefined_flag_GCJ=unsupported
always_export_symbols_GCJ=no
enable_shared_with_static_runtimes_GCJ=yes
@@ -3060,7 +3060,7 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -16406,7 +17136,7 @@
+@@ -16406,7 +17136,7 @@ EOF
fi
;;
@@ -3069,7 +3069,7 @@
hardcode_direct_GCJ=no
hardcode_shlibpath_var_GCJ=no
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-@@ -16421,7 +17151,7 @@
+@@ -16421,7 +17151,7 @@ EOF
archive_expsym_cmds_GCJ='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'
;;
@@ -3078,7 +3078,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -16439,13 +17169,22 @@
+@@ -16439,13 +17169,22 @@ EOF
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -3103,7 +3103,7 @@
fi
link_all_deplibs_GCJ=no
else
-@@ -16551,7 +17290,7 @@
+@@ -16551,7 +17290,7 @@ _LT_EOF
fi
;;
@@ -3112,7 +3112,7 @@
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.
-@@ -16571,7 +17310,7 @@
+@@ -16571,7 +17310,7 @@ _LT_EOF
# 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.
@@ -3121,7 +3121,7 @@
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -16605,7 +17344,7 @@
+@@ -16605,7 +17344,7 @@ _LT_EOF
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -3130,7 +3130,7 @@
else
# We have old collect2
hardcode_direct_GCJ=unsupported
-@@ -16679,11 +17418,18 @@
+@@ -16679,11 +17418,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -3153,7 +3153,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -16738,11 +17484,18 @@
+@@ -16738,11 +17484,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -3176,7 +3176,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -16796,7 +17549,7 @@
+@@ -16796,7 +17549,7 @@ if test -z "$aix_libpath"; then aix_libp
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds_GCJ='true'
# FIXME: Should let the user specify the lib program.
@@ -3185,7 +3185,7 @@
fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes_GCJ=yes
;;
-@@ -16829,19 +17582,18 @@
+@@ -16829,19 +17582,18 @@ if test -z "$aix_libpath"; then aix_libp
link_all_deplibs_GCJ=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -3211,7 +3211,7 @@
module_expsym_cmds_GCJ='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}'
;;
*)
-@@ -17003,6 +17755,7 @@
+@@ -17003,6 +17755,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
openbsd*)
@@ -3219,7 +3219,7 @@
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -17022,6 +17775,9 @@
+@@ -17022,6 +17775,9 @@ if test -z "$aix_libpath"; then aix_libp
;;
esac
fi
@@ -3229,7 +3229,7 @@
;;
os2*)
-@@ -17079,17 +17835,16 @@
+@@ -17079,17 +17835,16 @@ if test -z "$aix_libpath"; then aix_libp
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -3256,7 +3256,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -17146,7 +17901,7 @@
+@@ -17146,7 +17901,7 @@ if test -z "$aix_libpath"; then aix_libp
fi
;;
@@ -3265,7 +3265,7 @@
no_undefined_flag_GCJ='${wl}-z,text'
archive_cmds_need_lc_GCJ=no
hardcode_shlibpath_var_GCJ=no
-@@ -17223,7 +17978,7 @@
+@@ -17223,7 +17978,7 @@ x|xyes)
{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
@@ -3274,7 +3274,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -17281,20 +18036,7 @@
+@@ -17281,20 +18036,7 @@ shlibpath_overrides_runpath=unknown
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -3296,7 +3296,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17312,7 +18054,7 @@
+@@ -17312,7 +18054,7 @@ aix3*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -3305,7 +3305,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17451,12 +18193,7 @@
+@@ -17451,12 +18193,7 @@ darwin* | rhapsody*)
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -3319,7 +3319,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -17510,7 +18247,7 @@
+@@ -17510,7 +18247,7 @@ freebsd* | dragonfly*)
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -3328,7 +3328,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -17573,7 +18310,7 @@
+@@ -17573,7 +18310,7 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
@@ -3337,7 +3337,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17644,7 +18381,7 @@
+@@ -17644,7 +18381,7 @@ linux* | k*bsd*-gnu)
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -3346,7 +3346,7 @@
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -17750,6 +18487,10 @@
+@@ -17750,6 +18487,10 @@ osf3* | osf4* | osf5*)
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -3357,7 +3357,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -17846,6 +18587,21 @@
+@@ -17846,6 +18587,21 @@ esac
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -3379,7 +3379,7 @@
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"
-@@ -17929,6 +18685,7 @@
+@@ -17929,6 +18685,7 @@ if test -f "$ltmain"; then
predeps_GCJ \
postdeps_GCJ \
compiler_lib_search_path_GCJ \
@@ -3387,7 +3387,7 @@
archive_cmds_GCJ \
archive_expsym_cmds_GCJ \
postinstall_cmds_GCJ \
-@@ -17944,6 +18701,7 @@
+@@ -17944,6 +18701,7 @@ if test -f "$ltmain"; then
module_cmds_GCJ \
module_expsym_cmds_GCJ \
lt_cv_prog_compiler_c_o_GCJ \
@@ -3395,7 +3395,7 @@
exclude_expsyms_GCJ \
include_expsyms_GCJ; do
-@@ -18176,6 +18934,10 @@
+@@ -18176,6 +18934,10 @@ predeps=$lt_predeps_GCJ
# shared library.
postdeps=$lt_postdeps_GCJ
@@ -3406,7 +3406,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
-@@ -18264,7 +19026,7 @@
+@@ -18264,7 +19026,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -3415,7 +3415,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_GCJ
-@@ -18321,7 +19083,7 @@
+@@ -18321,7 +19083,7 @@ objext=o
objext_RC=$objext
# Code to be used in simple compile tests
@@ -3424,7 +3424,7 @@
# Code to be used in simple link tests
lt_simple_link_test_code="$lt_simple_compile_test_code"
-@@ -18340,16 +19102,16 @@
+@@ -18340,16 +19102,16 @@ compiler=$CC
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -3444,7 +3444,7 @@
# Allow CC to be a program name with arguments.
-@@ -18409,6 +19171,7 @@
+@@ -18409,6 +19171,7 @@ if test -f "$ltmain"; then
predeps_RC \
postdeps_RC \
compiler_lib_search_path_RC \
@@ -3452,7 +3452,7 @@
archive_cmds_RC \
archive_expsym_cmds_RC \
postinstall_cmds_RC \
-@@ -18424,6 +19187,7 @@
+@@ -18424,6 +19187,7 @@ if test -f "$ltmain"; then
module_cmds_RC \
module_expsym_cmds_RC \
lt_cv_prog_compiler_c_o_RC \
@@ -3460,7 +3460,7 @@
exclude_expsyms_RC \
include_expsyms_RC; do
-@@ -18656,6 +19420,10 @@
+@@ -18656,6 +19420,10 @@ predeps=$lt_predeps_RC
# shared library.
postdeps=$lt_postdeps_RC
@@ -3471,7 +3471,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_RC
-@@ -18744,7 +19512,7 @@
+@@ -18744,7 +19512,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -3480,7 +3480,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_RC
-@@ -18856,13 +19624,13 @@
+@@ -18856,13 +19624,13 @@ else
fi
@@ -3498,7 +3498,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -18897,31 +19665,31 @@
+@@ -18897,31 +19665,31 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -3539,7 +3539,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -18956,25 +19724,25 @@
+@@ -18956,25 +19724,25 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -3571,7 +3571,7 @@
#AC_SUBST([TK_PREFIX])
#AC_SUBST([TCL_INCLUDE_SPEC])
-@@ -19807,9 +20575,6 @@
+@@ -19807,9 +20575,6 @@ _ACEOF
program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
rm -f conftest.sed
@@ -3581,7 +3581,7 @@
test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
# Use eval to expand $SHELL
if eval "$MISSING --run true"; then
-@@ -21413,12 +22178,15 @@
+@@ -21413,12 +22178,15 @@ host!$host$ac_delim
host_cpu!$host_cpu$ac_delim
host_vendor!$host_vendor$ac_delim
host_os!$host_os$ac_delim
@@ -3597,7 +3597,7 @@
CPP!$CPP$ac_delim
CXX!$CXX$ac_delim
CXXFLAGS!$CXXFLAGS$ac_delim
-@@ -21446,9 +22214,6 @@
+@@ -21446,9 +22214,6 @@ INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PRO
mkdir_p!$mkdir_p$ac_delim
AWK!$AWK$ac_delim
SET_MAKE!$SET_MAKE$ac_delim
@@ -3607,7 +3607,7 @@
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -21490,6 +22255,9 @@
+@@ -21490,6 +22255,9 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
@@ -3617,7 +3617,7 @@
am__untar!$am__untar$ac_delim
DEPDIR!$DEPDIR$ac_delim
am__include!$am__include$ac_delim
-@@ -21512,7 +22280,7 @@
+@@ -21512,7 +22280,7 @@ TK_PREFIX!$TK_PREFIX$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
@@ -3626,7 +3626,7 @@
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -21913,21 +22681,22 @@
+@@ -21913,21 +22681,22 @@ echo "$as_me: $ac_file is unchanged" >&6
fi
rm -f "$tmp/out12"
# Compute $ac_file's index in $config_headers.
@@ -3656,7 +3656,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -21964,7 +22733,7 @@
+@@ -21964,7 +22733,7 @@ echo "$as_me: executing $ac_file command
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
@@ -3665,9 +3665,9 @@
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
---- WordNet-3.0.orig/configure.ac
-+++ WordNet-3.0/configure.ac
-@@ -12,6 +12,7 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -12,6 +12,7 @@ AC_DEFINE_UNQUOTED(DEFAULTPATH, "${prefi
# Checks for programs.
AC_PROG_CC
@@ -3675,7 +3675,7 @@
AC_PROG_RANLIB
AC_PROG_LEX
AC_PROG_YACC
-@@ -23,9 +24,9 @@
+@@ -23,9 +24,9 @@ AC_MSG_RESULT([$LEX])
AM_CONDITIONAL(LEX_TEST, test x$LEX = xflex)
dnl Checks for libraries.
@@ -3688,8 +3688,8 @@
#AC_SUBST([TK_PREFIX])
#AC_SUBST([TCL_INCLUDE_SPEC])
---- WordNet-3.0.orig/contrib/Makefile.in
-+++ WordNet-3.0/contrib/Makefile.in
+--- a/contrib/Makefile.in
++++ b/contrib/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -3701,7 +3701,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -76,6 +76,7 @@
+@@ -76,6 +76,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DICTZIP = @DICTZIP@
@@ -3709,7 +3709,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -101,6 +102,7 @@
+@@ -101,6 +102,7 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
@@ -3717,7 +3717,7 @@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -110,6 +112,7 @@
+@@ -110,6 +112,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
@@ -3725,7 +3725,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-@@ -288,8 +291,8 @@
+@@ -288,8 +291,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -3736,7 +3736,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -314,8 +317,8 @@
+@@ -314,8 +317,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -3747,7 +3747,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -325,13 +328,12 @@
+@@ -325,13 +328,12 @@ ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -3763,8 +3763,8 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
---- WordNet-3.0.orig/contrib/wordnet_structures/Makefile.in
-+++ WordNet-3.0/contrib/wordnet_structures/Makefile.in
+--- a/contrib/wordnet_structures/Makefile.in
++++ b/contrib/wordnet_structures/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -3776,7 +3776,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -75,6 +75,7 @@
+@@ -75,6 +75,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DICTZIP = @DICTZIP@
@@ -3784,7 +3784,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -100,6 +101,7 @@
+@@ -100,6 +101,7 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
@@ -3792,7 +3792,7 @@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -109,6 +111,7 @@
+@@ -109,6 +111,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
@@ -3800,8 +3800,8 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
---- WordNet-3.0.orig/dict/dbfiles/Makefile.in
-+++ WordNet-3.0/dict/dbfiles/Makefile.in
+--- a/dict/dbfiles/Makefile.in
++++ b/dict/dbfiles/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -3813,7 +3813,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -78,6 +78,7 @@
+@@ -78,6 +78,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DICTZIP = @DICTZIP@
@@ -3821,7 +3821,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -103,6 +104,7 @@
+@@ -103,6 +104,7 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
@@ -3829,7 +3829,7 @@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -112,6 +114,7 @@
+@@ -112,6 +114,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
@@ -3837,8 +3837,8 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
---- WordNet-3.0.orig/dict/Makefile.in
-+++ WordNet-3.0/dict/Makefile.in
+--- a/dict/Makefile.in
++++ b/dict/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -3850,7 +3850,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -86,6 +86,7 @@
+@@ -86,6 +86,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DICTZIP = @DICTZIP@
@@ -3858,7 +3858,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -111,6 +112,7 @@
+@@ -111,6 +112,7 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
@@ -3866,7 +3866,7 @@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -120,6 +122,7 @@
+@@ -120,6 +122,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
@@ -3874,7 +3874,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-@@ -324,8 +327,8 @@
+@@ -324,8 +327,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -3885,7 +3885,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -350,8 +353,8 @@
+@@ -350,8 +353,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -3896,7 +3896,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -361,13 +364,12 @@
+@@ -361,13 +364,12 @@ ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -3912,8 +3912,8 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
---- WordNet-3.0.orig/doc/html/Makefile.in
-+++ WordNet-3.0/doc/html/Makefile.in
+--- a/doc/html/Makefile.in
++++ b/doc/html/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -3925,7 +3925,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -74,6 +74,7 @@
+@@ -74,6 +74,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DICTZIP = @DICTZIP@
@@ -3933,7 +3933,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -99,6 +100,7 @@
+@@ -99,6 +100,7 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
@@ -3941,7 +3941,7 @@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -108,6 +110,7 @@
+@@ -108,6 +110,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
@@ -3949,8 +3949,8 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
---- WordNet-3.0.orig/doc/Makefile.in
-+++ WordNet-3.0/doc/Makefile.in
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -3962,7 +3962,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -76,6 +76,7 @@
+@@ -76,6 +76,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DICTZIP = @DICTZIP@
@@ -3970,7 +3970,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -101,6 +102,7 @@
+@@ -101,6 +102,7 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
@@ -3978,7 +3978,7 @@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -110,6 +112,7 @@
+@@ -110,6 +112,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
@@ -3986,7 +3986,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-@@ -288,8 +291,8 @@
+@@ -288,8 +291,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -3997,7 +3997,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -314,8 +317,8 @@
+@@ -314,8 +317,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -4008,7 +4008,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -325,13 +328,12 @@
+@@ -325,13 +328,12 @@ ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -4024,8 +4024,8 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
---- WordNet-3.0.orig/doc/man/Makefile.in
-+++ WordNet-3.0/doc/man/Makefile.in
+--- a/doc/man/Makefile.in
++++ b/doc/man/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4037,7 +4037,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -68,6 +68,7 @@
+@@ -68,6 +68,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DICTZIP = @DICTZIP@
@@ -4045,7 +4045,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -93,6 +94,7 @@
+@@ -93,6 +94,7 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
@@ -4053,7 +4053,7 @@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -102,6 +104,7 @@
+@@ -102,6 +104,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
@@ -4061,8 +4061,8 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
---- WordNet-3.0.orig/doc/pdf/Makefile.in
-+++ WordNet-3.0/doc/pdf/Makefile.in
+--- a/doc/pdf/Makefile.in
++++ b/doc/pdf/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4074,7 +4074,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -74,6 +74,7 @@
+@@ -74,6 +74,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DICTZIP = @DICTZIP@
@@ -4082,7 +4082,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -99,6 +100,7 @@
+@@ -99,6 +100,7 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
@@ -4090,7 +4090,7 @@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -108,6 +110,7 @@
+@@ -108,6 +110,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
@@ -4098,8 +4098,8 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
---- WordNet-3.0.orig/doc/ps/Makefile.in
-+++ WordNet-3.0/doc/ps/Makefile.in
+--- a/doc/ps/Makefile.in
++++ b/doc/ps/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4111,7 +4111,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -74,6 +74,7 @@
+@@ -74,6 +74,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DICTZIP = @DICTZIP@
@@ -4119,7 +4119,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -99,6 +100,7 @@
+@@ -99,6 +100,7 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
@@ -4127,7 +4127,7 @@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -108,6 +110,7 @@
+@@ -108,6 +110,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
@@ -4135,8 +4135,8 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
---- WordNet-3.0.orig/include/Makefile.in
-+++ WordNet-3.0/include/Makefile.in
+--- a/include/Makefile.in
++++ b/include/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4148,7 +4148,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -77,6 +77,7 @@
+@@ -77,6 +77,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DICTZIP = @DICTZIP@
@@ -4156,7 +4156,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -102,6 +103,7 @@
+@@ -102,6 +103,7 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
@@ -4164,7 +4164,7 @@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -111,6 +113,7 @@
+@@ -111,6 +113,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
@@ -4172,7 +4172,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-@@ -236,8 +239,8 @@
+@@ -236,8 +239,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -4183,7 +4183,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -249,8 +252,8 @@
+@@ -249,8 +252,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -4194,7 +4194,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -260,13 +263,12 @@
+@@ -260,13 +263,12 @@ ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -4210,8 +4210,8 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
---- WordNet-3.0.orig/lib/Makefile.in
-+++ WordNet-3.0/lib/Makefile.in
+--- a/lib/Makefile.in
++++ b/lib/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4223,7 +4223,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -71,7 +71,7 @@
+@@ -71,7 +71,7 @@ libwordnet_la_OBJECTS = $(am_libwordnet_
libwordnet_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libwordnet_la_LDFLAGS) $(LDFLAGS) -o $@
@@ -4232,7 +4232,7 @@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -118,6 +118,7 @@
+@@ -118,6 +118,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DICTZIP = @DICTZIP@
@@ -4240,7 +4240,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -143,6 +144,7 @@
+@@ -143,6 +144,7 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
@@ -4248,7 +4248,7 @@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -152,6 +154,7 @@
+@@ -152,6 +154,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
@@ -4256,7 +4256,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-@@ -260,8 +263,8 @@
+@@ -260,8 +263,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIE
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
@@ -4267,7 +4267,7 @@
else :; fi; \
done
-@@ -269,8 +272,8 @@
+@@ -269,8 +272,8 @@ uninstall-libLTLIBRARIES:
@$(NORMAL_UNINSTALL)
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
@@ -4278,7 +4278,7 @@
done
clean-libLTLIBRARIES:
-@@ -449,8 +452,8 @@
+@@ -449,8 +452,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -4289,7 +4289,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -475,8 +478,8 @@
+@@ -475,8 +478,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -4300,7 +4300,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -486,13 +489,12 @@
+@@ -486,13 +489,12 @@ ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -4316,8 +4316,8 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
---- WordNet-3.0.orig/lib/wnres/Makefile.in
-+++ WordNet-3.0/lib/wnres/Makefile.in
+--- a/lib/wnres/Makefile.in
++++ b/lib/wnres/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4329,7 +4329,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -74,6 +74,7 @@
+@@ -74,6 +74,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DICTZIP = @DICTZIP@
@@ -4337,7 +4337,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -99,6 +100,7 @@
+@@ -99,6 +100,7 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
@@ -4345,7 +4345,7 @@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -108,6 +110,7 @@
+@@ -108,6 +110,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
@@ -4353,8 +4353,8 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
---- WordNet-3.0.orig/Makefile.in
-+++ WordNet-3.0/Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4366,7 +4366,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -96,6 +96,7 @@
+@@ -96,6 +96,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DICTZIP = @DICTZIP@
@@ -4374,7 +4374,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -121,6 +122,7 @@
+@@ -121,6 +122,7 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
@@ -4382,7 +4382,7 @@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -130,6 +132,7 @@
+@@ -130,6 +132,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
@@ -4390,7 +4390,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-@@ -334,8 +337,8 @@
+@@ -334,8 +337,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -4401,7 +4401,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -360,8 +363,8 @@
+@@ -360,8 +363,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -4412,7 +4412,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -371,13 +374,12 @@
+@@ -371,13 +374,12 @@ ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -4428,7 +4428,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -451,6 +453,10 @@
+@@ -451,6 +453,10 @@ dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
@@ -4439,7 +4439,7 @@
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
-@@ -477,6 +483,8 @@
+@@ -477,6 +483,8 @@ distcheck: dist
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
@@ -4448,7 +4448,7 @@
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
-@@ -628,18 +636,18 @@
+@@ -628,18 +636,18 @@ uninstall-am:
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
@@ -4479,8 +4479,8 @@
# Remove unneeded Makefiles
---- WordNet-3.0.orig/src/grind/Makefile.in
-+++ WordNet-3.0/src/grind/Makefile.in
+--- a/src/grind/Makefile.in
++++ b/src/grind/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4492,7 +4492,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -53,7 +53,7 @@
+@@ -53,7 +53,7 @@ am_grind_OBJECTS = create.$(OBJEXT) file
grind-wnlex.$(OBJEXT)
grind_OBJECTS = $(am_grind_OBJECTS)
grind_LDADD = $(LDADD)
@@ -4501,7 +4501,7 @@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -97,6 +97,7 @@
+@@ -97,6 +97,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DICTZIP = @DICTZIP@
@@ -4509,7 +4509,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -122,6 +123,7 @@
+@@ -122,6 +123,7 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
@@ -4517,7 +4517,7 @@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -131,6 +133,7 @@
+@@ -131,6 +133,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
@@ -4525,7 +4525,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-@@ -245,8 +248,8 @@
+@@ -245,8 +248,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
@@ -4536,7 +4536,7 @@
else :; fi; \
done
-@@ -331,8 +334,8 @@
+@@ -331,8 +334,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -4547,7 +4547,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -344,8 +347,8 @@
+@@ -344,8 +347,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -4558,7 +4558,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -355,13 +358,12 @@
+@@ -355,13 +358,12 @@ ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -4574,8 +4574,8 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
---- WordNet-3.0.orig/src/Makefile.in
-+++ WordNet-3.0/src/Makefile.in
+--- a/src/Makefile.in
++++ b/src/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4587,7 +4587,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -57,7 +57,7 @@
+@@ -57,7 +57,7 @@ wn_OBJECTS = $(am_wn_OBJECTS)
wn_DEPENDENCIES = $(am__DEPENDENCIES_1)
binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
SCRIPTS = $(bin_SCRIPTS)
@@ -4596,7 +4596,7 @@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -104,6 +104,7 @@
+@@ -104,6 +104,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DICTZIP = @DICTZIP@
@@ -4604,7 +4604,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -129,6 +130,7 @@
+@@ -129,6 +130,7 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
@@ -4612,7 +4612,7 @@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -138,6 +140,7 @@
+@@ -138,6 +140,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
@@ -4620,7 +4620,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-@@ -254,8 +257,8 @@
+@@ -254,8 +257,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
@@ -4631,7 +4631,7 @@
else :; fi; \
done
-@@ -453,8 +456,8 @@
+@@ -453,8 +456,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -4642,7 +4642,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -479,8 +482,8 @@
+@@ -479,8 +482,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -4653,7 +4653,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -490,13 +493,12 @@
+@@ -490,13 +493,12 @@ ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -4669,9 +4669,8 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-
---- WordNet-3.0.orig/aclocal.m4
-+++ WordNet-3.0/aclocal.m4
+--- a/aclocal.m4
++++ b/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
@@ -4705,7 +4704,7 @@
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -106,7 +109,6 @@
+@@ -106,7 +109,6 @@ AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
AC_REQUIRE([AC_OBJEXT])dnl
AC_REQUIRE([AC_EXEEXT])dnl
dnl
@@ -4713,7 +4712,7 @@
AC_LIBTOOL_SYS_MAX_CMD_LEN
AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
AC_LIBTOOL_OBJDIR
-@@ -181,7 +183,7 @@
+@@ -181,7 +183,7 @@ test -z "$STRIP" && STRIP=:
test -z "$ac_objext" && ac_objext=o
# Determine commands to create old-style static archives.
@@ -4722,7 +4721,7 @@
old_postinstall_cmds='chmod 644 $oldlib'
old_postuninstall_cmds=
-@@ -208,6 +210,8 @@
+@@ -208,6 +210,8 @@ file_magic*)
;;
esac
@@ -4731,7 +4730,7 @@
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)
-@@ -268,8 +272,9 @@
+@@ -268,8 +272,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],
@@ -4743,7 +4742,7 @@
eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_compiler_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -281,13 +286,85 @@
+@@ -281,13 +286,85 @@ $rm conftest*
# Check for linker boilerplate output or warnings with
# the simple link test code.
AC_DEFUN([_LT_LINKER_BOILERPLATE],
@@ -4832,7 +4831,7 @@
# _LT_AC_SYS_LIBPATH_AIX
# ----------------------
-@@ -298,12 +375,20 @@
+@@ -298,12 +375,20 @@ $rm conftest*
# If we don't find anything, use the default library path according
# to the aix ld manual.
AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
@@ -4858,7 +4857,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
])# _LT_AC_SYS_LIBPATH_AIX
-@@ -534,13 +619,17 @@
+@@ -534,13 +619,17 @@ ia64-*-hpux*)
rm -rf conftest*
;;
@@ -4877,7 +4876,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
-@@ -557,6 +646,9 @@
+@@ -557,6 +646,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li
;;
*64-bit*)
case $host in
@@ -4887,7 +4886,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
-@@ -597,7 +689,11 @@
+@@ -597,7 +689,11 @@ sparc*-*solaris*)
*64-bit*)
case $lt_cv_prog_gnu_ld in
yes*) LD="${LD-ld} -m elf64_sparc" ;;
@@ -4900,7 +4899,7 @@
esac
;;
esac
-@@ -628,7 +724,7 @@
+@@ -628,7 +724,7 @@ AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
AC_CACHE_CHECK([$1], [$2],
[$2=no
ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
@@ -4909,7 +4908,7 @@
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.
-@@ -669,11 +765,12 @@
+@@ -669,11 +765,12 @@ fi
# ------------------------------------------------------------
# Check whether the given compiler option works
AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
@@ -4924,7 +4923,7 @@
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
-@@ -689,7 +786,7 @@
+@@ -689,7 +786,7 @@ AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
$2=yes
fi
fi
@@ -4933,7 +4932,7 @@
LDFLAGS="$save_LDFLAGS"
])
-@@ -787,9 +884,11 @@
+@@ -787,9 +884,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
fi
;;
*)
@@ -4948,7 +4947,7 @@
SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
= "XX$teststring") >/dev/null 2>&1 &&
-@@ -805,6 +904,7 @@
+@@ -805,6 +904,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
# 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`
@@ -4956,7 +4955,7 @@
;;
esac
])
-@@ -957,7 +1057,7 @@
+@@ -957,7 +1057,7 @@ else
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
[AC_CHECK_LIB([dld], [shl_load],
@@ -4965,7 +4964,7 @@
[AC_CHECK_FUNC([dlopen],
[lt_cv_dlopen="dlopen"],
[AC_CHECK_LIB([dl], [dlopen],
-@@ -965,7 +1065,7 @@
+@@ -965,7 +1065,7 @@ else
[AC_CHECK_LIB([svld], [dlopen],
[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
[AC_CHECK_LIB([dld], [dld_link],
@@ -4974,7 +4973,7 @@
])
])
])
-@@ -1031,7 +1131,8 @@
+@@ -1031,7 +1131,8 @@ fi
# ---------------------------------
# Check to see if options -c and -o are simultaneously supported by compiler
AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
@@ -4984,7 +4983,7 @@
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
-@@ -1039,7 +1140,7 @@
+@@ -1039,7 +1140,7 @@ AC_CACHE_CHECK([if $compiler supports -c
mkdir conftest
cd conftest
mkdir out
@@ -4993,7 +4992,7 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -1179,6 +1280,7 @@
+@@ -1179,6 +1280,7 @@ else
darwin*)
if test -n "$STRIP" ; then
striplib="$STRIP -x"
@@ -5001,7 +5000,7 @@
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
-@@ -1196,7 +1298,8 @@
+@@ -1196,7 +1298,8 @@ fi
# -----------------------------
# PORTME Fill in your ld.so characteristics
AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
@@ -5011,7 +5010,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
-@@ -1210,20 +1313,58 @@
+@@ -1210,20 +1313,58 @@ shlibpath_overrides_runpath=unknown
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -5075,7 +5074,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -1241,7 +1382,7 @@
+@@ -1241,7 +1382,7 @@ aix3*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -5084,7 +5083,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -1380,12 +1521,8 @@
+@@ -1380,12 +1521,8 @@ darwin* | rhapsody*)
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -5099,7 +5098,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -1439,7 +1576,7 @@
+@@ -1439,7 +1576,7 @@ freebsd* | dragonfly*)
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -5108,7 +5107,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -1502,7 +1639,7 @@
+@@ -1502,7 +1639,7 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
@@ -5117,7 +5116,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -1573,7 +1710,7 @@
+@@ -1573,7 +1710,7 @@ linux* | k*bsd*-gnu)
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -5126,7 +5125,7 @@
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -1679,6 +1816,10 @@
+@@ -1679,6 +1816,10 @@ osf3* | osf4* | osf5*)
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -5137,7 +5136,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -1774,6 +1915,13 @@
+@@ -1774,6 +1915,13 @@ esac
AC_MSG_RESULT([$dynamic_linker])
test "$dynamic_linker" = no && can_build_shared=no
@@ -5151,7 +5150,7 @@
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"
-@@ -1784,7 +1932,8 @@
+@@ -1784,7 +1932,8 @@ fi
# _LT_AC_TAGCONFIG
# ----------------
AC_DEFUN([_LT_AC_TAGCONFIG],
@@ -5161,7 +5160,7 @@
[AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
[include additional configurations @<:@automatic@:>@])],
[tagnames="$withval"])
-@@ -2045,7 +2194,7 @@
+@@ -2045,7 +2194,7 @@ m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC
# AC_PATH_TOOL_PREFIX
# -------------------
@@ -5170,7 +5169,7 @@
AC_DEFUN([AC_PATH_TOOL_PREFIX],
[AC_REQUIRE([AC_PROG_EGREP])dnl
AC_MSG_CHECKING([for $1])
-@@ -2108,7 +2257,7 @@
+@@ -2108,7 +2257,7 @@ fi
# AC_PATH_MAGIC
# -------------
@@ -5179,7 +5178,7 @@
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
-@@ -2255,7 +2404,7 @@
+@@ -2255,7 +2404,7 @@ esac
# how to check for library dependencies
# -- PORTME fill in with the dynamic library characteristics
AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
@@ -5188,7 +5187,7 @@
lt_cv_deplibs_check_method,
[lt_cv_file_magic_cmd='$MAGIC_CMD'
lt_cv_file_magic_test_file=
-@@ -2272,7 +2421,7 @@
+@@ -2272,7 +2421,7 @@ lt_cv_deplibs_check_method='unknown'
# whether `pass_all' will *always* work, you probably want this one.
case $host_os in
@@ -5197,7 +5196,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -2294,9 +2443,15 @@
+@@ -2294,9 +2443,15 @@ cygwin*)
mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
@@ -5214,7 +5213,7 @@
;;
darwin* | rhapsody*)
-@@ -2341,7 +2496,7 @@
+@@ -2341,7 +2496,7 @@ hpux10.20* | hpux11*)
esac
;;
@@ -5223,7 +5222,7 @@
# 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)$'
;;
-@@ -2391,6 +2546,10 @@
+@@ -2391,6 +2546,10 @@ osf3* | osf4* | osf5*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -5234,7 +5233,7 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
;;
-@@ -2659,10 +2818,10 @@
+@@ -2659,10 +2818,10 @@ objext=o
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -5247,7 +5246,7 @@
_LT_AC_SYS_COMPILER
-@@ -2698,7 +2857,7 @@
+@@ -2698,7 +2857,7 @@ aix3*)
fi
;;
@@ -5256,7 +5255,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -2755,6 +2914,7 @@
+@@ -2755,6 +2914,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)=
@@ -5264,7 +5263,7 @@
# Source file extension for C++ test sources.
ac_ext=cpp
-@@ -2764,10 +2924,10 @@
+@@ -2764,10 +2924,10 @@ objext=o
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -5277,7 +5276,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
-@@ -2864,7 +3024,7 @@
+@@ -2864,7 +3024,7 @@ case $host_os in
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -5286,7 +5285,7 @@
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.
-@@ -2877,7 +3037,7 @@
+@@ -2877,7 +3037,7 @@ case $host_os in
# 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.
@@ -5295,7 +5294,7 @@
for ld_flag in $LDFLAGS; do
case $ld_flag in
*-brtl*)
-@@ -2913,7 +3073,7 @@
+@@ -2913,7 +3073,7 @@ case $host_os in
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -5304,7 +5303,7 @@
else
# We have old collect2
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -3023,59 +3183,31 @@
+@@ -3023,59 +3183,31 @@ case $host_os in
fi
;;
darwin* | rhapsody*)
@@ -5374,7 +5373,7 @@
_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}'
;;
*)
-@@ -3158,9 +3290,7 @@
+@@ -3158,9 +3290,7 @@ case $host_os in
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
case $host_cpu in
@@ -5385,7 +5384,7 @@
*)
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
;;
-@@ -3228,7 +3358,7 @@
+@@ -3228,7 +3358,7 @@ case $host_os in
;;
esac
;;
@@ -5394,7 +5393,7 @@
_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'
-@@ -3320,7 +3450,7 @@
+@@ -3320,7 +3450,7 @@ case $host_os in
_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'
;;
@@ -5403,7 +5402,7 @@
# 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'
-@@ -3348,6 +3478,29 @@
+@@ -3348,6 +3478,29 @@ case $host_os in
# dependencies.
output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
;;
@@ -5433,7 +5432,7 @@
esac
;;
lynxos*)
-@@ -3386,6 +3539,7 @@
+@@ -3386,6 +3539,7 @@ case $host_os in
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
openbsd*)
@@ -5441,7 +5440,7 @@
_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'
-@@ -3396,6 +3550,9 @@
+@@ -3396,6 +3550,9 @@ case $host_os in
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
fi
output_verbose_link_cmd='echo'
@@ -5451,7 +5450,7 @@
;;
osf3*)
case $cc_basename in
-@@ -3557,15 +3714,10 @@
+@@ -3557,15 +3714,10 @@ case $host_os in
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
@@ -5470,7 +5469,7 @@
;;
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -3612,6 +3764,12 @@
+@@ -3612,6 +3764,12 @@ case $host_os in
fi
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
@@ -5483,7 +5482,7 @@
fi
;;
esac
-@@ -3727,7 +3885,8 @@
+@@ -3727,7 +3885,8 @@ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
# compiler output when linking a shared library.
# Parse the compiler output and extract the necessary
# objects, libraries and library flags.
@@ -5493,7 +5492,7 @@
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
-@@ -3852,10 +4011,15 @@
+@@ -3852,10 +4011,15 @@ fi
$rm -f confest.$objext
@@ -5510,7 +5509,7 @@
# 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)=
-@@ -3863,19 +4027,51 @@
+@@ -3863,19 +4027,51 @@ interix3*)
_LT_AC_TAGVAR(postdeps,$1)=
;;
@@ -5564,7 +5563,7 @@
case " $_LT_AC_TAGVAR(postdeps, $1) " in
*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
esac
-@@ -3918,10 +4114,17 @@
+@@ -3918,10 +4114,17 @@ objext=o
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -5584,7 +5583,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
-@@ -3953,7 +4156,7 @@
+@@ -3953,7 +4156,7 @@ aix3*)
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -5593,7 +5592,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -4000,10 +4203,10 @@
+@@ -4000,10 +4203,10 @@ objext=o
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -5606,7 +5605,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
-@@ -4056,7 +4259,7 @@
+@@ -4056,7 +4259,7 @@ objext=o
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -5615,7 +5614,7 @@
# Code to be used in simple link tests
lt_simple_link_test_code="$lt_simple_compile_test_code"
-@@ -4130,6 +4333,7 @@
+@@ -4130,6 +4333,7 @@ if test -f "$ltmain"; then
_LT_AC_TAGVAR(predeps, $1) \
_LT_AC_TAGVAR(postdeps, $1) \
_LT_AC_TAGVAR(compiler_lib_search_path, $1) \
@@ -5623,7 +5622,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) \
_LT_AC_TAGVAR(postinstall_cmds, $1) \
-@@ -4145,6 +4349,7 @@
+@@ -4145,6 +4349,7 @@ if test -f "$ltmain"; then
_LT_AC_TAGVAR(module_cmds, $1) \
_LT_AC_TAGVAR(module_expsym_cmds, $1) \
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
@@ -5631,7 +5630,7 @@
_LT_AC_TAGVAR(exclude_expsyms, $1) \
_LT_AC_TAGVAR(include_expsyms, $1); do
-@@ -4191,7 +4396,7 @@
+@@ -4191,7 +4396,7 @@ ifelse([$1], [],
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
@@ -5640,7 +5639,7 @@
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
-@@ -4428,6 +4633,10 @@
+@@ -4428,6 +4633,10 @@ predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
# shared library.
postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
@@ -5651,7 +5650,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
-@@ -4516,7 +4725,7 @@
+@@ -4516,7 +4725,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -5660,7 +5659,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
-@@ -4599,6 +4808,7 @@
+@@ -4599,6 +4808,7 @@ fi
# ---------------------------------
AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
[AC_REQUIRE([AC_CANONICAL_HOST])
@@ -5668,7 +5667,7 @@
AC_REQUIRE([AC_PROG_NM])
AC_REQUIRE([AC_OBJEXT])
# Check for command to grab the raw symbol name followed by C symbol from nm.
-@@ -4776,7 +4986,7 @@
+@@ -4776,7 +4986,7 @@ EOF
echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
cat conftest.$ac_ext >&5
fi
@@ -5677,7 +5676,7 @@
# Do not use the global_symbol_pipe unless it works.
if test "$pipe_works" = yes; then
-@@ -4825,13 +5035,16 @@
+@@ -4825,13 +5035,16 @@ AC_MSG_CHECKING([for $compiler option to
# like `-m68040'.
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
@@ -5697,7 +5696,7 @@
;;
darwin* | rhapsody*)
# PIC is the default on this platform
-@@ -4842,7 +5055,7 @@
+@@ -4842,7 +5055,7 @@ AC_MSG_CHECKING([for $compiler option to
# DJGPP does not support shared libraries at all
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
;;
@@ -5706,7 +5705,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -4868,7 +5081,7 @@
+@@ -4868,7 +5081,7 @@ AC_MSG_CHECKING([for $compiler option to
esac
else
case $host_os in
@@ -5715,7 +5714,7 @@
# All AIX code is PIC.
if test "$host_cpu" = ia64; then
# AIX 5 now supports IA64 processor
-@@ -4964,7 +5177,7 @@
+@@ -4964,7 +5177,7 @@ AC_MSG_CHECKING([for $compiler option to
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
;;
@@ -5724,7 +5723,7 @@
# Portland Group C++ compiler.
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-@@ -4978,6 +5191,14 @@
+@@ -4978,6 +5191,14 @@ AC_MSG_CHECKING([for $compiler option to
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
*)
@@ -5739,7 +5738,7 @@
;;
esac
;;
-@@ -5098,14 +5319,17 @@
+@@ -5098,14 +5319,17 @@ AC_MSG_CHECKING([for $compiler option to
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
@@ -5760,7 +5759,7 @@
;;
darwin* | rhapsody*)
-@@ -5114,7 +5338,7 @@
+@@ -5114,7 +5338,7 @@ AC_MSG_CHECKING([for $compiler option to
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
@@ -5769,7 +5768,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -5172,10 +5396,11 @@
+@@ -5172,10 +5396,11 @@ AC_MSG_CHECKING([for $compiler option to
esac
;;
@@ -5783,7 +5782,7 @@
;;
hpux9* | hpux10* | hpux11*)
-@@ -5224,6 +5449,22 @@
+@@ -5224,6 +5449,22 @@ AC_MSG_CHECKING([for $compiler option to
# All Alpha code is PIC.
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -5806,7 +5805,7 @@
esac
;;
-@@ -5233,6 +5474,10 @@
+@@ -5233,6 +5474,10 @@ AC_MSG_CHECKING([for $compiler option to
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -5817,7 +5816,7 @@
solaris*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -5292,7 +5537,7 @@
+@@ -5292,7 +5537,7 @@ AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_co
#
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],
@@ -5826,7 +5825,7 @@
[$_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
"" | " "*) ;;
-@@ -5316,7 +5561,7 @@
+@@ -5316,7 +5561,7 @@ esac
#
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],
@@ -5835,7 +5834,7 @@
$lt_tmp_static_flag,
[],
[_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-@@ -5327,11 +5572,12 @@
+@@ -5327,11 +5572,12 @@ AC_LIBTOOL_LINKER_OPTION([if $compiler s
# ------------------------------------
# See if the linker supports building shared libraries.
AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
@@ -5850,7 +5849,7 @@
# 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
-@@ -5344,7 +5590,7 @@
+@@ -5344,7 +5590,7 @@ ifelse([$1],[CXX],[
_LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -5859,7 +5858,7 @@
;;
linux* | k*bsd*-gnu)
_LT_AC_TAGVAR(link_all_deplibs, $1)=no
-@@ -5353,6 +5599,7 @@
+@@ -5353,6 +5599,7 @@ ifelse([$1],[CXX],[
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
esac
@@ -5867,7 +5866,7 @@
],[
runpath_var=
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -5383,12 +5630,14 @@
+@@ -5383,12 +5630,14 @@ ifelse([$1],[CXX],[
# 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'.
@@ -5883,7 +5882,7 @@
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
_LT_CC_BASENAME([$compiler])
-@@ -5438,7 +5687,7 @@
+@@ -5438,7 +5687,7 @@ ifelse([$1],[CXX],[
# See if GNU ld supports shared libraries.
case $host_os in
@@ -5892,7 +5891,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -5486,7 +5735,7 @@
+@@ -5486,7 +5735,7 @@ EOF
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_AC_TAGVAR(always_export_symbols, $1)=no
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -5901,7 +5900,7 @@
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'
-@@ -5504,7 +5753,7 @@
+@@ -5504,7 +5753,7 @@ EOF
fi
;;
@@ -5910,7 +5909,7 @@
_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'
-@@ -5519,7 +5768,7 @@
+@@ -5519,7 +5768,7 @@ EOF
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -5919,7 +5918,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -5537,13 +5786,22 @@
+@@ -5537,13 +5786,22 @@ EOF
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -5944,7 +5943,7 @@
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=no
else
-@@ -5649,7 +5907,7 @@
+@@ -5649,7 +5907,7 @@ _LT_EOF
fi
;;
@@ -5953,7 +5952,7 @@
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.
-@@ -5669,7 +5927,7 @@
+@@ -5669,7 +5927,7 @@ _LT_EOF
# 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.
@@ -5962,7 +5961,7 @@
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -5703,7 +5961,7 @@
+@@ -5703,7 +5961,7 @@ _LT_EOF
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -5971,7 +5970,7 @@
else
# We have old collect2
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -5796,7 +6054,7 @@
+@@ -5796,7 +6054,7 @@ _LT_EOF
# 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.
@@ -5980,7 +5979,7 @@
_LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
;;
-@@ -5829,19 +6087,18 @@
+@@ -5829,19 +6087,18 @@ _LT_EOF
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -6006,7 +6005,7 @@
_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}'
;;
*)
-@@ -6003,6 +6260,7 @@
+@@ -6003,6 +6260,7 @@ _LT_EOF
;;
openbsd*)
@@ -6014,7 +6013,7 @@
_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
-@@ -6022,6 +6280,9 @@
+@@ -6022,6 +6280,9 @@ _LT_EOF
;;
esac
fi
@@ -6024,7 +6023,7 @@
;;
os2*)
-@@ -6079,17 +6340,16 @@
+@@ -6079,17 +6340,16 @@ _LT_EOF
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
@@ -6051,7 +6050,7 @@
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
-@@ -6146,7 +6406,7 @@
+@@ -6146,7 +6406,7 @@ _LT_EOF
fi
;;
@@ -6060,7 +6059,7 @@
_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
-@@ -6221,7 +6481,7 @@
+@@ -6221,7 +6481,7 @@ x|xyes)
# to ld, don't add -lc before -lgcc.
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
@@ -6069,7 +6068,7 @@
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest
-@@ -6324,6 +6584,30 @@
+@@ -6324,6 +6584,30 @@ AC_DEFUN([LT_AC_PROG_RC],
[AC_CHECK_TOOL(RC, windres, no)
])
@@ -6100,7 +6099,7 @@
# 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 #
-@@ -6344,12 +6628,13 @@
+@@ -6344,12 +6628,13 @@ do
test -z "$as_dir" && as_dir=.
for lt_ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6115,7 +6114,7 @@
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-@@ -6382,10 +6667,11 @@
+@@ -6382,10 +6667,11 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xp
done
])
SED=$lt_cv_path_SED
@@ -6128,7 +6127,7 @@
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
-@@ -6400,7 +6686,7 @@
+@@ -6400,7 +6686,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.10'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
@@ -6137,7 +6136,7 @@
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
-@@ -6416,8 +6702,10 @@
+@@ -6416,8 +6702,10 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
@@ -6150,7 +6149,7 @@
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-@@ -6689,7 +6977,7 @@
+@@ -6689,7 +6977,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
@@ -6159,7 +6158,7 @@
dirpart=`AS_DIRNAME("$mf")`
else
continue
-@@ -6737,13 +7025,13 @@
+@@ -6737,13 +7025,13 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS]
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
@@ -6175,7 +6174,7 @@
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
-@@ -6848,16 +7136,17 @@
+@@ -6848,16 +7136,17 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC],
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
[# Compute $1's index in $config_headers.
@@ -6195,7 +6194,7 @@
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
-@@ -6946,6 +7235,40 @@
+@@ -6946,6 +7235,40 @@ AC_MSG_RESULT([$_am_result])
rm -f confinc confmf
])
@@ -6236,7 +6235,7 @@
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
-@@ -7129,7 +7452,7 @@
+@@ -7129,7 +7452,7 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
Modified: packages/wordnet/trunk/debian/patches/10_wordnet_structures.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/patches/10_wordnet_structures.patch?rev=45908&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/patches/10_wordnet_structures.patch (original)
+++ packages/wordnet/trunk/debian/patches/10_wordnet_structures.patch Fri May 17 07:42:18 2013
@@ -2,8 +2,8 @@
from WordNet 2.1 to WordNet 3.0 format
Author: Sebastian Hagen <sebastian_hagen at memespace.net>
---- WordNet-3.0.orig/contrib/wordnet_structures/wordnet_structures.py
-+++ WordNet-3.0/contrib/wordnet_structures/wordnet_structures.py
+--- a/contrib/wordnet_structures/wordnet_structures.py
++++ b/contrib/wordnet_structures/wordnet_structures.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-#Copyright 2007 Sebastian Hagen
@@ -20,7 +20,7 @@
# correctly, and create output very similar to what wnfilter would have
# written.
-@@ -117,27 +117,37 @@
+@@ -117,27 +117,37 @@ class WordIndexDictFormatter(WordIndex):
linesep = '\n'
LINE_WIDTH_MAX = 68
prefix_fmtf_line_first = ' %s 1: '
@@ -65,7 +65,7 @@
return self.linesep.join(lines)
-@@ -209,9 +219,7 @@
+@@ -209,9 +219,7 @@ class Synset:
return (rv, comments)
def dict_str(self):
@@ -76,7 +76,7 @@
rv = self.gloss.rstrip()
if (len(self.words) > 1):
rv += ' [syn: %s]' % (', '.join([('{%s}' % word) for word in self.words]))
-@@ -399,7 +407,7 @@
+@@ -399,7 +407,7 @@ if (__name__ == '__main__'):
op.add_option('-i', '--outindex', dest='oi', default='wn.index', help='filename of index file to write to')
op.add_option('-d', '--outdata', dest='od', default='wn.dict', help='filename of data file to write to')
op.add_option('--wn_url', dest='wn_url', default='ftp://ftp.cogsci.princeton.edu/pub/wordnet/2.0', help='URL for wordnet sources')
Modified: packages/wordnet/trunk/debian/patches/20_adj.all_fix.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/patches/20_adj.all_fix.patch?rev=45908&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/patches/20_adj.all_fix.patch (original)
+++ packages/wordnet/trunk/debian/patches/20_adj.all_fix.patch Fri May 17 07:42:18 2013
@@ -3,8 +3,8 @@
Forwarded: wordnet at princeton.edu
Bug-Debian: http://bugs.debian.org/544866
---- wordnet-3.0.orig/dict/dbfiles/adj.all
-+++ wordnet-3.0/dict/dbfiles/adj.all
+--- a/dict/dbfiles/adj.all
++++ b/dict/dbfiles/adj.all
@@ -11750,7 +11750,7 @@
{ [ ATOMISTIC, noun.cognition:atomism1,+ noun.cognition:atomism,+ HOLISTIC,!] [ atomistical, noun.cognition:atomism1,+ noun.cognition:atomism,+ ] (divided into separate and often disparate elements) }]
Modified: packages/wordnet/trunk/debian/patches/20_doc_Makefile.in.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/patches/20_doc_Makefile.in.patch?rev=45908&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/patches/20_doc_Makefile.in.patch (original)
+++ packages/wordnet/trunk/debian/patches/20_doc_Makefile.in.patch Fri May 17 07:42:18 2013
@@ -2,9 +2,9 @@
Just go with the man pages.
Author: Andreas Tille <tille at debian.org>
---- WordNet-3.0.orig/doc/Makefile.in
-+++ WordNet-3.0/doc/Makefile.in
-@@ -176,7 +176,7 @@
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -176,7 +176,7 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
Modified: packages/wordnet/trunk/debian/patches/20_doc_man_wninput.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/patches/20_doc_man_wninput.patch?rev=45908&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/patches/20_doc_man_wninput.patch (original)
+++ packages/wordnet/trunk/debian/patches/20_doc_man_wninput.patch Fri May 17 07:42:18 2013
@@ -1,9 +1,9 @@
Use proper sections of man pages
Author: Andreas Tille <tille at debian.org>
---- WordNet-3.0.orig/doc/man/wninput.5
-+++ WordNet-3.0/doc/man/wninput.5
-@@ -500,12 +500,12 @@
+--- a/doc/man/wninput.5
++++ b/doc/man/wninput.5
+@@ -500,12 +500,12 @@ Sample adverb synsets:
.fi
.RE
.SH SEE ALSO
Modified: packages/wordnet/trunk/debian/patches/20_include_wn.h.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/patches/20_include_wn.h.patch?rev=45908&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/patches/20_include_wn.h.patch (original)
+++ packages/wordnet/trunk/debian/patches/20_include_wn.h.patch Fri May 17 07:42:18 2013
@@ -2,8 +2,8 @@
than hard coding it into the header file
Author: Andreas Tille <tille at debian.org>
---- WordNet-3.0.orig/include/wn.h
-+++ WordNet-3.0/include/wn.h
+--- a/include/wn.h
++++ b/include/wn.h
@@ -27,7 +27,9 @@
#define VRBIDXFILE "%s\\sentidx.vrb"
#define CNTLISTFILE "%s\\cntlist.rev"
Modified: packages/wordnet/trunk/debian/patches/20_src_stubs_c.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/patches/20_src_stubs_c.patch?rev=45908&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/patches/20_src_stubs_c.patch (original)
+++ packages/wordnet/trunk/debian/patches/20_src_stubs_c.patch Fri May 17 07:42:18 2013
@@ -2,8 +2,8 @@
Author: Matthew Wilcox <matthew at wil.cx>
Closes: #389415
---- WordNet-3.0.orig/src/stubs.c
-+++ WordNet-3.0/src/stubs.c
+--- a/src/stubs.c
++++ b/src/stubs.c
@@ -14,7 +14,7 @@
#include <tk.h>
#include <wn.h>
Modified: packages/wordnet/trunk/debian/patches/20_src_wnb.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/patches/20_src_wnb.patch?rev=45908&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/patches/20_src_wnb.patch (original)
+++ packages/wordnet/trunk/debian/patches/20_src_wnb.patch Fri May 17 07:42:18 2013
@@ -1,8 +1,8 @@
Adapt pathes of tcl script to Debian locations
Author: Andreas Tille <tille at debian.org>
---- WordNet-3.0.orig/src/wnb
-+++ WordNet-3.0/src/wnb
+--- a/src/wnb
++++ b/src/wnb
@@ -1,6 +1,6 @@
#!/bin/sh
# the following line is evaluated by sh but ignored by tcl \
@@ -11,7 +11,7 @@
# the following line is evaluated by sh but ignored by tcl \
exec true
# the preceding lines make this script self-executing on unix systems
-@@ -103,7 +103,7 @@
+@@ -103,7 +103,7 @@ set version "3.0"
if {$tcl_platform(platform) == "unix"} {
if {[lsearch -exact [array names env] WNHOME] == -1} {
@@ -20,7 +20,7 @@
} else {
set resourcedir "$env(WNHOME)/lib/wnres"
}
-@@ -1725,7 +1725,7 @@
+@@ -1725,7 +1725,7 @@ if {$labonly} {
-command {showhelpwidget helpwidget_wngloss $resourcedir/wngloss.man "WordNet Glossary"}
.menubar.help.menu add command \
-label "Display the WordNet license" \
Modified: packages/wordnet/trunk/debian/patches/20_verb.social_fix.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/patches/20_verb.social_fix.patch?rev=45908&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/patches/20_verb.social_fix.patch (original)
+++ packages/wordnet/trunk/debian/patches/20_verb.social_fix.patch Fri May 17 07:42:18 2013
@@ -2,8 +2,8 @@
Author: Ben Haskell <ben at clarity.princeton.edu>
Closes: #478803
---- WordNet-3.0.orig/dict/dbfiles/verb.social
-+++ WordNet-3.0/dict/dbfiles/verb.social
+--- a/dict/dbfiles/verb.social
++++ b/dict/dbfiles/verb.social
@@ -254,7 +254,7 @@
{ [let, prevent,!] allow, permit, frames: 25,35 (make it possible through a specific action or lack of action for something to happen; "This permits the water to rush in"; "This sealed door won't allow the water come into the basement"; "This will permit the rain to run off") }
{ pass11, allow,@ frames: 8 (allow to go without comment or censure; "the insult passed as if unnoticed") }
Modified: packages/wordnet/trunk/debian/patches/30_src_grind.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/patches/30_src_grind.patch?rev=45908&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/patches/30_src_grind.patch (original)
+++ packages/wordnet/trunk/debian/patches/30_src_grind.patch Fri May 17 07:42:18 2013
@@ -1,8 +1,8 @@
Add missing includes to work with gcc4.x
Author: Andreas Tille <tille at debian.org>
---- WordNet-3.0.orig/src/grind/create.c
-+++ WordNet-3.0/src/grind/create.c
+--- a/src/grind/create.c
++++ b/src/grind/create.c
@@ -6,6 +6,7 @@
*/
@@ -11,8 +11,8 @@
#include <malloc.h>
#include <string.h>
#include "wngrind.h"
---- WordNet-3.0.orig/src/grind/files.c
-+++ WordNet-3.0/src/grind/files.c
+--- a/src/grind/files.c
++++ b/src/grind/files.c
@@ -5,6 +5,7 @@
*/
@@ -21,8 +21,8 @@
#include "wngrind.h"
static char *Id = "$Id: files.c,v 1.7 2005/01/31 20:03:36 wn Rel $";
---- WordNet-3.0.orig/src/grind/grind.c
-+++ WordNet-3.0/src/grind/grind.c
+--- a/src/grind/grind.c
++++ b/src/grind/grind.c
@@ -5,6 +5,7 @@
*/
@@ -31,7 +31,7 @@
#include "wngrind.h"
static char *Id = "$Id: grind.c,v 1.33 2005/01/31 20:03:36 wn Rel $";
-@@ -18,11 +19,11 @@
+@@ -18,11 +19,11 @@ int nominalizations = 0;
int synsetkeys = 0;
int extraflag = 0;
@@ -45,8 +45,8 @@
char c;
Argv=argv;
---- WordNet-3.0.orig/src/grind/makedb.c
-+++ WordNet-3.0/src/grind/makedb.c
+--- a/src/grind/makedb.c
++++ b/src/grind/makedb.c
@@ -5,6 +5,7 @@
*/
@@ -55,7 +55,7 @@
#include <string.h>
#include "wngrind.h"
-@@ -151,7 +152,7 @@
+@@ -151,7 +152,7 @@ void DumpData()
for (ss = headss; ss; ss = ss->ssnext) {
if (ftell(ofile[ss->part]) != ss->filepos) {
fprintf(logfile,
@@ -64,7 +64,7 @@
Argv[0], ftell(ofile[ss->part]), ss->filepos);
goto abortdump;
}
-@@ -239,7 +240,7 @@
+@@ -239,7 +240,7 @@ static void DumpPointers(Pointer ptrs)
for (p = ptrs; p; p = p->pnext)
if (p->status == RESOLVED) {
@@ -73,9 +73,9 @@
ptrsymbols[p->ptype],
p->psynset->filepos,
partchars[p->psynset->part],
---- WordNet-3.0.orig/src/grind/resolve.c
-+++ WordNet-3.0/src/grind/resolve.c
-@@ -174,7 +174,7 @@
+--- a/src/grind/resolve.c
++++ b/src/grind/resolve.c
+@@ -174,7 +174,7 @@ static void DoFanPointers(G_Synset clush
static void CheckSimilars(G_Synset clusheadss)
{
G_Synset fan;
@@ -84,7 +84,7 @@
for (fan = clusheadss->fans; fan; fan = fan->ssnext) {
if (!HasSimilar(fan)) { /* no similar in fan synset */
-@@ -219,7 +219,7 @@
+@@ -219,7 +219,7 @@ static void CheckSimilars(G_Synset clush
static void ResolveIt(Pointer p, Synonym syn, G_Synset ss, int fanss)
{
@@ -93,8 +93,8 @@
if ( syn->ss == ss && p->fromwdnum == ALLWORDS) {
fprintf(logfile, "Self-referential pointer: %s in file %s, line %d\n",
---- WordNet-3.0.orig/src/grind/util.c
-+++ WordNet-3.0/src/grind/util.c
+--- a/src/grind/util.c
++++ b/src/grind/util.c
@@ -4,6 +4,8 @@
*/
Modified: packages/wordnet/trunk/debian/patches/40_doc_man_fix_names.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/patches/40_doc_man_fix_names.patch?rev=45908&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/patches/40_doc_man_fix_names.patch (original)
+++ packages/wordnet/trunk/debian/patches/40_doc_man_fix_names.patch Fri May 17 07:42:18 2013
@@ -1,8 +1,8 @@
Fix NAME section of manpages
Author: Andreas Tille <tille at debian.org>
---- WordNet-3.0.orig/doc/man/binsrch.3
-+++ WordNet-3.0/doc/man/binsrch.3
+--- a/doc/man/binsrch.3
++++ b/doc/man/binsrch.3
@@ -2,7 +2,7 @@
.\" $Id$
.TH BINSRCH 3WN "Dec 2006" "WordNet 3.0" "WordNet\(tm Library Functions"
@@ -12,8 +12,8 @@
.SH SYNOPSIS
.LP
\fBchar *bin_search(char *key, FILE *fp);\fP
---- WordNet-3.0.orig/doc/man/lexnames.5
-+++ WordNet-3.0/doc/man/lexnames.5
+--- a/doc/man/lexnames.5
++++ b/doc/man/lexnames.5
@@ -3,7 +3,7 @@
.tr ~
.TH LEXNAMES 5WN "Dec 2006" "WordNet 3.0" "WordNet\(tm File Formats"
@@ -23,8 +23,8 @@
.SH DESCRIPTION
During WordNet development synsets are organized into forty-five
lexicographer files based on syntactic category and logical groupings.
---- WordNet-3.0.orig/doc/man/morph.3
-+++ WordNet-3.0/doc/man/morph.3
+--- a/doc/man/morph.3
++++ b/doc/man/morph.3
@@ -2,7 +2,7 @@
.\" $Id$
.TH MORPH 3WN "Dec 2006" "WordNet 3.0" "WordNet\(tm Library Functions"
@@ -34,8 +34,8 @@
.SH SYNOPSIS
.LP
\fB#include "wn.h"\fP
---- WordNet-3.0.orig/doc/man/wnsearch.3
-+++ WordNet-3.0/doc/man/wnsearch.3
+--- a/doc/man/wnsearch.3
++++ b/doc/man/wnsearch.3
@@ -2,7 +2,7 @@
.\" $Id$
.TH WNSEARCH 3WN "Dec 2006" "WordNet 3.0" "WordNet\(tm Library Functions"
@@ -45,8 +45,8 @@
.SH SYNOPSIS
.LP
\fB#include "wn.h"
---- WordNet-3.0.orig/doc/man/wnutil.3
-+++ WordNet-3.0/doc/man/wnutil.3
+--- a/doc/man/wnutil.3
++++ b/doc/man/wnutil.3
@@ -5,7 +5,7 @@
wninit, re_wninit, cntwords, strtolower, ToLowerCase, strsubst,
getptrtype, getpos, getsstype, StrToPos, GetSynsetForSense,
Modified: packages/wordnet/trunk/debian/patches/41_doc_man_fix_names.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/patches/41_doc_man_fix_names.patch?rev=45908&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/patches/41_doc_man_fix_names.patch (original)
+++ packages/wordnet/trunk/debian/patches/41_doc_man_fix_names.patch Fri May 17 07:42:18 2013
@@ -1,9 +1,9 @@
Fix some formating issues in manpages
Author: Andreas Tille <tille at debian.org>
---- WordNet-3.0.orig/doc/man/wninput.5
-+++ WordNet-3.0/doc/man/wninput.5
-@@ -247,7 +247,6 @@
+--- a/doc/man/wninput.5
++++ b/doc/man/wninput.5
+@@ -247,7 +247,6 @@ relations between all the words in the s
For verbs, the basic synset syntax is defined as follows:
@@ -11,7 +11,7 @@
.RS
.nf
\fB{\fP \fI~~words~~pointers~~frames~~\fP \fB(\fP ~\fIgloss~\fP \fB)~~}\fR
-@@ -268,7 +267,6 @@
+@@ -268,7 +267,6 @@ form:
\fB]\fR
.fi
.RE
@@ -19,9 +19,9 @@
Each adjective cluster is enclosed in square brackets, and may have
one or more parts. Each part consists of a head synset and optional
---- WordNet-3.0.orig/doc/man/wnsearch.3
-+++ WordNet-3.0/doc/man/wnsearch.3
-@@ -277,9 +277,9 @@
+--- a/doc/man/wnsearch.3
++++ b/doc/man/wnsearch.3
+@@ -277,9 +277,9 @@ OVERVIEW 31 \fIn/a\fP Show all synsets f
CLASSIF_CATEGORY 32 ;c Show domain topic
CLASSIF_USAGE 33 ;u Show domain usage
CLASSIF_REGIONAL 34 ;r Show domain region
@@ -34,9 +34,9 @@
INSTANCE 38 @i Instance of
INSTANCES 39 \(api Show instances
.TE
---- WordNet-3.0.orig/doc/man/wnutil.3
-+++ WordNet-3.0/doc/man/wnutil.3
-@@ -28,7 +28,7 @@
+--- a/doc/man/wnutil.3
++++ b/doc/man/wnutil.3
+@@ -28,7 +28,7 @@ GetValidIndexPointer, GetWNSense, GetSen
.LP
\fBint getsstype(char *ss_type);\fP
.LP
@@ -45,9 +45,9 @@
.LP
\fBSynsetPtr GetSynsetForSense(char *sense_key);\fP
.LP
---- WordNet-3.0.orig/doc/man/grind.1
-+++ WordNet-3.0/doc/man/grind.1
-@@ -142,7 +142,7 @@
+--- a/doc/man/grind.1
++++ b/doc/man/grind.1
+@@ -142,7 +142,7 @@ assign sense numbers in WordNet database
.BR wngloss (7WN).
.SH DIAGNOSTICS
Exit status is normally 0.
@@ -56,9 +56,9 @@
If syntactic or structural errors exist, exit status is number of
errors detected.
.TP
---- WordNet-3.0.orig/doc/man/lexnames.5
-+++ WordNet-3.0/doc/man/lexnames.5
-@@ -50,14 +50,14 @@
+--- a/doc/man/lexnames.5
++++ b/doc/man/lexnames.5
+@@ -50,14 +50,14 @@ l l l.
\fBFile Number\fP \fBName\fP \fBContents\fP
_
00 adj.all all adjective clusters
Modified: packages/wordnet/trunk/debian/patches/50_CVE-2008-2149_buffer_overflows.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/patches/50_CVE-2008-2149_buffer_overflows.patch?rev=45908&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/patches/50_CVE-2008-2149_buffer_overflows.patch (original)
+++ packages/wordnet/trunk/debian/patches/50_CVE-2008-2149_buffer_overflows.patch Fri May 17 07:42:18 2013
@@ -5,9 +5,9 @@
exploitable functions like strcpy()/strcat()/... and so even if there are no
known exploits the code needs a full security audit.
---- WordNet-3.0.orig/src/wn.c
-+++ WordNet-3.0/src/wn.c
-@@ -206,7 +206,8 @@
+--- a/src/wn.c
++++ b/src/wn.c
+@@ -206,7 +206,8 @@ static int searchwn(int ac, char *av[])
outsenses += do_search(av[1], optptr->pos, optptr->search,
whichsense, optptr->label);
} else {
Modified: packages/wordnet/trunk/debian/patches/51_overflows.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/patches/51_overflows.patch?rev=45908&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/patches/51_overflows.patch (original)
+++ packages/wordnet/trunk/debian/patches/51_overflows.patch Fri May 17 07:42:18 2013
@@ -1,18 +1,19 @@
-This patch was created by oCert according to
- http://www.ocert.org/advisories/ocert-2008-014.html
-and can be downloaded from
- http://www.ocert.org/analysis/2008-014/wordnet.patch
-Unfortunately the original patch had a problem which
-caused 'wordnet test -synsn' to fail. The critical
-part of the patch was removed from the whole patch
-set and is moved to 51_overflows_memcpy.patch which
-uses memcpy instead of the formerly used strcpy.
+Author: Anton Gladky <gladk at debian.org>
+LastChanged: Tue, 26 Feb 2013 20:40:25 +0100
+BugDebian: http://bugs.debian.org/700914
+Description: This patch was created by oCert according to
+ http://www.ocert.org/advisories/ocert-2008-014.html
+ and can be downloaded from
+ http://www.ocert.org/analysis/2008-014/wordnet.patch
+ Unfortunately the original patch had a problem which
+ caused 'wordnet test -synsn' to fail. The critical
+ part of the patch was removed from the whole patch
+ set and is moved to 51_overflows_memcpy.patch which
+ uses memcpy instead of the formerly used strcpy.
-Index: wordnet-3.0/lib/binsrch.c
-===================================================================
---- wordnet-3.0.orig/lib/binsrch.c 2013-02-19 16:03:01.698031603 +0800
-+++ wordnet-3.0/lib/binsrch.c 2013-02-19 16:03:01.686031603 +0800
-@@ -28,7 +28,7 @@
+--- a/lib/binsrch.c
++++ b/lib/binsrch.c
+@@ -28,7 +28,7 @@ char *read_index(long offset, FILE *fp)
char *linep;
linep = line;
@@ -21,7 +22,7 @@
fseek( fp, offset, SEEK_SET );
fgets(linep, LINE_LEN, fp);
-@@ -58,6 +58,8 @@
+@@ -58,6 +58,8 @@ char *bin_search(char *searchkey, FILE *
last_bin_search_offset = ftell( fp );
fgets(linep, LINE_LEN, fp);
length = (int)(strchr(linep, ' ') - linep);
@@ -30,7 +31,7 @@
strncpy(key, linep, length);
key[length] = '\0';
if(strcmp(key, searchkey) < 0) {
-@@ -110,6 +112,8 @@
+@@ -110,6 +112,8 @@ static int bin_search_key(char *searchke
line[length++] = c;
if (getc(fp) == EOF) { /* only 1 line in file */
length = (int)(strchr(linep, ' ') - linep);
@@ -39,7 +40,7 @@
strncpy(key, linep, length);
key[length] = '\0';
if(strcmp(key, searchkey) > 0) {
-@@ -132,6 +136,8 @@
+@@ -132,6 +136,8 @@ static int bin_search_key(char *searchke
if (fgets(linep, LINE_LEN, fp) != NULL) {
offset2 = ftell(fp); /* offset at start of next line */
length = (int)(strchr(linep, ' ') - linep);
@@ -48,11 +49,9 @@
strncpy(key, linep, length);
key[length] = '\0';
if(strcmp(key, searchkey) < 0) { /* further in file */
-Index: wordnet-3.0/lib/morph.c
-===================================================================
---- wordnet-3.0.orig/lib/morph.c 2013-02-19 16:03:01.698031603 +0800
-+++ wordnet-3.0/lib/morph.c 2013-02-19 16:06:14.850029761 +0800
-@@ -51,21 +51,21 @@
+--- a/lib/morph.c
++++ b/lib/morph.c
+@@ -51,21 +51,21 @@ static struct {
char *str;
int strlen;
} prepositions[NUMPREPS] = {
@@ -89,7 +88,7 @@
};
static FILE *exc_fps[NUMPARTS + 1];
-@@ -144,18 +144,19 @@
+@@ -144,18 +144,19 @@ static int do_init(void)
} else
sprintf(searchdir, DEFAULTPATH);
#else
@@ -116,7 +115,7 @@
"WordNet library error: Can't open exception file(%s)\n\n",
fname);
display_message(msgbuf);
-@@ -178,13 +179,16 @@
+@@ -178,13 +179,16 @@ char *morphstr(char *origstr, int pos)
int prep;
char *end_idx1, *end_idx2;
char *append;
@@ -134,7 +133,7 @@
/* Assume string hasn't had spaces substitued with '_' */
strtolower(strsubst(strcpy(str, origstr), ' ', '_'));
searchstr[0] = '\0';
-@@ -232,7 +236,7 @@
+@@ -232,7 +236,7 @@ char *morphstr(char *origstr, int pos)
if (end_idx < 0) return(NULL); /* shouldn't do this */
strncpy(word, str + st_idx, end_idx - st_idx);
word[end_idx - st_idx] = '\0';
@@ -143,7 +142,7 @@
strcat(searchstr,tmp);
else
strcat(searchstr,word);
-@@ -240,7 +244,7 @@
+@@ -240,7 +244,7 @@ char *morphstr(char *origstr, int pos)
st_idx = end_idx + 1;
}
@@ -152,7 +151,7 @@
strcat(searchstr,tmp);
else
strcat(searchstr,word);
-@@ -270,16 +274,15 @@
+@@ -270,16 +274,15 @@ char *morphword(char *word, int pos)
{
int offset, cnt;
int i;
@@ -175,7 +174,7 @@
/* first look for word on exception list */
if((tmp = exc_lookup(word, pos)) != NULL)
-@@ -335,7 +338,10 @@
+@@ -335,7 +338,10 @@ static char *wordbase(char *word, int en
{
char *pt1;
static char copy[WORDBUF];
@@ -187,7 +186,7 @@
strcpy(copy, word);
if(strend(copy,sufx[ender])) {
pt1=strchr(copy,'\0');
-@@ -368,13 +374,14 @@
+@@ -368,13 +374,14 @@ static char *exc_lookup(char *word, int
{
static char line[WORDBUF], *beglp, *endlp;
char *excline;
@@ -203,7 +202,7 @@
if ((excline = bin_search(word, exc_fps[pos])) != NULL) {
strcpy(line, excline);
endlp = strchr(line,' ');
-@@ -403,6 +410,9 @@
+@@ -403,6 +410,9 @@ static char *morphprep(char *s)
char word[WORDBUF], end[WORDBUF];
static char retval[WORDBUF];
@@ -213,7 +212,7 @@
/* Assume that the verb is the first word in the phrase. Strip it
off, check for validity, then try various morphs with the
rest of the phrase tacked on, trying to find a match. */
-@@ -410,7 +420,7 @@
+@@ -410,7 +420,7 @@ static char *morphprep(char *s)
rest = strchr(s, '_');
last = strrchr(s, '_');
if (rest != last) { /* more than 2 words */
@@ -222,10 +221,8 @@
strncpy(end, rest, last - rest + 1);
end[last-rest+1] = '\0';
strcat(end, lastwd);
-Index: wordnet-3.0/lib/search.c
-===================================================================
---- wordnet-3.0.orig/lib/search.c 2013-02-19 16:03:01.698031603 +0800
-+++ wordnet-3.0/lib/search.c 2013-02-19 16:03:01.690031603 +0800
+--- a/lib/search.c
++++ b/lib/search.c
@@ -13,6 +13,7 @@
#include <stdlib.h>
#include <string.h>
@@ -234,7 +231,7 @@
#include "wn.h"
-@@ -119,33 +120,22 @@
+@@ -119,33 +120,22 @@ IndexPtr parse_index(long offset, int db
if ( !line )
line = read_index( offset, indexfps[dbase] );
@@ -271,7 +268,7 @@
/* get the collins count */
ptrtok=strtok(NULL," \n");
-@@ -154,7 +144,12 @@
+@@ -154,7 +144,12 @@ IndexPtr parse_index(long offset, int db
/* get the number of pointers types */
ptrtok=strtok(NULL," \n");
idx->ptruse_cnt = atoi(ptrtok);
@@ -285,7 +282,7 @@
if (idx->ptruse_cnt) {
idx->ptruse = (int *) malloc(idx->ptruse_cnt * (sizeof(int)));
assert(idx->ptruse);
-@@ -173,9 +168,14 @@
+@@ -173,9 +168,14 @@ IndexPtr parse_index(long offset, int db
/* get the number of senses that are tagged */
ptrtok=strtok(NULL," \n");
idx->tagged_cnt = atoi(ptrtok);
@@ -302,7 +299,7 @@
assert(idx->offset);
/* get the offsets */
-@@ -197,15 +197,21 @@
+@@ -197,15 +197,21 @@ IndexPtr getindex(char *searchstr, int d
char strings[MAX_FORMS][WORDBUF]; /* vector of search strings */
static IndexPtr offsets[MAX_FORMS];
static int offset;
@@ -326,7 +323,7 @@
strtolower(searchstr);
for (i = 0; i < MAX_FORMS; i++) {
strcpy(strings[i], searchstr);
-@@ -229,11 +235,11 @@
+@@ -229,11 +235,11 @@ IndexPtr getindex(char *searchstr, int d
/* Get offset of first entry. Then eliminate duplicates
and get offsets of unique strings. */
@@ -340,7 +337,7 @@
offsets[i] = index_lookup(strings[i], dbase);
}
-@@ -272,7 +278,7 @@
+@@ -272,7 +278,7 @@ SynsetPtr read_synset(int dbase, long bo
SynsetPtr parse_synset(FILE *fp, int dbase, char *word)
{
static char line[LINEBUF];
@@ -349,7 +346,7 @@
char *ptrtok;
char *tmpptr;
int foundpert = 0;
-@@ -286,33 +292,11 @@
+@@ -286,33 +292,11 @@ SynsetPtr parse_synset(FILE *fp, int dba
if ((tmpptr = fgets(line, LINEBUF, fp)) == NULL)
return(NULL);
@@ -385,7 +382,7 @@
ptrtok = line;
-@@ -322,7 +306,7 @@
+@@ -322,7 +306,7 @@ SynsetPtr parse_synset(FILE *fp, int dba
/* sanity check - make sure starting file offset matches first field */
if (synptr->hereiam != loc) {
@@ -394,7 +391,7 @@
loc);
display_message(msgbuf);
free(synptr);
-@@ -335,16 +319,20 @@
+@@ -335,16 +319,20 @@ SynsetPtr parse_synset(FILE *fp, int dba
/* looking at POS */
ptrtok = strtok(NULL, " \n");
@@ -418,7 +415,7 @@
synptr->words = (char **)malloc(synptr->wcount * sizeof(char *));
assert(synptr->words);
synptr->wnsns = (int *)malloc(synptr->wcount * sizeof(int));
-@@ -354,9 +342,8 @@
+@@ -354,9 +342,8 @@ SynsetPtr parse_synset(FILE *fp, int dba
for (i = 0; i < synptr->wcount; i++) {
ptrtok = strtok(NULL, " \n");
@@ -429,7 +426,7 @@
/* is this the word we're looking for? */
-@@ -371,6 +358,12 @@
+@@ -371,6 +358,12 @@ SynsetPtr parse_synset(FILE *fp, int dba
ptrtok = strtok(NULL," \n");
synptr->ptrcount = atoi(ptrtok);
@@ -442,7 +439,7 @@
if (synptr->ptrcount) {
/* alloc storage for the pointers */
-@@ -455,21 +448,23 @@
+@@ -455,21 +448,23 @@ SynsetPtr parse_synset(FILE *fp, int dba
ptrtok = strtok(NULL," \n");
if (ptrtok) {
ptrtok = strtok(NULL," \n");
@@ -470,7 +467,7 @@
synptr->key = GetKeyForOffset(tmpbuf);
}
-@@ -635,7 +630,7 @@
+@@ -635,7 +630,7 @@ static void traceptrs(SynsetPtr synptr,
if ((ptrtyp == PERTPTR || ptrtyp == PPLPTR) &&
synptr->pto[i] != 0) {
@@ -479,7 +476,7 @@
cursyn->wnsns[synptr->pto[i] - 1]);
printsynset(prefix, cursyn, tbuf, DEFOFF, synptr->pto[i],
SKIP_ANTS, PRINT_MARKER);
-@@ -656,7 +651,7 @@
+@@ -656,7 +651,7 @@ static void traceptrs(SynsetPtr synptr,
traceptrs(cursyn, HYPERPTR, getpos(cursyn->pos), 0);
}
} else if (ptrtyp == ANTPTR && dbase != ADJ && synptr->pto[i] != 0) {
@@ -488,7 +485,7 @@
cursyn->wnsns[synptr->pto[i] - 1]);
printsynset(prefix, cursyn, tbuf, DEFOFF, synptr->pto[i],
SKIP_ANTS, PRINT_MARKER);
-@@ -817,7 +812,7 @@
+@@ -817,7 +812,7 @@ static void tracenomins(SynsetPtr synptr
cursyn = read_synset(synptr->ppos[i], synptr->ptroff[i], "");
@@ -497,7 +494,7 @@
cursyn->wnsns[synptr->pto[i] - 1]);
printsynset(prefix, cursyn, tbuf, DEFOFF, synptr->pto[i],
SKIP_ANTS, SKIP_MARKER);
-@@ -989,12 +984,12 @@
+@@ -989,12 +984,12 @@ void getexample(char *offset, char *wd)
char sentbuf[512];
if (vsentfilefp != NULL) {
@@ -512,7 +509,7 @@
printbuffer(sentbuf);
}
}
-@@ -1011,7 +1006,7 @@
+@@ -1011,7 +1006,7 @@ int findexample(SynsetPtr synptr)
if (vidxfilefp != NULL) {
wdnum = synptr->whichword - 1;
@@ -521,7 +518,7 @@
synptr->words[wdnum],
getpos(synptr->pos),
synptr->fnum,
-@@ -1124,7 +1119,7 @@
+@@ -1124,7 +1119,7 @@ static void freq_word(IndexPtr index)
if (cnt >= 17 && cnt <= 32) familiar = 6;
if (cnt > 32 ) familiar = 7;
@@ -530,7 +527,7 @@
"\n%s used as %s is %s (polysemy count = %d)\n",
index->wd, a_an[getpos(index->pos)], freqcats[familiar], cnt);
printbuffer(tmpbuf);
-@@ -1147,6 +1142,9 @@
+@@ -1147,6 +1142,9 @@ void wngrep (char *word_passed, int pos)
}
rewind(inputfile);
@@ -540,7 +537,7 @@
strcpy (word, word_passed);
ToLowerCase(word); /* map to lower case for index file search */
strsubst (word, ' ', '_'); /* replace spaces with underscores */
-@@ -1169,7 +1167,7 @@
+@@ -1169,7 +1167,7 @@ void wngrep (char *word_passed, int pos)
((line[loc + wordlen] == '-') || (line[loc + wordlen] == '_')))
) {
strsubst (line, '_', ' ');
@@ -549,7 +546,7 @@
printbuffer (tmpbuf);
break;
}
-@@ -1683,9 +1681,8 @@
+@@ -1683,9 +1681,8 @@ SynsetPtr traceptrs_ds(SynsetPtr synptr,
cursyn = read_synset(synptr->ppos[i],
synptr->ptroff[i],
"");
@@ -560,7 +557,7 @@
synptr->headsense = cursyn->lexid[0];
free_synset(cursyn);
break;
-@@ -2013,7 +2010,7 @@
+@@ -2013,7 +2010,7 @@ static int getsearchsense(SynsetPtr synp
strsubst(strcpy(wdbuf, synptr->words[whichword - 1]), ' ', '_');
strtolower(wdbuf);
@@ -569,7 +566,7 @@
for (i = 0; i < idx->off_cnt; i++)
if (idx->offset[i] == synptr->hereiam) {
free_index(idx);
-@@ -2037,7 +2034,7 @@
+@@ -2037,7 +2034,7 @@ static void printsynset(char *head, Syns
by flags */
if (offsetflag) /* print synset offset */
@@ -578,7 +575,7 @@
if (fileinfoflag) { /* print lexicographer file information */
sprintf(tbuf + strlen(tbuf), "<%s> ", lexfiles[synptr->fnum]);
prlexid = 1; /* print lexicographer id after word */
-@@ -2072,7 +2069,7 @@
+@@ -2072,7 +2069,7 @@ static void printantsynset(SynsetPtr syn
tbuf[0] = '\0';
if (offsetflag)
@@ -587,11 +584,9 @@
if (fileinfoflag) {
sprintf(tbuf + strlen(tbuf),"<%s> ", lexfiles[synptr->fnum]);
prlexid = 1;
-Index: wordnet-3.0/lib/wnutil.c
-===================================================================
---- wordnet-3.0.orig/lib/wnutil.c 2013-02-19 16:03:01.698031603 +0800
-+++ wordnet-3.0/lib/wnutil.c 2013-02-19 16:03:01.690031603 +0800
-@@ -48,7 +48,7 @@
+--- a/lib/wnutil.c
++++ b/lib/wnutil.c
+@@ -48,7 +48,7 @@ int wninit(void)
char *env;
if (!done) {
@@ -600,7 +595,7 @@
wnrelease = strdup(env); /* set release */
assert(wnrelease);
}
-@@ -70,7 +70,7 @@
+@@ -70,7 +70,7 @@ int re_wninit(void)
closefps();
@@ -609,7 +604,7 @@
wnrelease = strdup(env); /* set release */
assert(wnrelease);
}
-@@ -149,25 +149,25 @@
+@@ -149,25 +149,25 @@ static int do_init(void)
sprintf(searchdir, DEFAULTPATH);
#else
if ((env = getenv("WNSEARCHDIR")) != NULL)
@@ -641,7 +636,7 @@
"WordNet library error: Can't open indexfile(%s)\n",
tmpbuf);
display_message(msgbuf);
-@@ -178,35 +178,35 @@
+@@ -178,35 +178,35 @@ static int do_init(void)
/* This file isn't used by the library and doesn't have to
be present. No error is reported if the open fails. */
@@ -685,11 +680,9 @@
"WordNet library warning: Can't open verb example sentence index file(%s)\n",
tmpbuf);
display_message(msgbuf);
-Index: wordnet-3.0/src/wn.c
-===================================================================
---- wordnet-3.0.orig/src/wn.c 2013-02-19 16:03:01.698031603 +0800
-+++ wordnet-3.0/src/wn.c 2013-02-19 16:03:01.690031603 +0800
-@@ -131,7 +131,7 @@
+--- a/src/wn.c
++++ b/src/wn.c
+@@ -131,7 +131,7 @@ static void printusage(), printlicense()
printsearches(char *, int, unsigned long);
static int error_message(char *);
@@ -698,7 +691,7 @@
{
display_message = error_message;
-@@ -228,14 +228,14 @@
+@@ -228,14 +228,14 @@ static int do_search(char *searchword, i
printf("\n%s of %s %s\n%s",
label, partnames[pos], searchword, outbuf);
Modified: packages/wordnet/trunk/debian/patches/51_overflows_memcpy.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/patches/51_overflows_memcpy.patch?rev=45908&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/patches/51_overflows_memcpy.patch (original)
+++ packages/wordnet/trunk/debian/patches/51_overflows_memcpy.patch Fri May 17 07:42:18 2013
@@ -4,9 +4,9 @@
later fixed by the issuer of the patch Rob Holland <rob at ocert.org>
This part was now separated in this file.
---- WordNet-3.0.orig/lib/search.c
-+++ WordNet-3.0/lib/search.c
-@@ -1568,7 +1568,8 @@
+--- a/lib/search.c
++++ b/lib/search.c
+@@ -1568,7 +1568,8 @@ char *findtheinfo(char *searchstr, int d
bufstart[0] = '\n';
bufstart++;
}
Modified: packages/wordnet/trunk/debian/patches/60_gcc-4.6.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/patches/60_gcc-4.6.patch?rev=45908&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/patches/60_gcc-4.6.patch (original)
+++ packages/wordnet/trunk/debian/patches/60_gcc-4.6.patch Fri May 17 07:42:18 2013
@@ -4,9 +4,9 @@
Description: When using -Werror=format-security with gcc-4.6 some function
calls are throwing erros. This patch replates [f]printf by [f]puts to
fix the problem
---- wordnet-3.0.orig/lib/binsrch.c
-+++ wordnet-3.0/lib/binsrch.c
-@@ -193,7 +193,7 @@
+--- a/lib/binsrch.c
++++ b/lib/binsrch.c
+@@ -193,7 +193,7 @@ char *replace_line(char *new_line, char
copyfile(fp, tfp);
if (fseek(fp, offset, 0) == -1)
return(NULL); /* could not seek to offset */
@@ -15,7 +15,7 @@
rewind(tfp);
copyfile(tfp, fp);
-@@ -220,7 +220,7 @@
+@@ -220,7 +220,7 @@ char *insert_line(char *new_line, char *
copyfile(fp, tfp);
if (fseek(fp, offset, 0) == -1)
return(NULL); /* could not seek to offset */
@@ -24,9 +24,9 @@
rewind(tfp);
copyfile(tfp, fp);
---- wordnet-3.0.orig/src/wn.c
-+++ wordnet-3.0/src/wn.c
-@@ -286,7 +286,7 @@
+--- a/src/wn.c
++++ b/src/wn.c
+@@ -286,7 +286,7 @@ static void printsearches(char *word, in
printf("\t");
printf(searchstr[j].template,
partchars[dbase], partchars[dbase]);
@@ -35,7 +35,7 @@
printf("\n");
}
}
-@@ -347,7 +347,7 @@
+@@ -347,7 +347,7 @@ static int getoptidx(char *searchtype)
static int error_message(char *msg)
{
Modified: packages/wordnet/trunk/debian/patches/90_prevent_parallel_build.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/patches/90_prevent_parallel_build.patch?rev=45908&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/patches/90_prevent_parallel_build.patch (original)
+++ packages/wordnet/trunk/debian/patches/90_prevent_parallel_build.patch Fri May 17 07:42:18 2013
@@ -3,9 +3,9 @@
Author: Jakub Wilk <ubanus at users.sf.net>
Bug-Debian: http://bugs.debian.org/540491
---- wordnet-3.0.orig/src/grind/Makefile.in
-+++ wordnet-3.0/src/grind/Makefile.in
-@@ -512,3 +512,8 @@
+--- a/src/grind/Makefile.in
++++ b/src/grind/Makefile.in
+@@ -512,3 +512,8 @@ uninstall-am: uninstall-binPROGRAMS
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
@@ -14,9 +14,9 @@
+# see http://bugs.debian.org/540491
+.NOTPARALLEL:
+
---- wordnet-3.0.orig/Makefile.in
-+++ wordnet-3.0/Makefile.in
-@@ -657,3 +657,9 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -657,3 +657,9 @@ dist-hook:
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
More information about the debian-science-commits
mailing list