X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=e3fcb8285b6ea48c292d2d7a9cd71a802466aa9a;hb=97ed7ded05b0eaf505aae79feeddaa21016b207f;hp=f7d52fa6698755079e5cb04b48e9924853d19b87;hpb=6f163198797ce335149881dcf2a423f93927e857;p=lyx.git diff --git a/configure.ac b/configure.ac index f7d52fa669..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, ["2021-02-14"]) +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 @@ -146,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\ @@ -190,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"