X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=3a1db2f646b4fca0ed9675b9099e8a508ca6d375;hb=33ff0f276a72113bcaf4c6e48f4bf40bb204cbdd;hp=7ba65bb193683cf84c7cd690f3efb374d20eb8fb;hpb=4bdeae27334536164cb7e37da9a9e491075fd682;p=lyx.git

diff --git a/configure.ac b/configure.ac
index 7ba65bb193..3a1db2f646 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,6 +13,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
@@ -66,7 +67,17 @@ AM_PATH_PYTHON(2.4.0,, :)
 AC_PROG_RANLIB
 
 ### 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
@@ -81,13 +92,14 @@ test ! x"$lyx_ldflags" = x && LDFLAGS="$lyx_ldflags $LDFLAGS"
 ### Add extra directories to check for include files.
 LYX_WITH_DIR([extra-inc],[extra include directory],extra_inc, NONE)
 LYX_LOOP_DIR($lyx_cv_extra_inc,LYX_ADD_INC_DIR(lyx_cppflags,$dir))
-test ! x"$lyx_cppflags" = x && CPPFLAGS="$lyx_cppflags $CPPFLAGS"
+test ! x"$lyx_cppflags" = x && AM_CPPFLAGS="$lyx_cppflags $AM_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(AM_CPPFLAGS,$dir/include)
+  LYX_ADD_LIB_DIR(LDFLAGS,$dir/lib)
+])
 
 ### These are needed in windows
 AC_CHECK_LIB(shlwapi, main, [LIBSHLWAPI=-lshlwapi])
@@ -102,6 +114,9 @@ LYX_USE_INCLUDED_MYTHES
 ### we need to know the byte order for unicode conversions
 AC_C_BIGENDIAN
 
+# Nice to have when an assertion triggers
+LYX_CHECK_CALLSTACK_PRINTING
+
 # Needed for our char_type
 AC_CHECK_SIZEOF(wchar_t)
 
@@ -214,22 +229,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)
 
@@ -281,13 +295,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
-#ifndef LYX_USE_TR1
-#  if __GNUC__ == 4 
-#    define LYX_USE_TR1
-#  endif
-#endif
-
 #ifdef __CYGWIN__
 #  define NOMINMAX
 #  define BOOST_POSIX 1