CPPFLAGS="$AM_CPPFLAGS $CPPFLAGS"
save_CXXFLAGS=$CXXFLAGS
CXXFLAGS="$flag $AM_CXXFLAGS $CXXFLAGS"
- AC_LANG_PUSH(C++)
dnl sample openmp source code to test
AC_TRY_COMPILE([
template <typename T>
auto d = a;], [],
[lyx_cv_cxx11_flags=$flag; break])
- AC_LANG_POP(C++)
CXXFLAGS=$save_CXXFLAGS
CPPFLAGS=$save_CPPFLAGS
done])
CPPFLAGS="$AM_CPPFLAGS $CPPFLAGS"
save_CXXFLAGS=$CXXFLAGS
CXXFLAGS="$AM_CXXFLAGS $CXXFLAGS"
- AC_LANG_PUSH(C++)
# The following code snippet has been taken taken from example in
# http://stackoverflow.com/questions/8561850/compile-stdregex-iterator-with-gcc
AC_TRY_LINK(
Myiter next(pat, pat + strlen(pat), rx);
Myiter end;
], [lyx_std_regex=yes], [lyx_std_regex=no])
- AC_LANG_POP(C++)
CXXFLAGS=$save_CXXFLAGS
CPPFLAGS=$save_CPPFLAGS
AC_MSG_RESULT([$lyx_std_regex])
])
+dnl Usage: LYX_CXX_USE_CALL_ONCE
+dnl check whether we can use std::call_once and set the
+dnl LYX_USE_STD_CALL_ONCE macro and conditional accordingly.
+AC_DEFUN([LYX_CXX_USE_CALL_ONCE],
+[AC_MSG_CHECKING([for std::call_once availability])
+ save_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$AM_CPPFLAGS $CPPFLAGS"
+ save_CXXFLAGS=$CXXFLAGS
+ CXXFLAGS="$AM_CXXFLAGS $CXXFLAGS"
+ AC_TRY_LINK(
+ [
+ #include <mutex>
+ static std::once_flag flag;
+ ], [
+ std::call_once(flag, [](){ return; });
+ ], [lyx_std_call_once=yes], [lyx_std_call_once=no])
+ CXXFLAGS=$save_CXXFLAGS
+ CPPFLAGS=$save_CPPFLAGS
+ AC_MSG_RESULT([$lyx_std_call_once])
+
+ if test $lyx_std_call_once = yes ; then
+ AC_DEFINE([LYX_USE_STD_CALL_ONCE], 1, [define to 1 if std::call_once is supported by the compiler])
+ fi
+ AM_CONDITIONAL([LYX_USE_STD_CALL_ONCE], test $lyx_std_call_once = yes)
+])
+
+
dnl Usage: LYX_LIB_STDCXX: set lyx_cv_lib_stdcxx to yes if the STL library is libstdc++.
AC_DEFUN([LYX_LIB_STDCXX],
[AC_CACHE_CHECK([whether STL is libstdc++],
AC_LANG_PUSH(C++)
LYX_PROG_CLANG
+LYX_CXX_CXX11_FLAGS
LYX_LIB_STDCXX
LYX_LIB_STDCXX_CXX11_ABI
+LYX_CXX_USE_REGEX
+LYX_CXX_USE_CALL_ONCE
AC_LANG_POP(C++)
if test $lyx_cv_lib_stdcxx = "yes" ; then
CXX_VERSION="($clang_version)"
fi
- AM_CXXFLAGS="$lyx_optim"
+ AM_CXXFLAGS="$lyx_optim $AM_CXXFLAGS"
if test x$enable_debug = xyes ; then
AM_CXXFLAGS="-g $AM_CXXFLAGS"
fi
fi
fi
-LYX_CXX_CXX11_FLAGS
-
# Some additional flags may be needed
if test x$GXX = xyes; then
case $gxx_version in
AM_CXXFLAGS="$AM_CXXFLAGS -Wno-deprecated-register";;
esac
fi
-
-LYX_CXX_USE_REGEX
])
dnl Usage: LYX_USE_INCLUDED_BOOST : select if the included boost should
AM_CONDITIONAL(USE_INCLUDED_BOOST, test x$lyx_cv_with_included_boost = xyes)
AC_MSG_RESULT([$lyx_cv_with_included_boost])
if test x$lyx_cv_with_included_boost = xyes ; then
+ lyx_included_libs="$lyx_included_libs boost"
BOOST_INCLUDES='-I$(top_srcdir)/3rdparty/boost'
if test $lyx_std_regex = yes ; then
BOOST_LIBS=""
AC_DEFUN([LYX_USE_INCLUDED_ICONV],[
AC_MSG_CHECKING([whether to use included iconv library])
AC_ARG_WITH(included-iconv,
- [AC_HELP_STRING([--without-included-iconv], [do not use the iconv lib supplied with LyX, try to find one in the system directories - compilation will abort if nothing suitable is found])],
+ [AC_HELP_STRING([--with-included-iconv], [use the iconv lib supplied with LyX instead of the system one])],
[lyx_cv_with_included_iconv=$withval],
[lyx_cv_with_included_iconv=no])
AM_CONDITIONAL(USE_INCLUDED_ICONV, test x$lyx_cv_with_included_iconv = xyes)
AC_MSG_RESULT([$lyx_cv_with_included_iconv])
if test x$lyx_cv_with_included_iconv = xyes ; then
+ lyx_included_libs="$lyx_included_libs iconv"
+
dnl Some bits from libiconv configure.ac to avoid a nested configure call:
AC_EILSEQ
AC_TYPE_MBSTATE_T
AC_DEFUN([LYX_USE_INCLUDED_ZLIB],[
AC_MSG_CHECKING([whether to use included zlib library])
AC_ARG_WITH(included-zlib,
- [AC_HELP_STRING([--without-included-zlib], [do not use the zlib lib supplied with LyX, try to find one in the system directories - compilation will abort if nothing suitable is found])],
+ [AC_HELP_STRING([--with-included-zlib], [use the zlib lib supplied with LyX instead of the system one])],
[lyx_cv_with_included_zlib=$withval],
[lyx_cv_with_included_zlib=no])
AM_CONDITIONAL(USE_INCLUDED_ZLIB, test x$lyx_cv_with_included_zlib = xyes)
AC_MSG_RESULT([$lyx_cv_with_included_zlib])
if test x$lyx_cv_with_included_zlib = xyes ; then
+ lyx_included_libs="$lyx_included_libs zlib"
ZLIB_INCLUDES='-I$(top_srcdir)/3rdparty/zlib/1.2.8 -I$(top_builddir)/3rdparty/zlib'
ZLIB_LIBS='$(top_builddir)/3rdparty/zlib/liblyxzlib.a'
mkdir -p 3rdparty/zlib
AC_DEFUN([LYX_USE_INCLUDED_MYTHES],[
AC_MSG_CHECKING([whether to use included MyThes library])
AC_ARG_WITH(included-mythes,
- [AC_HELP_STRING([--without-included-mythes], [do not use the MyThes lib supplied with LyX, try to find one in the system directories - compilation will abort if nothing suitable is found])],
+ [AC_HELP_STRING([--without-included-mythes], [use the system MyThes lib instead of the one supplied with LyX])],
[lyx_cv_with_included_mythes=$withval],
[lyx_cv_with_included_mythes=yes])
AM_CONDITIONAL(USE_INCLUDED_MYTHES, test x$lyx_cv_with_included_mythes = xyes)
AC_DEFINE(USE_EXTERNAL_MYTHES, 1, [Define as 1 to use an external MyThes library])
AC_DEFINE_UNQUOTED(MYTHES_H_LOCATION,$lyx_cv_mythes_h_location,[Location of mythes.hxx])
AC_SUBST(MYTHES_LIBS)
+ else
+ lyx_included_libs="$lyx_included_libs mythes"
fi
+
])
projects / features.git / blobdiff