diff -Nru timbl-6.4.4/aclocal.m4 timbl-6.4.6/aclocal.m4 --- timbl-6.4.4/aclocal.m4 2013-04-02 16:24:30.000000000 +0000 +++ timbl-6.4.6/aclocal.m4 2014-09-23 08:29:53.000000000 +0000 @@ -1,8 +1,7 @@ -# generated automatically by aclocal 1.11.3 -*- Autoconf -*- +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, -# Inc. # This file 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. @@ -12,33 +11,31 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, -[m4_warning([this file was generated for autoconf 2.68. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file 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. -# serial 1 - # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' +[am__api_version='1.14' 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. -m4_if([$1], [1.11.3], [], +m4_if([$1], [1.14.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -54,24 +51,22 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.3])dnl +[AM_AUTOMAKE_VERSION([1.14.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file 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. -# serial 1 - # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. # # Of course, Automake must honor this variable whenever it calls a # tool from the auxiliary directory. The problem is that $srcdir (and @@ -90,7 +85,7 @@ # # The reason of the latter failure is that $top_srcdir and $ac_aux_dir # are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you +# harmless because $srcdir is '.', but things will broke when you # start a VPATH build or use an absolute $srcdir. # # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, @@ -116,22 +111,19 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file 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. -# serial 9 - # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE])dnl AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl @@ -150,16 +142,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, -# 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file 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. -# serial 12 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, # will think it sees a *use*, and therefore will trigger all it's # C support machinery. Also note that it means that autoscan, seeing @@ -169,7 +159,7 @@ # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". # We try a few techniques and use that to set a single cache variable. # # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was @@ -182,12 +172,13 @@ AC_REQUIRE([AM_MAKE_INCLUDE])dnl AC_REQUIRE([AM_DEP_TRACK])dnl -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) AC_CACHE_CHECK([dependency style of $depcc], [am_cv_$1_dependencies_compiler_type], @@ -195,8 +186,8 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -236,16 +227,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -254,8 +245,8 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -263,7 +254,7 @@ fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -311,7 +302,7 @@ # AM_SET_DEPDIR # ------------- # Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl @@ -321,9 +312,13 @@ # AM_DEP_TRACK # ------------ AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' @@ -338,20 +333,18 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file 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. -#serial 5 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -364,7 +357,7 @@ # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -376,21 +369,19 @@ continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`AS_DIRNAME(["$file"])` @@ -408,7 +399,7 @@ # This macro should only be invoked once -- use via AC_REQUIRE. # # This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will +# is enabled. FIXME. This creates each '.P' file that we will # need in order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], @@ -418,18 +409,21 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file 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. -# serial 16 - # 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. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -442,7 +436,7 @@ # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl +[AC_PREREQ([2.65])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -471,31 +465,40 @@ # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl _AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) AC_REQUIRE([AM_PROG_INSTALL_SH])dnl AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target. The system "awk" is bad on # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl @@ -506,34 +509,78 @@ [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl -]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl +]) +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) + +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -555,15 +602,12 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, -# Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file 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. -# serial 1 - # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -577,16 +621,14 @@ install_sh="\${SHELL} $am_aux_dir/install-sh" esac fi -AC_SUBST(install_sh)]) +AC_SUBST([install_sh])]) -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003-2013 Free Software Foundation, Inc. # # This file 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. -# serial 2 - # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. AC_DEFUN([AM_SET_LEADING_DOT], @@ -602,14 +644,12 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file 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. -# serial 4 - # AM_MAKE_INCLUDE() # ----------------- # Check to see how make treats includes. @@ -627,7 +667,7 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -654,15 +694,12 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file 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. -# serial 6 - # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], @@ -670,11 +707,10 @@ $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) - # AM_MISSING_HAS_RUN # ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl @@ -687,54 +723,22 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) + AC_MSG_WARN(['missing' script is too old or missing]) fi ]) -# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, -# Inc. -# -# This file 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. - -# serial 1 - -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) - # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file 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. -# serial 5 - # _AM_MANGLE_OPTION(NAME) # ----------------------- AC_DEFUN([_AM_MANGLE_OPTION], @@ -744,7 +748,7 @@ # -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) # _AM_SET_OPTIONS(OPTIONS) # ------------------------ @@ -758,24 +762,82 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Check to make sure that the build environment is sane. -*- Autoconf -*- +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file 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. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file 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. -# serial 5 +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + +# Check to make sure that the build environment is sane. -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# +# This file 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. # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -786,32 +848,40 @@ esac case $srcdir in *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$[2]" = conftest.file ) then @@ -821,46 +891,118 @@ AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -AC_MSG_RESULT(yes)]) +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 Free Software Foundation, Inc. # # This file 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. -# serial 1 +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# ("yes" being less verbose, "no" or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +dnl +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file 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. # AM_PROG_INSTALL_STRIP # --------------------- -# One issue with vendor `install' (even GNU) is that you can't +# One issue with vendor 'install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip # is unlikely to handle the host's binaries. # Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize +# always use install-sh in "make install-strip", and initialize # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. +# Copyright (C) 2006-2013 Free Software Foundation, Inc. # # This file 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. -# serial 3 - # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. @@ -874,18 +1016,16 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. +# Copyright (C) 2004-2013 Free Software Foundation, Inc. # # This file 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. -# serial 2 - # _AM_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. # # Substitute a variable $(am__tar) that is a command # writing to stdout a FORMAT-tarball containing the directory @@ -895,76 +1035,114 @@ # Substitute a variable $(am__untar) that extract such # a tarball read from stdin. # $(am__untar) < result.tar +# AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AC_SUBST([AMTAR], ['$${TAR-tar}']) -m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. + +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR diff -Nru timbl-6.4.4/AUTHORS timbl-6.4.6/AUTHORS --- timbl-6.4.4/AUTHORS 2012-04-12 15:43:57.000000000 +0000 +++ timbl-6.4.6/AUTHORS 2013-10-14 09:09:49.000000000 +0000 @@ -43,6 +43,7 @@ Tom DePlonty Adam Radziszewski Albert Russel +Yvan Saeys Frank Scheelen Armin Schmidt Olaf Seibert diff -Nru timbl-6.4.4/bootstrap timbl-6.4.6/bootstrap --- timbl-6.4.4/bootstrap 2012-10-31 08:58:30.000000000 +0000 +++ timbl-6.4.6/bootstrap 1970-01-01 00:00:00.000000000 +0000 @@ -1,64 +0,0 @@ -# $Id: bootstrap 15360 2012-10-30 12:34:47Z mvgompel $ -# $URL: $ - -# bootstrap - script to bootstrap the distribution rolling engine - -# usage: -# $ sh ./bootstrap && ./configure && make dist[check] -# -# this yields a tarball which one can install doing -# -# $ tar zxf PACKAGENAME-*.tar.gz -# $ cd PACKAGENAME-* -# $ ./configure -# $ make -# # make install - -# requirements: -# GNU autoconf, from e.g. ftp.gnu.org:/pub/gnu/autoconf/ -# GNU automake, from e.g. http://ftp.gnu.org/gnu/automake/ - -automake=automake -aclocal=aclocal - -# if you want to autogenerate a ChangeLog form svn: -# -# svn2cl, a python script, as used in the GNU Enterprise project. -# By jcater (Jason Cater), contributions by reinhard (Reinhard Müller). -# Get it from -# http://www.gnuenterprise.org/cgi-bin/viewcvs.cgi/*checkout*/gnue/trunk/gnue-common/utils/svn2cl . -# svn2cl is used in Makefile.am too. -# -# (Another svn2cl implementation, in perl, is at -# http://www.contactor.se/~dast/svn/archive-2002-04/0910.shtml) -# -# see also toplevel Makefile.am - -# test -f ChangeLog || { -# svn log --verbose > ChangeLog -#} - -if $automake --version|head -1 |grep ' 1\.[4-9]'; then - echo "automake 1.4-1.9 is active. You should use automake 1.10 or later" - if test -f /etc/debian_version; then - echo " sudo apt-get install automake" - echo " sudo update-alternatives --config automake" - fi - exit 1 -fi - -# Debian automake package installs as automake-version. Use this -# to make sure the right automake is being used. -# if not installed, use: apt-get install automake1.9 - -AUTOMAKE=automake ACLOCAL=aclocal autoreconf --install \ - --symlink - -# add --make if you want to run "make" too. - -# autoreconf should run something like: -# -# aclocal-1.9 \ -# && automake-1.9 --add-missing --verbose --gnu \ -# && autoconf - diff -Nru timbl-6.4.4/bootstrap.sh timbl-6.4.6/bootstrap.sh --- timbl-6.4.4/bootstrap.sh 1970-01-01 00:00:00.000000000 +0000 +++ timbl-6.4.6/bootstrap.sh 2013-10-22 13:34:16.000000000 +0000 @@ -0,0 +1,83 @@ +# $Id: bootstrap.sh 16641 2013-10-22 13:33:11Z sloot $ +# $URL: $ + +# bootstrap - script to bootstrap the distribution rolling engine + +# usage: +# $ sh ./bootstrap && ./configure && make dist[check] +# +# this yields a tarball which one can install doing +# +# $ tar zxf PACKAGENAME-*.tar.gz +# $ cd PACKAGENAME-* +# $ ./configure +# $ make +# # make install + +# requirements: +# GNU autoconf, from e.g. ftp.gnu.org:/pub/gnu/autoconf/ +# GNU automake, from e.g. http://ftp.gnu.org/gnu/automake/ + +automake=automake +aclocal=aclocal + +# if you want to autogenerate a ChangeLog form svn: +# +# svn2cl, a python script, as used in the GNU Enterprise project. +# By jcater (Jason Cater), contributions by reinhard (Reinhard Müller). +# Get it from +# http://www.gnuenterprise.org/cgi-bin/viewcvs.cgi/*checkout*/gnue/trunk/gnue-common/utils/svn2cl . +# svn2cl is used in Makefile.am too. +# +# (Another svn2cl implementation, in perl, is at +# http://www.contactor.se/~dast/svn/archive-2002-04/0910.shtml) +# +# see also toplevel Makefile.am + +# test -f ChangeLog || { +# svn log --verbose > ChangeLog +#} + +if $automake --version|head -1 |grep ' 1\.[4-9]'; then + echo "automake 1.4-1.9 is active. You should use automake 1.10 or later" + if test -f /etc/debian_version; then + echo " sudo apt-get install automake" + echo " sudo update-alternatives --config automake" + fi + exit 1 +fi +# autoconf-archive Debian package, aclocal-archive RPM, obsolete/badly supported OS, installed in home dir +acdirs="/usr/share/autoconf-archive/ /usr/share/aclocal/ /usr/local/share/aclocal/ $HOME/local/share/autoconf-archive/" + +found=false +for d in $acdirs +do + if test -f ${d}libtool.m4 + then + found=true + break + fi +done + +if ! $found +then + cat <. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file 'INSTALL'. + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` + +# Create the lock directory. +# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff -Nru timbl-6.4.4/config.guess timbl-6.4.6/config.guess --- timbl-6.4.4/config.guess 2012-03-30 20:31:00.000000000 +0000 +++ timbl-6.4.6/config.guess 2013-08-11 11:49:21.000000000 +0000 @@ -1,14 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2012-02-10' +timestamp='2013-06-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -22,19 +20,17 @@ # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to and include a ChangeLog -# entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# Originally written by Per Bothner. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# +# Please send patches with a ChangeLog entry to config-patches@gnu.org. + me=`echo "$0" | sed -e 's,.*/,,'` @@ -54,9 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -138,6 +132,27 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -200,6 +215,10 @@ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} @@ -302,7 +321,7 @@ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) @@ -801,6 +820,9 @@ i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; @@ -852,21 +874,21 @@ exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -879,59 +901,54 @@ EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi else - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -950,54 +967,63 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-unknown-linux-${LIBC} exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + echo hppa64-unknown-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-unknown-linux-${LIBC} exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1201,6 +1227,9 @@ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1227,19 +1256,21 @@ exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) @@ -1256,7 +1287,7 @@ NEO-?:NONSTOP_KERNEL:*:*) echo neo-tandem-nsk${UNAME_RELEASE} exit ;; - NSE-?:NONSTOP_KERNEL:*:*) + NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*) @@ -1330,9 +1361,6 @@ exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - eval $set_cc_for_build cat >$dummy.c <. @@ -26,11 +20,12 @@ # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to . Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# Please send patches with a ChangeLog entry to config-patches@gnu.org. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -73,9 +68,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -123,7 +116,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) @@ -156,7 +149,7 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; @@ -225,6 +218,12 @@ -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; @@ -253,10 +252,12 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | be32 | be64 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ | bfin \ - | c4x | clipper \ + | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ | epiphany \ | fido | fr30 | frv \ @@ -267,7 +268,7 @@ | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -285,16 +286,17 @@ | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ | nds32 | nds32le | nds32be \ - | nios | nios2 \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ | open8 \ - | or32 \ + | or1k | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ @@ -364,13 +366,13 @@ | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ @@ -383,7 +385,8 @@ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -401,12 +404,13 @@ | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ | orion-* \ @@ -782,11 +786,15 @@ basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze*) basic_machine=microblaze-xilinx ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; mingw32) - basic_machine=i386-pc + basic_machine=i686-pc os=-mingw32 ;; mingw32ce) @@ -822,7 +830,7 @@ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; msys) - basic_machine=i386-pc + basic_machine=i686-pc os=-msys ;; mvs) @@ -1013,7 +1021,11 @@ basic_machine=i586-unknown os=-pw32 ;; - rdos) + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) basic_machine=i386-pc os=-rdos ;; @@ -1340,21 +1352,21 @@ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-uclibc* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1486,9 +1498,6 @@ -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; @@ -1537,6 +1546,12 @@ c4x-* | tic4x-*) os=-coff ;; + c8051-*) + os=-elf + ;; + hexagon-*) + os=-elf + ;; tic54x-*) os=-coff ;; @@ -1577,6 +1592,9 @@ mips*-*) os=-elf ;; + or1k-*) + os=-elf + ;; or32-*) os=-coff ;; diff -Nru timbl-6.4.4/configure timbl-6.4.6/configure --- timbl-6.4.4/configure 2013-04-02 16:24:31.000000000 +0000 +++ timbl-6.4.6/configure 2014-09-23 08:29:54.000000000 +0000 @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for timbl 6.4.4. +# Generated by GNU Autoconf 2.69 for timbl 6.4.6. # # Report bugs to . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -136,6 +134,31 @@ # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -169,7 +192,8 @@ else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -222,21 +246,25 @@ if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -338,6 +366,14 @@ } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -459,6 +495,10 @@ chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -493,16 +533,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -514,28 +554,8 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -569,8 +589,8 @@ # Identity of this package. PACKAGE_NAME='timbl' PACKAGE_TARNAME='timbl' -PACKAGE_VERSION='6.4.4' -PACKAGE_STRING='timbl 6.4.4' +PACKAGE_VERSION='6.4.6' +PACKAGE_STRING='timbl 6.4.6' PACKAGE_BUGREPORT='timbl@uvt.nl' PACKAGE_URL='' @@ -623,7 +643,6 @@ PKG_CONFIG_PATH PKG_CONFIG LIBOBJS -LIBTOOL_DEPS CXXCPP CPP OTOOL64 @@ -632,6 +651,7 @@ NMEDIT DSYMUTIL MANIFEST_TOOL +RANLIB ac_ct_AR AR DLLTOOL @@ -660,7 +680,6 @@ build_cpu build LIBTOOL -RANLIB am__fastdepCXX_FALSE am__fastdepCXX_TRUE CXXDEPMODE @@ -678,6 +697,10 @@ LDFLAGS CXXFLAGS CXX +AM_BACKSLASH +AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V am__untar am__tar AMTAR @@ -742,6 +765,7 @@ ac_subst_files='' ac_user_opts=' enable_option_checking +enable_silent_rules enable_dependency_tracking enable_shared enable_static @@ -1227,8 +1251,6 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1314,7 +1336,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures timbl 6.4.4 to adapt to many kinds of systems. +\`configure' configures timbl 6.4.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1384,7 +1406,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of timbl 6.4.4:";; + short | recursive ) echo "Configuration of timbl 6.4.6:";; esac cat <<\_ACEOF @@ -1392,8 +1414,12 @@ --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build --enable-shared[=PKGS] build shared libraries [default=yes] --enable-static[=PKGS] build static libraries [default=yes] --enable-fast-install[=PKGS] @@ -1502,10 +1528,10 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -timbl configure 6.4.4 -generated by GNU Autoconf 2.68 +timbl configure 6.4.6 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1619,7 +1645,7 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -1879,7 +1905,7 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -2155,8 +2181,8 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by timbl $as_me 6.4.4, which was -generated by GNU Autoconf 2.68. Invocation command line was +It was created by timbl $as_me 6.4.6, which was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2503,7 +2529,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -am__api_version='1.11' +am__api_version='1.14' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2571,7 +2597,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -2629,9 +2655,6 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -2642,32 +2665,40 @@ esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken -alias in your environment" "$LINENO" 5 - fi + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$2" = conftest.file ) then @@ -2679,6 +2710,16 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. @@ -2701,12 +2742,12 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh}" != xset; then @@ -2718,10 +2759,10 @@ esac fi -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. +# will honor the 'STRIP' environment variable to overrule this program. if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. @@ -2740,7 +2781,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2780,7 +2821,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2831,7 +2872,7 @@ test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -2860,12 +2901,6 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -2884,7 +2919,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2948,6 +2983,45 @@ fi rmdir .tst 2>/dev/null +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -2970,7 +3044,7 @@ # Define the identity of the package. PACKAGE='timbl' - VERSION='6.4.4' + VERSION='6.4.6' cat >>confdefs.h <<_ACEOF @@ -2998,12 +3072,22 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + # We need awk for the "check" target. The system "awk" is bad on # some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar pax cpio none' + am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' @@ -3011,6 +3095,48 @@ +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi + ac_config_headers="$ac_config_headers config.h" @@ -3054,7 +3180,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3098,7 +3224,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3551,7 +3677,7 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -3607,8 +3733,8 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -3643,16 +3769,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -3661,8 +3787,8 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -3670,7 +3796,7 @@ fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -3724,103 +3850,7 @@ fi -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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_RANLIB+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -RANLIB=$ac_cv_prog_RANLIB -if test -n "$RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 -$as_echo "$RANLIB" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_RANLIB="ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB -if test -n "$ac_ct_RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 -$as_echo "$ac_ct_RANLIB" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_RANLIB" = x; then - RANLIB=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - RANLIB=$ac_ct_RANLIB - fi -else - RANLIB="$ac_cv_prog_RANLIB" -fi - # libtool stuff -# unfortunately, a lot of old libtools hang around. -# so LT_INIT and LT_PREREQ cannot be used for now -#LT_PREREQ([2.2.0]) -#LT_INIT case `pwd` in *\ * | *\ *) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 @@ -4008,7 +4038,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4048,7 +4078,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4101,7 +4131,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4142,7 +4172,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -4200,7 +4230,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4244,7 +4274,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4440,8 +4470,7 @@ /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -4526,6 +4555,65 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -4537,8 +4625,8 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -4573,16 +4661,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -4591,8 +4679,8 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -4600,7 +4688,7 @@ fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -4676,7 +4764,7 @@ for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue + as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in @@ -4752,7 +4840,7 @@ for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -4818,7 +4906,7 @@ for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -4885,7 +4973,7 @@ for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue + as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP case `"$ac_path_FGREP" --version 2>&1` in @@ -5141,7 +5229,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5185,7 +5273,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5604,7 +5692,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5644,7 +5732,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5950,7 +6038,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5990,7 +6078,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6094,7 +6182,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6138,7 +6226,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6263,7 +6351,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6303,7 +6391,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6362,7 +6450,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6402,7 +6490,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7037,7 +7125,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7077,7 +7165,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7157,7 +7245,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7197,7 +7285,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7249,7 +7337,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7289,7 +7377,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7341,7 +7429,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7381,7 +7469,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7433,7 +7521,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7473,7 +7561,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7525,7 +7613,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7565,7 +7653,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15252,7 +15340,6 @@ - # when running tests, use CXX ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -15287,60 +15374,60 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#ifndef bool - "error: bool is not defined" -#endif -#ifndef false - "error: false is not defined" -#endif -#if false - "error: false is not 0" -#endif -#ifndef true - "error: true is not defined" -#endif -#if true != 1 - "error: true is not 1" -#endif -#ifndef __bool_true_false_are_defined - "error: __bool_true_false_are_defined is not defined" -#endif - - struct s { _Bool s: 1; _Bool t; } s; - - char a[true == 1 ? 1 : -1]; - char b[false == 0 ? 1 : -1]; - char c[__bool_true_false_are_defined == 1 ? 1 : -1]; - char d[(bool) 0.5 == true ? 1 : -1]; - /* See body of main program for 'e'. */ - char f[(_Bool) 0.0 == false ? 1 : -1]; - char g[true]; - char h[sizeof (_Bool)]; - char i[sizeof s.t]; - enum { j = false, k = true, l = false * true, m = true * 256 }; - /* The following fails for - HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ - _Bool n[m]; - char o[sizeof n == m * sizeof n[0] ? 1 : -1]; - char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; - /* Catch a bug in an HP-UX C compiler. See - http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html - http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html - */ - _Bool q = true; - _Bool *pq = &q; + #include + #ifndef bool + "error: bool is not defined" + #endif + #ifndef false + "error: false is not defined" + #endif + #if false + "error: false is not 0" + #endif + #ifndef true + "error: true is not defined" + #endif + #if true != 1 + "error: true is not 1" + #endif + #ifndef __bool_true_false_are_defined + "error: __bool_true_false_are_defined is not defined" + #endif + + struct s { _Bool s: 1; _Bool t; } s; + + char a[true == 1 ? 1 : -1]; + char b[false == 0 ? 1 : -1]; + char c[__bool_true_false_are_defined == 1 ? 1 : -1]; + char d[(bool) 0.5 == true ? 1 : -1]; + /* See body of main program for 'e'. */ + char f[(_Bool) 0.0 == false ? 1 : -1]; + char g[true]; + char h[sizeof (_Bool)]; + char i[sizeof s.t]; + enum { j = false, k = true, l = false * true, m = true * 256 }; + /* The following fails for + HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ + _Bool n[m]; + char o[sizeof n == m * sizeof n[0] ? 1 : -1]; + char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; + /* Catch a bug in an HP-UX C compiler. See + http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html + http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html + */ + _Bool q = true; + _Bool *pq = &q; int main () { - bool e = &s; - *pq |= q; - *pq |= ! q; - /* Refer to every declared value, to avoid compiler optimizations. */ - return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l - + !m + !n + !o + !p + !q + !pq); + bool e = &s; + *pq |= q; + *pq |= ! q; + /* Refer to every declared value, to avoid compiler optimizations. */ + return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l + + !m + !n + !o + !p + !q + !pq); ; return 0; @@ -15355,7 +15442,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5 $as_echo "$ac_cv_header_stdbool_h" >&6; } -ac_fn_cxx_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default" + ac_fn_cxx_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default" if test "x$ac_cv_type__Bool" = xyes; then : cat >>confdefs.h <<_ACEOF @@ -15365,6 +15452,7 @@ fi + if test $ac_cv_header_stdbool_h = yes; then $as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h @@ -15539,7 +15627,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15582,7 +15670,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -16015,6 +16103,14 @@ LTLIBOBJS=$ac_ltlibobjs +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -16333,16 +16429,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -16402,28 +16498,16 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -16444,8 +16528,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by timbl $as_me 6.4.4, which was -generated by GNU Autoconf 2.68. Invocation command line was +This file was extended by timbl $as_me 6.4.6, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -16510,11 +16594,11 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -timbl config.status 6.4.4 -configured by $0, generated by GNU Autoconf 2.68, +timbl config.status 6.4.6 +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -16605,7 +16689,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -17623,7 +17707,7 @@ case $ac_file$ac_mode in "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -17636,7 +17720,7 @@ # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -17670,21 +17754,19 @@ continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`$as_dirname -- "$file" || diff -Nru timbl-6.4.4/configure.ac timbl-6.4.6/configure.ac --- timbl-6.4.4/configure.ac 2013-04-02 16:05:26.000000000 +0000 +++ timbl-6.4.6/configure.ac 2014-09-23 08:29:44.000000000 +0000 @@ -1,10 +1,10 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -# $Id: configure.ac 15879 2013-04-02 16:05:03Z sloot $ +# $Id: configure.ac 16622 2013-10-17 12:51:01Z sloot $ # $URL $ AC_PREREQ(2.61) -AC_INIT([timbl],[6.4.4],[timbl@uvt.nl]) +AC_INIT([timbl],[6.4.6],[timbl@uvt.nl]) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([.]) AC_CONFIG_MACRO_DIR([m4]) @@ -22,14 +22,8 @@ # Checks for programs. AC_PROG_CXX( [g++] ) -AC_PROG_RANLIB # libtool stuff -# unfortunately, a lot of old libtools hang around. -# so LT_INIT and LT_PREREQ cannot be used for now -#LT_PREREQ([2.2.0]) -#LT_INIT -AC_PROG_LIBTOOL -AC_SUBST([LIBTOOL_DEPS]) +LT_INIT # when running tests, use CXX AC_LANG([C++]) @@ -60,7 +54,7 @@ LIBS="$LIBS $XML2_LIBS" AC_ARG_WITH(ticcutils, - [ --with-ticcutils=DIR use libticcutils installed in ; + [ --with-ticcutils=DIR use libticcutils installed in ; note that you can install libticcutils in a non-default directory with ./configure --prefix= in the libticutils installation directory], [PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$withval/lib/pkgconfig"], diff -Nru timbl-6.4.4/debian/changelog timbl-6.4.6/debian/changelog --- timbl-6.4.4/debian/changelog 2014-05-11 03:04:07.000000000 +0000 +++ timbl-6.4.6/debian/changelog 2014-10-31 04:14:59.000000000 +0000 @@ -1,8 +1,21 @@ -timbl (6.4.4-4ubuntu1) utopic; urgency=medium +timbl (6.4.6-1) unstable; urgency=low - * Use dh-autoreconf to get new libtool macros for ppc64el. + * New upstream release. + * debian/control: bumped libticcutils2-dev build-depends from >=0.3 to >= 0.7. + * debian/copyright: refer to versioned symlink to GPL (thanks lintian). + + -- Joost van Baal-Ilić Thu, 30 Oct 2014 07:41:25 +0100 + +timbl (6.4.5-1) unstable; urgency=low + + * New upstream release. + * debian/control: migrated version control from Subversion to git (still on + Debian's Alioth). Thanks Jeremy T. Bouse. + * debian/*: change version control tags from Subversion to git. + * debian/control: Standards-Version upgraded from policy 3.9.4 to 3.9.5 (no + changes needed.) - -- Logan Rosen Sat, 10 May 2014 23:03:53 -0400 + -- Joost van Baal-Ilić Tue, 28 Oct 2014 23:20:03 +0100 timbl (6.4.4-4) unstable; urgency=low @@ -246,5 +259,4 @@ -- Sebastiaan Tesink Tue, 08 Apr 2008 17:20:44 +0200 -# $Id: changelog 46153 2013-08-01 16:08:39Z joostvb $ -# $URL: svn+ssh://svn.debian.org/svn/debian-science/packages/timbl/trunk/debian/changelog $ +# git://anonscm.debian.org/debian-science/packages/timbl.git diff -Nru timbl-6.4.4/debian/control timbl-6.4.6/debian/control --- timbl-6.4.4/debian/control 2014-05-11 03:04:08.000000000 +0000 +++ timbl-6.4.6/debian/control 2014-10-31 03:52:37.000000000 +0000 @@ -1,14 +1,13 @@ Source: timbl Section: science Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Science Team +Maintainer: Debian Science Team Uploaders: Joost van Baal-Ilić , Ko van der Sloot -Build-Depends: debhelper (>= 7), cdbs, pkg-config, libxml2-dev, libticcutils2-dev (>=0.3), dh-autoreconf -Standards-Version: 3.9.4 +Build-Depends: debhelper (>= 7), cdbs, pkg-config, libxml2-dev, libticcutils2-dev (>=0.7) +Standards-Version: 3.9.5 Homepage: http://ilk.uvt.nl/timbl/ -Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/timbl/trunk -Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/timbl/trunk/ +Vcs-Git: git://anonscm.debian.org/debian-science/packages/timbl.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/timbl.git Package: timbl Architecture: any diff -Nru timbl-6.4.4/debian/copyright timbl-6.4.6/debian/copyright --- timbl-6.4.4/debian/copyright 2012-01-04 19:00:02.000000000 +0000 +++ timbl-6.4.6/debian/copyright 2014-10-31 04:05:23.000000000 +0000 @@ -119,7 +119,6 @@ On Debian GNU/Linux systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL'. +Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'. -# $Id: copyright 38262 2011-03-28 11:59:20Z joostvb $ -# $URL: svn+ssh://svn.debian.org/svn/debian-science/packages/timbl/trunk/debian/copyright $ +# git://anonscm.debian.org/debian-science/packages/timbl.git diff -Nru timbl-6.4.4/debian/libtimbl3-dev.install timbl-6.4.6/debian/libtimbl3-dev.install --- timbl-6.4.4/debian/libtimbl3-dev.install 2012-01-04 19:00:02.000000000 +0000 +++ timbl-6.4.6/debian/libtimbl3-dev.install 2014-09-26 19:07:07.000000000 +0000 @@ -1,5 +1,4 @@ -# $Id: libtimbl3-dev.install 38261 2011-03-28 11:55:51Z joostvb $ -# $URL: svn+ssh://svn.debian.org/svn/debian-science/packages/timbl/trunk/debian/libtimbl3-dev.install $ +# git://anonscm.debian.org/debian-science/packages/timbl.git usr/lib/*.a usr/lib/libtimbl.so usr/lib/pkgconfig diff -Nru timbl-6.4.4/debian/libtimbl3.install timbl-6.4.6/debian/libtimbl3.install --- timbl-6.4.4/debian/libtimbl3.install 2012-01-04 19:00:02.000000000 +0000 +++ timbl-6.4.6/debian/libtimbl3.install 2014-09-26 19:07:07.000000000 +0000 @@ -1,3 +1,2 @@ -# $Id: libtimbl3.install 38261 2011-03-28 11:55:51Z joostvb $ -# $URL: svn+ssh://svn.debian.org/svn/debian-science/packages/timbl/trunk/debian/libtimbl3.install $ +# git://anonscm.debian.org/debian-science/packages/timbl.git /usr/lib/libtimbl.so.3* diff -Nru timbl-6.4.4/debian/libtimbl4-dev.install timbl-6.4.6/debian/libtimbl4-dev.install --- timbl-6.4.4/debian/libtimbl4-dev.install 2013-08-01 13:21:45.000000000 +0000 +++ timbl-6.4.6/debian/libtimbl4-dev.install 2014-09-26 19:07:07.000000000 +0000 @@ -1,5 +1,4 @@ -# $Id: libtimbl3-dev.install 38261 2011-03-28 11:55:51Z joostvb $ -# $URL: svn+ssh://sloot-guest@svn.debian.org/svn/debian-science/packages/timbl/trunk/debian/libtimbl3-dev.install $ +# git://anonscm.debian.org/debian-science/packages/timbl.git usr/lib/*.a usr/lib/libtimbl.so usr/lib/pkgconfig diff -Nru timbl-6.4.4/debian/libtimbl4.install timbl-6.4.6/debian/libtimbl4.install --- timbl-6.4.4/debian/libtimbl4.install 2013-08-01 13:17:57.000000000 +0000 +++ timbl-6.4.6/debian/libtimbl4.install 2014-09-26 19:07:07.000000000 +0000 @@ -1,3 +1,2 @@ -# $Id: libtimbl3.install 38261 2011-03-28 11:55:51Z joostvb $ -# $URL: svn+ssh://sloot-guest@svn.debian.org/svn/debian-science/packages/timbl/trunk/debian/libtimbl3.install $ +# git://anonscm.debian.org/debian-science/packages/timbl.git /usr/lib/libtimbl.so.4* diff -Nru timbl-6.4.4/debian/NEWS timbl-6.4.6/debian/NEWS --- timbl-6.4.4/debian/NEWS 2012-01-04 19:00:02.000000000 +0000 +++ timbl-6.4.6/debian/NEWS 2014-09-26 19:07:07.000000000 +0000 @@ -23,5 +23,4 @@ -- Ko van der Sloot Mon, 15 Feb 2010 15:10:47 +0100 -# $Id: NEWS 44264 2011-12-29 07:22:46Z joostvb $ -# $URL: svn+ssh://svn.debian.org/svn/debian-science/packages/timbl/trunk/debian/NEWS $ +# git://anonscm.debian.org/debian-science/packages/timbl.git diff -Nru timbl-6.4.4/debian/rules timbl-6.4.6/debian/rules --- timbl-6.4.4/debian/rules 2014-05-11 03:03:44.000000000 +0000 +++ timbl-6.4.6/debian/rules 2014-09-26 19:07:07.000000000 +0000 @@ -1,11 +1,9 @@ #!/usr/bin/make -f -# $Id: rules 37087 2010-12-13 09:08:16Z joostvb $ -# $URL: svn+ssh://svn.debian.org/svn/debian-science/packages/timbl/trunk/debian/rules $ +# git://anonscm.debian.org/debian-science/packages/timbl.git include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk -include /usr/share/cdbs/1/rules/autoreconf.mk ## example override: ## DEB_CONFIGURE_EXTRA_FLAGS := --libexecdir=/usr/share diff -Nru timbl-6.4.4/debian/timbl.install timbl-6.4.6/debian/timbl.install --- timbl-6.4.4/debian/timbl.install 2012-01-04 19:00:02.000000000 +0000 +++ timbl-6.4.6/debian/timbl.install 2014-09-26 19:07:07.000000000 +0000 @@ -1,5 +1,4 @@ -# $Id: timbl.install 37084 2010-12-13 08:15:13Z joostvb $ -# $URL: svn+ssh://svn.debian.org/svn/debian-science/packages/timbl/trunk/debian/timbl.install $ +# git://anonscm.debian.org/debian-science/packages/timbl.git usr/bin usr/share/doc/timbl/examples usr/share/man/man1 diff -Nru timbl-6.4.4/debian/watch timbl-6.4.6/debian/watch --- timbl-6.4.4/debian/watch 2013-08-01 13:17:57.000000000 +0000 +++ timbl-6.4.6/debian/watch 2014-09-26 19:07:07.000000000 +0000 @@ -1,5 +1,4 @@ -# $Id: watch 46053 2013-06-15 23:40:38Z joostvb $ -# $URL: svn+ssh://svn.debian.org/svn/debian-science/packages/timbl/trunk/debian/watch $ +# git://anonscm.debian.org/debian-science/packages/timbl.git # See uscan(1) for format diff -Nru timbl-6.4.4/demos/api_test1.cxx timbl-6.4.6/demos/api_test1.cxx --- timbl-6.4.4/demos/api_test1.cxx 2013-01-07 14:26:40.000000000 +0000 +++ timbl-6.4.6/demos/api_test1.cxx 2014-01-06 10:10:24.000000000 +0000 @@ -1,8 +1,8 @@ /* - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp - + This file is part of timbl timbl is free software; you can redistribute it and/or modify @@ -29,8 +29,8 @@ Timbl::TimblAPI My_Experiment( "-a IGTREE +vDI+DB+F", "test1" ); My_Experiment.SetOptions( "-w3 -vDB" ); My_Experiment.ShowSettings( std::cout ); - My_Experiment.Learn( "dimin.train" ); - My_Experiment.Test( "dimin.test", "my_first_test.out" ); + My_Experiment.Learn( "dimin.train" ); + My_Experiment.Test( "dimin.test", "my_first_test.out" ); My_Experiment.SetOptions( "-mM" ); - My_Experiment.Test( "dimin.test", "my_first_test.out" ); + My_Experiment.Test( "dimin.test", "my_first_test.out" ); } diff -Nru timbl-6.4.4/demos/api_test2.cxx timbl-6.4.6/demos/api_test2.cxx --- timbl-6.4.4/demos/api_test2.cxx 2013-01-07 14:26:40.000000000 +0000 +++ timbl-6.4.6/demos/api_test2.cxx 2014-01-06 10:10:33.000000000 +0000 @@ -1,8 +1,8 @@ /* - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp - + This file is part of timbl timbl is free software; you can redistribute it and/or modify @@ -29,11 +29,11 @@ #include "timbl/TimblAPI.h" int main(){ - Timbl::TimblAPI *My_Experiment = new Timbl::TimblAPI( "-a IB2 +vF+DI+DB" , + Timbl::TimblAPI *My_Experiment = new Timbl::TimblAPI( "-a IB2 +vF+DI+DB" , "test2" ); My_Experiment->SetOptions( "-b100" ); My_Experiment->ShowSettings( std::cout ); - My_Experiment->Learn( "dimin.train" ); + My_Experiment->Learn( "dimin.train" ); My_Experiment->Test( "dimin.test", "my_second_test.out" ); delete My_Experiment; exit(1); diff -Nru timbl-6.4.4/demos/api_test3.cxx timbl-6.4.6/demos/api_test3.cxx --- timbl-6.4.4/demos/api_test3.cxx 2013-01-07 14:26:40.000000000 +0000 +++ timbl-6.4.6/demos/api_test3.cxx 2014-01-06 10:10:40.000000000 +0000 @@ -1,8 +1,8 @@ /* - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp - + This file is part of timbl timbl is free software; you can redistribute it and/or modify @@ -31,7 +31,7 @@ int main(){ TimblAPI *My_Experiment = new TimblAPI( "-t cross_validate" ); - My_Experiment->Test( "cross_val.test" ); + My_Experiment->Test( "cross_val.test" ); delete My_Experiment; exit(0); } diff -Nru timbl-6.4.4/demos/api_test4.cxx timbl-6.4.6/demos/api_test4.cxx --- timbl-6.4.4/demos/api_test4.cxx 2013-01-07 14:26:40.000000000 +0000 +++ timbl-6.4.6/demos/api_test4.cxx 2014-01-06 10:10:49.000000000 +0000 @@ -1,8 +1,8 @@ /* - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp - + This file is part of timbl timbl is free software; you can redistribute it and/or modify @@ -31,29 +31,29 @@ using namespace Timbl; int main(){ - TimblAPI *My_Experiment = new TimblAPI( "-a IB1 +vDI+DB +mM" , + TimblAPI *My_Experiment = new TimblAPI( "-a IB1 +vDI+DB +mM" , "test4" ); My_Experiment->ShowSettings( std::cout ); - My_Experiment->Learn( "dimin.train" ); + My_Experiment->Learn( "dimin.train" ); My_Experiment->Test( "dimin.test", "inc1.out" ); - My_Experiment->SaveWeights( "wg.1.wgt" ); - My_Experiment->WriteArrays( "arr.1.arr" ); - My_Experiment->Increment( "=,=,=,=,+,k,e,=,-,r,@,l,T" ); + My_Experiment->SaveWeights( "wg.1.wgt" ); + My_Experiment->WriteArrays( "arr.1.arr" ); + My_Experiment->Increment( "=,=,=,=,+,k,e,=,-,r,@,l,T" ); My_Experiment->Test( "dimin.test", "inc2.out" ); - My_Experiment->SaveWeights( "wg.2.wgt" ); - My_Experiment->WriteArrays( "arr.2.arr" ); - My_Experiment->Increment( "+,zw,A,rt,-,k,O,p,-,n,O,n,E" ); + My_Experiment->SaveWeights( "wg.2.wgt" ); + My_Experiment->WriteArrays( "arr.2.arr" ); + My_Experiment->Increment( "+,zw,A,rt,-,k,O,p,-,n,O,n,E" ); My_Experiment->Test( "dimin.test", "inc3.out" ); - My_Experiment->SaveWeights( "wg.3.wgt" ); - My_Experiment->WriteArrays( "arr.3.arr" ); - My_Experiment->Decrement( "+,zw,A,rt,-,k,O,p,-,n,O,n,E" ); + My_Experiment->SaveWeights( "wg.3.wgt" ); + My_Experiment->WriteArrays( "arr.3.arr" ); + My_Experiment->Decrement( "+,zw,A,rt,-,k,O,p,-,n,O,n,E" ); My_Experiment->Test( "dimin.test", "inc4.out" ); - My_Experiment->SaveWeights( "wg.4.wgt" ); - My_Experiment->WriteArrays( "arr.4.arr" ); - My_Experiment->Decrement( "=,=,=,=,+,k,e,=,-,r,@,l,T" ); + My_Experiment->SaveWeights( "wg.4.wgt" ); + My_Experiment->WriteArrays( "arr.4.arr" ); + My_Experiment->Decrement( "=,=,=,=,+,k,e,=,-,r,@,l,T" ); My_Experiment->Test( "dimin.test", "inc5.out" ); - My_Experiment->SaveWeights( "wg.5.wgt" ); - My_Experiment->WriteArrays( "arr.5.arr" ); + My_Experiment->SaveWeights( "wg.5.wgt" ); + My_Experiment->WriteArrays( "arr.5.arr" ); delete My_Experiment; exit(1); } diff -Nru timbl-6.4.4/demos/api_test5.cxx timbl-6.4.6/demos/api_test5.cxx --- timbl-6.4.4/demos/api_test5.cxx 2013-01-07 14:26:40.000000000 +0000 +++ timbl-6.4.6/demos/api_test5.cxx 2014-01-06 10:11:00.000000000 +0000 @@ -1,8 +1,8 @@ /* - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp - + This file is part of timbl timbl is free software; you can redistribute it and/or modify @@ -33,9 +33,9 @@ using namespace Timbl; int main(){ - TimblAPI *My_Experiment = new TimblAPI( "-a IB1 +vDI+DB+n +mM +k4 " , + TimblAPI *My_Experiment = new TimblAPI( "-a IB1 +vDI+DB+n +mM +k4 " , "test5" ); - My_Experiment->Learn( "dimin.train" ); + My_Experiment->Learn( "dimin.train" ); { string line = "=,=,=,=,+,k,e,=,-,r,@,l,T"; const neighborSet *neighbours1 = My_Experiment->classifyNS( line ); diff -Nru timbl-6.4.4/demos/api_test6.cxx timbl-6.4.6/demos/api_test6.cxx --- timbl-6.4.4/demos/api_test6.cxx 2013-01-07 14:26:40.000000000 +0000 +++ timbl-6.4.6/demos/api_test6.cxx 2014-01-06 10:11:07.000000000 +0000 @@ -1,8 +1,8 @@ /* - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp - + This file is part of timbl timbl is free software; you can redistribute it and/or modify @@ -33,7 +33,7 @@ int main(){ TimblAPI My_Experiment( "-a IB1 +vDI+DB -k3", "test6" ); - My_Experiment.Learn( "dimin.train" ); + My_Experiment.Learn( "dimin.train" ); const ValueDistribution *vd; const TargetValue *tv = My_Experiment.Classify( "-,=,O,m,+,h,K,=,-,n,I,N,K", vd ); @@ -54,6 +54,6 @@ delete vd2; vd2 = nb->bestDistribution( dc ); delete dc; - cout << "with exponenial decay, alpha = 0.3 " << vd2 << endl; + cout << "with exponenial decay, alpha = 0.3 " << vd2 << endl; delete vd2; } diff -Nru timbl-6.4.4/demos/classify.cxx timbl-6.4.6/demos/classify.cxx --- timbl-6.4.4/demos/classify.cxx 2013-01-07 14:26:40.000000000 +0000 +++ timbl-6.4.6/demos/classify.cxx 2014-01-06 10:11:30.000000000 +0000 @@ -1,8 +1,8 @@ /* - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp - + This file is part of timbl timbl is free software; you can redistribute it and/or modify @@ -23,12 +23,12 @@ or send mail to: timbl@uvt.nl */ - + #include #include #include - + #include "timbl/TimblAPI.h" using namespace std; @@ -40,7 +40,7 @@ int main(){ string Bresult; double Distance; - + TimblAPI *Exp = new TimblAPI( "-a TRIBL" ); Exp->SetOptions( "+vS +x -N30 -q2" ); Exp->ShowOptions( cout ); @@ -68,7 +68,7 @@ while ( getline( testfile, Buffer ) ){ if ( Exp->Classify( Buffer, Bresult, Distance ) ){ cout << Buffer << "\t --> " << Bresult << " " << Distance << endl; - } + } else cout << Buffer << "\t --> (nill)" << endl; } @@ -83,10 +83,10 @@ cout << "\nStart testing, using IGTree, first run" << endl; testfile.clear(); testfile.open( test_f, ios::in ); - while ( getline( testfile, Buffer ) ){ - if ( Exp->Classify( Buffer, Bresult, Distance ) ){ + while ( getline( testfile, Buffer ) ){ + if ( Exp->Classify( Buffer, Bresult, Distance ) ){ cout << Buffer << "\t --> " << Bresult << " " << Distance << endl; - } + } else cout << Buffer << "\t --> (nill)" << endl; } @@ -101,9 +101,9 @@ testfile.clear(); testfile.open( test_f, ios::in ); while ( getline( testfile, Buffer ) ){ - if ( Exp->Classify( Buffer, Bresult, Distance ) ){ + if ( Exp->Classify( Buffer, Bresult, Distance ) ){ cout << Buffer << "\t --> " << Bresult << " " << Distance << endl; - } + } else cout << Buffer << "\t --> (nill)" << endl; } diff -Nru timbl-6.4.4/demos/Makefile.in timbl-6.4.6/demos/Makefile.in --- timbl-6.4.4/demos/Makefile.in 2013-04-02 16:24:31.000000000 +0000 +++ timbl-6.4.6/demos/Makefile.in 2014-09-23 08:29:54.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # 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. @@ -20,6 +19,51 @@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -42,7 +86,8 @@ api_test3$(EXEEXT) api_test4$(EXEEXT) api_test5$(EXEEXT) \ api_test6$(EXEEXT) tse$(EXEEXT) classify$(EXEEXT) subdir = demos -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ @@ -60,6 +105,10 @@ api_test1_OBJECTS = $(am_api_test1_OBJECTS) api_test1_LDADD = $(LDADD) api_test1_DEPENDENCIES = ../src/libtimbl.la +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = am_api_test2_OBJECTS = api_test2.$(OBJEXT) api_test2_OBJECTS = $(am_api_test2_OBJECTS) api_test2_LDADD = $(LDADD) @@ -88,25 +137,51 @@ tse_OBJECTS = $(am_tse_OBJECTS) tse_LDADD = $(LDADD) tse_DEPENDENCIES = ../src/libtimbl.la +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(api_test1_SOURCES) $(api_test2_SOURCES) \ $(api_test3_SOURCES) $(api_test4_SOURCES) $(api_test5_SOURCES) \ $(api_test6_SOURCES) $(classify_SOURCES) $(tse_SOURCES) DIST_SOURCES = $(api_test1_SOURCES) $(api_test2_SOURCES) \ $(api_test3_SOURCES) $(api_test4_SOURCES) $(api_test5_SOURCES) \ $(api_test6_SOURCES) $(classify_SOURCES) $(tse_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -136,11 +211,29 @@ } am__installdirs = "$(DESTDIR)$(exdir)" DATA = $(ex_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -178,7 +271,6 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ -LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -324,30 +416,38 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + api_test1$(EXEEXT): $(api_test1_OBJECTS) $(api_test1_DEPENDENCIES) $(EXTRA_api_test1_DEPENDENCIES) @rm -f api_test1$(EXEEXT) - $(CXXLINK) $(api_test1_OBJECTS) $(api_test1_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(api_test1_OBJECTS) $(api_test1_LDADD) $(LIBS) + api_test2$(EXEEXT): $(api_test2_OBJECTS) $(api_test2_DEPENDENCIES) $(EXTRA_api_test2_DEPENDENCIES) @rm -f api_test2$(EXEEXT) - $(CXXLINK) $(api_test2_OBJECTS) $(api_test2_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(api_test2_OBJECTS) $(api_test2_LDADD) $(LIBS) + api_test3$(EXEEXT): $(api_test3_OBJECTS) $(api_test3_DEPENDENCIES) $(EXTRA_api_test3_DEPENDENCIES) @rm -f api_test3$(EXEEXT) - $(CXXLINK) $(api_test3_OBJECTS) $(api_test3_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(api_test3_OBJECTS) $(api_test3_LDADD) $(LIBS) + api_test4$(EXEEXT): $(api_test4_OBJECTS) $(api_test4_DEPENDENCIES) $(EXTRA_api_test4_DEPENDENCIES) @rm -f api_test4$(EXEEXT) - $(CXXLINK) $(api_test4_OBJECTS) $(api_test4_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(api_test4_OBJECTS) $(api_test4_LDADD) $(LIBS) + api_test5$(EXEEXT): $(api_test5_OBJECTS) $(api_test5_DEPENDENCIES) $(EXTRA_api_test5_DEPENDENCIES) @rm -f api_test5$(EXEEXT) - $(CXXLINK) $(api_test5_OBJECTS) $(api_test5_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(api_test5_OBJECTS) $(api_test5_LDADD) $(LIBS) + api_test6$(EXEEXT): $(api_test6_OBJECTS) $(api_test6_DEPENDENCIES) $(EXTRA_api_test6_DEPENDENCIES) @rm -f api_test6$(EXEEXT) - $(CXXLINK) $(api_test6_OBJECTS) $(api_test6_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(api_test6_OBJECTS) $(api_test6_LDADD) $(LIBS) + classify$(EXEEXT): $(classify_OBJECTS) $(classify_DEPENDENCIES) $(EXTRA_classify_DEPENDENCIES) @rm -f classify$(EXEEXT) - $(CXXLINK) $(classify_OBJECTS) $(classify_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(classify_OBJECTS) $(classify_LDADD) $(LIBS) + tse$(EXEEXT): $(tse_OBJECTS) $(tse_DEPENDENCIES) $(EXTRA_tse_DEPENDENCIES) @rm -f tse$(EXEEXT) - $(CXXLINK) $(tse_OBJECTS) $(tse_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(tse_OBJECTS) $(tse_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -365,25 +465,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tse.Po@am__quote@ .cxx.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cxx.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cxx.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -392,8 +492,11 @@ -rm -rf .libs _libs install-exDATA: $(ex_DATA) @$(NORMAL_INSTALL) - test -z "$(exdir)" || $(MKDIR_P) "$(DESTDIR)$(exdir)" @list='$(ex_DATA)'; test -n "$(exdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(exdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(exdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -409,26 +512,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(exdir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -440,15 +532,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -457,6 +545,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -601,19 +704,19 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exDATA install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-exDATA +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exDATA \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-exDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru timbl-6.4.4/demos/tse.cxx timbl-6.4.6/demos/tse.cxx --- timbl-6.4.4/demos/tse.cxx 2013-01-07 14:26:40.000000000 +0000 +++ timbl-6.4.6/demos/tse.cxx 2014-01-06 10:11:39.000000000 +0000 @@ -1,8 +1,8 @@ /* - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp - + This file is part of timbl timbl is free software; you can redistribute it and/or modify @@ -64,16 +64,16 @@ // // here are the various scripting actions: // -enum ActionType { UnknownAct, New, Free, +enum ActionType { UnknownAct, New, Free, Set, Show, Classify, Train, Test, Increment, Decrement, Expand, Remove, - SaveTree, GetTree, + SaveTree, GetTree, SaveW, GetW, Quit }; /* The following scripting commands are implemented: - QUIT + QUIT stop all further actions. NEW name create an experiment with name 'name' of type 'algo' @@ -88,19 +88,19 @@ .SHOW SETTINGS show all options with current settings of 'name' .TRAIN file - build an instancebase from file. + build an instancebase from file. .TEST file1 [file2] classify all lines from file1, write results to file2 or to file1.out if parameter file2 is not present - .EXPAND file1 + .EXPAND file1 increment the database with contents of file1 - .REMOVE file1 + .REMOVE file1 decrement the database with contents of file1 - .CLASSIFY line + .CLASSIFY line classify this line - .ADD line + .ADD line increment the database with line - .REM line + .REM line decrement the database with line .SAVE file save the instancebase of experiment name to file. @@ -134,7 +134,7 @@ for ( size_t u_i = 0; u_i < len; u_i++) { if ( line[u_i] == ',' || line[u_i] == ' ' ){ if ( params[i] != "" ) // Don't accept zero length strings ! - ++i; + ++i; if ( i >= MAX_PARAMS ) break; } @@ -270,7 +270,7 @@ int pos = -1, len; if ( params == 0 ){ params = new string[MAX_PARAMS+1]; - } + } string Buffer; getline( in_file, Buffer ); line_count++; @@ -297,7 +297,7 @@ cerr << " Wrong number of parameters for New" << endl; exit(1); } - string cmnd; + string cmnd; if ( len == 1 ){ cerr << "1 parameters " << params[0] << endl; cmnd = "-a IB1"; @@ -307,7 +307,7 @@ cmnd += params[i] + " "; } experiments[exp_cnt++] = new TimblAPI( cmnd, params[0] ); - cerr << "Created a new experiment: " + cerr << "Created a new experiment: " << experiments[exp_cnt-1]->ExpName() << endl; break; } @@ -393,7 +393,7 @@ experiments[pos]->Test( params[0], params[1] ); break; } - case Classify: + case Classify: if ( len == 1 ){ const TargetValue *tv = experiments[pos]->Classify(params[0]); cout << "classify: " << params[0] << " ==> " << tv << endl; @@ -401,13 +401,13 @@ else cerr << "missing instancestring for Add" << endl; break; - case Increment: + case Increment: if ( len == 1 ) experiments[pos]->Increment(params[0]); else cerr << "missing instancestring for Add" << endl; break; - case Decrement: + case Decrement: if ( len == 1 ) experiments[pos]->Decrement(params[0]); else @@ -423,8 +423,8 @@ break; case UnknownAct: if ( pos < 0 ) - cerr << "[" << line_count << "]" << Buffer - << " ==> Unknown experiment, skipped\n" << endl; + cerr << "[" << line_count << "]" << Buffer + << " ==> Unknown experiment, skipped\n" << endl; else cerr << "[" << line_count << "] " << Buffer << " ==> Unknown action, skipped\n" << endl; @@ -444,7 +444,7 @@ } cout << "reading script from: " << argv[1] << endl; script_file = &test_file; - } + } else script_file = &cin; int line = 0; diff -Nru timbl-6.4.4/depcomp timbl-6.4.6/depcomp --- timbl-6.4.4/depcomp 2012-04-02 17:37:09.000000000 +0000 +++ timbl-6.4.6/depcomp 2014-01-02 19:14:59.000000000 +0000 @@ -1,10 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2011-12-04.11; # UTC +scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, -# 2011 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,9 +27,9 @@ case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 - exit 1; - ;; + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; -h | --h*) cat <<\EOF Usage: depcomp [--help] [--version] PROGRAM [ARGS] @@ -40,8 +39,8 @@ Environment variables: depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. + source Source file read by 'PROGRAMS ARGS'. + object Object file output by 'PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. tmpdepfile Temporary file to use when outputting dependencies. @@ -57,6 +56,66 @@ ;; esac +# Get the directory component of the given path, and save it in the +# global variables '$dir'. Note that this directory component will +# be either empty or ending with a '/' character. This is deliberate. +set_dir_from () +{ + case $1 in + */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; + *) dir=;; + esac +} + +# Get the suffix-stripped basename of the given path, and save it the +# global variable '$base'. +set_base_from () +{ + base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` +} + +# If no dependency file was actually created by the compiler invocation, +# we still have to create a dummy depfile, to avoid errors with the +# Makefile "include basename.Plo" scheme. +make_dummy_depfile () +{ + echo "#dummy" > "$depfile" +} + +# Factor out some common post-processing of the generated depfile. +# Requires the auxiliary global variable '$tmpdepfile' to be set. +aix_post_process_depfile () +{ + # If the compiler actually managed to produce a dependency file, + # post-process it. + if test -f "$tmpdepfile"; then + # Each line is of the form 'foo.o: dependency.h'. + # Do two passes, one to just change these to + # $object: dependency.h + # and one to simply output + # dependency.h: + # which is needed to avoid the deleted-header problem. + { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" + sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" + } > "$depfile" + rm -f "$tmpdepfile" + else + make_dummy_depfile + fi +} + +# A tabulation character. +tab=' ' +# A newline character. +nl=' +' +# Character ranges might be problematic outside the C locale. +# These definitions help. +upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ +lower=abcdefghijklmnopqrstuvwxyz +digits=0123456789 +alpha=${upper}${lower} + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 @@ -69,6 +128,9 @@ rm -f "$tmpdepfile" +# Avoid interferences from the environment. +gccflag= dashmflag= + # Some modes work just like other modes, but use different flags. We # parameterize here, but still list the modes in the big case below, # to make depend.m4 easier to write. Note that we *cannot* use a case @@ -80,26 +142,32 @@ fi if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout fi cygpath_u="cygpath -u -f -" if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvisualcpp + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvisualcpp fi if test "$depmode" = msvc7msys; then - # This is just like msvc7 but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvc7 + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 +fi + +if test "$depmode" = xlc; then + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. + gccflag=-qmakedep=gcc,-MF + depmode=gcc fi case "$depmode" in @@ -122,8 +190,7 @@ done "$@" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -131,13 +198,17 @@ ;; gcc) +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. +## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. +## (see the conditional assignment to $gccflag above). ## There are various ways to get dependency output from gcc. Here's ## why we pick this rather obscure method: ## - Don't want to use -MD because we'd like the dependencies to end ## up in a subdir. Having to rename by hand is ugly. ## (We might end up doing this anyway to support other compilers.) ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). +## -MM, not -M (despite what the docs say). Also, it might not be +## supported by the other compilers which use the 'gcc' depmode. ## - Using -M directly means running the compiler twice (even worse ## than renaming). if test -z "$gccflag"; then @@ -145,33 +216,31 @@ fi "$@" -Wp,"$gccflag$tmpdepfile" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. + # The second -e expression handles DOS-style file names with drive + # letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. +## This next piece of magic avoids the "deleted header file" problem. ## The problem is that when a header file which appears in a .P file ## is deleted, the dependency causes make to die (because there is ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory +## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as ## well. hp depmode also adds that space, but also prefixes the VPATH ## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -189,8 +258,7 @@ "$@" -MDupdate "$tmpdepfile" fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -198,43 +266,41 @@ if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files echo "$object : \\" > "$depfile" - # Clip off the initial element (the dependent). Don't try to be # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the + # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ + | tr "$nl" ' ' >> "$depfile" echo >> "$depfile" - # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> "$depfile" else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" ;; +xlc) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + aix) # The C for AIX Compiler uses -M and outputs the dependencies # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the + # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.u tmpdepfile2=$base.u @@ -247,9 +313,7 @@ "$@" -M fi stat=$? - - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi @@ -258,44 +322,100 @@ do test -f "$tmpdepfile" && break done - if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + aix_post_process_depfile + ;; + +tcc) + # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 + # FIXME: That version still under development at the moment of writing. + # Make that this statement remains true also for stable, released + # versions. + # It will wrap lines (doesn't matter whether long or short) with a + # trailing '\', as in: + # + # foo.o : \ + # foo.c \ + # foo.h \ + # + # It will put a trailing '\' even on the last line, and will use leading + # spaces rather than leading tabs (at least since its commit 0394caf7 + # "Emit spaces for -MD"). + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat fi + rm -f "$depfile" + # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. + # We have to change lines of the first kind to '$object: \'. + sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" + # And for each line of the second kind, we have to emit a 'dep.h:' + # dummy dependency, to avoid the deleted-header problem. + sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; -icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want: - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output +## The order of this option in the case statement is important, since the +## shell code in configure will try each of these formats in the order +## listed in this file. A plain '-MD' option would be understood by many +## compilers, so we must ensure this comes after the gcc and icc options. +pgcc) + # Portland's C compiler understands '-MD'. + # Will always output deps to 'file.d' where file is the root name of the + # source file under compilation, even if file resides in a subdirectory. + # The object file name does not affect the name of the '.d' file. + # pgcc 10.2 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : + # and will wrap long lines using '\' : # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... + set_dir_from "$object" + # Use the source, not the object, to determine the base name, since + # that's sadly what pgcc will do too. + set_base_from "$source" + tmpdepfile=$base.d + + # For projects that build the same source file twice into different object + # files, the pgcc approach of using the *source* file root name can cause + # problems in parallel builds. Use a locking strategy to avoid stomping on + # the same $tmpdepfile. + lockdir=$base.d-lock + trap " + echo '$0: caught signal, cleaning up...' >&2 + rmdir '$lockdir' + exit 1 + " 1 2 13 15 + numtries=100 + i=$numtries + while test $i -gt 0; do + # mkdir is a portable test-and-set. + if mkdir "$lockdir" 2>/dev/null; then + # This process acquired the lock. + "$@" -MD + stat=$? + # Release the lock. + rmdir "$lockdir" + break + else + # If the lock is being held by a different process, wait + # until the winning process is done or we timeout. + while test -d "$lockdir" && test $i -gt 0; do + sleep 1 + i=`expr $i - 1` + done + fi + i=`expr $i - 1` + done + trap - 1 2 13 15 + if test $i -le 0; then + echo "$0: failed to acquire lock after $numtries attempts" >&2 + echo "$0: check lockdir '$lockdir'" >&2 + exit 1 + fi - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -307,8 +427,8 @@ sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" # Some versions of the HPUX 10.20 sed can't process this invocation # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -319,9 +439,8 @@ # 'foo.d', which lands next to the object file, wherever that # happens to be. # Much of this is similar to the tru64 case; see comments there. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.d tmpdepfile2=$dir.libs/$base.d @@ -332,8 +451,7 @@ "$@" +Maked fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" exit $stat fi @@ -343,77 +461,61 @@ test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. + sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" + # Add 'dependent.h:' lines. sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" else - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" "$tmpdepfile2" ;; tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mechanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in 'foo.d' instead, so we check for that too. + # Subdirectories are respected. + set_dir_from "$object" + set_base_from "$object" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; + if test "$libtool" = yes; then + # Libtool generates 2 separate objects for the 2 libraries. These + # two compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir$base.o.d # libtool 1.5 + tmpdepfile2=$dir.libs/$base.o.d # Likewise. + tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi + + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done + # Same post-processing that is required for AIX mode. + aix_post_process_depfile + ;; msvc7) if test "$libtool" = yes; then @@ -424,8 +526,7 @@ "$@" $showIncludes > "$tmpdepfile" stat=$? grep -v '^Note: including file: ' "$tmpdepfile" - if test "$stat" = 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -443,14 +544,15 @@ p }' | $cygpath_u | sort -u | sed -n ' s/ /\\ /g -s/\(.*\)/ \1 \\/p +s/\(.*\)/'"$tab"'\1 \\/p s/.\(.*\) \\/\1:/ H $ { - s/.*/ / + s/.*/'"$tab"'/ G p }' >> "$depfile" + echo >> "$depfile" # make sure the fragment doesn't end with a backslash rm -f "$tmpdepfile" ;; @@ -478,7 +580,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -498,18 +600,18 @@ done test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' + # Require at least two characters before searching for ':' # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process this sed invocation + # correctly. Breaking it into two sed invocations is a workaround. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -562,11 +664,12 @@ # makedepend may prepend the VPATH from the source file name to the object. # No need to regex-escape $object, excess matching of '.' is harmless. sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process the last invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed '1,2d' "$tmpdepfile" \ + | tr ' ' "$nl" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" "$tmpdepfile".bak ;; @@ -583,7 +686,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -602,10 +705,10 @@ esac done - "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" + "$@" -E \ + | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" cat < "$tmpdepfile" >> "$depfile" @@ -637,23 +740,23 @@ shift ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; + set fnord "$@" + shift + shift + ;; *) - set fnord "$@" "$arg" - shift - shift - ;; + set fnord "$@" "$arg" + shift + shift + ;; esac done "$@" -E 2>/dev/null | sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" + echo "$tab" >> "$depfile" sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; diff -Nru timbl-6.4.4/docs/Makefile.in timbl-6.4.6/docs/Makefile.in --- timbl-6.4.4/docs/Makefile.in 2013-04-02 16:24:31.000000000 +0000 +++ timbl-6.4.6/docs/Makefile.in 2014-09-23 08:29:54.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # 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. @@ -18,6 +17,51 @@ # $Id: Makefile.am 8993 2011-03-21 11:19:11Z sloot $ # $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/docs/Makefile.am $ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -37,7 +81,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = docs -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ @@ -50,8 +94,25 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -83,9 +144,11 @@ am__installdirs = "$(DESTDIR)$(man1dir)" NROFF = nroff MANS = $(man1_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -123,7 +186,6 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ -LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -254,9 +316,18 @@ -rm -rf .libs _libs install-man1: $(man1_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ + @list1='$(man1_MANS)'; \ + list2=''; \ + test -n "$(man1dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.1[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -284,27 +355,14 @@ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -442,16 +500,17 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-man1 \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-man uninstall-man1 + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-man1 install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-man \ + uninstall-man1 # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru timbl-6.4.4/include/Makefile.in timbl-6.4.6/include/Makefile.in --- timbl-6.4.4/include/Makefile.in 2013-04-02 16:24:31.000000000 +0000 +++ timbl-6.4.6/include/Makefile.in 2014-09-23 08:29:54.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # 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. @@ -18,6 +17,51 @@ # $Id: Makefile.am 8191 2011-02-02 14:50:37Z sloot $ # $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/include/Makefile.am $ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -37,7 +81,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = include -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ @@ -50,20 +94,58 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -95,6 +177,7 @@ reldir="$$dir2" ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -132,7 +215,6 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ -LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -263,22 +345,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -293,57 +378,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -359,12 +399,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -376,15 +411,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -393,6 +424,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -429,13 +475,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -556,22 +599,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru timbl-6.4.4/include/timbl/BestArray.h timbl-6.4.6/include/timbl/BestArray.h --- timbl-6.4.4/include/timbl/BestArray.h 2013-04-02 13:24:58.000000000 +0000 +++ timbl-6.4.6/include/timbl/BestArray.h 2014-01-06 10:12:32.000000000 +0000 @@ -1,8 +1,8 @@ /* - $Id: BestArray.h 15865 2013-04-02 13:24:34Z sloot $ + $Id: BestArray.h 16820 2014-01-06 10:12:30Z sloot $ $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/include/timbl/BestArray.h $ - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp diff -Nru timbl-6.4.4/include/timbl/Choppers.h timbl-6.4.6/include/timbl/Choppers.h --- timbl-6.4.4/include/timbl/Choppers.h 2013-01-07 14:27:12.000000000 +0000 +++ timbl-6.4.6/include/timbl/Choppers.h 2014-01-06 10:12:32.000000000 +0000 @@ -1,10 +1,10 @@ #ifndef TIMBL_CHOPPERS_H #define TIMBL_CHOPPERS_H /* - $Id: Choppers.h 15565 2013-01-07 14:27:05Z sloot $ + $Id: Choppers.h 16820 2014-01-06 10:12:30Z sloot $ $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/include/timbl/Choppers.h $ - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp diff -Nru timbl-6.4.4/include/timbl/CommandLine.h timbl-6.4.6/include/timbl/CommandLine.h --- timbl-6.4.4/include/timbl/CommandLine.h 2013-01-07 14:27:12.000000000 +0000 +++ timbl-6.4.6/include/timbl/CommandLine.h 2014-01-06 10:12:32.000000000 +0000 @@ -1,8 +1,8 @@ /* - $Id: CommandLine.h 15565 2013-01-07 14:27:05Z sloot $ + $Id: CommandLine.h 16820 2014-01-06 10:12:30Z sloot $ $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/include/timbl/CommandLine.h $ - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp diff -Nru timbl-6.4.4/include/timbl/Common.h timbl-6.4.6/include/timbl/Common.h --- timbl-6.4.4/include/timbl/Common.h 2013-04-02 09:35:47.000000000 +0000 +++ timbl-6.4.6/include/timbl/Common.h 2014-01-06 10:12:32.000000000 +0000 @@ -1,8 +1,8 @@ /* - $Id: Common.h 15854 2013-04-02 09:35:24Z sloot $ + $Id: Common.h 16820 2014-01-06 10:12:30Z sloot $ $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/include/timbl/Common.h $ - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp @@ -40,8 +40,8 @@ std::string Version(); std::string VersionName(); - std::string VersionInfo( bool = false ); - void ShowVersionInfo( std::ostream& ); + std::string BuildInfo(); + std::string VersionInfo( bool ); // obsolete inline int look_ahead( std::istream &is ){ int nc; diff -Nru timbl-6.4.4/include/timbl/GetOptClass.h timbl-6.4.6/include/timbl/GetOptClass.h --- timbl-6.4.4/include/timbl/GetOptClass.h 2013-01-07 14:27:12.000000000 +0000 +++ timbl-6.4.6/include/timbl/GetOptClass.h 2014-08-26 08:27:39.000000000 +0000 @@ -1,11 +1,11 @@ /* - $Id: GetOptClass.h 15565 2013-01-07 14:27:05Z sloot $ + $Id: GetOptClass.h 17566 2014-08-26 08:27:38Z sloot $ $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/include/timbl/GetOptClass.h $ - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp - + This file is part of timbl timbl is free software; you can redistribute it and/or modify @@ -48,11 +48,8 @@ bool definitive_options( TimblExperiment * ); AlgorithmType Algo() const { return local_algo; }; int MaxFeatures() const { return MaxFeats; }; - std::string getLogFile() const { return logFile; }; - std::string getPidFile() const { return pidFile; }; - bool daemonizeFlag() const { return do_daemon; }; VerbosityFlags getVerbosity() { return myVerbosity; }; - private: + private: AlgorithmType local_algo; MetricType local_metric; OrdeningType local_order; @@ -95,16 +92,13 @@ bool do_sloppy_loo; bool do_silly; bool do_diversify; - bool do_daemon; std::vectormetricsArray; std::ostream *parent_socket_os; std::string inPath; std::string outPath; - std::string logFile; - std::string pidFile; int occIn; void Error( const std::string& ) const; - inline bool parse_range( std::string&, + inline bool parse_range( std::string&, std::string::iterator&, MetricType ); inline bool parse_metrics( const std::string&, diff -Nru timbl-6.4.4/include/timbl/IBtree.h timbl-6.4.6/include/timbl/IBtree.h --- timbl-6.4.4/include/timbl/IBtree.h 2013-04-02 13:24:58.000000000 +0000 +++ timbl-6.4.6/include/timbl/IBtree.h 2014-01-06 10:12:32.000000000 +0000 @@ -1,8 +1,8 @@ /* - $Id: IBtree.h 15865 2013-04-02 13:24:34Z sloot $ + $Id: IBtree.h 16820 2014-01-06 10:12:30Z sloot $ $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/include/timbl/IBtree.h $ - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp diff -Nru timbl-6.4.4/include/timbl/Instance.h timbl-6.4.6/include/timbl/Instance.h --- timbl-6.4.4/include/timbl/Instance.h 2013-01-07 14:27:12.000000000 +0000 +++ timbl-6.4.6/include/timbl/Instance.h 2014-01-06 10:12:32.000000000 +0000 @@ -1,8 +1,8 @@ /* - $Id: Instance.h 15565 2013-01-07 14:27:05Z sloot $ + $Id: Instance.h 16820 2014-01-06 10:12:30Z sloot $ $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/include/timbl/Instance.h $ - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp diff -Nru timbl-6.4.4/include/timbl/Makefile.in timbl-6.4.6/include/timbl/Makefile.in --- timbl-6.4.4/include/timbl/Makefile.in 2013-04-02 16:24:31.000000000 +0000 +++ timbl-6.4.6/include/timbl/Makefile.in 2014-09-23 08:29:54.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # 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. @@ -19,6 +18,51 @@ # $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/include/timbl/Makefile.am $ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -38,8 +82,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = include/timbl -DIST_COMMON = $(pkginclude_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(pkginclude_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ @@ -52,8 +96,25 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -83,11 +144,29 @@ } am__installdirs = "$(DESTDIR)$(pkgincludedir)" HEADERS = $(pkginclude_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -125,7 +204,6 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ -LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -260,8 +338,11 @@ -rm -rf .libs _libs install-pkgincludeHEADERS: $(pkginclude_HEADERS) @$(NORMAL_INSTALL) - test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -277,26 +358,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(pkgincludedir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -308,15 +378,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -325,6 +391,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -464,18 +545,19 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool ctags distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-pkgincludeHEADERS install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-pkgincludeHEADERS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-pkgincludeHEADERS install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pkgincludeHEADERS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru timbl-6.4.4/include/timbl/Matrices.h timbl-6.4.6/include/timbl/Matrices.h --- timbl-6.4.4/include/timbl/Matrices.h 2013-01-07 14:27:12.000000000 +0000 +++ timbl-6.4.6/include/timbl/Matrices.h 2014-01-06 10:12:32.000000000 +0000 @@ -1,8 +1,8 @@ /* - $Id: Matrices.h 15565 2013-01-07 14:27:05Z sloot $ + $Id: Matrices.h 16820 2014-01-06 10:12:30Z sloot $ $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/include/timbl/Matrices.h $ - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp diff -Nru timbl-6.4.4/include/timbl/MBLClass.h timbl-6.4.6/include/timbl/MBLClass.h --- timbl-6.4.4/include/timbl/MBLClass.h 2013-01-07 14:27:12.000000000 +0000 +++ timbl-6.4.6/include/timbl/MBLClass.h 2014-01-06 10:12:32.000000000 +0000 @@ -1,8 +1,8 @@ /* - $Id: MBLClass.h 15565 2013-01-07 14:27:05Z sloot $ + $Id: MBLClass.h 16820 2014-01-06 10:12:30Z sloot $ $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/include/timbl/MBLClass.h $ - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp diff -Nru timbl-6.4.4/include/timbl/Metrics.h timbl-6.4.6/include/timbl/Metrics.h --- timbl-6.4.4/include/timbl/Metrics.h 2013-01-07 14:27:12.000000000 +0000 +++ timbl-6.4.6/include/timbl/Metrics.h 2014-01-06 10:12:32.000000000 +0000 @@ -1,8 +1,8 @@ /* - $Id: Metrics.h 15565 2013-01-07 14:27:05Z sloot $ + $Id: Metrics.h 16820 2014-01-06 10:12:30Z sloot $ $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/include/timbl/Metrics.h $ - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp diff -Nru timbl-6.4.4/include/timbl/MsgClass.h timbl-6.4.6/include/timbl/MsgClass.h --- timbl-6.4.4/include/timbl/MsgClass.h 2013-01-07 14:27:12.000000000 +0000 +++ timbl-6.4.6/include/timbl/MsgClass.h 2014-01-06 10:12:32.000000000 +0000 @@ -1,8 +1,8 @@ /* - $Id: MsgClass.h 15565 2013-01-07 14:27:05Z sloot $ + $Id: MsgClass.h 16820 2014-01-06 10:12:30Z sloot $ $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/include/timbl/MsgClass.h $ - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp diff -Nru timbl-6.4.4/include/timbl/neighborSet.h timbl-6.4.6/include/timbl/neighborSet.h --- timbl-6.4.4/include/timbl/neighborSet.h 2013-01-07 14:27:12.000000000 +0000 +++ timbl-6.4.6/include/timbl/neighborSet.h 2014-01-06 10:12:32.000000000 +0000 @@ -1,8 +1,8 @@ /* - $Id: neighborSet.h 15565 2013-01-07 14:27:05Z sloot $ + $Id: neighborSet.h 16820 2014-01-06 10:12:30Z sloot $ $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/include/timbl/neighborSet.h $ - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp diff -Nru timbl-6.4.4/include/timbl/Options.h timbl-6.4.6/include/timbl/Options.h --- timbl-6.4.4/include/timbl/Options.h 2013-03-28 11:56:16.000000000 +0000 +++ timbl-6.4.6/include/timbl/Options.h 2014-01-06 10:12:32.000000000 +0000 @@ -1,8 +1,8 @@ /* - $Id: Options.h 15828 2013-03-28 11:55:53Z sloot $ + $Id: Options.h 16820 2014-01-06 10:12:30Z sloot $ $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/include/timbl/Options.h $ - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp diff -Nru timbl-6.4.4/include/timbl/Statistics.h timbl-6.4.6/include/timbl/Statistics.h --- timbl-6.4.4/include/timbl/Statistics.h 2013-01-07 14:27:12.000000000 +0000 +++ timbl-6.4.6/include/timbl/Statistics.h 2014-01-06 10:12:32.000000000 +0000 @@ -1,8 +1,8 @@ /* - $Id: Statistics.h 15565 2013-01-07 14:27:05Z sloot $ + $Id: Statistics.h 16820 2014-01-06 10:12:30Z sloot $ $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/include/timbl/Statistics.h $ - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp diff -Nru timbl-6.4.4/include/timbl/StringOps.h timbl-6.4.6/include/timbl/StringOps.h --- timbl-6.4.4/include/timbl/StringOps.h 2013-01-07 14:27:12.000000000 +0000 +++ timbl-6.4.6/include/timbl/StringOps.h 2014-01-06 10:12:32.000000000 +0000 @@ -1,8 +1,8 @@ /* - $Id: StringOps.h 15565 2013-01-07 14:27:05Z sloot $ + $Id: StringOps.h 16820 2014-01-06 10:12:30Z sloot $ $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/include/timbl/StringOps.h $ - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp diff -Nru timbl-6.4.4/include/timbl/Testers.h timbl-6.4.6/include/timbl/Testers.h --- timbl-6.4.4/include/timbl/Testers.h 2013-01-07 14:27:12.000000000 +0000 +++ timbl-6.4.6/include/timbl/Testers.h 2014-01-06 10:12:32.000000000 +0000 @@ -1,8 +1,8 @@ /* - $Id: Testers.h 15565 2013-01-07 14:27:05Z sloot $ + $Id: Testers.h 16820 2014-01-06 10:12:30Z sloot $ $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/include/timbl/Testers.h $ - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp diff -Nru timbl-6.4.4/include/timbl/TimblAPI.h timbl-6.4.6/include/timbl/TimblAPI.h --- timbl-6.4.4/include/timbl/TimblAPI.h 2013-01-07 14:27:12.000000000 +0000 +++ timbl-6.4.6/include/timbl/TimblAPI.h 2014-08-26 12:13:53.000000000 +0000 @@ -1,11 +1,11 @@ /* - $Id: TimblAPI.h 15565 2013-01-07 14:27:05Z sloot $ + $Id: TimblAPI.h 17567 2014-08-26 12:13:53Z sloot $ $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/include/timbl/TimblAPI.h $ - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp - + This file is part of timbl timbl is free software; you can redistribute it and/or modify @@ -40,15 +40,17 @@ #include "timbl/Instance.h" #include "timbl/neighborSet.h" #include "timbl/TimblExperiment.h" +#include "ticcutils/CommandLine.h" namespace Timbl{ - + inline std::string Version() { return Common::Version(); } inline std::string VersionName() { return Common::VersionName(); } - + inline std::string BuildInfo() { return Common::BuildInfo(); } + enum Algorithm { UNKNOWN_ALG, IB1, IB2, IGTREE, TRIBL, TRIBL2, LOO, CV }; enum Weighting { UNKNOWN_W, UD, NW, GR, IG, X2, SV, SD }; - + class TimblOpts { friend class TimblAPI; friend std::ostream& operator<<( std::ostream&, const TimblOpts& ); @@ -69,11 +71,12 @@ TimblOpts( const TimblOpts& ); TimblOpts& operator=( const TimblOpts& ); }; - + class TimblAPI { friend class TimblExperiment; public: TimblAPI( const TimblOpts *, const std::string& = "" ); + TimblAPI( const TiCC::CL_Options&, const std::string& = "" ); TimblAPI( const std::string&, const std::string& = "" ); TimblAPI( const TimblAPI& ); ~TimblAPI(); @@ -97,17 +100,17 @@ bool Decrement( const std::string& ); bool Expand( const std::string& ); bool Remove( const std::string& ); - bool Test( const std::string& = "", + bool Test( const std::string& = "", const std::string& = "", const std::string& = "" ); - bool NS_Test( const std::string& = "", + bool NS_Test( const std::string& = "", const std::string& = "" ); const TargetValue *Classify( const std::string& ); - const TargetValue *Classify( const std::string&, + const TargetValue *Classify( const std::string&, const ValueDistribution *& ); const TargetValue *Classify( const std::string&, double& ); - const TargetValue *Classify( const std::string&, - const ValueDistribution *&, + const TargetValue *Classify( const std::string&, + const ValueDistribution *&, double& ); const neighborSet *classifyNS( const std::string& ); bool classifyNS( const std::string&, neighborSet& ); @@ -115,13 +118,13 @@ const Target *myTargets() const; bool Classify( const std::string&, std::string& ); bool Classify( const std::string&, std::string&, double& ); - bool Classify( const std::string&, std::string&, + bool Classify( const std::string&, std::string&, std::string&, double& ); bool ShowBestNeighbors( std::ostream& ) const; size_t matchDepth() const; bool matchedAtLeaf() const; std::string ExpName() const; - static std::string VersionInfo( bool = false ); + static std::string VersionInfo( bool = false ); //obsolete bool SaveWeights( const std::string& = "" ); bool GetWeights( const std::string& = "", Weighting = UNKNOWN_W ); double GetAccuracy(); @@ -134,7 +137,7 @@ bool WriteArrays( const std::string& = "" ); bool WriteMatrices( const std::string& = "" ); bool GetArrays( const std::string& = "" ); - bool GetMatrices( const std::string& = "" ); + bool GetMatrices( const std::string& = "" ); bool WriteNamesFile( const std::string& = "" ); bool ShowWeights( std::ostream& ) const; bool ShowOptions( std::ostream& ) const; @@ -153,12 +156,12 @@ TimblAPI& operator=( const TimblAPI& ); // so nobody may use them TimblExperiment *pimpl; bool i_am_fine; - }; - + }; + const std::string to_string( const Algorithm ); const std::string to_string( const Weighting ); bool string_to( const std::string&, Algorithm& ); bool string_to( const std::string&, Weighting& ); - + } #endif // TIMBL_API_H diff -Nru timbl-6.4.4/include/timbl/TimblExperiment.h timbl-6.4.6/include/timbl/TimblExperiment.h --- timbl-6.4.4/include/timbl/TimblExperiment.h 2013-04-02 13:24:58.000000000 +0000 +++ timbl-6.4.6/include/timbl/TimblExperiment.h 2014-01-06 10:12:32.000000000 +0000 @@ -1,11 +1,11 @@ /* - $Id: TimblExperiment.h 15865 2013-04-02 13:24:34Z sloot $ + $Id: TimblExperiment.h 16820 2014-01-06 10:12:30Z sloot $ $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/include/timbl/TimblExperiment.h $ - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp - + This file is part of timbl timbl is free software; you can redistribute it and/or modify @@ -30,6 +30,7 @@ #ifndef TIMBL_EXPERIMENT_H #define TIMBL_EXPERIMENT_H +#include #include #include #include "ticcutils/XMLtools.h" @@ -43,7 +44,7 @@ class ConfusionMatrix; class CL_Options; class GetOptClass; - + class resultStore: public MsgClass { public: resultStore(): dist(0), disposable(false), isTop(false), beam(0) {}; @@ -57,7 +58,7 @@ std::string getResult(); void prepare(); void normalize(); - double confidence( const TargetValue* tv ) const { + double confidence( const TargetValue* tv ) const { return dist->Confidence( tv ); }; private: @@ -78,7 +79,7 @@ bool operator()( const FeatureValue* F, const FeatureValue* G ) const{ return F->Index() > G->Index(); } - }; + }; typedef std::map, fCmp> fileIndex; typedef std::map fileDoubleIndex; @@ -155,9 +156,9 @@ bool Classify( const std::string& , std::string&, std::string&, double& ); size_t matchDepth() const { return match_depth; }; bool matchedAtLeaf() const { return last_leaf; }; - + virtual AlgorithmType Algorithm() const = 0; - const TargetValue *Classify( const std::string& Line, + const TargetValue *Classify( const std::string& Line, const ValueDistribution *& db, double& di ){ const TargetValue *res = classifyString( Line, di ); @@ -171,8 +172,8 @@ double dum_d; return classifyString( Line, dum_d ); } - - const TargetValue *Classify( const std::string& Line, + + const TargetValue *Classify( const std::string& Line, const ValueDistribution *& db ){ double dum_d; const TargetValue *res = classifyString( Line, dum_d ); @@ -182,20 +183,20 @@ } return res; } - const TargetValue *Classify( const std::string& Line, + const TargetValue *Classify( const std::string& Line, double& di ){ return classifyString( Line, di ); } - + const neighborSet *NB_Classify( const std::string& ); - + virtual void initExperiment( bool = false ); - + protected: TimblExperiment( const AlgorithmType, const std::string& = "" ); virtual bool checkLine( const std::string& ); virtual bool ClassicLearn( const std::string& = "", bool = true ); - virtual const TargetValue *LocalClassify( const Instance& , + virtual const TargetValue *LocalClassify( const Instance& , double&, bool& ); virtual bool GetInstanceBase( std::istream& ) = 0; @@ -205,7 +206,7 @@ bool initTestFiles( const std::string&, const std::string& ); void show_results( std::ostream&, const double, - const std::string&, + const std::string&, const TargetValue *, const double ) ; void testInstance( const Instance&, @@ -216,13 +217,13 @@ bool nextLine( std::istream &, std::string&, int& ); bool nextLine( std::istream &, std::string& ); bool skipARFFHeader( std::istream & ); - + void show_progress( std::ostream& os, time_t, unsigned int ); bool createPercFile( const std::string& = "" ) const; - + void show_speed_summary( std::ostream& os, const timeval& ) const; - + void show_ignore_info( std::ostream& os ) const; void show_weight_info( std::ostream& os ) const; void show_metric_info( std::ostream& os ) const; @@ -241,7 +242,7 @@ std::string outStreamName; std::ifstream testStream; std::ofstream outStream; - unsigned long ibCount; + unsigned long ibCount; ConfusionMatrix *confusionInfo; std::vector instances; StatisticsClass stats; @@ -254,11 +255,11 @@ int estimate; int numOfThreads; const TargetValue *classifyString( const std::string& , double& ); - }; + }; class IB1_Experiment: public TimblExperiment { public: - IB1_Experiment( const size_t N = DEFAULT_MAX_FEATS, + IB1_Experiment( const size_t N = DEFAULT_MAX_FEATS, const std::string& s= "", const bool init = true ); bool Increment( const std::string& ); @@ -270,8 +271,8 @@ bool NS_Test( const std::string&, const std::string& ); protected: - TimblExperiment *clone() const { - return new IB1_Experiment( MaxFeats(), "", false ); + TimblExperiment *clone() const { + return new IB1_Experiment( MaxFeats(), "", false ); }; bool checkTestFile(); bool checkLine( const std::string& ); @@ -280,13 +281,13 @@ private: bool GetInstanceBase( std::istream& ); }; - + class IB2_Experiment: public IB1_Experiment { public: - IB2_Experiment( size_t N, const std::string& s="" ): + IB2_Experiment( size_t N, const std::string& s="" ): IB1_Experiment( N, s ) { IB2_offset( 0 ); - }; + }; bool Prepare( const std::string& = "", bool = false, bool = false ); bool Expand( const std::string& ); bool Remove( const std::string& ); @@ -298,10 +299,10 @@ bool Expand_N( const std::string& ); bool show_learn_progress( std::ostream& os, time_t, size_t ); }; - + class LOO_Experiment: public IB1_Experiment { public: - LOO_Experiment( int N, const std::string& s = "" ): + LOO_Experiment( int N, const std::string& s = "" ): IB1_Experiment( N, s ) { }; bool Test( const std::string&, @@ -313,10 +314,10 @@ bool checkTestFile( ); void showTestingInfo( std::ostream& ); }; - + class CV_Experiment: public IB1_Experiment { public: - CV_Experiment( int N = DEFAULT_MAX_FEATS, const std::string& s = "" ): + CV_Experiment( int N = DEFAULT_MAX_FEATS, const std::string& s = "" ): IB1_Experiment( N, s ), NumOfFiles( 0 ), FileNames( NULL ) { }; ~CV_Experiment(){ delete [] FileNames; }; @@ -340,35 +341,35 @@ std::string CV_PfileName; WeightType CV_fileW; }; - + class TRIBL_Experiment: public TimblExperiment { public: - TRIBL_Experiment( const size_t N = DEFAULT_MAX_FEATS, + TRIBL_Experiment( const size_t N = DEFAULT_MAX_FEATS, const std::string& s = "", - const bool init = true ): + const bool init = true ): TimblExperiment( TRIBL_a, s ) { if ( init ) InitClass( N ); }; void InitInstanceBase(); protected: - TimblExperiment *clone() const { + TimblExperiment *clone() const { return new TRIBL_Experiment( MaxFeats(), "", false ); }; void showTestingInfo( std::ostream& ); bool checkTestFile(); AlgorithmType Algorithm() const { return TRIBL_a; }; bool checkLine( const std::string& ); - const TargetValue *LocalClassify( const Instance& , + const TargetValue *LocalClassify( const Instance& , double&, bool& ); private: bool GetInstanceBase( std::istream& ); }; - + class TRIBL2_Experiment: public TimblExperiment { public: - TRIBL2_Experiment( const size_t N = DEFAULT_MAX_FEATS, + TRIBL2_Experiment( const size_t N = DEFAULT_MAX_FEATS, const std::string& s = "", - const bool init = true ): + const bool init = true ): TimblExperiment( TRIBL2_a, s ) { if ( init ) InitClass( N ); }; @@ -390,8 +391,8 @@ public: IG_Experiment( const size_t N = DEFAULT_MAX_FEATS, const std::string& s = "", - const bool init = true ): - TimblExperiment( IGTREE_a, s ) { + const bool init = true ): + TimblExperiment( IGTREE_a, s ) { if ( init ) InitClass( N ); }; AlgorithmType Algorithm() const { return IGTREE_a; }; @@ -401,11 +402,11 @@ void initExperiment( bool = false ); bool Expand( const std::string& ){ FatalError( "Expand not supported for IGTree" ); - return false; + return false; }; - + protected: - TimblExperiment *clone() const { + TimblExperiment *clone() const { return new IG_Experiment( MaxFeats(), "", false ); }; bool ClassicLearn( const std::string& = "", bool = true ); bool checkTestFile(); @@ -416,10 +417,10 @@ double&, bool& ); private: - + bool GetInstanceBase( std::istream& ); }; - + } #endif // TIMBL_EXPERIMENT_H diff -Nru timbl-6.4.4/include/timbl/Types.h timbl-6.4.6/include/timbl/Types.h --- timbl-6.4.4/include/timbl/Types.h 2013-03-28 11:56:16.000000000 +0000 +++ timbl-6.4.6/include/timbl/Types.h 2014-01-06 10:12:32.000000000 +0000 @@ -1,8 +1,8 @@ /* - $Id: Types.h 15828 2013-03-28 11:55:53Z sloot $ + $Id: Types.h 16820 2014-01-06 10:12:30Z sloot $ $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/include/timbl/Types.h $ - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp diff -Nru timbl-6.4.4/INSTALL timbl-6.4.6/INSTALL --- timbl-6.4.4/INSTALL 2012-04-02 17:37:09.000000000 +0000 +++ timbl-6.4.6/INSTALL 2014-01-02 19:14:59.000000000 +0000 @@ -1,7 +1,7 @@ Installation Instructions ************************* -Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, +Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, @@ -12,8 +12,8 @@ Basic Installation ================== - Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following + Briefly, the shell command `./configure && make && make install' +should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for instructions specific to this package. Some packages provide this `INSTALL' file but do not implement all of the features documented @@ -309,9 +309,10 @@ overridden in the site shell script). Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf bug. Until the bug is fixed you can use this workaround: +an Autoconf limitation. Until the limitation is lifted, you can use +this workaround: - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash `configure' Invocation ====================== @@ -367,4 +368,3 @@ `configure' also accepts some other, not widely useful, options. Run `configure --help' for more details. - diff -Nru timbl-6.4.4/install-sh timbl-6.4.6/install-sh --- timbl-6.4.4/install-sh 2011-11-12 07:11:50.000000000 +0000 +++ timbl-6.4.6/install-sh 2014-02-11 12:58:49.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2009-04-28.21; # UTC +scriptversion=2011-11-20.07; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -35,7 +35,7 @@ # FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it +# 'make' implicit rules from creating a file called install from it # when there is no Makefile. # # This script is compatible with the BSD install script, but was written @@ -156,6 +156,10 @@ -s) stripcmd=$stripprog;; -t) dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac shift;; -T) no_target_directory=true;; @@ -186,6 +190,10 @@ fi shift # arg dst_arg=$arg + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac done fi @@ -194,13 +202,17 @@ echo "$0: no input file specified." >&2 exit 1 fi - # It's OK to call `install-sh -d' without argument. + # It's OK to call 'install-sh -d' without argument. # This can happen when creating conditional directories. exit 0 fi if test -z "$dir_arg"; then - trap '(exit $?); exit' 1 2 13 15 + do_exit='(exit $ret); exit $ret' + trap "ret=129; $do_exit" 1 + trap "ret=130; $do_exit" 2 + trap "ret=141; $do_exit" 13 + trap "ret=143; $do_exit" 15 # Set umask so as not to create temps with too-generous modes. # However, 'strip' requires both read and write access to temps. @@ -228,9 +240,9 @@ for src do - # Protect names starting with `-'. + # Protect names problematic for 'test' and other utilities. case $src in - -*) src=./$src;; + -* | [=\(\)!]) src=./$src;; esac if test -n "$dir_arg"; then @@ -252,12 +264,7 @@ echo "$0: no destination specified." >&2 exit 1 fi - dst=$dst_arg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst;; - esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. @@ -347,7 +354,7 @@ if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writeable bit of parent directory when it shouldn't. + # other-writable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. ls_ld_tmpdir=`ls -ld "$tmpdir"` case $ls_ld_tmpdir in @@ -385,7 +392,7 @@ case $dstdir in /*) prefix='/';; - -*) prefix='./';; + [-=\(\)!]*) prefix='./';; *) prefix='';; esac @@ -403,7 +410,7 @@ for d do - test -z "$d" && continue + test X"$d" = X && continue prefix=$prefix$d if test -d "$prefix"; then diff -Nru timbl-6.4.4/ltmain.sh timbl-6.4.6/ltmain.sh --- timbl-6.4.4/ltmain.sh 2011-11-12 07:11:50.000000000 +0000 +++ timbl-6.4.6/ltmain.sh 2014-02-11 12:58:49.000000000 +0000 @@ -70,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1 +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1 # automake: $automake_version # autoconf: $autoconf_version # @@ -80,7 +80,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1ubuntu1" +VERSION="2.4.2 Debian-2.4.2-1.7ubuntu1" TIMESTAMP="" package_revision=1.3337 diff -Nru timbl-6.4.4/m4/Makefile.in timbl-6.4.6/m4/Makefile.in --- timbl-6.4.4/m4/Makefile.in 2013-04-02 16:24:31.000000000 +0000 +++ timbl-6.4.6/m4/Makefile.in 2014-09-23 08:29:54.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # 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. @@ -18,6 +17,51 @@ # $Id: $ # $URL: $ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -37,7 +81,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = m4 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ @@ -50,11 +94,30 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -92,7 +155,6 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ -LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -220,11 +282,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -360,15 +422,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru timbl-6.4.4/Makefile.am timbl-6.4.6/Makefile.am --- timbl-6.4.4/Makefile.am 2012-04-12 15:43:57.000000000 +0000 +++ timbl-6.4.6/Makefile.am 2014-04-30 10:40:18.000000000 +0000 @@ -1,11 +1,11 @@ -# $Id: Makefile.am 7708 2011-01-05 13:47:18Z sloot $ +# $Id: Makefile.am 17169 2014-04-30 10:35:53Z sloot $ # $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/Makefile.am $ ACLOCAL_AMFLAGS =-I m4 --install SUBDIRS = src include demos docs m4 -EXTRA_DIST = bootstrap AUTHORS TODO NEWS timbl.pc.in +EXTRA_DIST = bootstrap.sh AUTHORS TODO NEWS timbl.pc.in pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = timbl.pc diff -Nru timbl-6.4.4/Makefile.in timbl-6.4.6/Makefile.in --- timbl-6.4.4/Makefile.in 2013-04-02 16:24:31.000000000 +0000 +++ timbl-6.4.6/Makefile.in 2014-09-23 08:29:54.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # 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. @@ -15,10 +14,55 @@ @SET_MAKE@ -# $Id: Makefile.am 7708 2011-01-05 13:47:18Z sloot $ +# $Id: Makefile.am 17169 2014-04-30 10:35:53Z sloot $ # $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/Makefile.am $ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -38,11 +82,12 @@ build_triplet = @build@ host_triplet = @host@ subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(srcdir)/timbl.pc.in $(top_srcdir)/configure AUTHORS COPYING \ - ChangeLog INSTALL NEWS TODO config.guess config.sub depcomp \ - install-sh ltmain.sh missing +DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/config.h.in $(srcdir)/timbl.pc.in COPYING TODO \ + compile config.guess config.sub depcomp install-sh missing \ + ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ @@ -57,15 +102,33 @@ CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = timbl.pc CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -97,11 +160,33 @@ DATA = $(pkgconfig_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) @@ -112,6 +197,7 @@ && rm -rf "$(distdir)" \ || { sleep 5 && rm -rf "$(distdir)"; }; \ else :; fi +am__post_remove_distdir = $(am__remove_distdir) am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -139,12 +225,14 @@ reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best +DIST_TARGETS = dist-gzip distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -182,7 +270,6 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ -LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -272,7 +359,7 @@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I m4 --install SUBDIRS = src include demos docs m4 -EXTRA_DIST = bootstrap AUTHORS TODO NEWS timbl.pc.in +EXTRA_DIST = bootstrap.sh AUTHORS TODO NEWS timbl.pc.in pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = timbl.pc all: config.h @@ -315,8 +402,8 @@ $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -341,8 +428,11 @@ -rm -f libtool config.lt install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -359,22 +449,25 @@ dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -389,57 +482,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -455,12 +503,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -472,15 +515,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -489,9 +528,31 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) +clean-cscope: + -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files distdir: $(DISTFILES) $(am__remove_distdir) @@ -527,13 +588,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -562,40 +620,42 @@ || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + $(am__post_remove_distdir) dist-lzip: distdir tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz - $(am__remove_distdir) - -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) + $(am__post_remove_distdir) dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) + $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -606,8 +666,6 @@ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.lz*) \ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ @@ -619,18 +677,19 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + && ../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -653,7 +712,7 @@ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__remove_distdir) + $(am__post_remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' @@ -791,25 +850,24 @@ uninstall-am: uninstall-pkgconfigDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ - ctags-recursive install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) all install-am install-strip -.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 \ - dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \ - dist-zip distcheck distclean distclean-generic distclean-hdr \ - distclean-libtool distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-pkgconfigDATA install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--refresh check check-am clean clean-cscope clean-generic \ + clean-libtool cscope cscopelist-am ctags ctags-am dist \ + dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \ + dist-xz dist-zip distcheck distclean distclean-generic \ + distclean-hdr distclean-libtool distclean-tags distcleancheck \ + distdir distuninstallcheck dvi dvi-am html html-am info \ + info-am install install-am install-data install-data-am \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-pkgconfigDATA \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-pkgconfigDATA + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-pkgconfigDATA ChangeLog: NEWS diff -Nru timbl-6.4.4/missing timbl-6.4.6/missing --- timbl-6.4.4/missing 2012-04-02 17:37:09.000000000 +0000 +++ timbl-6.4.6/missing 2014-01-02 19:14:59.000000000 +0000 @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-01-06.13; # UTC +scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard , 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,68 +25,40 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to ." exit $? @@ -99,228 +70,141 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; +# Run the given program, remember its exit status. +"$@"; st=$? - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'autom4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff -Nru timbl-6.4.4/NEWS timbl-6.4.6/NEWS --- timbl-6.4.4/NEWS 2013-04-03 12:29:57.000000000 +0000 +++ timbl-6.4.6/NEWS 2014-09-23 08:29:31.000000000 +0000 @@ -1,3 +1,10 @@ +6.4.6 2014-09-23 +[Ko van der Sloot] + * release + +6.4.5 2014-09-16 + * small bug fixes + 6.4.4 2013-04-03 * rely more on ticcutils stuff. A lot of functions are moved there * added a GetAccuracy option to the API @@ -55,7 +62,7 @@ 6.3.2 - fixed bug 44. Segfault in weird cases - fixed bug 45. Needless processing of traindata when required option is missing -- fixed bug 46. Tribl2 sometimes fails to correctly output +v+k+n +- fixed bug 46. Tribl2 sometimes fails to correctly output +v+k+n - fixed bug 47. Unclear error message when InnerProduct fails - several small uncritical enhancements @@ -66,7 +73,7 @@ 6.2.3 forgot to edit this file -6.2.2 +6.2.2 forgot to edit this file 6.2.1 - 2009-11-30 @@ -106,5 +113,5 @@ 2007-10-01: Ko vd Sloot first packaging attempt -# $Id: NEWS 15899 2013-04-03 12:29:33Z sloot $ +# $Id: NEWS 17677 2014-09-16 14:30:05Z sloot $ # $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/NEWS $ diff -Nru timbl-6.4.4/src/BestArray.cxx timbl-6.4.6/src/BestArray.cxx --- timbl-6.4.4/src/BestArray.cxx 2013-04-02 14:06:21.000000000 +0000 +++ timbl-6.4.6/src/BestArray.cxx 2014-01-06 10:12:32.000000000 +0000 @@ -1,8 +1,8 @@ /* - $Id: BestArray.cxx 15868 2013-04-02 14:05:58Z sloot $ + $Id: BestArray.cxx 16820 2014-01-06 10:12:30Z sloot $ $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/src/BestArray.cxx $ - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp diff -Nru timbl-6.4.4/src/Choppers.cxx timbl-6.4.6/src/Choppers.cxx --- timbl-6.4.4/src/Choppers.cxx 2013-03-28 11:56:16.000000000 +0000 +++ timbl-6.4.6/src/Choppers.cxx 2014-01-06 10:12:32.000000000 +0000 @@ -1,8 +1,8 @@ /* - $Id: Choppers.cxx 15828 2013-03-28 11:55:53Z sloot $ + $Id: Choppers.cxx 16820 2014-01-06 10:12:30Z sloot $ $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/src/Choppers.cxx $ - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp diff -Nru timbl-6.4.4/src/CommandLine.cxx timbl-6.4.6/src/CommandLine.cxx --- timbl-6.4.4/src/CommandLine.cxx 2013-01-07 14:27:12.000000000 +0000 +++ timbl-6.4.6/src/CommandLine.cxx 2014-01-06 10:12:32.000000000 +0000 @@ -1,8 +1,8 @@ /* - $Id: CommandLine.cxx 15565 2013-01-07 14:27:05Z sloot $ + $Id: CommandLine.cxx 16820 2014-01-06 10:12:30Z sloot $ $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/src/CommandLine.cxx $ - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp diff -Nru timbl-6.4.4/src/Common.cxx timbl-6.4.6/src/Common.cxx --- timbl-6.4.4/src/Common.cxx 2013-04-02 09:35:47.000000000 +0000 +++ timbl-6.4.6/src/Common.cxx 2014-01-06 10:12:32.000000000 +0000 @@ -1,8 +1,8 @@ /* - $Id: Common.cxx 15854 2013-04-02 09:35:24Z sloot $ + $Id: Common.cxx 16820 2014-01-06 10:12:30Z sloot $ $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/src/Common.cxx $ - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp @@ -35,21 +35,17 @@ namespace Common { - void ShowVersionInfo( std::ostream& os, bool full ){ - os << VERSION; - if ( full ) - os << ", compiled on " << __DATE__ << ", " << __TIME__; - } - string VersionInfo( bool full ){ - string result; - ostringstream oss; - ShowVersionInfo( oss, full ); - result = oss.str(); - return result; + // obsolete + if ( full ) + return BuildInfo(); + else + return Version(); } - string Version() { return VERSION; } string VersionName() { return PACKAGE_STRING; } + string BuildInfo() { + return Version() + ", compiled on " + __DATE__ + ", " + __TIME__; + } } diff -Nru timbl-6.4.4/src/CVExperiment.cxx timbl-6.4.6/src/CVExperiment.cxx --- timbl-6.4.4/src/CVExperiment.cxx 2013-03-28 11:56:16.000000000 +0000 +++ timbl-6.4.6/src/CVExperiment.cxx 2014-01-06 10:12:32.000000000 +0000 @@ -1,8 +1,8 @@ /* - $Id: CVExperiment.cxx 15828 2013-03-28 11:55:53Z sloot $ + $Id: CVExperiment.cxx 16820 2014-01-06 10:12:30Z sloot $ $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/src/CVExperiment.cxx $ - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp diff -Nru timbl-6.4.4/src/GetOptClass.cxx timbl-6.4.6/src/GetOptClass.cxx --- timbl-6.4.4/src/GetOptClass.cxx 2013-03-28 11:56:16.000000000 +0000 +++ timbl-6.4.6/src/GetOptClass.cxx 2014-08-26 12:13:53.000000000 +0000 @@ -1,11 +1,11 @@ /* - $Id: GetOptClass.cxx 15828 2013-03-28 11:55:53Z sloot $ + $Id: GetOptClass.cxx 17567 2014-08-26 12:13:53Z sloot $ $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/src/GetOptClass.cxx $ - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp - + This file is part of timbl timbl is free software; you can redistribute it and/or modify @@ -47,7 +47,7 @@ using namespace TiCC; namespace Timbl { - + void GetOptClass::set_default_options( int Max ){ local_algo = IB1_a; local_metric = UnknownMetric; @@ -81,7 +81,6 @@ do_sloppy_loo = false; do_silly = false; do_diversify = false; - do_daemon = true; if ( MaxFeats == -1 ){ MaxFeats = Max; LocalInputFormat = UnknownInputFormat; // InputFormat and verbosity @@ -93,11 +92,9 @@ metricsArray[i] = UnknownMetric; } outPath = ""; - logFile = ""; - pidFile = ""; occIn = 0; } - + GetOptClass::GetOptClass( CL_Options& Opts ): LocalInputFormat( UnknownInputFormat ), MaxFeats(-1), @@ -119,10 +116,10 @@ } set_default_options( MaxF ); } - + GetOptClass::~GetOptClass( ){ } - + GetOptClass::GetOptClass( const GetOptClass& in ): MsgClass(in), local_algo( in.local_algo ), @@ -153,35 +150,32 @@ myVerbosity( in.myVerbosity ), opt_init( in.opt_init ), opt_changed( in.opt_changed ), - do_exact( in.do_exact ), - do_hashed( in.do_hashed ), + do_exact( in.do_exact ), + do_hashed( in.do_hashed ), min_present( in.min_present ), N_present(false), keep_distributions( in.keep_distributions ), do_sample_weights( in.do_sample_weights ), - do_ignore_samples( in.do_ignore_samples ), + do_ignore_samples( in.do_ignore_samples ), do_ignore_samples_test( in.do_ignore_samples_test ), do_query( in.do_query ), do_all_weights( false ), do_sloppy_loo( false ), do_silly( in.do_silly ), do_diversify( in.do_diversify ), - do_daemon( in.do_daemon ), metricsArray( in.metricsArray ), parent_socket_os( in.parent_socket_os ), outPath( in.outPath ), - logFile( in.logFile ), - pidFile( in.pidFile ), occIn( in.occIn ) { } - + GetOptClass *GetOptClass::Clone( ostream *sock_os ) const{ GetOptClass *result = new GetOptClass(*this); result->parent_socket_os = sock_os; return result; } - + void GetOptClass::Error( const string& out_line ) const { if ( parent_socket_os ) *parent_socket_os << "ERROR { " << out_line << " }" << endl; @@ -189,7 +183,7 @@ cerr << "Error:" << out_line << endl; } } - + bool GetOptClass::definitive_options( TimblExperiment *Exp ){ if ( opt_changed || !opt_init ){ opt_changed = false; @@ -277,11 +271,11 @@ } if ( threshold >= 0 ){ if ( local_algo != TRIBL_a ){ - Error( "-q option only valid for TRIBL algorithm" ); + Error( "-q option only valid for TRIBL algorithm" ); return false; } if ( threshold == 0 ){ - Error( "invalid -q option. Must be > 0 " ); + Error( "invalid -q option. Must be > 0 " ); return false; } optline = "TRIBL_OFFSET: " + toString(threshold); @@ -372,7 +366,7 @@ for ( size_t j=0; j < metricsArray.size(); ++j ){ metricsArray[j] = Overlap; } - + } optline = "GLOBAL_METRIC: " + toString(local_metric); Exp->SetOption( optline ); @@ -404,20 +398,16 @@ if ( Exp->SetOption( optline ) ){ optline = "PROGRESS: " + toString(local_progress); if ( Exp->SetOption( optline ) ){ - optline = "VERBOSITY: " + + optline = "VERBOSITY: " + toString(myVerbosity); if ( Exp->SetOption( optline ) ){ for ( size_t i=0; i < metricsArray.size(); ++i ){ - if ( !first ){ - if ( metricsArray[i] == Ignore ){ - Error( "-m:I is not possible at this stage" ); - return false; - } - } optline = "METRICS: " + toString( i ) + "=" + toString(metricsArray[i]); - if (!Exp->SetOption( optline ) ) + if (!Exp->SetOption( optline ) ){ + Error( "changing metric is not possible at this stage" ); return false; + } } if ( do_query ){ Exp->ShowSettings( cerr ); @@ -436,8 +426,8 @@ } return true; } - - inline bool GetOptClass::parse_range( string& line, + + inline bool GetOptClass::parse_range( string& line, string::iterator& it, MetricType Value ){ size_t m; @@ -445,7 +435,7 @@ while( it != line.end() && *it != ':' ){ eit = it; while( eit != line.end() && isdigit( *eit ) ) ++eit; - string tmp = string( it, eit ); + string tmp = string( it, eit ); size_t k; if ( stringTo( tmp, k, 1, metricsArray.size() ) ){ if ( metricsArray[k] != UnknownMetric && metricsArray[k] != Value ){ @@ -469,7 +459,7 @@ ++it; eit = it; while( eit != line.end() && isdigit( *eit ) ) ++eit; - tmp = string( it, eit ); + tmp = string( it, eit ); m = stringTo(tmp); if ( m <= 0 || m > metricsArray.size() ){ Error( "illegal value in metric description: -m " + line ); @@ -486,9 +476,9 @@ } else { for ( size_t j=k+1; j <= m && j <= metricsArray.size(); ++j ){ - if ( metricsArray[j] != UnknownMetric + if ( metricsArray[j] != UnknownMetric && metricsArray[j] != Value ){ - Error( "metric of feature " + toString(j) + + Error( "metric of feature " + toString(j) + " is multiply changed!" ); return false; } @@ -500,7 +490,7 @@ } return true; } - + inline bool GetOptClass::parse_metrics( const string& Mline, MetricType& Def ){ string line = TiCC::trim( Mline ); @@ -508,7 +498,7 @@ string::iterator p = line.begin(); if ( p != line.end() ){ switch ( *p++ ){ - case 'O' : + case 'O' : Def = Overlap; break; case 'J' : @@ -581,7 +571,7 @@ MetricType TmpMT; while( p != line.end() ){ switch ( *p ){ - case 'O' : + case 'O' : TmpMT = Overlap; break; case 'S' : @@ -618,7 +608,7 @@ } metricClass *tmpMC = getMetricClass(Def); if ( TmpMT != Ignore && tmpMC->isSimilarityMetric() ){ - Error( "Similarity metric " + toString( Def ) + Error( "Similarity metric " + toString( Def ) + " only accepts -I specifications: -m " + Mline ); delete tmpMC; return false; @@ -658,7 +648,7 @@ else return false; } - + inline bool isBoolOrEmpty( const string& in, bool& val ){ if ( in.empty() ){ val = true; @@ -687,21 +677,21 @@ } const char *ok_opt; switch ( mode ){ - case 0: - ok_opt = "a:b:B:c:C:d:De:F:G:Hk:l:L:m:M:n:N:o:O:p:q:QR:sS:t:T:v:w:Wx"; + case 0: + ok_opt = "a:b:B:c:C:d:De:F:G:Hk:l:L:m:M:n:N:o:O:p:q:QR:st:T:v:w:Wx"; break; case 1: // limited usage, for @t - ok_opt = "d:e:G:k:L:m:p:QR:v:x"; + ok_opt = "d:e:G:k:L:m:p:QR:v:x"; break; case 2: // limited usage, for Server - ok_opt = "C:d:G:k:l:L:p:QS:v:x"; + ok_opt = "C:d:G:k:l:L:p:Qv:x"; break; default: ok_opt = NULL; - string msg = string("Invalid value '") + toString(mode) - + "' in switch (" + string msg = string("Invalid value '") + toString(mode) + + "' in switch (" + __FILE__ + "," + toString(__LINE__) + ")\n" + "ABORTING now"; throw std::logic_error( msg ); @@ -745,17 +735,17 @@ } return false; }; - + try { // cerr << "try " << option << endl; switch (option) { - case 'a': + case 'a': if ( !stringTo( myoptarg, local_algo ) ){ Error( "illegal -a value: " + myoptarg ); return false; } break; - + case 'b': bootstrap_lines = stringTo( myoptarg ); if ( bootstrap_lines < 1 ){ @@ -763,11 +753,11 @@ return false; } break; - + case 'B': if ( longOpt ){ if ( long_option == "Beam" ){ - if ( !stringTo( myoptarg, BeamSize ) + if ( !stringTo( myoptarg, BeamSize ) || BeamSize <= 0 ){ Error( "illegal value for -Beam option: " + myoptarg ); return false; @@ -790,13 +780,13 @@ } } break; - + case 'c': if ( longOpt ){ if ( long_option == "clones" ){ clones = stringTo( myoptarg ); if ( clones <= 0 ){ - Error( "invalid value for " + long_option + ": '" + Error( "invalid value for " + long_option + ": '" + myoptarg + "'" ); return false; } @@ -810,35 +800,15 @@ } } break; - - case 'd': { - if ( longOpt ){ - if ( long_option == "daemonize" ){ - bool val; - if ( !isBoolOrEmpty(myoptarg,val) ){ - Error( "invalid value for " + long_option + ": '" - + myoptarg + "'" ); - return false; - } - do_daemon = val; - } - else { - Error( "invalid option: Did you mean '--daemonize'?" ); - return false; - } - } - else if ( myoptarg.find("aemonize") != string::npos ){ - Error( "invalid option: Did you mean '--daemonize' ?" ); - return false; - } - else { + + case 'd': { string::size_type pos1 = myoptarg.find( ":" ); if ( pos1 == string::npos ){ pos1 = myoptarg.find_first_of( "0123456789" ); if ( pos1 != string::npos ){ if ( ! ( stringTo( string( myoptarg, 0, pos1 ), local_decay ) && - stringTo( string( myoptarg, pos1 ), + stringTo( string( myoptarg, pos1 ), local_decay_alfa ) ) ){ Error( "illegal value for -d option: " + myoptarg ); return false; @@ -856,7 +826,7 @@ if ( pos2 != string::npos ){ if ( ! ( stringTo( string( myoptarg, 0, pos1 ), local_decay ) && - stringTo( string( myoptarg, pos2 ), + stringTo( string( myoptarg, pos2 ), local_decay_alfa ) ) ){ Error( "illegal value for -d option: " + myoptarg ); return false; @@ -870,19 +840,18 @@ else { if ( ! ( stringTo( string( myoptarg, 0, pos1 ), local_decay ) && - stringTo( string( myoptarg, pos1+1, pos2-pos1-1 ), + stringTo( string( myoptarg, pos1+1, pos2-pos1-1 ), local_decay_alfa ) && - stringTo( string( myoptarg, pos2+1 ), + stringTo( string( myoptarg, pos2+1 ), local_decay_beta ) ) ){ Error( "illegal value for -d option: " + myoptarg ); return false; } } } - } break; } - + case 'D': if ( longOpt ){ if ( long_option == "Diversify" ) @@ -899,7 +868,7 @@ else keep_distributions = mood; break; - + case 'e': estimate = stringTo( myoptarg ); if ( estimate < 0 ){ @@ -914,7 +883,7 @@ return false; } break; - + case 'G': if ( myoptarg.empty() ) local_normalisation = probabilityNorm; @@ -926,7 +895,7 @@ } else { local_normalisation = stringTo( string( myoptarg, 0, pos1 ) ); - if ( !stringTo( string( myoptarg, pos1+1 ), + if ( !stringTo( string( myoptarg, pos1+1 ), local_norm_factor ) || local_norm_factor < Epsilon ){ Error( "illegal value for -G option: " + myoptarg ); @@ -939,11 +908,11 @@ } } break; - + case 'H': do_hashed = mood; break; - + case 'k': no_neigh = stringTo(myoptarg); if ( no_neigh <= 0 ){ @@ -951,34 +920,15 @@ return false; } break; - + case 'l': - if ( longOpt ){ - if ( long_option == "logfile" ){ - if ( myoptarg.empty() ){ - Error( "missing filename for '--logfile'" ); - return false; - } - logFile = myoptarg; - } - else { - Error( "invalid option: Did you mean '--logfile' ?" ); - return false; - } - } - else if ( myoptarg.find("ogfile") != string::npos ){ - Error( "invalid option: Did you mean '--logfile' ?" ); + f_length = stringTo( myoptarg ); + if ( f_length <= 0 ){ + Error( "illegal value for -l option: " + myoptarg ); return false; } - else { - f_length = stringTo( myoptarg ); - if ( f_length <= 0 ){ - Error( "illegal value for -l option: " + myoptarg ); - return false; - } - } break; - + case 'L': { string::size_type pos1 = myoptarg.find( ":" ); if ( pos1 == string::npos ){ @@ -1000,11 +950,11 @@ } break; } - case 'm': + case 'm': if ( !parse_metrics( myoptarg, local_metric ) ) return false; break; - + case 'M': maxbests = stringTo( myoptarg ); if ( maxbests <= 0 ){ @@ -1012,11 +962,11 @@ return false; } break; - + case 'N': // skip previously parsed NumOfFeatures info. break; - + case 'O': outPath = myoptarg; break; @@ -1049,38 +999,19 @@ return false; } break; - + case 'p': - if ( longOpt ){ - if ( long_option == "pidfile" ){ - if ( myoptarg.empty() ){ - Error( "missing filename for '--pidfile'" ); - return false; - } - pidFile = myoptarg; - } - else { - Error( "invalid option: Did you mean '--pidfile' ?" ); - return false; - } - } - else if ( myoptarg.find("idfile") != string::npos ){ - Error( "invalid option: Did you mean '--pidfile' ?" ); - return false; - } - else { - local_progress = stringTo( myoptarg ); - } + local_progress = stringTo( myoptarg ); break; - + case 'q': threshold = stringTo( myoptarg ); break; - + case 'Q': do_query = true; break; - + case 'R': if ( isdigit(myoptarg[0]) ) seed = stringTo( myoptarg ); @@ -1089,13 +1020,13 @@ return false; } break; - + case 's': if ( longOpt ){ if ( long_option == "sloppy" ){ bool val; if ( !isBoolOrEmpty(myoptarg,val) ){ - Error( "invalid value for sloppy: '" + Error( "invalid value for sloppy: '" + myoptarg + "'" ); return false; } @@ -1104,7 +1035,7 @@ else if ( long_option == "silly" ){ bool val; if ( !isBoolOrEmpty(myoptarg,val) ){ - Error( "invalid value for silly: '" + Error( "invalid value for silly: '" + myoptarg + "'" ); return false; } @@ -1139,18 +1070,18 @@ } } break; - + case 't': if ( compare_nocase( myoptarg, "leave_one_out" ) ) local_algo = LOO_a; else if ( compare_nocase( myoptarg, "cross_validate" ) ) local_algo = CV_a; break; - + case 'T': { if ( longOpt ){ if ( long_option == "Threshold" ){ - if ( !stringTo(myoptarg, igThreshold ) + if ( !stringTo(myoptarg, igThreshold ) || igThreshold < 0 ){ Error( "invalid value for Threshold: " + myoptarg ); return false; @@ -1182,7 +1113,7 @@ } } break; - + case 'v':{ VerbosityFlags Flag = NO_VERB; if ( !stringTo( myoptarg, Flag ) ){ @@ -1205,22 +1136,22 @@ } } break; - + case 'w': { if ( !stringTo( myoptarg, local_weight ) ) return false; }; break; - + case 'W': { do_all_weights = true; }; break; - + case 'x': do_exact = mood; break; - + } } catch( std::runtime_error& err ) { @@ -1231,7 +1162,5 @@ } return true; } - -} - +} diff -Nru timbl-6.4.4/src/IBprocs.cxx timbl-6.4.6/src/IBprocs.cxx --- timbl-6.4.4/src/IBprocs.cxx 2013-03-28 11:56:16.000000000 +0000 +++ timbl-6.4.6/src/IBprocs.cxx 2014-01-06 10:12:32.000000000 +0000 @@ -1,8 +1,8 @@ /* - $Id: IBprocs.cxx 15828 2013-03-28 11:55:53Z sloot $ + $Id: IBprocs.cxx 16820 2014-01-06 10:12:30Z sloot $ $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/src/IBprocs.cxx $ - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp diff -Nru timbl-6.4.4/src/IBtree.cxx timbl-6.4.6/src/IBtree.cxx --- timbl-6.4.4/src/IBtree.cxx 2013-04-02 16:05:26.000000000 +0000 +++ timbl-6.4.6/src/IBtree.cxx 2014-01-06 10:12:32.000000000 +0000 @@ -1,11 +1,11 @@ /* - $Id: IBtree.cxx 15879 2013-04-02 16:05:03Z sloot $ + $Id: IBtree.cxx 16820 2014-01-06 10:12:30Z sloot $ $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/src/IBtree.cxx $ - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp - + This file is part of timbl timbl is free software; you can redistribute it and/or modify @@ -52,32 +52,32 @@ using namespace Common; IBtree::IBtree(): - FValue(0), TValue(0), TDistribution(0), + FValue(0), TValue(0), TDistribution(0), link(0), next(0) { } - + IBtree::IBtree( FeatureValue *_fv ): - FValue(_fv), TValue( 0 ), TDistribution( 0 ), + FValue(_fv), TValue( 0 ), TDistribution( 0 ), link(0), next(0) { } - + IBtree::~IBtree(){ delete TDistribution; delete link; delete next; } - + #ifdef IBSTATS - inline IBtree *IBtree::add_feat_val( FeatureValue *FV, + inline IBtree *IBtree::add_feat_val( FeatureValue *FV, unsigned int &mm, IBtree **tree, unsigned long& cnt ){ #else - inline IBtree *IBtree::add_feat_val( FeatureValue *FV, + inline IBtree *IBtree::add_feat_val( FeatureValue *FV, IBtree **tree, unsigned long& cnt ){ #endif - // Add a Featurevalue to the IB. + // Add a Featurevalue to the IB. IBtree **pnt = tree; while ( *pnt ){ if ( (*pnt)->FValue == FV ){ @@ -104,7 +104,7 @@ ++cnt; return *pnt; } - + static int IBtree_Indent = 0; ostream &operator<<( ostream &os, const IBtree& grap ){ @@ -164,7 +164,7 @@ os << ib.InstBase << endl; return os; } - + ostream& operator<<( ostream &os, const InstanceBase_base *ib ){ if ( ib ) os << *ib; @@ -172,15 +172,15 @@ os << "empty INSTANCE BASE"; return os; } - - unsigned long int InstanceBase_base::GetSizeInfo( unsigned long int& CurSize, + + unsigned long int InstanceBase_base::GetSizeInfo( unsigned long int& CurSize, double &Compression ) const { unsigned long int MaxSize = (Depth+1) * NumOfTails; CurSize = ibCount; Compression = 100*(1-(double)CurSize/(double)MaxSize); return CurSize * sizeof(IBtree); } - + void InstanceBase_base::write_tree( ostream &os, const IBtree *pnt ) const { // part of saving a tree in a recoverable manner os << " (" << pnt->TValue << " "; @@ -209,7 +209,7 @@ } os << ")\n"; } - + void InstanceBase_base::write_tree_hashed( ostream &os, const IBtree *pnt ) const { // part of saving a tree in a recoverable manner os << "(" << pnt->TValue->Index(); @@ -238,12 +238,12 @@ } os << ")\n"; } - + const TargetValue *InstanceBase_base::TopTarget( bool &tie ) { if ( !DefaultsValid || !DefAss ) TopT = 0; if ( TopT == 0 ){ - TopT = TopDistribution->BestTarget( tiedTop, Random); + TopT = TopDistribution->BestTarget( tiedTop, Random); } tie = tiedTop; return TopT; @@ -255,7 +255,7 @@ PersistentDistributions = persist; AssignDefaults(); bool dummy; - os << "# Version " << Version << "\n#\n(" + os << "# Version " << Version << "\n#\n(" << TopTarget( dummy ) << " " << TopDistribution->Save(); IBtree *pnt = InstBase; if ( pnt ){ @@ -272,7 +272,7 @@ os << ")\n"; PersistentDistributions = temp_persist; } - + xmlNode *to_node( const FeatureValue *fv ){ xmlNode *result = XmlNewNode( "feature" ); XmlAddContent( result, fv->Name() ); @@ -290,7 +290,7 @@ XmlAddContent( result, d->DistToString() ); return result; } - + string spaces( int id ){ string res; for ( int j=0; j vec ){ string result; vector::const_iterator it = vec.begin(); @@ -356,7 +356,7 @@ return result; } - void InstanceBase_base::printStatsTree( ostream &os, + void InstanceBase_base::printStatsTree( ostream &os, unsigned int startLevel ) { if ( !PersistentDistributions ){ os << "no statsTree written, use IG tree and +D while training" << endl; @@ -375,7 +375,7 @@ pnt = pnt->link; } if ( pnt ){ - os << level << " [" << toString(pad) << " " << pnt->FValue << " ] " + os << level << " [" << toString(pad) << " " << pnt->FValue << " ] " << pnt->TDistribution << " < "; pnt = pnt->link; while ( pnt ){ @@ -392,9 +392,9 @@ } } } - + void save_hash( ostream &os, - Hash::StringHash *cats, + Hash::StringHash *cats, Hash::StringHash *feats ){ int Size = cats->NumOfEntries(); os << "Classes" << endl; @@ -406,9 +406,9 @@ os << i << "\t" << feats->ReverseLookup( i ) << endl; os << endl; } - - void InstanceBase_base::Save( ostream &os, - Hash::StringHash *cats, + + void InstanceBase_base::Save( ostream &os, + Hash::StringHash *cats, Hash::StringHash *feats, bool persist ) { // save an IBtree for later use. @@ -434,8 +434,8 @@ os << ")\n"; PersistentDistributions = temp_persist; } - - IBtree* InstanceBase_base::read_list( istream &is, + + IBtree* InstanceBase_base::read_list( istream &is, std::vector& Feats, Target *Targ, int level ){ @@ -456,8 +456,8 @@ is >> delim; // skip closing `]` return result; } - - IBtree* InstanceBase_base::read_list_hashed( istream &is, + + IBtree* InstanceBase_base::read_list_hashed( istream &is, std::vector& Feats, Target *Targ, int level ){ @@ -478,12 +478,12 @@ is >> delim; // skip closing `]` return result; } - + IBtree *InstanceBase_base::read_local( istream &is, vector& Feats, Target *Targ, int level ){ - if ( !is ) + if ( !is ) return NULL; IBtree *result = new IBtree(); ++ibCount; @@ -543,12 +543,12 @@ } return result; } - + IBtree *InstanceBase_base::read_local_hashed( istream &is, vector& Feats, Target *Targ, int level ){ - if ( !is ) + if ( !is ) return NULL; IBtree *result = new IBtree(); ++ibCount; @@ -568,10 +568,10 @@ if ( nxt == '{' ){ // // A distribution is found, must be the last featurevalue - // (the dummy node is not stored) + // (the dummy node is not stored) // OR we have Persistent Distributions try { - result->TDistribution + result->TDistribution = ValueDistribution::read_distribution_hashed( is, Targ, false ); } catch ( const string what ){ @@ -589,7 +589,7 @@ } } else if ( look_ahead(is) == ')' && result->TDistribution ){ - // + // // make a dummy node for the targetdistributions just read // result->link = new IBtree(); @@ -611,13 +611,13 @@ } return result; } - - bool InstanceBase_base::ReadIB( istream &is, + + bool InstanceBase_base::ReadIB( istream &is, vector& Feats, Target *Targs, int expected_version ){ if ( read_IB( is, Feats, Targs, expected_version ) ){ InstBase->redo_distributions(); - ValueDistribution *Top + ValueDistribution *Top = InstBase->sum_distributions( PersistentDistributions ); delete Top; // still a bit silly but the Top Distribution is known // but we need to cleanup behind us also @@ -626,7 +626,7 @@ else return false; } - + void InstanceBase_base::fill_index(){ IBtree *pnt = InstBase; while ( pnt ){ @@ -635,12 +635,12 @@ } } - bool IG_InstanceBase::ReadIB( istream &is, + bool IG_InstanceBase::ReadIB( istream &is, vector& Feats, Target *Targs, int expected_version ){ if ( read_IB( is, Feats, Targs, expected_version ) ){ if ( PersistentDistributions ){ - ValueDistribution *Top + ValueDistribution *Top = InstBase->sum_distributions( PersistentDistributions ); delete Top; // still a bit silly but the Top Distribution is known // but we need to cleanup behind us also @@ -650,8 +650,8 @@ else return false; } - - bool InstanceBase_base::read_IB( istream &is, + + bool InstanceBase_base::read_IB( istream &is, vector& Feats, Target *Targs, int expected_version ){ string buf; @@ -674,7 +674,7 @@ // Now read the TopDistribution, to get the Targets // in the right order in Targ try { - TopDistribution + TopDistribution = ValueDistribution::read_distribution( is, Targs, true ); } catch ( const string& what ){ @@ -696,8 +696,8 @@ } return (InstBase != NULL); } - - bool InstanceBase_base::read_hash( istream &is, + + bool InstanceBase_base::read_hash( istream &is, Hash::StringHash *cats, Hash::StringHash *feats ) const { string line; @@ -732,15 +732,15 @@ } return true; } - - bool InstanceBase_base::ReadIB( istream &is, + + bool InstanceBase_base::ReadIB( istream &is, vector& Feats, Target *Targs, - Hash::StringHash *cats, + Hash::StringHash *cats, Hash::StringHash *feats, int expected_version ){ if ( read_IB( is, Feats, Targs, cats, feats, expected_version ) ){ InstBase->redo_distributions(); - ValueDistribution *Top + ValueDistribution *Top = InstBase->sum_distributions( PersistentDistributions ); delete Top; // still a bit silly but the Top Distribution is known // but we need to cleanup behind us also @@ -749,14 +749,14 @@ else return false; } - - bool IG_InstanceBase::ReadIB( istream &is, + + bool IG_InstanceBase::ReadIB( istream &is, vector& Feats, Target *Targs, Hash::StringHash *cats, Hash::StringHash *feats, int expected_version ){ if ( read_IB( is, Feats, Targs, cats, feats, expected_version ) ){ if ( PersistentDistributions ){ - ValueDistribution *Top + ValueDistribution *Top = InstBase->sum_distributions( PersistentDistributions ); delete Top; // still a bit silly but the Top Distribution is known // but we need to cleanup behind us also @@ -766,10 +766,10 @@ else return false; } - - bool InstanceBase_base::read_IB( istream &is, + + bool InstanceBase_base::read_IB( istream &is, vector& Feats, Target *Targs, - Hash::StringHash *cats, + Hash::StringHash *cats, Hash::StringHash *feats, int expected_version ){ char delim; @@ -793,7 +793,7 @@ // Now read the TopDistribution, to get the Targets // in the right order in Targ try { - TopDistribution + TopDistribution = ValueDistribution::read_distribution_hashed( is, Targs, true ); } catch ( const string& what ){ @@ -811,12 +811,13 @@ if ( InstBase ){ is >> delim; if ( delim != ')' ) - Error( "missing last `)` in Instance base file, found " + delim ); + Error( string("missing last `)` in Instance base file, found: ") + + delim ); } } return (InstBase != NULL); } - + bool InstanceBase_base::HasDistributions() const { if ( InstBase && InstBase->link ) return InstBase->link->TDistribution != NULL; @@ -864,7 +865,7 @@ } return result; } - + void IBtree::assign_defaults( bool Random, bool persist, size_t level ){ // recursively gather Distribution information up to the top. // at each Node we use that info to calculate the Default target. @@ -883,8 +884,8 @@ pnt = pnt->next; } } - - void IBtree::re_assign_defaults( bool Random, + + void IBtree::re_assign_defaults( bool Random, bool persist ){ // recursively gather Distribution information up to the top. // at each Node we use that info to calculate the Default target. @@ -900,7 +901,7 @@ pnt = pnt->next; } } - + void IBtree::redo_distributions(){ // recursively gather Distribution information up to the top. // removing old info... @@ -919,7 +920,7 @@ } } - inline IBtree *IBtree::make_unique( const TargetValue *Top, + inline IBtree *IBtree::make_unique( const TargetValue *Top, unsigned long& cnt ){ // remove branches with the same target as the Top, except when they // still have a subbranch, which means that they are an exception. @@ -939,7 +940,7 @@ } return result; } - + inline IBtree *IBtree::Reduce( const TargetValue *Top, unsigned long& cnt, long depth ){ @@ -956,7 +957,7 @@ else return this; } - + const ValueDistribution *IBtree::exact_match( const Instance& Inst ) const { // Is there an exact match between the Instance and the IB // If so, return the best Distribution. @@ -984,10 +985,10 @@ } return NULL; } - - InstanceBase_base::InstanceBase_base( size_t depth, + + InstanceBase_base::InstanceBase_base( size_t depth, unsigned long int&cnt, - bool Rand, + bool Rand, bool persist ): DefAss( false ), DefaultsValid( false ), @@ -1006,7 +1007,7 @@ Depth( depth ), NumOfTails( 0 ) {} - + InstanceBase_base::~InstanceBase_base(){ if ( InstPath ){ delete [] InstPath; @@ -1046,11 +1047,11 @@ delete TopDistribution; delete WTop; } - + IB_InstanceBase *IB_InstanceBase::clone() const { return new IB_InstanceBase( Depth, ibCount, Random ); } - + IB_InstanceBase *IB_InstanceBase::Copy() const { IB_InstanceBase *result = clone(); result->DefAss = DefAss; @@ -1062,12 +1063,12 @@ result->TopDistribution = TopDistribution; return result; } - + IG_InstanceBase *IG_InstanceBase::clone() const { - return new IG_InstanceBase( Depth, ibCount, + return new IG_InstanceBase( Depth, ibCount, Random, Pruned, PersistentDistributions ); } - + IG_InstanceBase *IG_InstanceBase::Copy() const { IG_InstanceBase *result = clone(); result->Pruned = Pruned; @@ -1080,8 +1081,8 @@ result->TopDistribution = TopDistribution; return result; } - - void IBtree::countBranches( unsigned int l, + + void IBtree::countBranches( unsigned int l, std::vector& terminals, std::vector& nonTerminals ){ if ( link && link->FValue != 0 ){ @@ -1095,7 +1096,7 @@ next->countBranches( l, terminals, nonTerminals ); } } - + void InstanceBase_base::summarizeNodes( std::vector& terminals, std::vector& nonTerminals ){ terminals.clear(); @@ -1108,7 +1109,7 @@ } TRIBL_InstanceBase *TRIBL_InstanceBase::clone() const { - return new TRIBL_InstanceBase( Depth, ibCount, + return new TRIBL_InstanceBase( Depth, ibCount, Random, PersistentDistributions ); } @@ -1124,7 +1125,7 @@ result->TopDistribution = TopDistribution; return result; } - + TRIBL2_InstanceBase *TRIBL2_InstanceBase::clone() const { return new TRIBL2_InstanceBase( Depth, ibCount, Random, PersistentDistributions ); @@ -1141,7 +1142,7 @@ result->TopDistribution = TopDistribution; return result; } - + IB_InstanceBase* TRIBL_InstanceBase::IBPartition( IBtree *sub ) const { int i=0; IBtree *tmp = sub; @@ -1190,7 +1191,7 @@ TopDistribution = 0; // save TopDistribution for deletion delete this; } - + void InstanceBase_base::AssignDefaults(){ if ( !DefaultsValid ){ if ( !DefAss ){ @@ -1201,7 +1202,7 @@ else { InstBase->re_assign_defaults( Random, PersistentDistributions ); } - ValueDistribution *Top + ValueDistribution *Top = InstBase->sum_distributions( PersistentDistributions ); delete Top; // still a bit silly but the Top Distribution is known } @@ -1224,7 +1225,7 @@ void InstanceBase_base::Prune( const TargetValue *, long ){ FatalError( "You Cannot Prune this kind of tree! " ); } - + void IG_InstanceBase::Prune( const TargetValue *top, long depth ){ AssignDefaults( ); if ( !Pruned ) { @@ -1232,10 +1233,10 @@ Pruned = true; } } - + void IG_InstanceBase::specialPrune( const TargetValue *top ){ IBtree *pnt = InstBase->link; - // we have to fix the toptarget here, because the node + // we have to fix the toptarget here, because the node // is build incremental ValueDistribution dist; while ( pnt ){ @@ -1248,7 +1249,7 @@ InstBase = InstBase->Reduce( top, ibCount, 0 ); Pruned = true; } - + bool InstanceBase_base::AddInstance( const Instance& Inst ){ bool sw_conflict = false; // add one instance to the IB @@ -1303,7 +1304,7 @@ bool InstanceBase_base::MergeSub( InstanceBase_base *ib ){ if ( ib->InstBase ){ // we place the InstanceBase of ib in front of the current InstanceBase - // the assumption is that both are sorted on ascending index, and that + // the assumption is that both are sorted on ascending index, and that // the indices in ib are all smaller then those in the current IB if ( !InstBase ){ InstBase = ib->InstBase; @@ -1338,7 +1339,7 @@ DefAss = false; ib->InstBase = 0; return true; - } + } void IBtree::cleanDistributions() { IBtree *pnt = this; @@ -1371,7 +1372,7 @@ return false; } if ( (*pnt)->FValue->Index() == fv->Index() ){ - // this may happen + // this may happen // snip the link and insert at our link IBtree *snip = ibPnt->link; ibPnt->link = 0; @@ -1381,7 +1382,7 @@ delete ibPnt; while ( snip ){ if ( PersistentDistributions ) - (*pnt)->TDistribution->Merge( *snip->TDistribution ); + (*pnt)->TDistribution->Merge( *snip->TDistribution ); else delete snip->TDistribution; IBtree **tmp = &(*pnt)->link; @@ -1449,7 +1450,7 @@ } DefaultsValid = false; } - + const ValueDistribution *InstanceBase_base::InitGraphTest( vector&, const vector *, size_t, @@ -1540,14 +1541,14 @@ #endif return result; } - - const ValueDistribution *InstanceBase_base::NextGraphTest( vector&, + + const ValueDistribution *InstanceBase_base::NextGraphTest( vector&, size_t& ){ FatalError( "NextGraphTest" ); return 0; } - - const ValueDistribution *IB_InstanceBase::NextGraphTest( vector& Path, + + const ValueDistribution *IB_InstanceBase::NextGraphTest( vector& Path, size_t& pos ){ const IBtree *pnt = NULL; const ValueDistribution *result = NULL; @@ -1624,8 +1625,8 @@ #endif return result; } - - const ValueDistribution *InstanceBase_base::IG_test( const Instance& , + + const ValueDistribution *InstanceBase_base::IG_test( const Instance& , size_t &, bool &, const TargetValue *& ){ @@ -1633,7 +1634,7 @@ return NULL; } - const ValueDistribution *IG_InstanceBase::IG_test( const Instance& Inst, + const ValueDistribution *IG_InstanceBase::IG_test( const Instance& Inst, size_t &end_level, bool &leaf, const TargetValue *&result ) { @@ -1651,7 +1652,7 @@ if ( PersistentDistributions ) Dist = pnt->TDistribution; pnt = pnt->link; - if ( pnt && !pnt->FValue ) + if ( pnt && !pnt->FValue ) pnt = NULL; leaf = (pnt == NULL); ++pos; @@ -1667,7 +1668,7 @@ return Dist; } - IB_InstanceBase *InstanceBase_base::TRIBL_test( const Instance& , + IB_InstanceBase *InstanceBase_base::TRIBL_test( const Instance& , size_t, const TargetValue *&, const ValueDistribution *&, @@ -1676,20 +1677,20 @@ return NULL; } - IB_InstanceBase *InstanceBase_base::TRIBL2_test( const Instance& , + IB_InstanceBase *InstanceBase_base::TRIBL2_test( const Instance& , const ValueDistribution *&, size_t & ){ FatalError( "TRIBL2_test " ); return NULL; } - IB_InstanceBase *TRIBL_InstanceBase::TRIBL_test( const Instance& Inst, + IB_InstanceBase *TRIBL_InstanceBase::TRIBL_test( const Instance& Inst, size_t threshold, const TargetValue *&TV, const ValueDistribution *&dist, size_t &level ) { // The Test function for the TRIBL algorithm, returns a pointer to the - // Target at the last matching position in the Tree, + // Target at the last matching position in the Tree, // or the subtree Instance Base necessary for IB1 IBtree *pnt = InstBase; #pragma omp critical @@ -1720,7 +1721,7 @@ else { level = pos; } - } + } else { if ( pos == 0 && dist == NULL ){ if ( !WTop && TopDistribution ) @@ -1734,8 +1735,8 @@ } return subt; } - - IB_InstanceBase *TRIBL2_InstanceBase::TRIBL2_test( const Instance& Inst, + + IB_InstanceBase *TRIBL2_InstanceBase::TRIBL2_test( const Instance& Inst, const ValueDistribution *& dist, size_t &level ){ // The Test function for the TRIBL2 algorithm, returns a pointer to the @@ -1769,5 +1770,5 @@ } return subtree; } - + } // namespace Timbl diff -Nru timbl-6.4.4/src/IGExperiment.cxx timbl-6.4.6/src/IGExperiment.cxx --- timbl-6.4.4/src/IGExperiment.cxx 2013-04-02 09:35:47.000000000 +0000 +++ timbl-6.4.6/src/IGExperiment.cxx 2014-01-06 10:12:32.000000000 +0000 @@ -1,8 +1,8 @@ /* - $Id: IGExperiment.cxx 15854 2013-04-02 09:35:24Z sloot $ + $Id: IGExperiment.cxx 16820 2014-01-06 10:12:30Z sloot $ $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/src/IGExperiment.cxx $ - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp diff -Nru timbl-6.4.4/src/Instance.cxx timbl-6.4.6/src/Instance.cxx --- timbl-6.4.4/src/Instance.cxx 2013-03-28 11:56:16.000000000 +0000 +++ timbl-6.4.6/src/Instance.cxx 2014-01-06 10:12:32.000000000 +0000 @@ -1,8 +1,8 @@ /* - $Id: Instance.cxx 15828 2013-03-28 11:55:53Z sloot $ + $Id: Instance.cxx 16820 2014-01-06 10:12:30Z sloot $ $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/src/Instance.cxx $ - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp diff -Nru timbl-6.4.4/src/LOOExperiment.cxx timbl-6.4.6/src/LOOExperiment.cxx --- timbl-6.4.4/src/LOOExperiment.cxx 2013-03-28 11:56:16.000000000 +0000 +++ timbl-6.4.6/src/LOOExperiment.cxx 2014-01-06 10:12:32.000000000 +0000 @@ -1,8 +1,8 @@ /* - $Id: LOOExperiment.cxx 15828 2013-03-28 11:55:53Z sloot $ + $Id: LOOExperiment.cxx 16820 2014-01-06 10:12:30Z sloot $ $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/src/LOOExperiment.cxx $ - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp diff -Nru timbl-6.4.4/src/Makefile.in timbl-6.4.6/src/Makefile.in --- timbl-6.4.4/src/Makefile.in 2013-04-03 15:49:28.000000000 +0000 +++ timbl-6.4.6/src/Makefile.in 2014-09-23 08:29:54.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # 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. @@ -20,6 +19,51 @@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -41,7 +85,8 @@ bin_PROGRAMS = timbl$(EXEEXT) check_PROGRAMS = simpletest$(EXEEXT) subdir = src -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp $(top_srcdir)/test-driver ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ @@ -91,7 +136,11 @@ LOOExperiment.lo CVExperiment.lo Types.lo neighborSet.lo \ Statistics.lo BestArray.lo libtimbl_la_OBJECTS = $(am_libtimbl_la_OBJECTS) -libtimbl_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +libtimbl_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(libtimbl_la_LDFLAGS) $(LDFLAGS) -o $@ PROGRAMS = $(bin_PROGRAMS) @@ -103,30 +152,249 @@ timbl_OBJECTS = $(am_timbl_OBJECTS) timbl_LDADD = $(LDADD) timbl_DEPENDENCIES = libtimbl.la +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(libtimbl_la_SOURCES) $(simpletest_SOURCES) \ $(timbl_SOURCES) DIST_SOURCES = $(libtimbl_la_SOURCES) $(simpletest_SOURCES) \ $(timbl_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -164,7 +432,6 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ -LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -272,7 +539,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cxx .lo .o .obj +.SUFFIXES: .cxx .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -303,9 +570,9 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -313,6 +580,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ } @@ -328,24 +597,32 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libtimbl.la: $(libtimbl_la_OBJECTS) $(libtimbl_la_DEPENDENCIES) $(EXTRA_libtimbl_la_DEPENDENCIES) - $(libtimbl_la_LINK) -rpath $(libdir) $(libtimbl_la_OBJECTS) $(libtimbl_la_LIBADD) $(LIBS) + $(AM_V_CXXLD)$(libtimbl_la_LINK) -rpath $(libdir) $(libtimbl_la_OBJECTS) $(libtimbl_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -366,7 +643,8 @@ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -388,12 +666,14 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + simpletest$(EXEEXT): $(simpletest_OBJECTS) $(simpletest_DEPENDENCIES) $(EXTRA_simpletest_DEPENDENCIES) @rm -f simpletest$(EXEEXT) - $(CXXLINK) $(simpletest_OBJECTS) $(simpletest_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(simpletest_OBJECTS) $(simpletest_LDADD) $(LIBS) + timbl$(EXEEXT): $(timbl_OBJECTS) $(timbl_DEPENDENCIES) $(EXTRA_timbl_DEPENDENCIES) @rm -f timbl$(EXEEXT) - $(CXXLINK) $(timbl_OBJECTS) $(timbl_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(timbl_OBJECTS) $(timbl_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -427,25 +707,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simpletest.Po@am__quote@ .cxx.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cxx.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cxx.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -453,26 +733,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -484,15 +753,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -501,102 +766,187 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +simpletest.log: simpletest$(EXEEXT) + @p='simpletest$(EXEEXT)'; \ + b='simpletest'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -659,6 +1009,9 @@ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -743,20 +1096,21 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-binPROGRAMS clean-checkPROGRAMS clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-binPROGRAMS install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-libLTLIBRARIES install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-binPROGRAMS \ + clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-libLTLIBRARIES \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am recheck tags tags-am \ + uninstall uninstall-am uninstall-binPROGRAMS \ uninstall-libLTLIBRARIES diff -Nru timbl-6.4.4/src/MBLClass.cxx timbl-6.4.6/src/MBLClass.cxx --- timbl-6.4.4/src/MBLClass.cxx 2013-04-02 14:06:21.000000000 +0000 +++ timbl-6.4.6/src/MBLClass.cxx 2014-01-06 10:12:32.000000000 +0000 @@ -1,8 +1,8 @@ /* - $Id: MBLClass.cxx 15868 2013-04-02 14:05:58Z sloot $ + $Id: MBLClass.cxx 16820 2014-01-06 10:12:30Z sloot $ $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/src/MBLClass.cxx $ - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp @@ -329,7 +329,6 @@ for ( unsigned int i=0; i < Features.size(); ++i ){ delete Features[i]; } - delete sock_os; delete GlobalMetric; delete tester; delete decay; diff -Nru timbl-6.4.4/src/Metrics.cxx timbl-6.4.6/src/Metrics.cxx --- timbl-6.4.4/src/Metrics.cxx 2013-03-28 11:56:16.000000000 +0000 +++ timbl-6.4.6/src/Metrics.cxx 2014-01-06 10:12:32.000000000 +0000 @@ -1,8 +1,8 @@ /* - $Id: Metrics.cxx 15828 2013-03-28 11:55:53Z sloot $ + $Id: Metrics.cxx 16820 2014-01-06 10:12:30Z sloot $ $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/src/Metrics.cxx $ - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp diff -Nru timbl-6.4.4/src/MsgClass.cxx timbl-6.4.6/src/MsgClass.cxx --- timbl-6.4.4/src/MsgClass.cxx 2013-01-07 14:27:12.000000000 +0000 +++ timbl-6.4.6/src/MsgClass.cxx 2014-01-06 10:12:32.000000000 +0000 @@ -1,8 +1,8 @@ /* - $Id: MsgClass.cxx 15565 2013-01-07 14:27:05Z sloot $ + $Id: MsgClass.cxx 16820 2014-01-06 10:12:30Z sloot $ $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/src/MsgClass.cxx $ - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp diff -Nru timbl-6.4.4/src/neighborSet.cxx timbl-6.4.6/src/neighborSet.cxx --- timbl-6.4.4/src/neighborSet.cxx 2013-03-28 11:56:16.000000000 +0000 +++ timbl-6.4.6/src/neighborSet.cxx 2014-01-06 10:12:32.000000000 +0000 @@ -1,8 +1,8 @@ /* - $Id: neighborSet.cxx 15828 2013-03-28 11:55:53Z sloot $ + $Id: neighborSet.cxx 16820 2014-01-06 10:12:30Z sloot $ $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/src/neighborSet.cxx $ - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp diff -Nru timbl-6.4.4/src/simpletest.cxx timbl-6.4.6/src/simpletest.cxx --- timbl-6.4.4/src/simpletest.cxx 2013-01-07 14:24:15.000000000 +0000 +++ timbl-6.4.6/src/simpletest.cxx 2014-01-06 09:55:27.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp diff -Nru timbl-6.4.4/src/Statistics.cxx timbl-6.4.6/src/Statistics.cxx --- timbl-6.4.4/src/Statistics.cxx 2013-01-07 14:27:12.000000000 +0000 +++ timbl-6.4.6/src/Statistics.cxx 2014-01-06 10:12:32.000000000 +0000 @@ -1,8 +1,8 @@ /* - $Id: Statistics.cxx 15565 2013-01-07 14:27:05Z sloot $ + $Id: Statistics.cxx 16820 2014-01-06 10:12:30Z sloot $ $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/src/Statistics.cxx $ - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp @@ -150,7 +150,6 @@ size_t FN = 0; size_t TN = 0; ValueClass *tv = tg->ValuesArray[i]; - size_t valFreq = tv->ValFreq(); size_t testCount = 0; for ( unsigned int j=0; j < size; ++j ){ testCount += mat[i][j]; diff -Nru timbl-6.4.4/src/StringOps.cxx timbl-6.4.6/src/StringOps.cxx --- timbl-6.4.4/src/StringOps.cxx 2013-01-07 14:27:12.000000000 +0000 +++ timbl-6.4.6/src/StringOps.cxx 2014-01-06 10:12:32.000000000 +0000 @@ -1,8 +1,8 @@ /* - $Id: StringOps.cxx 15565 2013-01-07 14:27:05Z sloot $ + $Id: StringOps.cxx 16820 2014-01-06 10:12:30Z sloot $ $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/src/StringOps.cxx $ - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp diff -Nru timbl-6.4.4/src/Testers.cxx timbl-6.4.6/src/Testers.cxx --- timbl-6.4.4/src/Testers.cxx 2013-03-28 11:56:16.000000000 +0000 +++ timbl-6.4.6/src/Testers.cxx 2014-01-06 10:12:32.000000000 +0000 @@ -1,8 +1,8 @@ /* - $Id: Testers.cxx 15828 2013-03-28 11:55:53Z sloot $ + $Id: Testers.cxx 16820 2014-01-06 10:12:30Z sloot $ $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/src/Testers.cxx $ - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp diff -Nru timbl-6.4.4/src/TimblAPI.cxx timbl-6.4.6/src/TimblAPI.cxx --- timbl-6.4.4/src/TimblAPI.cxx 2013-03-28 11:56:16.000000000 +0000 +++ timbl-6.4.6/src/TimblAPI.cxx 2014-08-26 12:13:53.000000000 +0000 @@ -1,11 +1,11 @@ /* - $Id: TimblAPI.cxx 15828 2013-03-28 11:55:53Z sloot $ + $Id: TimblAPI.cxx 17567 2014-08-26 12:13:53Z sloot $ $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/src/TimblAPI.cxx $ - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp - + This file is part of timbl timbl is free software; you can redistribute it and/or modify @@ -47,28 +47,28 @@ using namespace TiCC; namespace Timbl { - + TimblOpts::TimblOpts( const int argc, const char * const *argv ): pimpl( new CL_Options( argc, argv ) ) {} - + TimblOpts::TimblOpts( const string& args ): pimpl( new CL_Options( args ) ) {} - + TimblOpts::~TimblOpts(){ delete pimpl; } - + ostream& operator<<( ostream& os, const TimblOpts& opts ){ os << *opts.pimpl; return os; } - + bool TimblOpts::Find( char c, string& opt, bool& mood ) const{ return pimpl->Find( c, opt, mood ); } - + bool TimblOpts::Find( const string& s, string& opt ) const{ return pimpl->Find( s, opt ); } @@ -81,23 +81,23 @@ mood=false; return pimpl->Find( s, opt ); } - + void TimblOpts::Add( char c, const string& opt, bool mood ){ pimpl->Add( c, opt, mood ); } - + void TimblOpts::Add( const string& opt, const string& val ){ pimpl->Add( opt, val ); } - + bool TimblOpts::Delete( char c ){ return pimpl->Delete( c ); } - + bool TimblOpts::Delete( const string& s ){ return pimpl->Delete( s ); } - + TimblExperiment *Create_Pimpl( AlgorithmType algo, const string& ex_name, GetOptClass *opt ){ TimblExperiment *result = NULL; @@ -134,11 +134,11 @@ TimblAPI::TimblAPI( const TimblAPI& exp ): pimpl( exp.pimpl->splitChild() ), i_am_fine(true) { } - + TimblAPI::TimblAPI( ): pimpl( 0 ), i_am_fine(false) { } - + TimblAPI::TimblAPI( const TimblOpts *T_Opts, const string& name ): pimpl(), i_am_fine(false) { @@ -155,8 +155,26 @@ } i_am_fine = (pimpl != NULL); } - - TimblAPI::TimblAPI( const string& pars, + + TimblAPI::TimblAPI( const TiCC::CL_Options& opts, + const string& name ): + pimpl(), i_am_fine(false) { + string bla = opts.toString(); + CL_Options Opts( bla ); + GetOptClass *OptPars = new GetOptClass( Opts ); + if ( !OptPars->parse_options( Opts ) ){ + delete OptPars; + } + else if ( OptPars->Algo() != Unknown_a ){ + pimpl = Create_Pimpl( OptPars->Algo(), name, OptPars ); + } + else { + pimpl = Create_Pimpl( IB1_a, name, OptPars ); + } + i_am_fine = (pimpl != NULL); + } + + TimblAPI::TimblAPI( const string& pars, const string& name ): pimpl(), i_am_fine(false){ CL_Options Opts( pars ); @@ -171,19 +189,19 @@ } i_am_fine = (pimpl != NULL); } - - TimblAPI::~TimblAPI(){ - delete pimpl; + + TimblAPI::~TimblAPI(){ + delete pimpl; } - + bool TimblAPI::Valid() const { return i_am_fine && pimpl && !pimpl->ExpInvalid(); } - + bool TimblAPI::isValid() const { return i_am_fine && pimpl && !pimpl->ExpInvalid(false); - } - + } + const string to_string( const Algorithm A ) { string result; switch ( A ){ @@ -214,7 +232,7 @@ } return result; } - + bool string_to( const string& s, Algorithm& A ){ A = UNKNOWN_ALG; AlgorithmType tmp; @@ -241,7 +259,7 @@ } return false; } - + const string to_string( const Weighting W ) { string result; switch ( W ){ @@ -295,7 +313,7 @@ } return w; } - + bool string_to( const string& s, Weighting& w ){ w = UNKNOWN_W; WeightType tmp; @@ -307,7 +325,7 @@ } return false; } - + Algorithm TimblAPI::Algo() const { Algorithm result = UNKNOWN_ALG; if ( pimpl ){ @@ -340,21 +358,21 @@ } return result; } - + bool TimblAPI::Learn( const string& s ){ if ( Valid() ) return pimpl->Learn( s ); - else + else return false; } - + bool TimblAPI::Prepare( const string& s ){ if ( Valid() ) return pimpl->Prepare( s ); else return false; } - + bool TimblAPI::CVprepare( const string& wf, Weighting w, const string& pf ){ if ( Valid() ){ WeightType tmp; @@ -381,24 +399,24 @@ else return false; } - + bool TimblAPI::Increment( const string& s ){ return Valid() && pimpl->Increment( s ); } - + bool TimblAPI::Decrement( const string& s ){ return Valid() && pimpl->Decrement( s ); } - + bool TimblAPI::Expand( const string& s ){ return Valid() && pimpl->Expand( s ); } - + bool TimblAPI::Remove( const string& s ){ return Valid() && pimpl->Remove( s ); } - + bool TimblAPI::Test( const string& in, const string& out, const string& p ){ @@ -414,7 +432,7 @@ return pimpl->createPercFile( p ); } } - + bool TimblAPI::NS_Test( const string& in, const string& out ){ if ( !Valid() ) @@ -427,7 +445,7 @@ return pimpl->NS_Test( in, out ); } } - + const TargetValue *TimblAPI::Classify( const string& s, const ValueDistribution *& db, double& di ){ @@ -440,14 +458,14 @@ } return NULL; } - + const TargetValue *TimblAPI::Classify( const string& s ){ if ( Valid() ){ return pimpl->Classify( s ); } return NULL; } - + const TargetValue *TimblAPI::Classify( const string& s, const ValueDistribution *& db ){ if ( Valid() ){ @@ -463,7 +481,7 @@ if ( Valid() ){ return pimpl->Classify( s, di ); } - else + else di = DBL_MAX; return NULL; } @@ -475,7 +493,7 @@ } return ns; } - + bool TimblAPI::classifyNS( const string& s, neighborSet& ns ){ const neighborSet *b = classifyNS( s ); if ( b != 0 ){ @@ -484,7 +502,7 @@ } return false; } - + const Instance *TimblAPI::lastHandledInstance() const { if ( Valid() ) return &pimpl->CurrInst; @@ -494,18 +512,18 @@ const Target *TimblAPI::myTargets() const{ if ( Valid() ) return pimpl->Targets; - return 0; + return 0; } bool TimblAPI::Classify( const string& s, string& d ){ return Valid() && pimpl->Classify( s, d ); } - + bool TimblAPI::Classify( const string& s, string& d, double &f ) { return Valid() && pimpl->Classify( s, d, f ); } - - bool TimblAPI::Classify( const string& s, string& d, + + bool TimblAPI::Classify( const string& s, string& d, string& e, double &f ){ return Valid() && pimpl->Classify( s, d, e, f ); } @@ -529,21 +547,21 @@ else return false; } - + InputFormatType TimblAPI::getInputFormat() const { if ( Valid() ) return pimpl->InputFormat(); else return UnknownInputFormat; } - + bool TimblAPI::SaveWeights( const string& f ){ if ( Valid() ) return pimpl->SaveWeights( f ); else return false; } - + bool TimblAPI::GetWeights( const string& f, Weighting w ){ if ( Valid() ){ WeightType tmp; @@ -567,10 +585,10 @@ } return pimpl->GetWeights( f, tmp ); } - else + else return false; } - + double TimblAPI::GetAccuracy() { if (Valid()) { return pimpl->stats.testedCorrect()/(double) pimpl->stats.dataLines(); @@ -578,14 +596,14 @@ return -1; } } - + Weighting TimblAPI::CurrentWeighting() const{ if ( Valid() ) return WT_to_W( pimpl->CurrentWeighting() ); else return UNKNOWN_W; } - + Weighting TimblAPI::GetCurrentWeights( std::vector& res ) const { res.clear(); if ( Valid() ){ @@ -594,22 +612,22 @@ } return UNKNOWN_W; } - + bool TimblAPI::SetOptions( const string& argv ){ return Valid() && pimpl->SetOptions( argv ); } - + bool TimblAPI::SetIndirectOptions( const TimblOpts& O ){ return Valid() && pimpl->IndirectOptions( *O.pimpl ); } - + string TimblAPI::ExpName() const { if ( pimpl ) // return the name, even when !Valid() return pimpl->ExpName(); else return "ERROR"; } - + bool TimblAPI::WriteNamesFile( const string& f ){ if ( Valid() ) { return pimpl->WriteNamesFile( f ); @@ -617,7 +635,7 @@ else return false; } - + bool TimblAPI::WriteInstanceBase( const string& f ){ if ( Valid() ){ return pimpl->WriteInstanceBase( f ); @@ -625,7 +643,7 @@ else return false; } - + bool TimblAPI::WriteInstanceBaseXml( const string& f ){ if ( Valid() ){ return pimpl->WriteInstanceBaseXml( f ); @@ -633,7 +651,7 @@ else return false; } - + bool TimblAPI::WriteInstanceBaseLevels( const string& f, unsigned int l ){ if ( Valid() ){ return pimpl->WriteInstanceBaseLevels( f, l ); @@ -641,7 +659,7 @@ else return false; } - + bool TimblAPI::GetInstanceBase( const string& f ){ if ( Valid() ){ if ( !pimpl->ReadInstanceBase( f ) ) @@ -651,7 +669,7 @@ else return false; } - + bool TimblAPI::WriteArrays( const string& f ){ if ( Valid() ){ return pimpl->WriteArrays( f ); @@ -659,7 +677,7 @@ else return false; } - + bool TimblAPI::GetArrays( const string& f ){ if ( Valid() ){ return pimpl->GetArrays( f ); @@ -667,15 +685,15 @@ else return false; } - + bool TimblAPI::WriteMatrices( const string& f ){ return Valid() && pimpl->WriteMatrices( f ); } - + bool TimblAPI::GetMatrices( const string& f ){ return Valid() && pimpl->GetMatrices( f ); } - + bool TimblAPI::ShowBestNeighbors( ostream& os ) const{ return Valid() && pimpl->showBestNeighbors( os ); } @@ -683,15 +701,15 @@ bool TimblAPI::ShowWeights( ostream& os ) const{ return Valid() && pimpl->ShowWeights( os ); } - + bool TimblAPI::ShowOptions( ostream& os ) const{ return Valid() && pimpl->ShowOptions( os ); } - + bool TimblAPI::ShowSettings( ostream& os ) const{ return Valid() && pimpl->ShowSettings( os ); } - + bool TimblAPI::ShowIBInfo( ostream& os ) const{ if ( Valid() ){ pimpl->IBInfo( os ); @@ -699,21 +717,21 @@ } else return false; - + } - + bool TimblAPI::ShowStatistics( ostream& os ) const{ return Valid() && pimpl->showStatistics( os ); } - + bool TimblAPI::StartServer( const int , const int ){ return false; } - + bool TimblAPI::StartMultiServer( const string& ){ return false; } - + bool TimblAPI::SetThreads( int c ){ if ( Valid() ){ pimpl->Clones( c ); @@ -722,13 +740,14 @@ else return false; } - + string TimblAPI::VersionInfo( bool full ){ + // obsolete return Common::VersionInfo( full ); } - + int TimblAPI::Default_Max_Feats() { return Common::DEFAULT_MAX_FEATS; } - + } diff -Nru timbl-6.4.4/src/Timbl.cxx timbl-6.4.6/src/Timbl.cxx --- timbl-6.4.4/src/Timbl.cxx 2013-03-28 11:56:16.000000000 +0000 +++ timbl-6.4.6/src/Timbl.cxx 2014-01-06 10:12:32.000000000 +0000 @@ -1,11 +1,11 @@ /* - $Id: Timbl.cxx 15828 2013-03-28 11:55:53Z sloot $ + $Id: Timbl.cxx 16820 2014-01-06 10:12:30Z sloot $ $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/src/Timbl.cxx $ - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp - + This file is part of timbl timbl is free software; you can redistribute it and/or modify @@ -86,14 +86,14 @@ cerr << " 2 or TRIBL : TRIBL" << endl; cerr << " 3 or IB2 : IB2" << endl; cerr << " 4 or TRIBL2 : TRIBL2" << endl; - cerr << "-m s : use feature metrics as specified in string s:" + cerr << "-m s : use feature metrics as specified in string s:" << endl - << " format: GlobalMetric:MetricRange:MetricRange" + << " format: GlobalMetric:MetricRange:MetricRange" << endl << " e.g.: mO:N3:I2,5-7" << endl; - cerr << " C: Cosine distance. (Global only. numeric features implied)" + cerr << " C: Cosine distance. (Global only. numeric features implied)" << endl; - cerr << " D: Dot product. (Global only. numeric features implied)" + cerr << " D: Dot product. (Global only. numeric features implied)" << endl; cerr << " DC: Dice Coefficient" << endl; cerr << " O: weighted Overlap (default)" << endl; @@ -113,13 +113,13 @@ cerr << " 5 or sd: Weight using Standard Deviation. (all features must be numeric)" << endl; cerr << "-w f : read Weights from file 'f'" << endl; cerr << "-w f:n : read Weight n from file 'f'" << endl; - cerr << "-b n : number of lines used for bootstrapping (IB2 only)" + cerr << "-b n : number of lines used for bootstrapping (IB2 only)" << endl; #ifdef HAVE_OPENMP cerr << "--clones= : use 'n' threads for parallel testing" << endl; #endif cerr << "--Diversify: rescale weight (see docs)" << endl; - cerr << "-d val : weight neighbors as function of their distance:" + cerr << "-d val : weight neighbors as function of their distance:" << endl; cerr << " Z : equal weights to all (default)" << endl; cerr << " ID : Inverse Distance" << endl; @@ -135,27 +135,27 @@ cerr << "-t f : test using file 'f'" << endl; cerr << "-t leave_one_out:" << " test with Leave One Out,using IB1" << endl; - cerr << " you may add -sloppy to speed up Leave One Out testing (see docs)" + cerr << " you may add -sloppy to speed up Leave One Out testing (see docs)" << endl; cerr << "-t cross_validate:" << " Cross Validate Test,using IB1" << endl; - cerr << " @f : test using files and options described in file 'f'" + cerr << " @f : test using files and options described in file 'f'" << endl; - cerr << " Supported options: d e F k m o p q R t u v w x % -" + cerr << " Supported options: d e F k m o p q R t u v w x % -" << endl; cerr << " -t is mandatory" << endl; cerr << "Input options:" << endl; cerr << "-f f : read from Datafile 'f'" << endl; cerr << "-f f : OR: use filenames from 'f' for CV test" << endl; cerr << "-F format : Assume the specified inputformat" << endl; - cerr << " (Compact, C4.5, ARFF, Columns, Tabbed, Binary, Sparse )" + cerr << " (Compact, C4.5, ARFF, Columns, Tabbed, Binary, Sparse )" << endl; cerr << "-l n : length of Features (Compact format only)" << endl; cerr << "-i f : read the InstanceBase from file 'f' " << "(skips phase 1 & 2 )" << endl; cerr << "--matrixin= read ValueDifference Matrices from file 'f'" << endl; - cerr << "-u f : read value_class probabilities from file 'f'" + cerr << "-u f : read value_class probabilities from file 'f'" << endl; cerr << "--occurrences=train|test|both assume occurrence info in the files." << endl; @@ -171,7 +171,7 @@ cerr << "--matrixout= store ValueDifference Matrices in file 'f'" << endl; cerr << "-X f : dump the InstanceBase as XML in file 'f'" << endl; cerr << "-n f : create names file 'f'" << endl; - cerr << "-p n : show progress every n lines (default p = 100,000)" + cerr << "-p n : show progress every n lines (default p = 100,000)" << endl; cerr << "-U f : save value_class probabilities in file 'f'" << endl; cerr << "-V : Show VERSION" << endl; @@ -180,7 +180,7 @@ cerr << " s: work silently" << endl; cerr << " o: show all options set" << endl; cerr << " b: show node/branch count and branching factor" << endl; - cerr << " f: show Calculated Feature Weights (default)" + cerr << " f: show Calculated Feature Weights (default)" << endl; cerr << " p: show Value Difference matrices" << endl; cerr << " e: show exact matches" << endl; @@ -189,7 +189,7 @@ cerr << " cs: show per Class Statistics (implies +vas)" << endl; cerr << " cf: add confidence to the output file. (needs -G)" << endl; cerr << " di: add distance to output file" << endl; - cerr << " db: add distribution of best matched to output file" + cerr << " db: add distribution of best matched to output file" << endl; cerr << " md: add matching depth to output file." << endl; cerr << " k: add a summary for all k neigbors to output file" @@ -200,7 +200,7 @@ << endl; cerr << "-G : normalize distibutions (+vdb option only)" << endl << " Probability : normalize between 0 and 1" << endl - << " O : does the same " << endl + << " 0 : does the same " << endl << " addFactor: : add f to all possible targets" << endl << " then normalize between 0 and 1 (default f=1.0)" << endl << " 1: : does the same" << endl @@ -212,7 +212,7 @@ cerr << "-o s : use s as output filename" << endl; cerr << "-O d : save output using path 'd'" << endl; cerr << "Internal representation options:" << endl; - cerr << "-B n : number of bins used for discretization of numeric " + cerr << "-B n : number of bins used for discretization of numeric " << "feature values" << endl; cerr << "-c n : clipping frequency for prestoring MVDM matrices" << endl; @@ -221,7 +221,7 @@ << endl; cerr << "+H or -H : write hashed trees (default +H)" << endl; cerr << "-M n : size of MaxBests Array" << endl; - cerr << "-N n : Number of features (default " + cerr << "-N n : Number of features (default " << TimblAPI::Default_Max_Feats() << ")" << endl; cerr << "--Treeorder= : ordering of the Tree :" << endl; cerr << " DO: none" << endl; @@ -254,9 +254,9 @@ void get_command_lines( const string& value, list& result ){ result.clear(); - ifstream ind( value.c_str()+1 ); // skip @ + ifstream ind( value.c_str()+1 ); // skip @ if ( ind.bad() ){ - cerr << "Problem reading command-lines from file '" + cerr << "Problem reading command-lines from file '" << value << "'" << endl; throw( "command line failure" ); } @@ -270,12 +270,12 @@ string correct_path( const string& filename, const string& path, - bool keep_origpath ){ + bool keep_origpath ){ // if filename contains pathinformation, it is replaced with path, except - // when keep_origpath is true. + // when keep_origpath is true. // if filename contains NO pathinformation, path is always appended. // of course we don't append if the filename is empty or just '-' ! - + if ( path != "" && filename != "" && filename[0] != '-' ){ bool add_slash = path[path.length()] != '/'; string tmp; @@ -286,14 +286,14 @@ tmp += "/"; tmp += filename; } - else { + else { tmp = path; if ( add_slash ) tmp += "/"; if ( !keep_origpath ){ tmp += filename.substr( pos+1 ); } - else + else tmp += filename; } return tmp; @@ -312,7 +312,7 @@ throw( softExit() ); } if ( Opts.Find( 'V', value, mood ) ){ - cerr << "TiMBL " << TimblAPI::VersionInfo( true ) << endl; + cerr << "TiMBL " << Timbl::BuildInfo() << endl; throw( softExit() ); } if ( Opts.Find( 'S', value, mood ) ){ @@ -531,7 +531,7 @@ else if ( num == 1 ){ WgtInFile = correct_path( value, I_Path, true ); Opts.Delete( 'w' ); - } + } else { cerr << "invalid weighting option: " << value << endl; return false; @@ -598,7 +598,7 @@ if ( Opts.Find( 'w', value, mood ) ){ temp += value; } - else + else if ( !WgtInFile.empty() ) temp += "ud"; else @@ -662,7 +662,7 @@ TimblOpts Opts( tmp_line ); Adjust_Default_Values( Opts ); if ( !get_file_names( Opts ) || TestFile == "" ){ - cerr << "Warning: Skipped a line from indirect testfile:\n'" + cerr << "Warning: Skipped a line from indirect testfile:\n'" << tmp_line << "'" << endl; if ( TestFile == "" ) cerr << "missing a Testfile name " << endl; @@ -721,7 +721,7 @@ // Start. // cerr << "TiMBL " << TimblAPI::VersionInfo() - << " (c) ILK 1998 - 2013.\n" + << " (c) ILK 1998 - 2014.\n" << "Tilburg Memory Based Learner\n" << "Induction of Linguistic Knowledge Research Group, Tilburg University\n" << "CLiPS Computational Linguistics Group, University of Antwerp" << endl; @@ -787,7 +787,7 @@ } if ( ProbOutFile != "" ) Run->WriteArrays( ProbOutFile ); - + do_test = TestFile != "" || Do_Indirect; if ( do_test || // something to test ? MatrixOutFile != "" || // or at least to produce @@ -809,15 +809,15 @@ if ( TreeOutFile != "" ) Run->WriteInstanceBase( TreeOutFile ); if ( levelTreeOutFile != "" ) - Run->WriteInstanceBaseLevels( levelTreeOutFile, + Run->WriteInstanceBaseLevels( levelTreeOutFile, levelTreeLevel ); } - else + else do_test = false; // no testing because of problems } } } - else if ( !dataFile.empty() && + else if ( !dataFile.empty() && !( TestFile.empty() && TreeOutFile.empty() && levelTreeOutFile.empty() ) ){ // it seems we want to expand our tree do_test = false; @@ -826,7 +826,7 @@ if ( !TreeOutFile.empty() ) Run->WriteInstanceBase( TreeOutFile ); if ( levelTreeOutFile != "" ) - Run->WriteInstanceBaseLevels( levelTreeOutFile, + Run->WriteInstanceBaseLevels( levelTreeOutFile, levelTreeLevel ); do_test = !TestFile.empty(); } @@ -865,14 +865,14 @@ catch( softExit& e ){ return 0; } - catch(std::string& what){ - cerr << what << ", sorry" << endl; + catch(std::string& what){ + cerr << what << ", sorry" << endl; } catch(std::exception& e){ cerr << e.what() << ", sorry" << endl; } catch(...){ cerr << "some exception was raised" << endl; - cerr << "timbl terminated, Sorry for that" << endl; + cerr << "timbl terminated, Sorry for that" << endl; } } diff -Nru timbl-6.4.4/src/TimblExperiment.cxx timbl-6.4.6/src/TimblExperiment.cxx --- timbl-6.4.4/src/TimblExperiment.cxx 2013-04-02 14:06:21.000000000 +0000 +++ timbl-6.4.6/src/TimblExperiment.cxx 2014-01-06 10:12:32.000000000 +0000 @@ -1,8 +1,8 @@ /* - $Id: TimblExperiment.cxx 15868 2013-04-02 14:05:58Z sloot $ + $Id: TimblExperiment.cxx 16820 2014-01-06 10:12:30Z sloot $ $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/src/TimblExperiment.cxx $ - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp diff -Nru timbl-6.4.4/src/TRIBLExperiments.cxx timbl-6.4.6/src/TRIBLExperiments.cxx --- timbl-6.4.4/src/TRIBLExperiments.cxx 2013-03-28 11:56:16.000000000 +0000 +++ timbl-6.4.6/src/TRIBLExperiments.cxx 2014-01-06 10:12:32.000000000 +0000 @@ -1,8 +1,8 @@ /* - $Id: TRIBLExperiments.cxx 15828 2013-03-28 11:55:53Z sloot $ + $Id: TRIBLExperiments.cxx 16820 2014-01-06 10:12:30Z sloot $ $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/src/TRIBLExperiments.cxx $ - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp diff -Nru timbl-6.4.4/src/Types.cxx timbl-6.4.6/src/Types.cxx --- timbl-6.4.4/src/Types.cxx 2013-01-07 14:27:12.000000000 +0000 +++ timbl-6.4.6/src/Types.cxx 2014-01-06 10:12:32.000000000 +0000 @@ -1,8 +1,8 @@ /* - $Id: Types.cxx 15565 2013-01-07 14:27:05Z sloot $ + $Id: Types.cxx 16820 2014-01-06 10:12:30Z sloot $ $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/src/Types.cxx $ - Copyright (c) 1998 - 2013 + Copyright (c) 1998 - 2014 ILK - Tilburg University CLiPS - University of Antwerp diff -Nru timbl-6.4.4/test-driver timbl-6.4.6/test-driver --- timbl-6.4.4/test-driver 1970-01-01 00:00:00.000000000 +0000 +++ timbl-6.4.6/test-driver 2014-01-02 19:14:59.000000000 +0000 @@ -0,0 +1,139 @@ +#! /bin/sh +# test-driver - basic testsuite driver script. + +scriptversion=2013-07-13.22; # UTC + +# Copyright (C) 2011-2013 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +# Make unconditional expansion of undefined variables an error. This +# helps a lot in preventing typo-related bugs. +set -u + +usage_error () +{ + echo "$0: $*" >&2 + print_usage >&2 + exit 2 +} + +print_usage () +{ + cat <$log_file 2>&1 +estatus=$? +if test $enable_hard_errors = no && test $estatus -eq 99; then + estatus=1 +fi + +case $estatus:$expect_failure in + 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; + 0:*) col=$grn res=PASS recheck=no gcopy=no;; + 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; + 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;; + *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;; + *:*) col=$red res=FAIL recheck=yes gcopy=yes;; +esac + +# Report outcome to console. +echo "${col}${res}${std}: $test_name" + +# Register the test result, and other relevant metadata. +echo ":test-result: $res" > $trs_file +echo ":global-test-result: $res" >> $trs_file +echo ":recheck: $recheck" >> $trs_file +echo ":copy-in-global-log: $gcopy" >> $trs_file + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: