From: levill_r <levill_r@4aad255d-cdde-0310-9447-f3009e2ae8c0> * build-aux/warning.m4 (AC_COMPILE_STDERR_IFELSE, DYN_CXX_WARNINGS): Prevent unwanted concatenations creating dummy tokens with recent versions of Autoconf. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4645 4aad255d-cdde-0310-9447-f3009e2ae8c0 --- dynamic-use-of-static-c++/ChangeLog | 9 +++++++++ dynamic-use-of-static-c++/config/warning.m4 | 11 +++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dynamic-use-of-static-c++/ChangeLog b/dynamic-use-of-static-c++/ChangeLog index 4cf0c69..9e82e17 100644 --- a/dynamic-use-of-static-c++/ChangeLog +++ b/dynamic-use-of-static-c++/ChangeLog @@ -1,5 +1,14 @@ 2009-10-13 Roland Levillain <roland@lrde.epita.fr> + Have DYN_CXX_WARNINGS be compatible with recent versions of Autoconf. + + * build-aux/warning.m4 + (AC_COMPILE_STDERR_IFELSE, DYN_CXX_WARNINGS): Prevent unwanted + concatenations creating dummy tokens with recent versions of + Autoconf. + +2009-10-13 Roland Levillain <roland@lrde.epita.fr> + Require more recent versions of Autoconf and Automake. * configure.ac: Here. diff --git a/dynamic-use-of-static-c++/config/warning.m4 b/dynamic-use-of-static-c++/config/warning.m4 index 2df4649..5719e52 100644 --- a/dynamic-use-of-static-c++/config/warning.m4 +++ b/dynamic-use-of-static-c++/config/warning.m4 @@ -1,6 +1,6 @@ -# Finding valid warning flags for the C Compiler. -*-Autoconf-*- +# Finding valid warning flags for the C and C++ Compilers. -*-Autoconf-*- # -# Copyright (C) 2003 Free Software Foundation, Inc. +# Copyright (C) 2003, 2006, 2009 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -31,7 +31,7 @@ AS_IF([_AC_EVAL_STDERR($ac_compile) && AC_TRY_COMMAND([test -s conftest.$ac_objext])], [$2], [_AC_MSG_LOG_CONFTEST -m4_ifvaln([$3],[$3])dnl])dnl +m4_ifvaln([$3],[$3])dnl]) rm -f conftest.$ac_objext m4_ifval([$1], [conftest.$ac_ext])[]dnl ])# AC_COMPILE_STDERR_IFELSE @@ -99,7 +99,10 @@ AC_DEFUN([DYN_CXX_WARNINGS], m4_foreach([AC_Option], [$1], [DYN_COMPILER_OPTION_IF(AC_Option, [WARNING_CXXFLAGS="$WARNING_CXXFLAGS AC_Option" - DYN_COMPILER_FLAGS_NAME="$ac_save_compiler_flags $WARNING_FLAGS"])]) + DYN_COMPILER_FLAGS_NAME="$ac_save_compiler_flags $WARNING_FLAGS"]) +dnl Newlines inserted on purpose, to avoid erroneous concatenations. + +]) DYN_COMPILER_FLAGS_NAME=$ac_save_compiler_flags AC_SUBST([WARNING_CXXFLAGS]) ])# DYN_CXX_WARNINGS(OPTIONS) -- 1.6.5