X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=785d5c96cd3a878da24918e8c310794053bba03f;hb=ec677b25ea612f1f717afcd5ec5121a7283560a1;hp=1f59e4897e97d61ba49619a77a758b4b1eb7ae53;hpb=d49e54018b421afdd43de05fddf730d9c6811380;p=lyx.git diff --git a/configure.ac b/configure.ac index 1f59e4897e..785d5c96cd 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,9 @@ dnl Process with autoconf to generate configure script -*- sh -*- -AC_INIT([LyX],[2.4.0-alpha1],[lyx-devel@lists.lyx.org],[lyx]) +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, ["2020-12-28"]) +AC_SUBST(LYX_DATE, ["2021-02-14"]) AC_PREREQ([2.65]) AC_CONFIG_SRCDIR(src/main.cpp) AC_CONFIG_HEADERS([config.h]) @@ -13,7 +13,10 @@ AC_CONFIG_AUX_DIR(config) # First check the version LYX_CHECK_VERSION LYX_VERSION_SUFFIX +LYX_CHECK_QT6 +if test x$USE_QT6 = xno ; then LYX_CHECK_QT5 +fi # Check how the files should be packaged AC_CANONICAL_TARGET LYX_USE_PACKAGING @@ -193,6 +196,9 @@ AC_FUNC_SELECT_ARGTYPES LYX_CHECK_SPELL_ENGINES LYX_USE_INCLUDED_MYTHES +LYX_CHECK_WITH_SAXON +LYX_CHECK_WITH_XSLT_SHEETS + lyx_client_subdir=true dnl LIBS already contains some X extra libs that may interfere. save_LIBS="$LIBS"