git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@4369 1f5c12ca-751b-0410-a591-d2e778427230
This commit is contained in:
bhaddow 2011-10-15 09:46:43 +00:00
parent 9b00ae425c
commit 27dd30122e

View File

@ -15,6 +15,7 @@ AC_PROG_LIBTOOL
#LT_INIT([disable-shared]) #LT_INIT([disable-shared])
AX_XMLRPC_C AX_XMLRPC_C
BOOST_REQUIRE([1.36.0])
AC_ARG_WITH(protobuf, AC_ARG_WITH(protobuf,
[AC_HELP_STRING([--with-protobuf=PATH], [(optional) path to Google protobuf])], [AC_HELP_STRING([--with-protobuf=PATH], [(optional) path to Google protobuf])],
@ -98,12 +99,6 @@ AC_ARG_ENABLE(threads,
[enable_threads=no] [enable_threads=no]
) )
AC_ARG_ENABLE(boost,
[AC_HELP_STRING([--enable-boost], [use Boost library])],
[],
[enable_boost=no]
)
AC_ARG_WITH(zlib, AC_ARG_WITH(zlib,
[AC_HELP_STRING([--with-zlib=PATH], [(optional) path to zlib])], [AC_HELP_STRING([--with-zlib=PATH], [(optional) path to zlib])],
[with_zlib=$withval], [with_zlib=$withval],
@ -116,16 +111,10 @@ AC_ARG_WITH(tcmalloc,
[with_tcmalloc=no] [with_tcmalloc=no]
) )
require_boost=no
if test "x$enable_threads" != 'xno' || test "x$enable_boost" != 'xno'
then
require_boost=yes
fi
AC_ARG_ENABLE(boost-pool, AC_ARG_ENABLE(boost-pool,
[AC_HELP_STRING([--enable-boost-pool], [(optional) try to improve speed by selectively using Boost pool allocation (may increase total memory use); default is yes if Boost enabled])], [AC_HELP_STRING([--enable-boost-pool], [(optional) try to improve speed by selectively using Boost pool allocation (may increase total memory use); default is yes if Boost enabled])],
[], [enable_boost_pool=yes],
[enable_boost_pool=$require_boost] [enable_boost_pool=no]
) )
@ -150,12 +139,6 @@ else
CPPFLAGS="$CPPFLAGS -DTRACE_ENABLE=1" CPPFLAGS="$CPPFLAGS -DTRACE_ENABLE=1"
fi fi
if test "x$require_boost" = 'xyes'
then
AC_MSG_NOTICE([Using Boost library])
BOOST_REQUIRE([1.36.0])
fi
if test "x$enable_threads" = 'xyes' if test "x$enable_threads" = 'xyes'
then then
AC_MSG_NOTICE([Building threaded moses]) AC_MSG_NOTICE([Building threaded moses])