Check path of Qt tools if qtchooser is detected

[lyx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 6de63c9fd70e65cdc40388ec645395ef25148838..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
@@ -127,9 +130,25 @@ 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)
 
+# Taken from gettext, needed for libiconv
+AC_CACHE_CHECK([for wchar_t], [gt_cv_c_wchar_t],
+   [AC_TRY_COMPILE([#include <stddef.h>
+      wchar_t foo = (wchar_t)'\0';], ,
+      [gt_cv_c_wchar_t=yes], [gt_cv_c_wchar_t=no])])
+if test $gt_cv_c_wchar_t = yes; then
+  AC_DEFINE([HAVE_WCHAR_T], [1], [Define if you have the 'wchar_t' type.])
+  HAVE_WCHAR_T=1
+else
+  HAVE_WCHAR_T=0
+fi
+AC_SUBST([HAVE_WCHAR_T])
+
 # Needed for Mingw-w64
 AC_TYPE_LONG_LONG_INT
 if test "$ac_cv_type_long_long_int" = yes; then
@@ -138,12 +157,7 @@ if test "$ac_cv_type_long_long_int" = yes; then
 fi
 
 ### We need iconv for unicode support (Qt4 frontend requires it too)
-AM_ICONV
-if test "$am_cv_func_iconv" = no; then
-  AC_MSG_ERROR([cannot find required library iconv.])
-else
-  LIBS="$LIBS $LIBICONV"
-fi
+LYX_USE_INCLUDED_ICONV
 
 ### check for compression support
 LYX_USE_INCLUDED_ZLIB
@@ -197,14 +211,6 @@ AC_TYPE_OFF_T
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 AC_TYPE_UID_T
-# Taken from gettext
-AC_CACHE_CHECK([for wchar_t], [gt_cv_c_wchar_t],
-   [AC_TRY_COMPILE([#include <stddef.h>
-      wchar_t foo = (wchar_t)'\0';], ,
-      [gt_cv_c_wchar_t=yes], [gt_cv_c_wchar_t=no])])
-if test $gt_cv_c_wchar_t = yes; then
-  AC_DEFINE([HAVE_WCHAR_T], [1], [Define if you have the 'wchar_t' type.])
-fi
 
 LYX_CHECK_DEF(PATH_MAX, limits.h, [int n = PATH_MAX;])
 
@@ -234,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
 
@@ -285,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"
@@ -296,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)
@@ -312,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
@@ -368,6 +371,7 @@ AC_CONFIG_FILES([Makefile \
       3rdparty/boost/Makefile \
       3rdparty/hunspell/Makefile \
       3rdparty/libiconv/Makefile \
+      $ICONV_ICONV_H_IN \
       3rdparty/zlib/Makefile \
       autotests/Makefile \
       config/Makefile \