From 26d4900ae930b6e0c5275f95069ab97275c0da0a Mon Sep 17 00:00:00 2001
From: Christian Engwer <christi@dune-project.org>
Date: Thu, 11 Sep 2008 10:18:31 +0000
Subject: [PATCH] add --disable-gxx0xcheck option to configure
[[Imported from SVN: r5274]]
---
m4/static_assert.m4 | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/m4/static_assert.m4 b/m4/static_assert.m4
index 6b083d5e0..d9f47fd1e 100644
--- a/m4/static_assert.m4
+++ b/m4/static_assert.m4
@@ -1,7 +1,12 @@
AC_DEFUN([GXX0X],[
AC_REQUIRE([AC_PROG_CXX])
+ AC_ARG_ENABLE(gxx0xcheck,
+ AC_HELP_STRING([--disable-gxx0xcheck],
+ [try to enabel c++0x feature for g++ [[default=yes]]]),
+ [gxx0xcheck=$enable],
+ [gxx0xcheck=yes])
AC_LANG_PUSH([C++])
- if test "x$GXX" = xyes; then
+ if test "x$GXX" = xyes && test "x$gxx0xcheck" = xyes; then
AC_MSG_CHECKING([whether g++ accepts -std=c++0x])
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS -std=c++0x"
@@ -14,14 +19,17 @@ AC_DEFUN([GXX0X],[
])
AC_DEFUN([STATIC_ASSERT_CHECK],[
+ AC_REQUIRE([AC_PROG_CXX])
+ AC_REQUIRE([GXX0X])
AC_LANG_PUSH([C++])
AC_MSG_CHECKING([whether static_assert is supported])
AC_TRY_COMPILE([],[static_assert(true,"MSG")], [
- HAVE_STATIC_ASSERT=0,
+ HAVE_STATIC_ASSERT=no,
AC_MSG_RESULT(yes)], [
- HAVE_STATIC_ASSERT=1,
+ HAVE_STATIC_ASSERT=yes,
AC_MSG_RESULT(no)])
- if test x$HAVE_STATIC_ASSERT = x1; then
+ echo HAVE_STATIC_ASSERT $HAVE_STATIC_ASSERT
+ if test "x$HAVE_STATIC_ASSERT" = xyes; then
AC_DEFINE(HAVE_STATIC_ASSERT, 1, [Define to 1 if static_assert is supported])
fi
AC_LANG_POP
--
GitLab