X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=e3fcb8285b6ea48c292d2d7a9cd71a802466aa9a;hb=cfcc57bd895fc3c74dd47b8cb40fd40c0c57dbcb;hp=d203049bf9dce2dd1c71fbe1f4b963484fee5edb;hpb=2f701e6a1c6b2a487a28c7a212421aef21f1b58c;p=lyx.git diff --git a/configure.ac b/configure.ac index d203049bf9..e3fcb8285b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,10 @@ dnl Process with autoconf to generate configure script -*- sh -*- -AC_INIT(LyX,2.3.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, ["2016-04-16"]) -AC_PREREQ(2.60) +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 @@ -26,53 +26,26 @@ if test "${enable_maintainer_mode+set}" != set; then enable_maintainer_mode=$lyx_devel_version fi AM_MAINTAINER_MODE - -save_PACKAGE=$PACKAGE -dnl The test for _AM_PROG_CC_C_O intends to test for automake 1.14 or newer, -dnl which are the versions where subdir-objects can beused. -dnl see: https://www.mail-archive.com/lyx-devel@lists.lyx.org/msg181023.html -m4_define([LYX_OBJECTS_LAYOUT], m4_ifdef([_AM_PROG_CC_C_O],[subdir-objects],)) +AM_SILENT_RULES([yes]) # Automake is pulling the historical V7 format. This tar format supports # 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. -AM_INIT_AUTOMAKE([foreign dist-bzip2 no-define 1.8 tar-ustar] LYX_OBJECTS_LAYOUT) -m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) +save_PACKAGE=$PACKAGE +AM_INIT_AUTOMAKE([foreign dist-xz no-define 1.14 tar-ustar subdir-objects]) PACKAGE=$save_PACKAGE -# Allow to build some parts of the code as one big chunk -m4_define([ALLPARTS],[boost,client,insets,mathed,core,tex2lyx,frontend_qt]) -AC_ARG_ENABLE(monolithic-build, - AC_HELP_STRING([--enable-monolithic-build@<:@=LIST@:>@], - [Use monolithic build for modules in LIST (default: ALLPARTS)]), - [test "$enable_monolithic_build" = yes && enable_monolithic_build="ALLPARTS" - test "$enable_monolithic_build" = no && enable_monolithic_build= - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=" ," - for i in $enable_monolithic_build ; do - eval "enable_monolithic_$i=yes" - done - IFS="$ac_save_ifs"], - [enable_monolithic_build=]) - -AM_CONDITIONAL(MONOLITHIC_BOOST, test "x$enable_monolithic_boost" = "xyes") -AM_CONDITIONAL(MONOLITHIC_CLIENT, test "x$enable_monolithic_client" = "xyes") -AM_CONDITIONAL(MONOLITHIC_INSETS, test "x$enable_monolithic_insets" = "xyes") -AM_CONDITIONAL(MONOLITHIC_MATHED, test "x$enable_monolithic_mathed" = "xyes") -AM_CONDITIONAL(MONOLITHIC_CORE, test "x$enable_monolithic_core" = "xyes") -AM_CONDITIONAL(MONOLITHIC_TEX2LYX, test "x$enable_monolithic_tex2lyx" = "xyes") -AM_CONDITIONAL(MONOLITHIC_FRONTEND_QT, test "x$enable_monolithic_frontend_qt" = "xyes") - ### Set the execute permissions of the various scripts correctly for file in config/install-sh ; do chmod 755 ${srcdir}/${file} 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 # Tools for creating libraries (note that we do not use libtool) -m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) dnl AM_PROG_AR requires automake 1.12 +AM_PROG_AR AC_PROG_RANLIB dnl Recent debian/ubuntu (at least) have built 'ar' so that deterministic mode is the default. dnl This means that it does not make sense to use the 'u' flag (default ARFLAGS is 'cru'). @@ -121,8 +94,8 @@ AC_SUBST(LIBPSAPI) AC_CHECK_LIB(gdi32, main) AC_CHECK_LIB(ole32, main) +LYX_USE_INCLUDED_NOD LYX_USE_INCLUDED_BOOST -LYX_USE_INCLUDED_MYTHES ### we need to know the byte order for unicode conversions AC_C_BIGENDIAN @@ -138,9 +111,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 - 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 + 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 @@ -151,17 +123,16 @@ AC_SUBST([HAVE_WCHAR_T]) # Needed for Mingw-w64 AC_TYPE_LONG_LONG_INT -if test "$ac_cv_type_long_long_int" = yes; then - AC_CHECK_SIZEOF(long) - AC_CHECK_SIZEOF(long long) -fi -### 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"], @@ -175,8 +146,8 @@ 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]) -AC_SUBST([FRONTENDS_SUBDIRS], [qt4]) +QT_DO_IT_ALL([5.0.0]) +AC_SUBST([FRONTENDS_SUBDIRS], [qt]) FRONTEND_INFO="${FRONTEND_INFO}\ Qt Frontend:\n\ Qt version:\t ${QTLIB_VERSION}\n" @@ -219,10 +190,17 @@ 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 AC_LANG_PUSH(C) dnl LIBS already contains some X extra libs that may interfere. save_LIBS="$LIBS" LIBS= @@ -235,7 +213,6 @@ AC_CHECK_FUNCS(fcntl, AC_SUBST(SOCKET_LIBS,$LIBS) LIBS="$save_LIBS" AM_CONDITIONAL(BUILD_CLIENT_SUBDIR, $lyx_client_subdir) -dnl AC_LANG_POP(C) lyx_win_res=false; case ${host} in @@ -245,7 +222,7 @@ esac if test "x$lyx_win_res" = "xtrue"; then AC_CHECK_TOOL(RC, windres,) if test -z "$RC"; then - AC_ERROR([Could not find a resource compiler]) + AC_MSG_ERROR([Could not find a resource compiler]) fi fi AM_CONDITIONAL(LYX_WIN_RESOURCE, $lyx_win_res) @@ -336,12 +313,6 @@ char * strerror(int n); # define USE_WCHAR_T #endif -#ifdef HAVE_LONG_LONG_INT -#if SIZEOF_LONG_LONG > SIZEOF_LONG -#define LYX_USE_LONG_LONG -#endif -#endif - #endif ]) @@ -371,7 +342,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 \ @@ -399,9 +373,10 @@ AC_CONFIG_FILES([Makefile \ src/Makefile \ src/tex2lyx/Makefile \ src/tex2lyx/tex2lyx.1:src/tex2lyx/tex2lyx.1in \ + src/convert/Makefile \ src/support/Makefile \ src/frontends/Makefile \ - src/frontends/qt4/Makefile + src/frontends/qt/Makefile ])