From e6829546aeef31e6d32ecc6e1a595f6c5b7cd0e3 Mon Sep 17 00:00:00 2001
From: Amit D <amitdev2222@gmail.com>
Date: Sun, 8 Jan 2017 19:00:58 +0200
Subject: [PATCH] configure.ac: Exit if compiler does not have c++11 support

---
 configure.ac | 47 ++++++++++++++++++++++-------------------------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/configure.ac b/configure.ac
index de33af5cdd..09ff0cb61c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -368,15 +368,35 @@ AC_COMPILE_IFELSE(
   ]])
 ], [
      AC_MSG_RESULT(yes)
-     has_cpp11=yes
    ],
    [
      AC_MSG_RESULT(no)
-     has_cpp11=no
+     AC_MSG_ERROR([Your compiler does not have the necessary c++11 support! Cannot proceed.])
    ])
 AC_CHECK_FUNCS([snprintf],, [snprintfworks=yes])
 CXXFLAGS="$OLD_CXXFLAGS"
 
+
+# set c++11 support based on platform/compiler
+case "${host_os}" in
+  cygwin*)
+    CXXFLAGS="$CXXFLAGS -std=gnu++11"
+    ;;
+  *-darwin* | *-macos10*)
+     if test "x$CLANG" = "xyes"; then
+       CXXFLAGS="$CXXFLAGS -std=c++11 "
+       LDFLAGS="$LDFLAGS -stdlib=libc++"
+     else
+       CXXFLAGS="$CXXFLAGS -std=c++11"
+     fi
+    ;;
+  *)
+    # default
+    CXXFLAGS="$CXXFLAGS -std=c++11"
+    ;;
+esac
+
+
 # ----------------------------------------
 # Check for libraries
 # ----------------------------------------
@@ -458,29 +478,6 @@ else
       CPPFLAGS="$CPPFLAGS $cairo_CFLAGS"
 fi
 
-# set c++11 support based on platform/compiler
-if test "x$has_cpp11" = "xyes"; then
-  case "${host_os}" in
-    cygwin*)
-      CXXFLAGS="$CXXFLAGS -std=gnu++11"
-      ;;
-    *-darwin* | *-macos10*)
-       if test "x$CLANG" = "xyes"; then
-         CXXFLAGS="$CXXFLAGS -std=c++11 "
-         LDFLAGS="$LDFLAGS -stdlib=libc++"
-       else
-         CXXFLAGS="$CXXFLAGS -std=c++11"
-       fi
-      ;;
-    *)
-      # default
-      CXXFLAGS="$CXXFLAGS -std=c++11"
-      ;;
-  esac
-else
-  AC_MSG_WARN([Training tools WILL NOT be built because of missing c++11 support.])
-  AM_CONDITIONAL([ENABLE_TRAINING], false)
-fi
 
 # ----------------------------------------
 # Final Tasks and Output