X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=f4a6caf5ddc90f6413caba5e78569506af1c48d4;hb=71fe3282077d572aabcc6b76639476ab2d6ca151;hp=45b66c8cc40cbe3987676aa05067e35443d85959;hpb=ca53991043d5ab55e0e34d1e0d930b45cdf59cad;p=lyx.git

diff --git a/configure.ac b/configure.ac
index 45b66c8cc4..f4a6caf5dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
 dnl Process with autoconf to generate configure script   -*- sh -*-
 
-AC_INIT(LyX,2.3.0alpha1,[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, ["2017-04-24"])
+AC_SUBST(LYX_DATE, ["2018-02-24"])
 AC_PREREQ(2.65)
 AC_CONFIG_SRCDIR(src/main.cpp)
 AC_CONFIG_HEADERS([config.h])
@@ -34,28 +34,6 @@ 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}
@@ -145,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
@@ -331,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
 ])
 
@@ -395,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