Check path of Qt tools if qtchooser is detected

[lyx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 7b8b742a63947cb8e7483dff4abe25d553f204aa..75df6c75de7d9e2cd8f9f763dce099f252d388da 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -74,6 +74,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
@@ -117,8 +120,6 @@ AC_CHECK_LIB(psapi, main, [LIBPSAPI=-lpsapi])
 AC_SUBST(LIBPSAPI)
 AC_CHECK_LIB(gdi32, main)
 AC_CHECK_LIB(ole32, main)
-test x"$WINDRES" = x && WINDRES=windres
-AC_ARG_VAR(WINDRES, [windows resource compiler command])
 
 LYX_USE_INCLUDED_BOOST
 LYX_USE_INCLUDED_MYTHES
@@ -129,6 +130,9 @@ AC_C_BIGENDIAN
 # Nice to have when an assertion triggers
 LYX_CHECK_CALLSTACK_PRINTING
 
+# C++14 only
+LYX_CHECK_DEF(make_unique, memory, [using std::make_unique;])
+
 # Needed for our char_type
 AC_CHECK_SIZEOF(wchar_t)
 
@@ -236,7 +240,14 @@ 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
+if test "x$lyx_win_res" = "xtrue"; then
+    AC_CHECK_TOOL(RC, windres,)
+    if test -z "$RC"; then
+      AC_ERROR([Could not find a resource compiler])
+    fi
+fi
 AM_CONDITIONAL(LYX_WIN_RESOURCE, $lyx_win_res)
 LYX_SET_VERSION_INFO
 
@@ -287,10 +298,6 @@ 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"
@@ -298,12 +305,6 @@ extern "C"
 char * strerror(int n);
 #endif
 
-#if defined(HAVE_OSTREAM) && defined(HAVE_LOCALE) && defined(HAVE_SSTREAM)
-#  define USE_BOOST_FORMAT 1
-#else
-#  define USE_BOOST_FORMAT 0
-#endif
-
 #define BOOST_USER_CONFIG <config.h>
 
 #if !defined(ENABLE_ASSERTIONS)
@@ -314,9 +315,9 @@ char * strerror(int n);
 #define BOOST_DISABLE_THREADS 1
 #define BOOST_NO_WREGEX 1
 #define BOOST_NO_WSTRING 1
-#define BOOST_SIGNALS_NO_DEPRECATION_WARNING 1
 
 #ifdef __CYGWIN__
+#  define _DEFAULT_SOURCE
 #  define NOMINMAX
 #  define BOOST_POSIX 1
 #  define BOOST_POSIX_API 1