From 18e23e90e2a542ee4eb04bf277e2a8cadeca77de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 14 Jan 2011 12:53:54 +0000
Subject: [PATCH] hydra: Clarify the dependency on BDW-GC.

---
 configure.ac             | 2 ++
 release.nix              | 5 +++--
 src/c/Makefile.am        | 8 +++++---
 src/c/hydra_eval_jobs.cc | 2 ++
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index aa218fe4..a7c8e31e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,6 +42,8 @@ AC_CHECK_LIB([expr], [_ZN3nix17parseExprFromFileERNS_9EvalStateESs], [:],
 CPPFLAGS="$old_CPPFLAGS"
 LIBS="$old_LIBS"
 
+PKG_CHECK_MODULES([BDW_GC], [bdw-gc])
+
 AC_CONFIG_FILES([
   Makefile
 
diff --git a/release.nix b/release.nix
index 258a655f..90fc33ea 100644
--- a/release.nix
+++ b/release.nix
@@ -15,7 +15,8 @@ rec {
       inherit officialRelease;
       version = builtins.readFile ./version;
 
-      buildInputs = [ perl libxslt dblatex tetex nukeReferences ] ;
+      buildInputs =
+        [ perl libxslt dblatex tetex nukeReferences pkgconfig boehmgc ] ;
 
       preConfigure = ''
         # TeX needs a writable font cache.
@@ -46,7 +47,7 @@ rec {
       configureFlags = "--with-nix=${nix}";
 
       buildInputs =
-        [ perl makeWrapper libtool nix unzip nukeReferences boehmgc ]
+        [ perl makeWrapper libtool nix unzip nukeReferences pkgconfig boehmgc ]
         ++ (import ./deps.nix) { inherit pkgs; };
 
       hydraPath = stdenv.lib.concatStringsSep ":" (map (p: "${p}/bin") ( [
diff --git a/src/c/Makefile.am b/src/c/Makefile.am
index 78668e6b..52e8dbbd 100644
--- a/src/c/Makefile.am
+++ b/src/c/Makefile.am
@@ -1,6 +1,8 @@
 bin_PROGRAMS = hydra_eval_jobs
 
 hydra_eval_jobs_SOURCES = hydra_eval_jobs.cc
-hydra_eval_jobs_LDADD = -lmain -lexpr -L$(nix)/lib/nix
-AM_CXXFLAGS = \
- -I$(nix)/include/nix
+hydra_eval_jobs_LDADD = -lmain -lexpr -L$(nix)/lib/nix $(BDW_GC_LIBS)
+
+AM_CXXFLAGS =					\
+ -I$(nix)/include/nix				\
+  $(BDW_GC_CFLAGS)
diff --git a/src/c/hydra_eval_jobs.cc b/src/c/hydra_eval_jobs.cc
index 79b2ce95..0618d923 100644
--- a/src/c/hydra_eval_jobs.cc
+++ b/src/c/hydra_eval_jobs.cc
@@ -1,6 +1,8 @@
 #include <map>
 #include <iostream>
 
+#include <gc/gc_allocator.h>
+
 #include "shared.hh"
 #include "store-api.hh"
 #include "eval.hh"