monotone-commits-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Monotone-commits-diffs] net.venge.monotone: 0b1b0a8f638b247813c14fa22e


From: code
Subject: [Monotone-commits-diffs] net.venge.monotone: 0b1b0a8f638b247813c14fa22e42045ea72dd862
Date: Fri, 18 Feb 2011 20:54:49 +0100 (CET)

revision:            0b1b0a8f638b247813c14fa22e42045ea72dd862
date:                2011-02-17T23:02:51
author:              address@hidden
branch:              net.venge.monotone
changelog:
* m4/*.m4: silence "no AC_LANG_SOURCE call detected in body" warning
  from autoconf-2.68 and higher

manifest:
format_version "1"

new_manifest [8ab95872045f57d2d07334a1e16e9dad855f557c]

old_revision [95731cd1e35212fe53f223b7a3645225c8fc84f8]

patch "m4/boost.m4"
 from [90da17aab421082f379f262e9a76cbd772755a2d]
   to [18916cab3335d7f178ef8a5e29b58e73de6b241c]

patch "m4/tempstatconst.m4"
 from [7738d43c8a0984a6258ecd64f8b44d650f20e2d6]
   to [75cacf73cf3074c9104733f79d5a145de3e80480]

patch "m4/tr1unorderedmap.m4"
 from [d93ce254f2119193d62884506e183703f53d7a23]
   to [fe15b94937aff51a0edd78cbd70a232a52e1c67d]
============================================================
--- m4/boost.m4	90da17aab421082f379f262e9a76cbd772755a2d
+++ m4/boost.m4	18916cab3335d7f178ef8a5e29b58e73de6b241c
@@ -13,7 +13,7 @@ AC_DEFUN([BOOST_VERSION_CHECK],
  AC_CACHE_CHECK([boost version 1.33.0 or newer],
                  ac_cv_boost_version_least_1_33_0,
  [
-  AC_COMPILE_IFELSE(
+  AC_COMPILE_IFELSE([AC_LANG_SOURCE(
   [#include <boost/version.hpp>
   #if BOOST_VERSION >= 103300
   int main() { return 0; }
@@ -23,7 +23,7 @@ AC_DEFUN([BOOST_VERSION_CHECK],
   ],
   ac_cv_boost_version_least_1_33_0=yes,
   ac_cv_boost_version_least_1_33_0=no)
- ])
+ ])])
   if test x$ac_cv_boost_version_least_1_33_0 = xno; then
         AC_MSG_ERROR([boost 1.33.0 or newer required])
   fi
============================================================
--- m4/tr1unorderedmap.m4	d93ce254f2119193d62884506e183703f53d7a23
+++ m4/tr1unorderedmap.m4	fe15b94937aff51a0edd78cbd70a232a52e1c67d
@@ -10,7 +10,7 @@ AC_DEFUN([AC_CXX_TR1_UNORDERED_MAP],
 [AC_LANG_ASSERT([C++])
  AC_CACHE_CHECK([whether the compiler supports tr1::unordered_map],
                        ac_cv_cxx_tr1_unordered_map_and_set,
-          [AC_COMPILE_IFELSE(AC_LANG_SOURCE([
+          [AC_COMPILE_IFELSE([AC_LANG_SOURCE([
         #include <tr1/functional>
         #include <tr1/unordered_map>
         #include <tr1/unordered_set>
@@ -18,7 +18,7 @@ AC_DEFUN([AC_CXX_TR1_UNORDERED_MAP],
         using std::tr1::unordered_map;
         using std::tr1::unordered_set;
         using std::tr1::unordered_multimap;
-        ]),
+        ])],
               ac_cv_cxx_tr1_unordered_map_and_set=yes,
               ac_cv_cxx_tr1_unordered_map_and_set=no)])
         if test x$ac_cv_cxx_tr1_unordered_map_and_set = xyes; then
@@ -40,11 +40,11 @@ AC_DEFUN([AC_CXX_TR1_UNORDERED_MAP_CONST
  AC_CACHE_CHECK([for early 4.0-series g++ bug in tr1 hashtables],
     ac_cv_cxx_tr1_hashtable_bug,
     [
-     AC_COMPILE_IFELSE(AC_LANG_PROGRAM(
+     AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
 		    [#include <tr1/unordered_set>],
                     [std::tr1::unordered_set<int> s;
                      const std::tr1::unordered_set<int> &s_ref = s;
-                     s_ref.find(27);]),
+                     s_ref.find(27);])],
                      [ac_cv_cxx_tr1_hashtable_bug=no],
                      [ac_cv_cxx_tr1_hashtable_bug=yes])])
  if test x$ac_cv_cxx_tr1_hashtable_bug = xno; then
============================================================
--- m4/tempstatconst.m4	7738d43c8a0984a6258ecd64f8b44d650f20e2d6
+++ m4/tempstatconst.m4	75cacf73cf3074c9104733f79d5a145de3e80480
@@ -30,11 +30,11 @@ AC_DEFUN([AC_CXX_TEMPLATE_STATIC_CONST_B
   [
    # Autoconf doesn't make it easy to do a test involving 
    # linking two files.  This is the best way I know of.
-   AC_COMPILE_IFELSE([$codeA],
+   AC_COMPILE_IFELSE([AC_LANG_SOURCE([$codeA])],
      [mv conftest.$ac_objext conftestA.$ac_objext
       save_LIBS="$LIBS"
       LIBS=conftestA.$ac_objext
-      AC_LINK_IFELSE([$codeB],
+      AC_LINK_IFELSE([AC_LANG_SOURCE([$codeB])],
         [ac_cv_prog_cxx_template_static_const_ok=yes],
         [ac_cv_prog_cxx_template_static_const_ok=no])
       LIBS="$save_LIBS"],

reply via email to

[Prev in Thread] Current Thread [Next in Thread]