X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=config%2Flyxinclude.m4;h=7bddfb09da05500ff6672dc5e548985c187a4740;hb=e8b1ec66fc0cf2f6c190d2e3c294630ebc2e12d0;hp=1e48fd687dc652361d74ad511df436ffc4446331;hpb=23dbcb59d2e861921677b3ce99d95c77c1ceec02;p=lyx.git

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index 1e48fd687d..7bddfb09da 100644
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -170,7 +170,6 @@ AC_DEFUN([LYX_CXX_CXX11_FLAGS],
     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>
@@ -195,53 +194,50 @@ AC_DEFUN([LYX_CXX_CXX11_FLAGS],
        check_type c;
        check_type&& cr = static_cast<check_type&&>(c);
 
-       auto d = a;],
-    [return 0;],
+       auto d = a;], [],
     [lyx_cv_cxx11_flags=$flag; break])
-   AC_LANG_POP(C++)
    CXXFLAGS=$save_CXXFLAGS
    CPPFLAGS=$save_CPPFLAGS
   done])
   if test $lyx_cv_cxx11_flags = none ; then
     AC_ERROR([Cannot find suitable C++11 mode for compiler $CXX])
   fi
-  lyx_cxx11_flags=$lyx_cv_cxx11_flags
-  AM_CXXFLAGS="$lyx_cxx11_flags $AM_CXXFLAGS"
+  AM_CXXFLAGS="$lyx_cv_cxx11_flags $AM_CXXFLAGS"
 ])
 
 
-dnl Usage: LYX_CXX_USE_REGEX(cxx11_flags)
+dnl Usage: LYX_CXX_USE_REGEX
 dnl decide whether we want to use std::regex and set the
-dnl LYX_USE_STD_REGEX accordingly.
-dnl the extra cxx11 flags have to be passed to the preprocessor. They are
-dnl not plainly added to AM_CPPFLAGS because then the objc compiler (mac)
-dnl would fail.
+dnl LYX_USE_STD_REGEX macro and conditional accordingly.
 AC_DEFUN([LYX_CXX_USE_REGEX],
 [AC_ARG_ENABLE(std-regex,
   AC_HELP_STRING([--enable-std-regex],[use std::regex instead of boost::regex (default is autodetected)]),
   [lyx_std_regex=$enableval],
-  [save_CPPFLAGS=$CPPFLAGS
-   # we want to pass -std=c++11 to clang/cpp if necessary
-   CPPFLAGS="$AM_CPPFLAGS $1 $CPPFLAGS"
+  [AC_MSG_CHECKING([for correct regex implementation])
+   save_CPPFLAGS=$CPPFLAGS
+   CPPFLAGS="$AM_CPPFLAGS $CPPFLAGS"
    save_CXXFLAGS=$CXXFLAGS
    CXXFLAGS="$AM_CXXFLAGS $CXXFLAGS"
-   AC_LANG_PUSH(C++)
-   AC_CHECK_HEADER([regex], [lyx_std_regex=yes], [lyx_std_regex=no])
-   AC_LANG_POP(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(
+     [
+	#include <regex>
+	#include <iostream>
+
+	#include <string.h>
+
+	typedef std::regex_iterator<const char *> Myiter;
+     ], [
+	const char *pat = "axayaz";
+	Myiter::regex_type rx("a");
+	Myiter next(pat, pat + strlen(pat), rx);
+	Myiter end;
+   ], [lyx_std_regex=yes], [lyx_std_regex=no])
    CXXFLAGS=$save_CXXFLAGS
    CPPFLAGS=$save_CPPFLAGS
-   if test x$GXX = xyes && test $lyx_std_regex = yes ; then
-     AC_MSG_CHECKING([for correct regex implementation])
-     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.6*|4.7*|4.8*) lyx_std_regex=no ;;
-         *) ;;
-       esac
-     fi
-     AC_MSG_RESULT([$lyx_std_regex])
-   fi])
+   AC_MSG_RESULT([$lyx_std_regex])
+ ])
 
  if test $lyx_std_regex = yes ; then
   lyx_flags="$lyx_flags std-regex"
@@ -251,6 +247,33 @@ AC_DEFUN([LYX_CXX_USE_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++],
@@ -284,8 +307,11 @@ AC_REQUIRE([AC_PROG_CXXCPP])
 
 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
@@ -362,7 +388,7 @@ if test x$GXX = xyes; 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
@@ -398,8 +424,6 @@ if test x$GXX = xyes; then
   fi
 fi
 
-LYX_CXX_CXX11_FLAGS
-
 # Some additional flags may be needed
 if test x$GXX = xyes; then
     case $gxx_version in
@@ -412,8 +436,6 @@ if test x$GXX = xyes; then
         AM_CXXFLAGS="$AM_CXXFLAGS -Wno-deprecated-register";;
     esac
 fi
-
-LYX_CXX_USE_REGEX([$lyx_cxx11_flags])
 ])
 
 dnl Usage: LYX_USE_INCLUDED_BOOST : select if the included boost should