[Rivet-svn] r1825 - in trunk: . src/Tools

blackhole at projects.hepforge.org blackhole at projects.hepforge.org
Mon Sep 21 17:52:26 BST 2009


Author: buckley
Date: Mon Sep 21 17:52:26 2009
New Revision: 1825

Log:
Conditional install of yaml-cpp

Modified:
   trunk/configure.ac
   trunk/src/Tools/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	Mon Sep 21 17:04:07 2009	(r1824)
+++ trunk/configure.ac	Mon Sep 21 17:52:26 2009	(r1825)
@@ -177,6 +177,10 @@
 AM_CONDITIONAL(WITH_ASCIIDOC, [test x$ASCIIDOC != x])
 
 
+## Test to see if we have to install libyaml-cpp
+AC_CEDAR_LIBRARYANDHEADERS([yaml-cpp], , , [AC_MSG_NOTICE([Rivet will install the yaml-cpp library])])
+
+
 ## Python extension
 AC_ARG_ENABLE(pyext, [AC_HELP_STRING(--disable-pyext, 
   [don't build Python module (default=build)])], 

Modified: trunk/src/Tools/Makefile.am
==============================================================================
--- trunk/src/Tools/Makefile.am	Mon Sep 21 17:04:07 2009	(r1824)
+++ trunk/src/Tools/Makefile.am	Mon Sep 21 17:52:26 2009	(r1825)
@@ -1,4 +1,6 @@
+if WITHOUT_YAML_CPP
 SUBDIRS = yaml-cpp
+endif
 
 noinst_LTLIBRARIES = libRivetTools.la
 


More information about the Rivet-svn mailing list