X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=a205fe8aea24db842aed974ba63fb70ecbda76cd;hb=fc80eba3701c10d2fe14d10969d5e0db020886bf;hp=282905a0fc490a72b001db2cc9ffc998a702bacd;hpb=f899dee382712b67a30448a3a8334d3d9bcab411;p=lyx.git diff --git a/configure.ac b/configure.ac index 282905a0fc..a205fe8aea 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Process with autoconf to generate configure script -*- sh -*- AC_INIT([LyX],[2.4.0dev],[lyx-devel@lists.lyx.org],[lyx]) AC_PRESERVE_HELP_ORDER # Use ISO format only. The frontend needs to parse this -AC_SUBST(LYX_DATE, ["2018-02-24"]) +AC_SUBST(LYX_DATE, ["2020-12-28"]) AC_PREREQ([2.65]) AC_CONFIG_SRCDIR(src/main.cpp) AC_CONFIG_HEADERS([config.h]) @@ -94,6 +94,9 @@ AC_SUBST(LIBPSAPI) AC_CHECK_LIB(gdi32, main) AC_CHECK_LIB(ole32, main) +LYX_USE_INCLUDED_NOD +LYX_USE_INCLUDED_BOOST + ### we need to know the byte order for unicode conversions AC_C_BIGENDIAN @@ -274,9 +277,23 @@ extern "C" char * strerror(int n); #endif +#define BOOST_USER_CONFIG + +#if !defined(ENABLE_ASSERTIONS) +# define BOOST_DISABLE_ASSERTS 1 +#endif +#define BOOST_ENABLE_ASSERT_HANDLER 1 + +#define BOOST_DISABLE_THREADS 1 +#define BOOST_NO_WREGEX 1 +#define BOOST_NO_WSTRING 1 + #ifdef __CYGWIN__ # define _DEFAULT_SOURCE # define NOMINMAX +# define BOOST_POSIX 1 +# define BOOST_POSIX_API 1 +# define BOOST_POSIX_PATH 1 #endif #ifdef __sparc__ @@ -317,9 +334,11 @@ AC_DEFINE_UNQUOTED([LYX_RELEASE_PATCH],$lyx_patch,[Patch version number]) AC_CONFIG_FILES([Makefile \ lyx.1:lyx.1in \ 3rdparty/Makefile \ + 3rdparty/boost/Makefile \ 3rdparty/dtl/Makefile \ 3rdparty/hunspell/Makefile \ 3rdparty/mythes/Makefile \ + 3rdparty/nod/Makefile \ 3rdparty/libiconv/Makefile \ $ICONV_ICONV_H_IN \ 3rdparty/zlib/Makefile \