From 29b60f7e1a0953a2c191b2047f900353bd925cdb Mon Sep 17 00:00:00 2001
From: Francesco Sanfilippo <fr.sanfilippo@gmail.com>
Date: Tue, 21 Feb 2017 12:58:50 +0100
Subject: [PATCH 1/2] adding --with switch to pass lime path

---
 configure.ac | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index a04bc338..2072a7ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,6 +70,13 @@ AC_ARG_WITH([fftw],
             [AM_CXXFLAGS="-I$with_fftw/include $AM_CXXFLAGS"]
             [AM_LDFLAGS="-L$with_fftw/lib $AM_LDFLAGS"])
 
+############### LIME
+AC_ARG_WITH([lime],
+            [AS_HELP_STRING([--with-lime=prefix],
+            [try this for a non-standard install prefix of the LIME library])],
+            [AM_CXXFLAGS="-I$with_lime/include $AM_CXXFLAGS"]
+            [AM_LDFLAGS="-L$with_lime/lib $AM_LDFLAGS"])
+
 ############### lapack 
 AC_ARG_ENABLE([lapack],
     [AC_HELP_STRING([--enable-lapack=yes|no|prefix], [enable LAPACK])], 
@@ -155,6 +162,14 @@ AC_SEARCH_LIBS([fftw_execute], [fftw3],
                [AC_DEFINE([HAVE_FFTW], [1], [Define to 1 if you have the `FFTW' library])]
                [have_fftw=true])
 
+AC_SEARCH_LIBS([limeCreateReader], [lime],
+               [AC_DEFINE([HAVE_LIME], [1], [Define to 1 if you have the `LIME' library])]
+               [have_lime=true],
+	       [AC_MSG_WARN(C-LIME library was not found in your system.
+In order to use ILGG file format please install or provide the correct path to your installation
+Info at: http://usqcd.jlab.org/usqcd-docs/c-lime/)])
+
+
 AC_SEARCH_LIBS([H5Fopen], [hdf5_cpp],
                [AC_DEFINE([HAVE_HDF5], [1], [Define to 1 if you have the `HDF5' library])]
                [have_hdf5=true]
@@ -164,15 +179,6 @@ AM_CONDITIONAL(BUILD_HDF5, [ test "${have_hdf5}X" == "trueX" ])
 CXXFLAGS=$CXXFLAGS_CPY
 LDFLAGS=$LDFLAGS_CPY
 
-AC_CHECK_LIB([lime],[limeCreateReader],
-  [AC_DEFINE([HAVE_LIME],[1],[Define to 1 if you have the `LIME' library (-llime).])]
-  [have_lime=true]
-  [LIBS="$LIBS -llime"],
-  [AC_MSG_WARN(C-LIME library was not found in your system.
-In order to use ILGG file format please install or provide the correct path to your installation [default search path ~/lime/]
-Info at: http://usqcd.jlab.org/usqcd-docs/c-lime/)])
-
-
 ############### SIMD instruction selection
 AC_ARG_ENABLE([simd],[AC_HELP_STRING([--enable-simd=code],
               [select SIMD target (cf. README.md)])], [ac_SIMD=${enable_simd}], [ac_SIMD=GEN])

From 93cc27001699a220ae60dc3e23d44ee9e5bf7acf Mon Sep 17 00:00:00 2001
From: Francesco Sanfilippo <fr.sanfilippo@gmail.com>
Date: Tue, 21 Feb 2017 23:02:47 +0100
Subject: [PATCH 2/2] making public same serializable parameters in HMC Module

RNGModuleParameters
GridModuleParameters
---
 lib/qcd/hmc/HMCModules.h      | 4 ++--
 lib/qcd/hmc/HMC_GridModules.h | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/qcd/hmc/HMCModules.h b/lib/qcd/hmc/HMCModules.h
index 768e8a47..0742efc6 100644
--- a/lib/qcd/hmc/HMCModules.h
+++ b/lib/qcd/hmc/HMCModules.h
@@ -39,10 +39,10 @@ namespace QCD {
 ////////////////////////////////////////////////////////////////////
 class RNGModuleParameters: Serializable {
 
+public:
   GRID_SERIALIZABLE_CLASS_MEMBERS(RNGModuleParameters,
   std::string, serial_seeds,
   std::string, parallel_seeds,);
-public:
   std::vector<int> SerialSeed;
   std::vector<int> ParallelSeed;
 
@@ -112,4 +112,4 @@ class StoutSmearingModule: public SmearingModule<ImplementationPolicy>{
 }  // namespace QCD
 }  // namespace Grid
 
-#endif  // GRID_HMC_MODULES
\ No newline at end of file
+#endif  // GRID_HMC_MODULES
diff --git a/lib/qcd/hmc/HMC_GridModules.h b/lib/qcd/hmc/HMC_GridModules.h
index 6e8d6195..d8156905 100644
--- a/lib/qcd/hmc/HMC_GridModules.h
+++ b/lib/qcd/hmc/HMC_GridModules.h
@@ -38,11 +38,11 @@ namespace QCD {
 
 class GridModuleParameters: Serializable{
   
+public: 
   GRID_SERIALIZABLE_CLASS_MEMBERS(GridModuleParameters,
   std::string, lattice,
   std::string,  mpi);
-
-public: 
+  
   // these namings are ugly
   // also ugly the distinction between the serializable members
   // and this
@@ -118,4 +118,4 @@ class GridFourDimModule : public GridModule {
 }  // namespace QCD
 }  // namespace Grid
 
-#endif  // HMC_GRID_MODULES
\ No newline at end of file
+#endif  // HMC_GRID_MODULES