])
+dnl Check whether to configure for Qt5. Default is Qt4.
+dnl
+AC_DEFUN([LYX_CHECK_QT5],[
+AC_MSG_CHECKING([whether Qt5 is requested])
+AC_ARG_ENABLE([qt5],
+ [ --enable-qt5 use Qt5 for building],
+ USE_QT5=$enableval, USE_QT5=no)
+AC_MSG_RESULT([$USE_QT5])
+AC_SUBST([USE_QT5])
+])
+
+
dnl Usage: LYX_WARNING(message) Displays the warning "message" and sets the
dnl flag lyx_warning to yes.
AC_DEFUN([LYX_WARNING],[
AC_HELP_STRING([--enable-concept-checks],[enable concept checks]),,
[AS_CASE([$build_type], [dev*|pre*], [enable_concept_checks=yes],
[enable_concept_checks=no])]
+ if test x$USE_QT5 = xyes ; then
+ enable_concept_checks=no
+ fi
)
### set up optimization
fi
# set the compiler options correctly.
+lyx_std_regex=no
if test x$GXX = xyes; then
dnl clang++ pretends to be g++ 4.2.1; this is not useful
if test x$CLANG = xno; then
fi
fi
if test "$ac_env_CPPFLAGS_set" != set; then
+ if test x$USE_QT5 = xyes ; then
+ AS_CASE([$host], [*mingw*|*cygwin*], [], [CPPFLAGS="-fPIC $CPPFLAGS"])
+ fi
if test x$enable_warnings = xyes ; then
case $gxx_version in
3.1*|3.2*|3.3*)
lyx_flags="$lyx_flags c++11-mode"
CXXFLAGS="-std=gnu++0x $CXXFLAGS"
;;
- 4.7*|4.8*)
+ 4.7*|4.8*|4.9*)
lyx_flags="$lyx_flags c++11-mode"
CXXFLAGS="-std=gnu++11 $CXXFLAGS"
;;
esac
+ if test x$CLANG = xno || test $lyx_cv_lib_stdcxx = yes; then
+ dnl <regex> in gcc is unusable in versions less than 4.9.0
+ dnl see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631
+ case $gxx_version in
+ 4.9*)
+ lyx_flags="$lyx_flags stdregex"
+ lyx_std_regex=yes
+ ;;
+ esac
+ else
+ lyx_flags="$lyx_flags stdregex"
+ lyx_std_regex=yes
+ fi
+
+ if test $lyx_std_regex = yes ; then
+ AC_DEFINE([LYX_USE_STD_REGEX], 1, [define to 1 if std::regex should be preferred to boost::regex])
+ fi
fi
fi
+AM_CONDITIONAL([LYX_USE_STD_REGEX], test $lyx_std_regex = yes)
test "$lyx_pch_comp" = yes && lyx_flags="$lyx_flags pch"
AM_CONDITIONAL(LYX_BUILD_PCH, test "$lyx_pch_comp" = yes)
])dnl
LIBS=$save_LIBS
AC_LANG_POP(C++)
BOOST_INCLUDES=
- BOOST_LIBS="-lboost_regex${BOOST_MT} -lboost_signals${BOOST_MT}"
+ if test $lyx_std_regex = yes ; then
+ BOOST_LIBS="-lboost_signals${BOOST_MT}"
+ else
+ BOOST_LIBS="-lboost_regex${BOOST_MT} -lboost_signals${BOOST_MT}"
+ fi
fi
AC_SUBST(BOOST_INCLUDES)
AC_SUBST(BOOST_LIBS)