[yoda-svn] yoda: Remove blocking of builds against ROOT6 -- it works fine.

[YODA Mercurial]

details:   https://yoda.hepforge.org/hg/yoda/rev/bd49180b9e71
branches:  release-1-5
changeset: 1217:bd49180b9e71
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Feb 29 15:13:12 2016 +0000
description:
Remove blocking of builds against ROOT6 -- it works fine.

diffs (40 lines):

--- a/ChangeLog	Tue Feb 16 22:21:51 2016 +0000
+++ b/ChangeLog	Mon Feb 29 15:13:12 2016 +0000
@@ -1,3 +1,7 @@
+2016-02-29  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Remove blocking of builds against ROOT6 -- it works fine.
+
 2016-02-16  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Add a --add option to yodamerge, for simple histo
--- a/configure.ac	Tue Feb 16 22:21:51 2016 +0000
+++ b/configure.ac	Mon Feb 29 15:13:12 2016 +0000
@@ -110,17 +110,17 @@
     ROOT_MINOR_VERSION=`echo $ROOT_VERSION | cut -d. -f2 | cut -d/ -f1`
     ROOT_MICRO_VERSION=`echo $ROOT_VERSION | cut -d. -f2 | cut -d/ -f2`
     AC_MSG_RESULT([$ROOT_VERSION ($ROOT_MAJOR_VERSION,$ROOT_MINOR_VERSION,$ROOT_MICRO_VERSION)])
-    if test "$ROOT_MAJOR_VERSION" -ne 5; then
+    if test "$ROOT_MAJOR_VERSION" -lt 5; then
       enable_root=no;
-      AC_MSG_WARN([ROOT major version is not 5 -- not building extra ROOT compatibility tools])
-    fi
-    if test "$ROOT_MINOR_VERSION" -lt 33; then
-      enable_root=no;
-      AC_MSG_WARN([ROOT version is less than 5.33 -- not building extra ROOT compatibility tools])
-    fi
-    if test "$ROOT_MINOR_VERSION" -eq 33 && test "$ROOT_MICRO_VERSION" -lt 2; then
-      enable_root=no;
-      AC_MSG_WARN([ROOT version is less than 5.33/02 -- not building extra ROOT compatibility tools])
+      AC_MSG_WARN([ROOT major version is < 5 -- not building extra ROOT compatibility tools])
+    elif test "$ROOT_MAJOR_VERSION" -eq 5; then
+      if test "$ROOT_MINOR_VERSION" -lt 33; then
+        enable_root=no;
+        AC_MSG_WARN([ROOT version is less than 5.33 -- not building extra ROOT compatibility tools])
+      elif test "$ROOT_MINOR_VERSION" -eq 33 && test "$ROOT_MICRO_VERSION" -lt 2; then
+        enable_root=no;
+        AC_MSG_WARN([ROOT version is less than 5.33/02 -- not building extra ROOT compatibility tools])
+      fi
     fi
     # TODO: Test for existence of TPython, instance_from_void API, etc.
     #AM_CXXFLAGS="$AM_CXXFLAGS -Wno-long-long"