X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=e8dfc3e8c89800827399239d82a18b90b529ad87;hb=refs%2Fheads%2F2.3.4-3;hp=992e69cd3a39369e8bb468ff3a75aa1dde895641;hpb=ce1814c6080c5867b30686003681183a26904ae9;p=lyx.git diff --git a/configure.ac b/configure.ac index 992e69cd3a..e8dfc3e8c8 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.0beta2,[lyx-devel@lists.lyx.org],[lyx]) +AC_INIT(LyX,2.3.4.3,[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-02-12"]) -AC_PREREQ(2.60) +AC_SUBST(LYX_DATE, ["2020-02-14"]) +AC_PREREQ(2.65) AC_CONFIG_SRCDIR(src/main.cpp) AC_CONFIG_HEADERS([config.h]) @@ -26,16 +26,12 @@ 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-pax has no character limit. -AM_INIT_AUTOMAKE([foreign dist-bzip2 no-define 1.8 tar-pax] LYX_OBJECTS_LAYOUT) -m4_ifdef([AM_SILENT_RULES],[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.8 tar-ustar subdir-objects]) PACKAGE=$save_PACKAGE # Allow to build some parts of the code as one big chunk @@ -71,8 +67,11 @@ LYX_PATH_PYTHON23([2.7.0], [3.3.0]) 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 @@ -115,9 +114,9 @@ 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_BOOST -LYX_USE_INCLUDED_MYTHES ### we need to know the byte order for unicode conversions AC_C_BIGENDIAN @@ -125,21 +124,37 @@ 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_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.]) + 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 +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) +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 for file magic support (currently optional) AC_CHECK_HEADERS(magic.h, @@ -190,14 +205,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,6 +214,7 @@ AC_FUNC_MKDIR AC_FUNC_SELECT_ARGTYPES LYX_CHECK_SPELL_ENGINES +LYX_USE_INCLUDED_MYTHES lyx_client_subdir=true dnl AC_LANG_PUSH(C) @@ -227,7 +235,14 @@ 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_ERROR([Could not find a resource compiler]) + fi +fi AM_CONDITIONAL(LYX_WIN_RESOURCE, $lyx_win_res) LYX_SET_VERSION_INFO @@ -236,9 +251,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\ @@ -278,10 +295,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" @@ -289,12 +302,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) @@ -305,9 +312,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 @@ -324,6 +331,12 @@ 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 ]) @@ -354,7 +367,9 @@ AC_CONFIG_FILES([Makefile \ 3rdparty/Makefile \ 3rdparty/boost/Makefile \ 3rdparty/hunspell/Makefile \ + 3rdparty/mythes/Makefile \ 3rdparty/libiconv/Makefile \ + $ICONV_ICONV_H_IN \ 3rdparty/zlib/Makefile \ autotests/Makefile \ config/Makefile \ @@ -380,6 +395,7 @@ 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