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.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, ["2016-04-16"])
-AC_PREREQ(2.60)
+AC_SUBST(LYX_DATE, ["2017-08-14"])
+AC_PREREQ(2.65)
AC_CONFIG_SRCDIR(src/main.cpp)
AC_CONFIG_HEADERS([config.h])
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-bzip2 no-define 1.8 tar-ustar subdir-objects])
PACKAGE=$save_PACKAGE
# Allow to build some parts of the code as one big chunk
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
AC_SUBST(LIBPSAPI)
AC_CHECK_LIB(gdi32, main)
AC_CHECK_LIB(ole32, main)
-test x"$WINDRES" = x && WINDRES=windres
-AC_SUBST(WINDRES)
LYX_USE_INCLUDED_BOOST
-LYX_USE_INCLUDED_MYTHES
### we need to know the byte order for unicode conversions
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)
AC_FUNC_SELECT_ARGTYPES
LYX_CHECK_SPELL_ENGINES
+LYX_USE_INCLUDED_MYTHES
lyx_client_subdir=true
dnl AC_LANG_PUSH(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
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\
/************************************************************
** 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"
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 <config.h>
#if !defined(ENABLE_ASSERTIONS)
#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
3rdparty/Makefile \
3rdparty/boost/Makefile \
3rdparty/hunspell/Makefile \
+ 3rdparty/mythes/Makefile \
3rdparty/libiconv/Makefile \
$ICONV_ICONV_H_IN \
3rdparty/zlib/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