diff options
author | Peter Kokot <peterkokot@gmail.com> | 2018-07-26 15:31:37 +0200 |
---|---|---|
committer | Peter Kokot <peterkokot@gmail.com> | 2018-07-26 15:54:20 +0200 |
commit | 27efe2db1b0988303e46bd5dda65ff9ec12de18b (patch) | |
tree | 79da0613ed4c5ea1f8bb2807f99ec6a9fad44fb1 /m4/ax_cxx_enum_computations_with_cast.m4 | |
parent | 72e8def2648d7d05daa95d533079e7373b7218d7 (diff) | |
download | autoconf-archive-27efe2db1b0988303e46bd5dda65ff9ec12de18b.tar.gz |
Replace AC_TRY_COMPILE and AC_LANG_
Autoconf 2.50 in 2001 made several macros obsolete. These include macros
for temporary changing the language - AC_LANG_SAVE, AC_LANG_CPLUSPLUS,
AC_LANG_C, and AC_LANG_RESTORE. Instead of these the AC_LANG_PUSH and
AC_LANG_POP macros should be used with later Autoconf versions.
AC_TRY_COMPILE macros should be replaced with AC_COMPILE_IFELSE.
Refs:
- http://git.savannah.gnu.org/cgit/autoconf.git/tree/NEWS
- https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Language-Choice.html
- https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Obsolete-Macros.html
Diffstat (limited to 'm4/ax_cxx_enum_computations_with_cast.m4')
-rw-r--r-- | m4/ax_cxx_enum_computations_with_cast.m4 | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/m4/ax_cxx_enum_computations_with_cast.m4 b/m4/ax_cxx_enum_computations_with_cast.m4 index d76f215..3ba533f 100644 --- a/m4/ax_cxx_enum_computations_with_cast.m4 +++ b/m4/ax_cxx_enum_computations_with_cast.m4 @@ -21,15 +21,14 @@ # and this notice are preserved. This file is offered as-is, without any # warranty. -#serial 7 +#serial 8 AU_ALIAS([AC_CXX_ENUM_COMPUTATIONS_WITH_CAST], [AX_CXX_ENUM_COMPUTATIONS_WITH_CAST]) AC_DEFUN([AX_CXX_ENUM_COMPUTATIONS_WITH_CAST], -[AC_CACHE_CHECK(whether the compiler handles (int) casts in enum computations, +[AC_CACHE_CHECK([whether the compiler handles (int) casts in enum computations], ax_cv_cxx_enum_computations_with_cast, -[AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_TRY_COMPILE([ +[AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ struct A { enum { a = 5, b = 7, c = 2 }; }; struct B { enum { a = 1, b = 6, c = 9 }; }; template<class T1, class T2> struct Z @@ -37,12 +36,12 @@ template<class T1, class T2> struct Z b = (int)T1::b + (int)T2::b, c = ((int)T1::c * (int)T2::c + (int)T2::a + (int)T1::a) }; -};],[ +};]], [[ return (((int)Z<A,B>::a == 5) && ((int)Z<A,B>::b == 13) - && ((int)Z<A,B>::c == 24)) ? 0 : 1;], - ax_cv_cxx_enum_computations_with_cast=yes, ax_cv_cxx_enum_computations_with_cast=no) - AC_LANG_RESTORE + && ((int)Z<A,B>::c == 24)) ? 0 : 1;]])], + [ax_cv_cxx_enum_computations_with_cast=yes], [ax_cv_cxx_enum_computations_with_cast=no]) + AC_LANG_POP([C++]) ]) if test "$ax_cv_cxx_enum_computations_with_cast" = yes; then AC_DEFINE(HAVE_ENUM_COMPUTATIONS_WITH_CAST,, |