PACKAGE=$save_PACKAGE
# Allow to build some parts of the code as one big chunk
-m4_define([ALLPARTS],[boost,client,insets,mathed,core,tex2lyx,frontend_qt4])
+m4_define([ALLPARTS],[boost,client,insets,mathed,core,tex2lyx,frontend_qt])
AC_ARG_ENABLE(monolithic-build,
AC_HELP_STRING([--enable-monolithic-build@<:@=LIST@:>@],
[Use monolithic build for modules in LIST (default: ALLPARTS)]),
AM_CONDITIONAL(MONOLITHIC_MATHED, test "x$enable_monolithic_mathed" = "xyes")
AM_CONDITIONAL(MONOLITHIC_CORE, test "x$enable_monolithic_core" = "xyes")
AM_CONDITIONAL(MONOLITHIC_TEX2LYX, test "x$enable_monolithic_tex2lyx" = "xyes")
-AM_CONDITIONAL(MONOLITHIC_FRONTEND_QT4, test "x$enable_monolithic_frontend_qt4" = "xyes")
+AM_CONDITIONAL(MONOLITHIC_FRONTEND_QT, test "x$enable_monolithic_frontend_qt" = "xyes")
### Set the execute permissions of the various scripts correctly
for file in config/install-sh ; do
### 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)
is correctly installed on your system.
Falling back to builtin file format detection.])])
-### setup the qt4 frontend.
+### setup the qt frontend.
dnl The code below is not in a macro, because this would cause big
-dnl problems with the AC_REQUIRE contained in QT4_DO_IT_ALL.
-QT4_DO_IT_ALL([4.5.0])
+dnl problems with the AC_REQUIRE contained in QT_DO_IT_ALL.
+QT_DO_IT_ALL([4.5.0])
AC_SUBST([FRONTENDS_SUBDIRS], [qt4])
FRONTEND_INFO="${FRONTEND_INFO}\
- Qt 4 Frontend:\n\
- Qt 4 version:\t\t${QT4_VERSION}\n"
+ Qt Frontend:\n\
+ Qt version:\t\t${QTLIB_VERSION}\n"
# fix the value of the prefixes.
test "x$prefix" = xNONE && prefix=$default_prefix
#define BOOST_SIGNALS_NO_DEPRECATION_WARNING 1
// TR1 regex not supported in GCC <= 4.5
+// clang defines __GNUC__ but libc++ does not have tr1
#ifndef LYX_USE_TR1
-# if __GNUC__ == 4
+# if __GNUC__ == 4 && !defined(USE_LLVM_LIBCPP)
# define LYX_USE_TR1
# endif
#endif