[Rivet-svn] r2128 - trunk/src/Core

[blackhole at projects.hepforge.org]

Author: buckley
Date: Wed Dec  2 10:05:04 2009
New Revision: 2128

Log:
Fixing use of yaml-cpp include path

Modified:
   trunk/src/Core/AnalysisInfo.cc
   trunk/src/Core/Makefile.am

Modified: trunk/src/Core/AnalysisInfo.cc
==============================================================================
--- trunk/src/Core/AnalysisInfo.cc	Wed Dec  2 00:39:52 2009	(r2127)
+++ trunk/src/Core/AnalysisInfo.cc	Wed Dec  2 10:05:04 2009	(r2128)
@@ -2,7 +2,7 @@
 #include "Rivet/AnalysisInfo.hh"
 #include "Rivet/Tools/Utils.hh"
 #include "Rivet/Tools/Logging.hh"
-#include "yaml.h"
+#include "yaml-cpp/yaml.h"
 #include <iostream>
 #include <fstream>
 #include <unistd.h>

Modified: trunk/src/Core/Makefile.am
==============================================================================
--- trunk/src/Core/Makefile.am	Wed Dec  2 00:39:52 2009	(r2127)
+++ trunk/src/Core/Makefile.am	Wed Dec  2 10:05:04 2009	(r2128)
@@ -6,5 +6,10 @@
   Analysis.cc AnalysisLoader.cc AnalysisInfo.cc \
   AnalysisHandler.cc Run.cc ProjectionHandler.cc HistoHandler.cc
 
-libRivetCore_la_CPPFLAGS = \
-  $(AM_CPPFLAGS) -I$(top_srcdir)/src/Tools/yaml-cpp $(CPPFLAGS)
+libRivetCore_la_CPPFLAGS = $(AM_CPPFLAGS)
+if WITHOUT_YAML_CPP
+libRivetCore_la_CPPFLAGS += -I$(top_srcdir)/src/Tools
+else
+libRivetCore_la_CPPFLAGS += -I$(YAML_CPPINCPATH)
+endif
+libRivetCore_la_CPPFLAGS += $(CPPFLAGS)