X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=442a8a05d9e3661ddde7835d424c89c4c4259f7c;hb=c7f53afd319fc9028be74f8949cec00063972462;hp=28c7196d43da65a970e0bef3bbedb4753ded828c;hpb=d1b3d20c43a98755c3b16e717f44da256c62d1bc;p=lyx.git diff --git a/configure.ac b/configure.ac index 28c7196d43..442a8a05d9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,10 @@ dnl Process with autoconf to generate configure script -*- sh -*- -AC_INIT(LyX,2.2.0dev,[lyx-devel@lists.lyx.org],[lyx]) +AC_INIT([LyX],[2.5.0~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-11"]) -AC_PREREQ(2.60) +AC_SUBST(LYX_DATE, ["2024-04-01"]) +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,54 +26,30 @@ 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'). +AC_SUBST([ARFLAGS], [cr]) ### Check for a C++ compiler dnl We have to do weird tricks so that autoconf does not touch CXXFLAGS even @@ -116,9 +92,10 @@ AC_SUBST(LIBSHLWAPI) AC_CHECK_LIB(psapi, main, [LIBPSAPI=-lpsapi]) 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 @@ -126,21 +103,35 @@ AC_C_BIGENDIAN # Nice to have when an assertion triggers LYX_CHECK_CALLSTACK_PRINTING +# C++14 only +LYX_CHECK_DEF(make_unique, memory, [using std::make_unique;]) + # Needed for our char_type AC_CHECK_SIZEOF(wchar_t) -### We need iconv for unicode support (Qt4 frontend requires it too) -AM_ICONV -if test "$am_cv_func_iconv" = no; then - AC_MSG_ERROR([cannot find required library iconv.]) +# Taken from gettext, needed for libiconv +AC_CACHE_CHECK([for wchar_t], [gt_cv_c_wchar_t], + [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 else - LIBS="$LIBS $LIBICONV" + HAVE_WCHAR_T=0 fi +AC_SUBST([HAVE_WCHAR_T]) + +# Needed for Mingw-w64 +AC_TYPE_LONG_LONG_INT + +### We need iconv for unicode support (Qt frontend requires it too) +LYX_USE_INCLUDED_ICONV ### check for compression support -AC_CHECK_HEADERS(zlib.h, - [AC_CHECK_LIB(z, gzopen, [LIBS="$LIBS -lz"], LYX_LIB_ERROR(libz,zlib))], - [LYX_LIB_ERROR(zlib.h,zlib)]) +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, @@ -155,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" @@ -191,14 +182,6 @@ AC_TYPE_OFF_T AC_TYPE_PID_T AC_TYPE_SIZE_T AC_TYPE_UID_T -# Taken from gettext -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])]) -if test $gt_cv_c_wchar_t = yes; then - AC_DEFINE([HAVE_WCHAR_T], [1], [Define if you have the 'wchar_t' type.]) -fi LYX_CHECK_DEF(PATH_MAX, limits.h, [int n = PATH_MAX;]) @@ -207,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= @@ -223,12 +213,18 @@ 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 *mingw*|*cygwin*) lyx_win_res=true;; + *freebsd*) AC_SEARCH_LIBS(backtrace_symbols, [execinfo]) esac +if test "x$lyx_win_res" = "xtrue"; then + AC_CHECK_TOOL(RC, windres,) + if test -z "$RC"; then + AC_MSG_ERROR([Could not find a resource compiler]) + fi +fi AM_CONDITIONAL(LYX_WIN_RESOURCE, $lyx_win_res) LYX_SET_VERSION_INFO @@ -237,9 +233,11 @@ LYX_SET_VERSION_INFO real_bindir=`eval "echo \`eval \"echo ${bindir}\"\`"` real_pkgdatadir=`eval "echo \`eval \"echo \\\`eval \\\"echo ${pkgdatadir}\\\"\\\`\"\`"` real_localedir=`eval "echo \`eval \"echo ${datadir}/locale\"\`"` +test -z "${lyx_included_libs}" && lyx_included_libs="(none)" VERSION_INFO="Configuration\n\ Host type: ${host}\n\ Special build flags: ${lyx_flags}\n\ + Bundled libraries: ${lyx_included_libs}\n\ C++ Compiler: ${CXX} ${CXX_VERSION}\n\ C++ Compiler flags: ${AM_CPPFLAGS} ${AM_CXXFLAGS}\n\ C++ Compiler user flags: ${CPPFLAGS} ${CXXFLAGS}\n\ @@ -279,10 +277,6 @@ AH_BOTTOM([ /************************************************************ ** You should not need to change anything beyond this point */ -#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) -#define LYX_USE_CXX11 -#endif - #ifndef HAVE_STRERROR #if defined(__cplusplus) extern "C" @@ -290,12 +284,6 @@ extern "C" char * strerror(int n); #endif -#if defined(HAVE_OSTREAM) && defined(HAVE_LOCALE) && defined(HAVE_SSTREAM) -# define USE_BOOST_FORMAT 1 -#else -# define USE_BOOST_FORMAT 0 -#endif - #define BOOST_USER_CONFIG #if !defined(ENABLE_ASSERTIONS) @@ -306,9 +294,9 @@ char * strerror(int n); #define BOOST_DISABLE_THREADS 1 #define BOOST_NO_WREGEX 1 #define BOOST_NO_WSTRING 1 -#define BOOST_SIGNALS_NO_DEPRECATION_WARNING 1 #ifdef __CYGWIN__ +# define _DEFAULT_SOURCE # define NOMINMAX # define BOOST_POSIX 1 # define BOOST_POSIX_API 1 @@ -325,6 +313,7 @@ char * strerror(int n); # define USE_WCHAR_T #endif + #endif ]) @@ -354,8 +343,12 @@ 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 \ autotests/Makefile \ config/Makefile \ @@ -381,9 +374,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 ])