Autotools: restore deprecation warning

[features.git] / config / lyxinclude.m4

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index 1f1fdb67e78ab187f73f86c49f3432e67e8a533b..e6fe875bb24a5dafa9085f214ec2a81c9b4d958d 100644 (file)
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -177,7 +177,6 @@ dnl not plainly added to AM_CPPFLAGS because then the objc compiler (mac)
 dnl would fail.
 AC_DEFUN([LYX_CXX_USE_REGEX],
 [lyx_std_regex=no
- if test $lyx_use_cxx11 = yes; then
    save_CPPFLAGS=$CPPFLAGS
    # we want to pass -std=c++11 to clang/cpp if necessary
    CPPFLAGS="$AM_CPPFLAGS $1 $CPPFLAGS"
@@ -194,13 +193,12 @@ AC_DEFUN([LYX_CXX_USE_REGEX],
        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.0*|4.1*|4.2*|4.3*|4.4*|4.5*|4.6*|4.7*|4.8*) lyx_std_regex=no ;;
+         4.3*|4.4*|4.5*|4.6*|4.7*|4.8*) lyx_std_regex=no ;;
          *) ;;
        esac
      fi
    fi
    AC_MSG_RESULT([$lyx_std_regex])
- fi
 
  if test $lyx_std_regex = yes ; then
   lyx_flags="$lyx_flags std-regex"
@@ -298,10 +296,6 @@ case $enable_optimization in
     *) lyx_optim=${enable_optimization};;
 esac
 
-AC_ARG_ENABLE(cxx11,
-  AC_HELP_STRING([--disable-cxx11],[disable C++11 mode (default: enabled for known good compilers)]),,
-  enable_cxx11=auto;)
-
 AC_ARG_ENABLE(assertions,
   AC_HELP_STRING([--enable-assertions],[add runtime sanity checks in the program]),,
   [AS_CASE([$build_type], [dev*|pre*], [enable_assertions=yes],
@@ -344,7 +338,8 @@ if test x$GXX = xyes; then
       AM_CPPFLAGS="$AM_CPPFLAGS -Wall -Wextra"
   fi
   case $gxx_version in
-      2.*|3.*) AC_ERROR([gcc 4.x is required]);;
+      2.*|3.*) AC_ERROR([gcc >= 4.3 is required]);;
+      4.0*|4.1*|4.2*) AC_ERROR([gcc >= 4.3 is required]);;
   esac
   if test x$enable_stdlib_debug = xyes ; then
     dnl FIXME: for clang/libc++, one should define _LIBCPP_DEBUG2=0
@@ -357,14 +352,7 @@ if test x$GXX = xyes; then
         ;;
     esac
   fi
-  dnl enable_cxx11 can be yes/no/auto.
-  dnl By default, it is auto and we enable C++11 when possible
-  if test x$enable_cxx11 != xno ; then
     case $gxx_version in
-      4.0*|4.1*|4.2*)
-         if test x$enable_cxx11 = xyes; then
-            AC_ERROR([There is no C++11 support in gcc 4.2 or older])
-         fi;;
       4.3*|4.4*|4.5*|4.6*)
         dnl Note that this will define __GXX_EXPERIMENTAL_CXX0X__.
         dnl The source code relies on that.
@@ -382,15 +370,11 @@ if test x$GXX = xyes; then
     # cxx11_flags is useful when running preprocessor alone 
     # (see detection of regex).
     AM_CXXFLAGS="$cxx11_flags $AM_CXXFLAGS"
-  fi
 fi
 
 LYX_CXX_CXX11
-if test $lyx_use_cxx11 = yes; then
-  if test x$GXX = xyes; then
-    dnl We still use auto_ptr, which is obsoleted. Shut off the warnings.
-    AM_CXXFLAGS="$AM_CXXFLAGS -Wno-deprecated-declarations"
-  fi
+if test $lyx_use_cxx11 = no; then
+  AC_ERROR([A C++11 compatible compiler is required])
 fi
 LYX_CXX_USE_REGEX([$cxx11_flags])
 ])