X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=config%2Flyxinclude.m4;h=90113fdf37284b26f292f31ee575986ba8e74a51;hb=8792e6418edaeecd5bb620d5a8072667c57137fd;hp=b6c26cadc2c2cec9964a9b8785ae858d76262451;hpb=4310430a38fd53254df2d27d0f14b906bd9cf63c;p=lyx.git

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index b6c26cadc2..90113fdf37 100644
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -63,7 +63,7 @@ AC_MSG_RESULT([$withval])
 ])
 
 
-dnl Check whether to configure for Qt4, Qt5, or Qt6. Default is Qt5.
+dnl Check whether to configure for Qt5, or Qt6. Default is Qt5.
 dnl
 AC_DEFUN([LYX_CHECK_QT6],[
 AC_MSG_CHECKING([whether Qt6 is requested])
@@ -310,9 +310,14 @@ AC_ARG_ENABLE(debug,
 )
 
 AC_ARG_ENABLE(stdlib-debug,
-  AS_HELP_STRING([--enable-stdlib-debug],[enable debug mode in the standard library]),,
-  [AS_CASE([$build_type], [dev*], [enable_stdlib_debug=yes], 
-	  [enable_stdlib_debug=no])]
+  AS_HELP_STRING([--enable-stdlib-debug],[enable debug mode in libstdc++]),,
+  [enable_stdlib_debug=no]
+)
+
+AC_ARG_ENABLE(stdlib-assertions,
+  AS_HELP_STRING([--enable-stdlib-assertions],[enable assertions in libstdc++]),,
+  [AS_CASE([$build_type], [dev*], [enable_stdlib_assertions=yes],
+	  [enable_stdlib_assertions=no])]
 )
 
 ### set up optimization
@@ -357,6 +362,10 @@ if test x$GXX = xyes; then
     CXX_VERSION="($clang_version)"
   fi
 
+  case $gxx_version in
+      2.*|3.*|4.@<:@0-8@:>@*) AC_MSG_ERROR([gcc >= 4.9 is required]);;
+  esac
+
   AM_CXXFLAGS="$lyx_optim $AM_CXXFLAGS"
   if test x$enable_debug = xyes ; then
       AM_CXXFLAGS="-g $AM_CXXFLAGS"
@@ -381,9 +390,6 @@ if test x$GXX = xyes; then
 	[AM_CXXFLAGS="$AM_CXXFLAGS -Wno-deprecated-copy"], [], [-Werror])
       AC_LANG_POP(C++)
     fi
-  case $gxx_version in
-      2.*|3.*|4.@<:@0-8@:>@*) AC_MSG_ERROR([gcc >= 4.9 is required]);;
-  esac
   if test x$enable_stdlib_debug = xyes ; then
     dnl FIXME: for clang/libc++, one should define _LIBCPP_DEBUG2=0
     dnl See http://clang-developers.42468.n3.nabble.com/libc-debug-mode-td3336742.html
@@ -396,6 +402,14 @@ if test x$GXX = xyes; then
 	enable_stdlib_debug=no
     fi
   fi
+  if test x$enable_stdlib_assertions = xyes ; then
+    if test x$lyx_cv_lib_stdcxx = xyes ; then
+        lyx_flags="$lyx_flags stdlib-assertions"
+	AC_DEFINE(_GLIBCXX_ASSERTIONS, 1, [libstdc++ assertions mode])
+    else
+	enable_stdlib_assertions=no
+    fi
+  fi
 fi
 
 # Some additional flags may be needed
@@ -404,10 +418,6 @@ if test x$GXX = xyes; then
       clang-3.0*|clang-3.1*|clang-3.2*|clang-3.3*)
         dnl boost contains pragmas that are annoying on older clang versions
         AM_CPPFLAGS="-Wno-unknown-pragmas $AM_CPPFLAGS";;
-      clang*)
-        dnl the more recent versions support the deprecated-register warning,
-        dnl which  is very annoying with Qt4.x right now.
-        AM_CXXFLAGS="$AM_CXXFLAGS -Wno-deprecated-register";;
     esac
 fi
 ])