de.po

[lyx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index ce4eb96215a15621064a934b2c39b23d5dfd9cf5..f4a6caf5ddc90f6413caba5e78569506af1c48d4 100644 (file)
--- 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.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, ["2018-02-24"])
+AC_PREREQ(2.65)
 AC_CONFIG_SRCDIR(src/main.cpp)
 AC_CONFIG_HEADERS([config.h])
 
@@ -26,41 +26,14 @@ 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-bzip2 no-define 1.8 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}
@@ -72,7 +45,7 @@ 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').
@@ -150,10 +123,6 @@ 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
@@ -336,12 +305,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
 ])
 
@@ -372,6 +335,7 @@ 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 \
@@ -399,6 +363,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