X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=d93bf4eb36a43632c795b7cc65fff9dd6c6fa3e8;hb=2d5fa181a1b187e47dae66b924a7eaf83b8fde72;hp=785d5c96cd3a878da24918e8c310794053bba03f;hpb=33b7088719c3c72e81483e3a82a321971403f505;p=lyx.git diff --git a/configure.ac b/configure.ac index 785d5c96cd..d93bf4eb36 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]) @@ -14,9 +14,6 @@ AC_CONFIG_AUX_DIR(config) 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 @@ -149,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\ @@ -193,6 +190,10 @@ 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 @@ -312,6 +313,7 @@ char * strerror(int n); # define USE_WCHAR_T #endif + #endif ])