X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=e3fcb8285b6ea48c292d2d7a9cd71a802466aa9a;hb=cfcc57bd895fc3c74dd47b8cb40fd40c0c57dbcb;hp=318986b4e247611aaa953a09b663d0099e142dfb;hpb=6448500ee29ca880b2e5a07296dd7fa2d191c33e;p=lyx.git

diff --git a/configure.ac b/configure.ac
index 318986b4e2..e3fcb8285b 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.0dev],[lyx-devel@lists.lyx.org],[lyx])
+AC_INIT([LyX],[2.4.0~RC1.devel],[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, ["2023-06-26"])
 AC_PREREQ([2.65])
 AC_CONFIG_SRCDIR(src/main.cpp)
 AC_CONFIG_HEADERS([config.h])
@@ -13,7 +13,7 @@ AC_CONFIG_AUX_DIR(config)
 # First check the version
 LYX_CHECK_VERSION
 LYX_VERSION_SUFFIX
-LYX_CHECK_QT5
+LYX_CHECK_QT6
 # Check how the files should be packaged
 AC_CANONICAL_TARGET
 LYX_USE_PACKAGING
@@ -94,6 +94,7 @@ 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
@@ -145,7 +146,7 @@ AC_CHECK_HEADERS(magic.h,
 ### setup the qt frontend.
 dnl The code below is not in a macro, because this would cause big
 dnl problems with the AC_REQUIRE contained in QT_DO_IT_ALL.
-QT_DO_IT_ALL([4.5.0])
+QT_DO_IT_ALL([5.0.0])
 AC_SUBST([FRONTENDS_SUBDIRS], [qt])
 FRONTEND_INFO="${FRONTEND_INFO}\
   Qt Frontend:\n\
@@ -189,9 +190,16 @@ AC_CHECK_FUNCS(chmod close _close fork getpid _getpid lockf lstat mkfifo open _o
 AC_FUNC_MKDIR
 AC_FUNC_SELECT_ARGTYPES
 
+if test "$lyx_use_packaging" = "macosx" ; then
+  LYX_CHECK_MACOS_DEPLOYMENT_TARGET
+fi
+
 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"
@@ -337,6 +345,7 @@ AC_CONFIG_FILES([Makefile \
       3rdparty/dtl/Makefile \
       3rdparty/hunspell/Makefile \
       3rdparty/mythes/Makefile \
+      3rdparty/nod/Makefile \
       3rdparty/libiconv/Makefile \
       $ICONV_ICONV_H_IN \
       3rdparty/zlib/Makefile \