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_template_qualified_base_class.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_template_qualified_base_class.m4')
| -rw-r--r-- | m4/ax_cxx_template_qualified_base_class.m4 | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/m4/ax_cxx_template_qualified_base_class.m4 b/m4/ax_cxx_template_qualified_base_class.m4 index bf1cbc3..79aee14 100644 --- a/m4/ax_cxx_template_qualified_base_class.m4 +++ b/m4/ax_cxx_template_qualified_base_class.m4 @@ -21,7 +21,7 @@ # and this notice are preserved. This file is offered as-is, without any # warranty. -#serial 7 +#serial 8 AU_ALIAS([AC_CXX_TEMPLATE_QUALIFIED_BASE_CLASS], [AX_CXX_TEMPLATE_QUALIFIED_BASE_CLASS]) AC_DEFUN([AX_CXX_TEMPLATE_QUALIFIED_BASE_CLASS], @@ -29,9 +29,8 @@ AC_DEFUN([AX_CXX_TEMPLATE_QUALIFIED_BASE_CLASS], ax_cv_cxx_template_qualified_base_class, [AC_REQUIRE([AX_CXX_TYPENAME]) AC_REQUIRE([AX_CXX_FULL_SPECIALIZATION_SYNTAX]) - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_TRY_COMPILE([ + AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #ifndef HAVE_TYPENAME #define typename #endif @@ -47,9 +46,9 @@ template<class T> class Weird : public base_trait<T>::base { public : typedef typename base_trait<T>::base base; int g () const { return base::f (); } -};],[ Weird<float> z; return z.g ();], - ax_cv_cxx_template_qualified_base_class=yes, ax_cv_cxx_template_qualified_base_class=no) - AC_LANG_RESTORE +};]], [[ Weird<float> z; return z.g ();]])], + [ax_cv_cxx_template_qualified_base_class=yes], [ax_cv_cxx_template_qualified_base_class=no]) + AC_LANG_POP([C++]) ]) if test "$ax_cv_cxx_template_qualified_base_class" = yes; then AC_DEFINE(HAVE_TEMPLATE_QUALIFIED_BASE_CLASS,, |