X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=eabbcf86cf9db624039b20efcab08dc215c2aa37;hb=3b3f43cf35b7a8e752300612d07a9e1a9b71ccb4;hp=3ad12bb94514ea36ac4e607a58e4d911eb3eedb8;hpb=9f6127c8fa58dfbc662b981f6c97acde9c52617d;p=lyx.git diff --git a/configure.ac b/configure.ac index 3ad12bb945..eabbcf86cf 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Process with autoconf to generate configure script -*- sh -*- -AC_INIT([LyX],[2.4.0-alpha3],[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, ["2021-02-14"]) @@ -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 @@ -190,9 +193,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"