X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=fb1e49ca5345dbec19555a166c1ba9822f16a439;hb=f16b2cab75752e7b0fbec5520e231b068eb29072;hp=eace28557a8c5ae818b9dcdb98a266f71b928868;hpb=e02f0a0babeb43d21ebbd2496631cac59a1bcba0;p=lyx.git diff --git a/configure.ac b/configure.ac index eace28557a..fb1e49ca53 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Process with autoconf to generate configure script -*- sh -*- AC_INIT(LyX,2.2.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, ["2014-04-14"]) +AC_SUBST(LYX_DATE, ["2016-02-12"]) AC_PREREQ(2.60) AC_CONFIG_SRCDIR(src/main.cpp) AC_CONFIG_HEADERS([config.h]) @@ -32,7 +32,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 @@ -170,13 +173,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 @@ -276,6 +279,10 @@ AH_BOTTOM([ /************************************************************ ** 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" @@ -345,7 +352,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 \