X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=eabbcf86cf9db624039b20efcab08dc215c2aa37;hb=3b3f43cf35b7a8e752300612d07a9e1a9b71ccb4;hp=b0f8d25851fa040d4084a6e17c2d5bee56419892;hpb=5173f2202471b946b28be55a423cc7ea586e8249;p=features.git

diff --git a/configure.ac b/configure.ac
index b0f8d25851..eabbcf86cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
 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.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, ["2018-02-24"])
-AC_PREREQ(2.65)
+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
@@ -31,7 +34,7 @@ AM_SILENT_RULES([yes])
 # file names only up to 99 characters. tar-ustar selects the ustar format defined
 # by POSIX 1003.1-1988. This format is believed to be old enough to be portable.
 save_PACKAGE=$PACKAGE
-AM_INIT_AUTOMAKE([foreign dist-bzip2 no-define 1.14 tar-ustar subdir-objects])
+AM_INIT_AUTOMAKE([foreign dist-xz no-define 1.14 tar-ustar subdir-objects])
 PACKAGE=$save_PACKAGE
 
 ### Set the execute permissions of the various scripts correctly
@@ -40,7 +43,7 @@ for file in config/install-sh ; do
 done
 
 # Find a suitable python interpreter
-LYX_PATH_PYTHON23([2.7.0], [3.3.0])
+LYX_PATH_PYTHON23([2.7.0], [3.5.0])
 # do the usual python setup stuff
 AM_PATH_PYTHON
 
@@ -94,6 +97,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
@@ -110,9 +114,8 @@ AC_CHECK_SIZEOF(wchar_t)
 
 # Taken from gettext, needed for libiconv
 AC_CACHE_CHECK([for wchar_t], [gt_cv_c_wchar_t],
-   [AC_TRY_COMPILE([#include <stddef.h>
-      wchar_t foo = (wchar_t)'\0';], ,
-      [gt_cv_c_wchar_t=yes], [gt_cv_c_wchar_t=no])])
+   [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stddef.h>
+      wchar_t foo = (wchar_t)'\0';]], [[]])],[gt_cv_c_wchar_t=yes],[gt_cv_c_wchar_t=no])])
 if test $gt_cv_c_wchar_t = yes; then
   AC_DEFINE([HAVE_WCHAR_T], [1], [Define if you have the 'wchar_t' type.])
   HAVE_WCHAR_T=1
@@ -124,12 +127,15 @@ AC_SUBST([HAVE_WCHAR_T])
 # Needed for Mingw-w64
 AC_TYPE_LONG_LONG_INT
 
-### We need iconv for unicode support (Qt4 frontend requires it too)
+### We need iconv for unicode support (Qt frontend requires it too)
 LYX_USE_INCLUDED_ICONV
 
 ### check for compression support
 LYX_USE_INCLUDED_ZLIB
 
+### check whether we build and install the supplied dtl programs
+LYX_BUILD_INCLUDED_DTL
+
 ### check for file magic support (currently optional)
 AC_CHECK_HEADERS(magic.h,
  [AC_CHECK_LIB(magic, magic_open, [LIBS="$LIBS -lmagic"],
@@ -144,7 +150,7 @@ AC_CHECK_HEADERS(magic.h,
 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])
-AC_SUBST([FRONTENDS_SUBDIRS], [qt4])
+AC_SUBST([FRONTENDS_SUBDIRS], [qt])
 FRONTEND_INFO="${FRONTEND_INFO}\
   Qt Frontend:\n\
       Qt version:\t   ${QTLIB_VERSION}\n"
@@ -187,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"
@@ -332,8 +345,10 @@ AC_CONFIG_FILES([Makefile \
       lyx.1:lyx.1in \
       3rdparty/Makefile \
       3rdparty/boost/Makefile \
+      3rdparty/dtl/Makefile \
       3rdparty/hunspell/Makefile \
       3rdparty/mythes/Makefile \
+      3rdparty/nod/Makefile \
       3rdparty/libiconv/Makefile \
       $ICONV_ICONV_H_IN \
       3rdparty/zlib/Makefile \
@@ -364,7 +379,7 @@ AC_CONFIG_FILES([Makefile \
       src/convert/Makefile \
       src/support/Makefile \
       src/frontends/Makefile \
-      src/frontends/qt4/Makefile
+      src/frontends/qt/Makefile
 ])