Fix some configure.ac inconsistencies; edit TODOs nd README

f5b7ab93 · Klaus Rabbertz · 9c4b36fd · f5b7ab93 · f5b7ab93 · f5b7ab93
Commit f5b7ab93 authored 6 years ago by Klaus Rabbertz
--- a/v2.0/toolkit/README
+++ b/v2.0/toolkit/README
 # -*-sh-*-
-# fastNLO_toolkit version 2.1.3pre:
-# =================================
-# This is a prerelease for testing!
+# fastNLO_toolkit version 2.3.1:
+# ==============================
 # Please contact the authors for any questions or problems.


@@ -12,7 +11,7 @@

 # Requirements:
 # -------------
-# For installation of toolkit package: LHAPDF version 5 or 6, see also http://lhapdf.hepforge.org
+# For installation of toolkit package: LHAPDF version 6, see also http://lhapdf.hepforge.org
 # For running executable: fastNLO table, PDF set from LHAPDF, see also http://fastnlo.hepforge.org


@@ -42,8 +41,8 @@ cd fastnlo_toolkit-v.v.v-nnnn
 #    how many cores, e.g. n=2, should be used in parallel in this step:
 make -j n

-# 5. Not yet implemented, please skip! Run functionality test suite:
-#make check
+# 5. Run functionality test suite:
+make check

 # 6. Install the products into the configured target directory:
 make install
@@ -91,19 +90,31 @@ make install

 # Usage:
 # ------
-# Please see the executables in the folder 'src', e.g. run
-fnlo-tk-example tablename PDF.LHgrid
+# Please see the executables in the folder 'src' and run e.g.
+fnlo-tk-example -h
 # or
-fnlo-tk-cppread tablename PDF.LHgrid
-# for some sample cross-section print-out.
-# In case of LHAPDF6 usage, the PDF sets have to be specified without extension.
-# For more details see also the description in fastnlotoolkit/fastNLOReader.cc
+fnlo-tk-cppread -h
+# for some usage explanations.
+# In case of LHAPDF6, the PDF sets have to be specified without extension.


-# For developers only:
+# For developers ONLY:
 # --------------------
-# If you have the GNU autotools installed, the project gets automatically reconfigured properly
-# if you e.g. add something new to a Makefile.am to be compiled or linked.
+# Instead of a distribution tarball experienced developers can also
+# check out the latest fastNLO software directly using git:
+git clone https://gitlab.ekp.kit.edu/qcd-public/fastNLO.git
+# The fastNLO toolkit resides in the subdirectory v2.0/toolkit.
+# To prepare this directory for installation the following command is needed:
+autoreconf -i
+# For this to work it is mandatory to have recent enough GNU autotools installed,
+# i.e. autoconf, automake, and libtool.
+# If files related to these tools are not found in the usual system places as
+# in the case of LCG environment setups, it might be necessary to set proper
+# paths where these files can be found now, e.g.
+csh: setenv ACLOCAL_PATH=/cvmfs/sft.cern.ch/lcg/releases/libtool/2.4.2-9ad34/x86_64-slc6-gcc62-opt/share/aclocal
+sh:  export ACLOCAL_PATH=/cvmfs/sft.cern.ch/lcg/releases/libtool/2.4.2-9ad34/x86_64-slc6-gcc62-opt/share/aclocal
+# After a successful reconfigure the configuration, make, and install steps should proceed
+# as before.
 #
 # The GNU autotools also support incremental installations. If you modify something in or add something
 # to the fastNLO_toolkit that requires recompilation or relinking, the install step can be restricted

--- a/v2.0/toolkit/TODO
+++ b/v2.0/toolkit/TODO
@@ -2,8 +2,8 @@
 TODO list for fastNLO_toolkit (orderd by priority)
 -----------------------------------------------------------------------

+ - Include stat. uncertainties into table
 - Creator for Referenztabellen
- - Modifier & Concatenator for tables/bins
 - Streamline usage of logger.messagelevel, shout|cout, error|warn|silent etc. in speaker

 - KR: Check, which points are actually done ...
@@ -13,11 +13,7 @@ TODO list for fastNLO_toolkit (orderd by priority)
 - Benutzbarkeit gewaehrleisten, wenn binning- und bin-suche im generator gemacht werden (ist teils implementiert bspw 'fnloEvent::_iOB')
 - fastNLOCreate fuer mehrere Tabellen - also (bspw.) mehrere fastNLOCreate instanzen (dazu muessen alle 'read-steer'-statements geaendert werden)
   oder mehrere Coeffizienten Tabellen
- - fast Warmup-run (just some events and then 'guess' PS boundaries)
- - 11x11 = 121 PDF-LiCos
- - 13x13 PDF-LiCos
 - 'automatisches' Erkennen von PDF-LiCos beim warm-up run
- - Codieren der LiCo's in Tabelle (und lesen im reader)
 - implement DIS fixed-scale (desired?)
 - 'Generator-stamps': konsistente beschreibung und zitate fuer CodeDescr[]. Bspw: fastNLO::CodeDescr::NLOJET_hhc(vector<string>& contrdescr)
 - fnloEvent: implementiere 'operator+' und/oder eine 'add-funktion' (ordentliche Klassendefinitionen??)
@@ -29,6 +25,11 @@ TODO list for fastNLO_toolkit (orderd by priority)
 =======================================================================
 DONE
 =======================================================================
+ - Modifier & Concatenator for tables/bins
+ - fast Warmup-run (just some events and then 'guess' PS boundaries)
+ - 11x11 = 121 PDF-LiCos
+ - 13x13 PDF-LiCos
+ - Codieren der LiCo's in Tabelle (und lesen im reader)
 - reader testen fuer NNLO
 - Ensure NNLO compatibility of reader
 - fastNLOConstants.h in fastNLOConstants.h.in with svn-variables

--- a/v2.0/toolkit/configure.ac
+++ b/v2.0/toolkit/configure.ac
@@ -10,7 +10,7 @@
 # Require minimal autoconf version, 2.69 is from 2012
 AC_PREREQ([2.69])
 # Define subproject fastNLO_toolkit
-AC_INIT([fastNLO_toolkit], [2.3.1pre], [daniel.britzger@desy.de,klaus.rabbertz@cern.ch,g.sieber@cern.ch,stober@cern.ch,wobisch@fnal.gov])
+AC_INIT([fastNLO_toolkit], [2.3.1], [daniel.britzger@desy.de,klaus.rabbertz@cern.ch,g.sieber@cern.ch,stober@cern.ch,wobisch@fnal.gov])
 #Suppress verbose output when compiling (use make V=99 for verbose output)
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 # Properly include subprojects
@@ -54,7 +54,7 @@ AC_PROG_MAKE_SET
 # Checks for libraries.
 AC_F77_LIBRARY_LDFLAGS
 AC_CHECK_LIB([g2c], [getenv_])
-AC_CHECK_LIB([LHAPDF], [alphas])
+#AC_CHECK_LIB([LHAPDF], [alphas])
 #AC_CHECK_LIB([fastnlotoolkit], [libfastnlotoolkit_la-FastNLOBlockB])
 #AC_CHECK_LIB([gfortranbegin], [fmain])
 #AC_CHECK_LIB([lhpdf_cteq6], [cteq6])
@@ -69,7 +69,10 @@ AM_CONDITIONAL(HAVE_LIBZ, test "x$ZLIBTEST" != "x")
 # Checks for typedefs, structures, compiler characteristics and functionalities.
 AC_HEADER_STDBOOL
 AC_C_INLINE
-# For gcc, full C++11 functionality has been supported since version 4.8.1
+
+# Require full C++11 functionality, which has been supported by gcc since version 4.8.1
+# If the following macro is not found, you might want to install the autoconf-archive
+# package and repeat the 'autoreconf -i' step.
 AX_CXX_COMPILE_STDCXX_11

 # Checks for library functions.
@@ -293,39 +296,65 @@ AC_ARG_WITH([hoppet],
 if test "x$with_hoppet" != "xno"; then
   if test "x$HOPPET" = "x"; then
      AC_MSG_NOTICE([No $TMPNAM installation path set. Try to find $TMPNAM in prefix path ...])
-      AC_CHECK_FILE([$prefix/lib/libhoppet_v1.a],
-      [prehoppet="$ac_cv_file_$prefix/lib/libhoppet_v1.a"],
-      [prehoppet=""])
-      if test "x$prehoppet" = "x"; then
-         AC_MSG_NOTICE([No $TMPNAM library found in prefix path. Try to link with systems $TMPNAM ...])
-         AC_CHECK_LIB([libhoppet_v1],[hoppetstart],
-         [syshoppet=$ac_cv_lib_libhoppet_v1_hoppetstart],
-         [syshoppet=""])
-         if test "x$syshoppet" = "x"; then
-            AC_MSG_ERROR([No $TMPNAM library found. Please install $TMPNAM first. Configuration aborted!])
-         else
-            AC_SUBST([HOPPETLIBPATH], [`dirname $syshoppet`])
+      AC_PATH_PROG([HOPPETBIN],[hoppet-config],[],[$prefix/bin])
+      if test "x$HOPPETBIN" = "x"; then
+         AC_MSG_NOTICE([No $TMPNAM installation found in prefix path. Try to find $TMPNAM in system path ...])
+         AC_PATH_PROG([HOPPETBIN],[hoppet-config])
+         if test "x$HOPPETBIN" = "x"; then
+            AC_MSG_NOTICE([Building $PACKAGE_NAME without $TMPNAM!])
         fi
-      else
-         AC_SUBST([HOPPETLIBPATH], [`dirname $prehoppet`])
      fi
-      AC_SUBST([HOPPET], [`dirname $HOPPETLIBPATH`])
   else
-      AC_CHECK_FILE([$HOPPET/lib/libhoppet_v1.a],
-      [],
-      [AC_MSG_ERROR([$TMPNAM library not found at given path $HOPPET/lib. Please install $TMPNAM first. Configuration aborted!])])
+      AC_PATH_PROG([HOPPETBIN],[hoppet-config],[],[$HOPPET/bin])
+      if test "x$HOPPETBIN" = "x"; then
+         AC_MSG_ERROR([hoppet-config not found in given path to $TMPNAM! Configuration aborted!])
+      fi
   fi
-   AC_SUBST([HOPPETPREFIX], ["$HOPPET"])
-   AC_SUBST([HOPPETBIN], ["$HOPPETPREFIX/bin"])
-   AC_SUBST([HOPPETLDFLAGS], ["$($HOPPETBIN/hoppet-config --libs)"])
-   AC_SUBST([HOPPETCXXFLAGS], ["$($HOPPETBIN/hoppet-config --cxxflags)"])
+
+# Look for library directly; might be useful if hoppet-config is not found
+#      AC_CHECK_FILE([$prefix/lib/libhoppet_v1.a],
+#      [prehoppet="$ac_cv_file_$prefix/lib/libhoppet_v1.a"],
+#      [prehoppet=""])
+#      if test "x$prehoppet" = "x"; then
+#         AC_MSG_NOTICE([No $TMPNAM library found in prefix path. Try to link with systems $TMPNAM ...])
+#         AC_CHECK_LIB([libhoppet_v1],[hoppetstart],
+#         [syshoppet=$ac_cv_lib_libhoppet_v1_hoppetstart],
+#         [syshoppet=""])
+#         if test "x$syshoppet" = "x"; then
+#            AC_MSG_ERROR([No $TMPNAM library found. Please install $TMPNAM first. Configuration aborted!])
+#         else
+#            AC_SUBST([HOPPETLIBPATH], [`dirname $syshoppet`])
+#         fi
+#      else
+#         AC_SUBST([HOPPETLIBPATH], [`dirname $prehoppet`])
+#      fi
+#      AC_SUBST([HOPPET], [`dirname $HOPPETLIBPATH`])
+#   else
+#      AC_CHECK_FILE([$HOPPET/lib/libhoppet_v1.a],
+#      [],
+#      [AC_MSG_ERROR([$TMPNAM library not found at given path $HOPPET/lib. Please install $TMPNAM first. Configuration aborted!])])
+#   fi
+
   AC_MSG_NOTICE([******************************************])
-   AC_DEFINE([WITH_HOPPET],[1],[Enable conditional compilation with HOPPET])
-   AC_MSG_NOTICE([$TMPNAM settings:])
-   AC_MSG_RESULT([Using $HOPPETPREFIX for the $TMPNAM installation path])
-   AC_MSG_RESULT([Using $HOPPETBIN for the $TMPNAM bin path])
-   AC_MSG_RESULT([Using $HOPPETCXXFLAGS for the compilation])
-   AC_MSG_RESULT([Using $HOPPETLDFLAGS for the libraries])
+   if test "x$HOPPETBIN" != "x"; then
+      AC_DEFINE([WITH_HOPPET],[1],[Enable conditional compilation with HOPPET])
+      AC_MSG_NOTICE([$TMPNAM settings:])
+      AC_SUBST([HOPPET],        [`$HOPPETBIN --prefix`])
+      AC_SUBST([HOPPETPREFIX],  [`$HOPPETBIN --prefix`])
+      AC_SUBST([HOPPETBINPATH], ["$HOPPETPREFIX/bin"])
+      AC_SUBST([HOPPETLIBPATH], ["$HOPPETPREFIX/lib"])
+      AC_SUBST([HOPPETINCLUDEPATH],["$HOPPETPREFIX/include"])
+      AC_SUBST([HOPPETLDFLAGS], [`$HOPPETBIN --ldflags`])
+      AC_SUBST([HOPPETCXXFLAGS], [`$HOPPETBIN --cxxflags`])
+      AC_MSG_RESULT([Using $HOPPETPREFIX for the $TMPNAM installation path])
+      AC_MSG_RESULT([Using $HOPPETBINPATH for the binaries])
+      AC_MSG_RESULT([Using $HOPPETLIBPATH for the libraries])
+      AC_MSG_RESULT([Using $HOPPETINCLUDEPATH for the includes])
+      AC_MSG_RESULT([Using $HOPPETCXXFLAGS for the compile flags])
+      AC_MSG_RESULT([Using $HOPPETLDFLAGS for the linker flags])
+   else
+      AC_MSG_ERROR([No $TMPNAM library found. Configuration aborted!])
+   fi
 else
   AC_MSG_NOTICE([No $TMPNAM support requested. Continue without $TMPNAM.])
   AC_MSG_NOTICE([******************************************])