OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable checks for C++11 if C++0x is disabled

Browse Source 
By adding an extra test we can avoid the somehow illogical possibility
of building with '--enable-gxx11check --disable-gxx0xcheck'.
This commit is contained in:
Roland Kaufmann
2012-10-24 11:25:28 +02:00
parent 6d2f7e1f7c
commit 9063a47051
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
m4/cxx0x_compiler.m4
View File

@@ -3,16 +3,23 @@
AC_DEFUN([GXX0X],[ AC_DEFUN([GXX0X],[
ac_save_CXX="$CXX" ac_save_CXX="$CXX"
# put this check first, so we get disable C++11 if C++0x is
AC_ARG_ENABLE(gxx0xcheck,
AC_HELP_STRING([--disable-gxx0xcheck],
[try flag -std=c++0x to enable C++0x features [[default=yes]]]),
[gxx0xcheck=$enableval],
[gxx0xcheck=yes])
AC_ARG_ENABLE(gxx11check,
AC_HELP_STRING([--disable-gxx11check],
[try flag -std=c++11 to enable C++11 features [[default=yes]]]),
[gxx11check=$enableval],
[gxx11check=yes])
# try flag -std=c++11 # try flag -std=c++11
AC_CACHE_CHECK([whether $CXX accepts -std=c++11], dune_cv_gplusplus_accepts_cplusplus11, [ AC_CACHE_CHECK([whether $CXX accepts -std=c++11], dune_cv_gplusplus_accepts_cplusplus11, [
AC_REQUIRE([AC_PROG_CXX]) AC_REQUIRE([AC_PROG_CXX])
AC_ARG_ENABLE(gxx11check, if test "x$GXX" = xyes && test "x$gxx11check" = xyes && test "x$gxx0xcheck" = xyes ; then
AC_HELP_STRING([--disable-gxx11check],
[try flag -std=c++11 to enable C++11 features [[default=yes]]]),
[gxx11check=$enableval],
[gxx11check=yes])
if test "x$GXX" = xyes && test "x$gxx11check" = xyes; then
AC_LANG_PUSH([C++]) AC_LANG_PUSH([C++])
CXX="$CXX -std=c++11" CXX="$CXX -std=c++11"
AC_TRY_COMPILE([ AC_TRY_COMPILE([
@@ -22,6 +29,8 @@ AC_DEFUN([GXX0X],[
dune_cv_gplusplus_accepts_cplusplus11=yes, dune_cv_gplusplus_accepts_cplusplus11=yes,
dune_cv_gplusplus_accepts_cplusplus11=no) dune_cv_gplusplus_accepts_cplusplus11=no)
AC_LANG_POP([C++]) AC_LANG_POP([C++])
else
dune_cv_gplusplus_accepts_cplusplus11=disabled
fi fi
]) ])
if test "x$dune_cv_gplusplus_accepts_cplusplus11" == "xyes" ; then if test "x$dune_cv_gplusplus_accepts_cplusplus11" == "xyes" ; then
@@ -33,11 +42,6 @@ AC_DEFUN([GXX0X],[
# try flag -std=c++0x instead # try flag -std=c++0x instead
AC_CACHE_CHECK([whether $CXX accepts -std=c++0x], dune_cv_gplusplus_accepts_cplusplus0x, [ AC_CACHE_CHECK([whether $CXX accepts -std=c++0x], dune_cv_gplusplus_accepts_cplusplus0x, [
AC_REQUIRE([AC_PROG_CXX]) AC_REQUIRE([AC_PROG_CXX])
AC_ARG_ENABLE(gxx0xcheck,
AC_HELP_STRING([--disable-gxx0xcheck],
[try flag -std=c++0x to enable C++11 features [[default=yes]]]),
[gxx0xcheck=$enableval],
[gxx0xcheck=yes])
if test "x$GXX" = xyes && test "x$gxx0xcheck" = xyes; then if test "x$GXX" = xyes && test "x$gxx0xcheck" = xyes; then
AC_LANG_PUSH([C++]) AC_LANG_PUSH([C++])
CXX="$CXX -std=c++0x" CXX="$CXX -std=c++0x"
@@ -48,6 +52,8 @@ AC_DEFUN([GXX0X],[
dune_cv_gplusplus_accepts_cplusplus0x=yes, dune_cv_gplusplus_accepts_cplusplus0x=yes,
dune_cv_gplusplus_accepts_cplusplus0x=no) dune_cv_gplusplus_accepts_cplusplus0x=no)
AC_LANG_POP([C++]) AC_LANG_POP([C++])
else
dune_cv_gplusplus_accepts_cplusplus0x=disabled
fi fi
]) ])
if test "x$dune_cv_gplusplus_accepts_cplusplus0x" == "xyes" ; then if test "x$dune_cv_gplusplus_accepts_cplusplus0x" == "xyes" ; then