Customization: correct some color names.

[lyx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 2856b0757cbb507e0bc05b20bc78c0c952bcfa40..d6cae08311dfeb0e76d4fee55010fd92f9bb8298 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +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.2.4dev,[lyx-devel@lists.lyx.org],[lyx])
 AC_PRESERVE_HELP_ORDER
+
 # Use ISO format only. The frontend needs to parse this
-AC_SUBST(LYX_DATE, ["2015-11-27"])
+AC_SUBST(LYX_DATE, ["2017-05-15"])
 AC_PREREQ(2.60)
 AC_CONFIG_SRCDIR(src/main.cpp)
 AC_CONFIG_HEADERS([config.h])
@@ -32,7 +33,10 @@ 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_INIT_AUTOMAKE([foreign dist-bzip2 no-define 1.8] LYX_OBJECTS_LAYOUT)
+# 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])])
 PACKAGE=$save_PACKAGE
 
@@ -71,6 +75,9 @@ 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
 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
@@ -225,6 +232,7 @@ 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
 AM_CONDITIONAL(LYX_WIN_RESOURCE, $lyx_win_res)
 LYX_SET_VERSION_INFO
@@ -350,11 +358,11 @@ AC_DEFINE_UNQUOTED([LYX_RELEASE_PATCH],$lyx_patch,[Patch version number])
 AC_CONFIG_FILES([Makefile \
       lyx.1:lyx.1in \
       3rdparty/Makefile \
+      3rdparty/boost/Makefile \
       3rdparty/hunspell/Makefile \
       3rdparty/libiconv/Makefile \
       3rdparty/zlib/Makefile \
       autotests/Makefile \
-      boost/Makefile \
       config/Makefile \
       development/Makefile \
       development/MacOSX/Makefile \