X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=65f0752c3b4e66c2384f817ce35c1ca71289b465;hb=151e004ab1bbe2e825ffcc498a15e518904ebf59;hp=17a463af5a6771ac076a95746ff31d4988875b6a;hpb=67385e69fc4d77bd5a02af3c75c56b2192cef279;p=lyx.git diff --git a/configure.ac b/configure.ac index 17a463af5a..65f0752c3b 100644 --- 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.2dev,[lyx-devel@lists.lyx.org],[lyx]) AC_PRESERVE_HELP_ORDER + # Use ISO format only. The frontend needs to parse this -AC_SUBST(LYX_DATE, ["2014-04-14"]) +AC_SUBST(LYX_DATE, ["2016-07-25"]) 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 @@ -170,13 +177,13 @@ if echo $prefix |grep ' ' >/dev/null 2>/dev/null ; then fi ### Setup po directory -AM_PO_SUBDIRS AM_NLS if test $USE_NLS = "yes" ; then AC_DEFINE(ENABLE_NLS, 1, [Define to 1 if translation of program messages to the user's native language is requested.])dnl' fi +AM_PO_SUBDIRS # some standard header files AC_HEADER_MAJOR @@ -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 @@ -349,7 +357,12 @@ AC_DEFINE_UNQUOTED([LYX_RELEASE_PATCH],$lyx_patch,[Patch version number]) AC_CONFIG_FILES([Makefile \ lyx.1:lyx.1in \ - boost/Makefile \ + 3rdparty/Makefile \ + 3rdparty/boost/Makefile \ + 3rdparty/hunspell/Makefile \ + 3rdparty/libiconv/Makefile \ + 3rdparty/zlib/Makefile \ + autotests/Makefile \ config/Makefile \ development/Makefile \ development/MacOSX/Makefile \