X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=39a6c0582c6e135f42caa8a221f05ab37f5a0dc3;hb=8b2d0af975b1768498b30b9e76cbd000c8cd8b8e;hp=562eba4d9be4fc62c3c6c205bcc7b26f18146dcf;hpb=90b1f084bf0998e37ad3fa9f54641656044c448f;p=lyx.git

diff --git a/configure.ac b/configure.ac
index 562eba4d9b..39a6c0582c 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.3dev,[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-10-15"])
 AC_PREREQ(2.60)
 AC_CONFIG_SRCDIR(src/main.cpp)
 AC_CONFIG_HEADERS([config.h])
@@ -13,6 +14,7 @@ AC_CONFIG_AUX_DIR(config)
 # First check the version
 LYX_CHECK_VERSION
 LYX_VERSION_SUFFIX
+LYX_CHECK_QT5
 # Check how the files should be packaged
 AC_CANONICAL_TARGET
 LYX_USE_PACKAGING
@@ -31,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
 
@@ -62,11 +67,30 @@ for file in config/install-sh ; do
   chmod 755 ${srcdir}/${file}
 done
 
-AM_PATH_PYTHON(2.4.0,, :)
+# Find a suitable python interpreter
+LYX_PATH_PYTHON23([2.7.0], [3.3.0])
+# do the usual python setup stuff
+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
+dnl if it is not set. We do not use autoconf defaults.
+lyx_has_CXXFLAGS=${CXXFLAGS+yes}
+if ! test "$lyx_has_CXXFLAGS" = yes; then
+  dnl set to a dummy value so that AC_PROG_CXX does not try to set CXXFLAGS
+  CXXFLAGS=" "
+fi
 LYX_PROG_CXX
+if ! test "$lyx_has_CXXFLAGS" = yes; then
+  unset CXXFLAGS
+fi
 AC_LANG(C++)
 
 ### Objective-C compiler
@@ -86,8 +110,9 @@ test ! x"$lyx_cppflags" = x && CPPFLAGS="$lyx_cppflags $CPPFLAGS"
 ### Add both includes and libraries
 LYX_WITH_DIR([extra-prefix],[extra lib+include directory],extra_prefix, NONE, ${prefix})
 LYX_LOOP_DIR($lyx_cv_extra_prefix,[
-LYX_ADD_INC_DIR(CPPFLAGS,$dir/include)
-  LYX_ADD_LIB_DIR(LDFLAGS,$dir/lib)])
+  LYX_ADD_INC_DIR(CPPFLAGS,$dir/include)
+  LYX_ADD_LIB_DIR(LDFLAGS,$dir/lib)
+])
 
 ### These are needed in windows
 AC_CHECK_LIB(shlwapi, main, [LIBSHLWAPI=-lshlwapi])
@@ -138,7 +163,7 @@ QT_DO_IT_ALL([4.5.0])
 AC_SUBST([FRONTENDS_SUBDIRS], [qt4])
 FRONTEND_INFO="${FRONTEND_INFO}\
   Qt Frontend:\n\
-      Qt version:\t\t${QTLIB_VERSION}\n"
+      Qt version:\t   ${QTLIB_VERSION}\n"
 
 # fix the value of the prefixes.
 test "x$prefix" = xNONE && prefix=$default_prefix
@@ -152,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
@@ -195,7 +220,7 @@ save_LIBS="$LIBS"
 LIBS=
 AC_CHECK_FUNCS(fcntl,
   [AC_SEARCH_LIBS([gethostbyname], [nsl])
-   AC_SEARCH_LIBS([socket], [socket], [],
+   AC_SEARCH_LIBS([socket], [socket network], [],
      [AC_CHECK_LIB([socket], [socket], [LIBS="-lsocket -lnsl $LIBS"],
 		[], [-lnsl])])],
   [lyx_client_subdir=false])
@@ -207,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
@@ -217,22 +243,21 @@ real_bindir=`eval "echo \`eval \"echo ${bindir}\"\`"`
 real_pkgdatadir=`eval "echo \`eval \"echo \\\`eval \\\"echo ${pkgdatadir}\\\"\\\`\"\`"`
 real_localedir=`eval "echo \`eval \"echo ${datadir}/locale\"\`"`
 VERSION_INFO="Configuration\n\
-  Host type:                    ${host}\n\
-  Special build flags:         ${lyx_flags}\n\
-  C++ Compiler:                 ${CXX} ${CXX_VERSION}\n\
-  C++ Compiler LyX flags:       ${AM_CPPFLAGS} ${AM_CXXFLAGS}\n\
-  C++ Compiler flags:           ${CPPFLAGS} ${CXXFLAGS}\n\
-  Linker flags:                 ${AM_LDFLAGS}\n\
-  Linker user flags:            ${LDFLAGS}\n\
+  Host type:               ${host}\n\
+  Special build flags:     ${lyx_flags}\n\
+  C++ Compiler:            ${CXX} ${CXX_VERSION}\n\
+  C++ Compiler flags:      ${AM_CPPFLAGS} ${AM_CXXFLAGS}\n\
+  C++ Compiler user flags: ${CPPFLAGS} ${CXXFLAGS}\n\
+  Linker flags:            ${AM_LDFLAGS}\n\
+  Linker user flags:       ${LDFLAGS}\n\
 ${FRONTEND_INFO}\
-  Packaging:                    ${lyx_use_packaging}\n\
-  LyX binary dir:               ${real_bindir}\n\
-  LyX files dir:                ${real_pkgdatadir}\n"
+  Packaging:               ${lyx_use_packaging}\n\
+  LyX binary dir:          ${real_bindir}\n\
+  LyX files dir:           ${real_pkgdatadir}\n"
 
 AC_SUBST(VERSION_INFO)
 AC_SUBST(AM_CPPFLAGS)
 AC_SUBST(AM_CXXFLAGS)
-AC_SUBST(AM_CFLAGS)
 AC_SUBST(AM_LDFLAGS)
 AC_SUBST(real_pkgdatadir)
 
@@ -259,6 +284,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"
@@ -284,16 +313,6 @@ char * strerror(int n);
 #define BOOST_NO_WSTRING 1
 #define BOOST_SIGNALS_NO_DEPRECATION_WARNING 1
 
-// TR1 regex not supported in GCC <= 4.5
-// <regex> and <tr1/regex> in gcc are unusable in versions less than 4.9.0
-// see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631
-// clang defines __GNUC__ but libc++ does not have tr1
-#ifndef LYX_USE_TR1
-#  if __GNUC__ == 4 && !defined(USE_LLVM_LIBCPP)
-#    define LYX_USE_TR1
-#  endif
-#endif
-
 #ifdef __CYGWIN__
 #  define NOMINMAX
 #  define BOOST_POSIX 1
@@ -338,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 \