diff options
author | dowobeha <dowobeha@1f5c12ca-751b-0410-a591-d2e778427230> | 2011-05-24 19:48:28 +0400 |
---|---|---|
committer | dowobeha <dowobeha@1f5c12ca-751b-0410-a591-d2e778427230> | 2011-05-24 19:48:28 +0400 |
commit | a040227376b03c51bc657ed4a7ae01a6ad944afa (patch) | |
tree | b240c00aca817e64127fc2d7070dda486b0388d9 | |
parent | 3135cf9e3f2f573a690e370e780e12620b5bacf5 (diff) |
Syntactic LM can now be enabled by passing --with-synlm to configure. The path to the ModelBlocks parser is now assumed to be synlm/hhmm, and no longer needs to be explicitly specified.
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3994 1f5c12ca-751b-0410-a591-d2e778427230
-rw-r--r-- | configure.in | 7 | ||||
-rwxr-xr-x | regenerate-makefiles.sh | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/configure.in b/configure.in index ea197c979..196d3094c 100644 --- a/configure.in +++ b/configure.in @@ -60,7 +60,7 @@ AC_ARG_WITH(randlm, ) AC_ARG_WITH(synlm, - [AC_HELP_STRING([--with-synlm=PATH], [(optional) path to syntactic language model parser])], + [AC_HELP_STRING([--with-synlm], [(optional) Include syntactic language model parser; default is no])], [with_synlm=$withval], [with_synlm=no] ) @@ -283,13 +283,14 @@ fi if test "x$with_synlm" != 'xno' then SAVE_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -DWITH_THREADS -I${with_synlm}/rvtl/include -I${with_synlm}/wsjparse/include -lm" + CPPFLAGS="$CPPFLAGS -DWITH_THREADS -I${PWD}/synlm/hhmm/rvtl/include -I${PWD}/synlm/hhmm/wsjparse/include -lm" AC_CHECK_HEADERS(nl-cpt.h, - [AC_DEFINE([HAVE_SYNLM], [], [flag for Syntactic Parser])]) + [AC_DEFINE([HAVE_SYNLM], [], [flag for Syntactic Parser])], + [AC_MSG_ERROR([Cannot find SYNLM in ${PWD}/synlm/hhmm])]) AM_CONDITIONAL([SYN_LM], true) diff --git a/regenerate-makefiles.sh b/regenerate-makefiles.sh index c1c9ef2e0..24e8f53f7 100755 --- a/regenerate-makefiles.sh +++ b/regenerate-makefiles.sh @@ -55,7 +55,7 @@ $LIBTOOLIZE || die "libtoolize failed" echo echo "You should now be able to configure and build:" -echo " ./configure [--with-srilm=/path/to/srilm] [--with-irstlm=/path/to/irstlm] [--with-randlm=/path/to/randlm] [--without-kenlm] [--with-synlm=/path/to/modelblocks] [--with-xmlrpc-c=/path/to/xmlrpc-c-config]" +echo " ./configure [--with-srilm=/path/to/srilm] [--with-irstlm=/path/to/irstlm] [--with-randlm=/path/to/randlm] [--without-kenlm] [--with-synlm] [--with-xmlrpc-c=/path/to/xmlrpc-c-config]" echo " make -j 4" echo |