[Rivet-svn] rivet: 2 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/3a129aa4e98c
branches:  
changeset: 5698:3a129aa4e98c
user:      Holger Schulz <holger.schulz at durham.ac.uk>
date:      Fri Feb 24 16:26:47 2017 +0000
description:
No more GSL dependency

details:   https://rivet.hepforge.org/hg/rivet/rev/d10fd48730f7
branches:  
changeset: 5699:d10fd48730f7
user:      Holger Schulz <holger.schulz at durham.ac.uk>
date:      Fri Feb 24 16:27:32 2017 +0000
description:
Add the generalized kt for ee algorithm as GENKTEE as it is needed for the Heisteron analysis

diffs (truncated from 253 to 50 lines):

--- a/bin/rivet-buildplugin.in	Mon Jan 23 23:17:33 2017 +0000
+++ b/bin/rivet-buildplugin.in	Fri Feb 24 16:27:32 2017 +0000
@@ -80,8 +80,8 @@
 test -n "$iyoda" && mycppflags="$mycppflags -I${iyoda}"
 ifastjet="@FASTJETINCPATH@"
 test -n "$ifastjet" && mycppflags="$mycppflags -I${ifastjet}"
-igsl="@GSLINCPATH@"
-test -n "$igsl" && mycppflags="$mycppflags -I${igsl}"
+# igsl="@GSLINCPATH@"
+# test -n "$igsl" && mycppflags="$mycppflags -I${igsl}"
 # iboost="@BOOST_CPPFLAGS@"
 # test -n "$iboost" && mycppflags="$mycppflags ${iboost}"
 
--- a/configure.ac	Mon Jan 23 23:17:33 2017 +0000
+++ b/configure.ac	Fri Feb 24 16:27:32 2017 +0000
@@ -1,7 +1,7 @@
 ## Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([Rivet],[trunk],[rivet at projects.hepforge.org],[Rivet])
+AC_INIT([Rivet],[2.6.0-pre],[rivet at projects.hepforge.org],[Rivet])
 
 ## Check and block installation into the src/build dir
 if test "$prefix" = "$PWD"; then
@@ -145,12 +145,12 @@
 
 
 ## GNU Scientific Library
-AC_SEARCH_GSL
-AC_CEDAR_HEADERS([gsl], , , [AC_MSG_ERROR([GSL (GNU Scientific Library) is required])])
-oldCPPFLAGS=$CPPFLAGS
-CPPFLAGS="$CPPFLAGS -I$GSLINCPATH"
-AC_CHECK_HEADER([gsl/gsl_vector.h], [], [AC_MSG_ERROR([GSL vectors not found.])])
-CPPFLAGS=$oldCPPFLAGS
+#AC_SEARCH_GSL
+#AC_CEDAR_HEADERS([gsl], , , [AC_MSG_ERROR([GSL (GNU Scientific Library) is required])])
+#oldCPPFLAGS=$CPPFLAGS
+#CPPFLAGS="$CPPFLAGS -I$GSLINCPATH"
+#AC_CHECK_HEADER([gsl/gsl_vector.h], [], [AC_MSG_ERROR([GSL vectors not found.])])
+#CPPFLAGS=$oldCPPFLAGS
 
 
 ## Disable build/install of standard analyses
@@ -213,9 +213,9 @@
 
 ## Cython checks
 if test x$enable_pyext == xyes; then
-  AM_CHECK_CYTHON([0.24.0], [:], [:])
+  AM_CHECK_CYTHON([0.23.5], [:], [:])
   if test x$CYTHON_FOUND = xyes; then