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.contrib.usher: b5e0b8c7297ac


From: code
Subject: [Monotone-commits-diffs] net.venge.monotone.contrib.usher: b5e0b8c7297acb3e7028c4a3efee1c3adf2d1c7a
Date: Wed, 27 Apr 2011 09:15:22 +0200 (CEST)

revision:            b5e0b8c7297acb3e7028c4a3efee1c3adf2d1c7a
date:                2011-04-27T07:15:05
author:              Richard Levitte <address@hidden>
branch:              net.venge.monotone.contrib.usher
changelog:
Since boost is used, configure needs to check for boost.

* m4/boost.m4: Added macros to do the check (copied from monotone).
* configure.in: Check for boost...  and make sure we declare C++ as the
  main language.
* Makefile.am: Add ACLOCAL_AMFLAGS to tell aclocal where the extra m4
  macros reside.

manifest:
format_version "1"

new_manifest [db19b38ada1f85b8fd262597b14c3c1835a49284]

old_revision [eab043a0c4ceb4bdfc8c8897dfc4b96b7e3c2df2]

add_dir "m4"

add_file "m4/boost.m4"
 content [18916cab3335d7f178ef8a5e29b58e73de6b241c]

patch "Makefile.am"
 from [48217181ccad2e9fb9ac037fa0fc9147c6bfff31]
   to [852744819101801894d07c20a90db7f7254b1b07]

patch "configure.in"
 from [b3d3a367625ddaaf9ad07a82470927b0798b2e62]
   to [c6591c7f0f6d33ac83aa5bbb567ba0d9d5682c87]
============================================================
--- Makefile.am	48217181ccad2e9fb9ac037fa0fc9147c6bfff31
+++ Makefile.am	852744819101801894d07c20a90db7f7254b1b07
@@ -1,3 +1,4 @@
+ACLOCAL_AMFLAGS  = -I m4
 
 bin_PROGRAMS = usher
 
============================================================
--- configure.in	b3d3a367625ddaaf9ad07a82470927b0798b2e62
+++ configure.in	c6591c7f0f6d33ac83aa5bbb567ba0d9d5682c87
@@ -7,12 +7,16 @@ AC_CONFIG_HEADER([config.h])
 
 AC_CONFIG_SRCDIR([src/usher.cc])
 AC_CONFIG_HEADER([config.h])
+AC_CONFIG_FILES([Makefile])
+AC_LANG([C++])
 
 # Checks for programs.
 AC_PROG_CXX
 
 # Checks for libraries.
 
+BOOST_VERSION_CHECK
+
 # Checks for header files.
 AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS([unistd.h])
@@ -27,4 +31,4 @@ AC_CHECK_FUNCS([dup2])
 AC_FUNC_FORK
 AC_HEADER_STDC
 AC_CHECK_FUNCS([dup2])
-AC_OUTPUT(Makefile)
+AC_OUTPUT
============================================================
--- /dev/null	
+++ m4/boost.m4	18916cab3335d7f178ef8a5e29b58e73de6b241c
@@ -0,0 +1,36 @@
+# Copyright (C) 2006 Zack Weinberg <address@hidden>
+#
+# This program is made available under the GNU GPL version 2.0 or
+# greater. See the accompanying file COPYING for details.
+#
+# This program is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+# PURPOSE.
+
+# Check for suitably new version of boost.
+AC_DEFUN([BOOST_VERSION_CHECK],
+[AC_LANG_ASSERT([C++])
+ AC_CACHE_CHECK([boost version 1.33.0 or newer],
+                 ac_cv_boost_version_least_1_33_0,
+ [
+  AC_COMPILE_IFELSE([AC_LANG_SOURCE(
+  [#include <boost/version.hpp>
+  #if BOOST_VERSION >= 103300
+  int main() { return 0; }
+  #else
+  #error boost version is too old
+  #endif
+  ],
+  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
+])
+
+# We currently don't need any checks for boost version-specific bugs,
+# but we have in the past and may again.  They go in this macro.
+AC_DEFUN([BOOST_VERSION_SPECIFIC_BUGS],
+[AC_LANG_ASSERT([C++])
+])

reply via email to

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