[Rivet-svn] r4269 - trunk

[blackhole at projects.hepforge.org]

Author: buckley
Date: Sun May 12 17:21:07 2013
New Revision: 4269

Log:
Adding configure-time differentiation between yaml-cpp API versions 3 and 5

Modified:
   trunk/ChangeLog
   trunk/configure.ac

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Tue May  7 15:53:23 2013	(r4268)
+++ trunk/ChangeLog	Sun May 12 17:21:07 2013	(r4269)
@@ -1,3 +1,7 @@
+2013-05-12  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Adding configure-time differentiation between yaml-cpp API versions 3 and 5.
+
 2013-05-07  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Converting info file reading to use the yaml-cpp 0.5.x API.

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	Tue May  7 15:53:23 2013	(r4268)
+++ trunk/configure.ac	Sun May 12 17:21:07 2013	(r4269)
@@ -139,6 +139,21 @@
 
 ## yaml-cpp metadata file parsing library
 AC_CEDAR_LIBRARYANDHEADERS([yaml-cpp], , , [AC_MSG_ERROR([yaml-cpp is required])])
+YAMLCPP_LIBS="-lyaml-cpp"
+oldCPPFLAGS=$CPPFLAGS
+oldLDFLAGS=$LDFLAGS
+CPPFLAGS="$AM_CPPFLAGS $CPPFLAGS -I$YAML_CPPINCPATH"
+LDFLAGS="$AM_LDFLAGS $LDFLAGS -L$YAML_CPP_LIBPATH"
+dnl AC_CHECK_HEADER([yaml-cpp/yaml.h], [], [AC_MSG_ERROR([yaml-cpp/yaml.h header not found.])])
+AC_CHECK_HEADER([yaml-cpp/node.h], [YAMLCPP_MAJOR_VERSION=3])
+AC_CHECK_HEADER([yaml-cpp/node/node.h], [YAMLCPP_MAJOR_VERSION=5])
+if test "x$YAMLCPP_MAJOR_VERSION" = x; then
+  AC_MSG_ERROR([yaml-cpp API version could not be determined])
+fi
+AC_MSG_NOTICE([yaml-cpp API version = $YAMLCPP_MAJOR_VERSION])
+AC_SUBST(YAMLCPP_MAJOR_VERSION)
+CPPFLAGS=$oldCPPFLAGS
+LDFLAGS=$oldLDFLAGS
 
 
 ## Disable build/install of standard analyses