diff --git a/m4/fastjet.m4 b/m4/fastjet.m4
--- a/m4/fastjet.m4
+++ b/m4/fastjet.m4
@@ -1,80 +1,88 @@
 dnl CHECK FASTJET BEGIN
 dnl
 dnl This script can be used in configure scripts to check for the
 dnl usability of the FastJet librarty.
 dnl
 dnl By defaults, it searches the FastJet library in standard system
 dnl locations but an alternative path can be specified using the
 dnl --with-fastjet=... configure option
 dnl
 dnl If FastJet is found and functional, the variables FASTJET_CXXFLAGS
 dnl and FASTJET_LIBS are set
 dnl
 dnl modified for Herwig++ 2011-10-04 D.Grellscheid
 dnl
 AC_DEFUN([FASTJET_CHECK_FASTJET],
 [
 dnl ckeck if a directory is specified for FastJet
 AC_ARG_WITH(fastjet,
             [AC_HELP_STRING([--with-fastjet=dir], 
                             [Assume the given directory for FastJet])])
 
 dnl search for the fastjet-config script
 if test "$with_fastjet" = ""; then
    AC_PATH_PROG(fjconfig, fastjet-config, no)
 else
    AC_PATH_PROG(fjconfig, fastjet-config, no, ${with_fastjet}/bin)
 fi
 
 LOAD_FASTJET=""
 CREATE_FASTJET="#create"
 
 if test "${fjconfig}" = "no"; then
    AC_MSG_CHECKING(FastJet)
    AC_MSG_RESULT(no);
    $2
 else
 
    dnl now see if FastJet is functional
    save_CXXFLAGS="$CXXFLAGS"
    save_LIBS="$LIBS"
 
    CXXFLAGS="${CXXFLAGS} `${fjconfig} --cxxflags`"
    LIBS="${LIBS} `${fjconfig} --libs --plugins`"
 
    AC_MSG_CHECKING([if FastJet is functional])
    AC_LANG_PUSH(C++)
    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <fastjet/ClusterSequence.hh>
    ]], [[
 fastjet::PseudoJet pj=fastjet::PtYPhiM(10.0,0.5,1.0,0.0);
    ]])], [fjok='yes'], [fjok='no'])
    AC_MSG_RESULT([$fjok])
    AC_LANG_POP()
    CXXFLAGS="$save_CXXFLAGS"
    LIBS="$save_LIBS"
 
    AC_MSG_CHECKING(FastJet)
    if test "${fjok}" = "yes"; then
       FASTJET_CXXFLAGS="`${fjconfig} --cxxflags`"
       FASTJET_LIBS="`${fjconfig} --libs --plugins`"
       LOAD_FASTJET="library HwLEPJetAnalysis.so"
       CREATE_FASTJET="create"
       AC_MSG_RESULT(yes)
       $1
    else
       AC_MSG_RESULT(no)
       $2
    fi
 fi
 
+warnfastjet=""
+if test "$LOAD_FASTJET" = "" ; then
+      AC_MSG_WARN([
+*****************************************************************************
+ Warning: Herwig++ will require ThePEG to be configured with FastJet.
+*****************************************************************************])
+   warnfastjet=" *** Herwig++ will require ThePEG to be configured with fastjet. ***"
+fi
 
 AC_SUBST(FASTJETINCLUDE,[$FASTJET_CXXFLAGS])
 AC_SUBST(CREATE_FASTJET)
 AC_SUBST(LOAD_FASTJET)
 AC_SUBST(FASTJETLIBS,[${FASTJET_LIBS/-Wl,-rpath,/-R}])
 
 AM_CONDITIONAL(WANT_LIBFASTJET,[test "x$CREATE_FASTJET" = "xcreate"])
 ])
 
 dnl CHECK FASTJET END
diff --git a/m4/lhapdf.m4 b/m4/lhapdf.m4
--- a/m4/lhapdf.m4
+++ b/m4/lhapdf.m4
@@ -1,63 +1,72 @@
 # lhapdf.m4 based on fastjet.m4
 # D.Grellscheid 2013-06-20
 
 # Search for LHAPDF and g77 compiler in standard directories
 AC_DEFUN([THEPEG_SEARCH_LHAPDF],
 [
 dnl ckeck if a directory is specified for LHAPDF
 AC_ARG_WITH(lhapdf,
             [AC_HELP_STRING([--with-lhapdf=dir], 
                             [Assume the given directory for LHAPDF])])
 
 dnl search for the lhapdf-config script
 if test "$with_lhapdf" = ""; then
    AC_PATH_PROG(lhaconfig, lhapdf-config, no)
 else
    AC_PATH_PROG(lhaconfig, lhapdf-config, no, ${with_lhapdf}/bin)
 fi
 
 LOAD_LHAPDF=""
 LHAPDF_PKGDATADIR=""
 
 if test "${lhaconfig}" = "no"; then
    AC_MSG_CHECKING([LHAPDF])
    AC_MSG_RESULT([no]);
    $2
 else
    dnl now see if LHAPDF is functional
    save_LDFLAGS="$LDFLAGS"
    save_LIBS="$LIBS"
 
    LDFLAGS="${LDFLAGS} -L`${lhaconfig} --libdir`"
    LIBS="${LIBS} -lLHAPDF"
 
    AC_MSG_CHECKING([if LHAPDF is functional])
    AC_LANG_PUSH(C++)
    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[extern "C" { void initpdf_(int&); }]], 
    				      [[int i = 1; initpdf_(i);]])], 
 				      [lhaok='yes'], [lhaok='no'])
    AC_MSG_RESULT([$lhaok])
    AC_LANG_POP()
    LDFLAGS="$save_LDFLAGS"
    LIBS="$save_LIBS"
 
    AC_MSG_CHECKING([LHAPDF])
    if test "${lhaok}" = "yes"; then
       LHAPDF_LDFLAGS="-L`${lhaconfig} --libdir`"
       LHAPDF_LIBS="-lLHAPDF"
       LOAD_LHAPDF="library ThePEGLHAPDF.so"
       LHAPDF_PKGDATADIR="`${lhaconfig} --datadir`"
       AC_MSG_RESULT(yes)
       $1
    else
       AC_MSG_RESULT(no)
       $2
    fi
 fi
 
+warnlhapdf=""
+if test "$LOAD_LHAPDF" = "" ; then
+      AC_MSG_WARN([
+*****************************************************************************
+ Warning: Herwig++ will require ThePEG to be configured with LHAPDF.
+*****************************************************************************])
+   warnlhapdf=" *** Herwig++ will require ThePEG to be configured with LHAPDF. ***"
+fi
+
 AC_SUBST([LHAPDF_LIBS])
 AC_SUBST([LOAD_LHAPDF])
 AC_SUBST([LHAPDF_LDFLAGS])
 AC_SUBST([LHAPDF_PKGDATADIR])
 AM_CONDITIONAL([USELHAPDF],[test "x$LOAD_LHAPDF" = "xlibrary ThePEGLHAPDF.so"])
 ])
diff --git a/m4/thepeg.m4 b/m4/thepeg.m4
--- a/m4/thepeg.m4
+++ b/m4/thepeg.m4
@@ -1,452 +1,452 @@
 # check for gcc bug http://gcc.gnu.org/bugzilla/show_bug.cgi?id=34130
 AC_DEFUN([THEPEG_CHECK_ABS_BUG],
 [
 if test "$GCC" = "yes"; then
 AC_MSG_CHECKING([for gcc abs bug])
 AC_RUN_IFELSE([
 	AC_LANG_PROGRAM(
 		[[ int foo (int i) { return -2 * __builtin_abs(i - 2); }	]],
 		[[ if ( foo(1) != -2 || foo(3) != -2 ) return 1; ]]
 	)],
 	[ AC_MSG_RESULT([not found. Compiler is ok.]) ],
 	[
 	AC_MSG_RESULT([found. Builtin abs() is buggy.])
 	AC_MSG_CHECKING([if -fno-builtin-abs works])
 	oldcxxflags=$CXXFLAGS
 	CXXFLAGS="$CXXFLAGS -fno-builtin-abs"
 	AC_RUN_IFELSE([
 		AC_LANG_PROGRAM(
 			[[
 			#include <cstdlib>
 			int foo (int i) { return -2 * std::abs(i - 2); }
 			]],
 			[[
 			if (foo(1) != -2 || foo(3) != -2) return 1; 
 			]]
 		)],
 		[
 		AC_MSG_RESULT([yes. Setting -fno-builtin-abs.])
 		AM_CXXFLAGS="$AM_CXXFLAGS -fno-builtin-abs"
 		AM_CFLAGS="$AM_CFLAGS -fno-builtin-abs"
 		],
 		[
 		AC_MSG_RESULT([no. Setting -fno-builtin.])
 		AC_MSG_WARN([
 *****************************************************************************
 For this version of gcc, -fno-builtin-abs alone did not work to avoid the 
 gcc abs() bug. Instead, all gcc builtin functions are now disabled.
 Update gcc if possible.
 *****************************************************************************])
 		AM_CXXFLAGS="$AM_CXXFLAGS -fno-builtin"
 		AM_CFLAGS="$AM_CFLAGS -fno-builtin"
 		]
 	)
 	CXXFLAGS=$oldcxxflags
 	]
 )
 fi
 ])
 
 
 # Check for ThePEG.
 AC_DEFUN([THEPEG_CHECK_THEPEG],
 [THEPEGBUILD="no"
 
 AC_MSG_CHECKING([if THEPEGPATH is set])
 if test -z "$THEPEGPATH"; then
   if test -f "../ThePEG/Config/config.h"; then
     THEPEGPATH="\$(top_builddir)/../ThePEG"
     THEPEGBUILD="yes"
     AC_MSG_RESULT([no (using ../ThePEG)])
     AM_CPPFLAGS="-I\$(top_builddir)/include -I\$(top_builddir)/../ThePEG/include "
     SETUPTHEPEG="$THEPEGPATH/src/setupThePEG -L $THEPEGPATH/lib"
     RUNTHEPEG="$THEPEGPATH/src/runThePEG -L $THEPEGPATH/lib"
     THEPEGDOC="\$(top_builddir)/../ThePEG/Doc"
     THEPEGLIB="\$(top_builddir)/../ThePEG/lib"
   else
     if test "x$prefix" == "xNONE"; then
       THEPEGPATH=$ac_default_prefix
     else
       THEPEGPATH=$prefix
     fi
     AC_MSG_RESULT([no (using $THEPEGPATH)])
   fi
 else
   AC_MSG_RESULT([yes ($THEPEGPATH)])
 fi
 
 if test "$THEPEGBUILD" == "no"; then
   AM_CPPFLAGS="-I\$(top_builddir)/include -I$THEPEGPATH/include "
   SETUPTHEPEG="$THEPEGPATH/bin/setupThePEG"
   RUNTHEPEG="$THEPEGPATH/bin/runThePEG"
   THEPEGDOC="$THEPEGPATH/share/ThePEG/Doc"
   THEPEGLIB="$THEPEGPATH/lib/ThePEG"
   AC_MSG_CHECKING([if the installed ThePEG works])
   if test -x $SETUPTHEPEG && $SETUPTHEPEG /dev/null; then
     AC_MSG_RESULT(yes)
   else
     AC_MSG_RESULT(no)
     AC_MSG_ERROR(ThePEG must be installed and THEPEGPATH set properly.)
   fi
 fi
 AC_ARG_VAR(THEPEGPATH,[The path to where ThePEG is installed. Default is $prefix unless we are working in a sister of the build directory of ThePEG.])
 
 pkglibdir="\$(libdir)/ThePEG"
 AC_SUBST(pkglibdir)
 AC_SUBST(THEPEGPATH)
 AC_SUBST(THEPEGINCLUDE)
 AC_SUBST(THEPEGDOC)
 AC_SUBST(THEPEGLIB)
 AC_SUBST(SETUPTHEPEG)
 AC_SUBST(RUNTHEPEG)
 AC_SUBST(AM_CPPFLAGS)
 ])
 
 # Search for ThePEG in standard places.
 AC_DEFUN([THEPEG_SEARCH_THEPEG],
 [THEPEGBUILD="no"
 
 AC_MSG_CHECKING([if THEPEGPATH is set])
 if test -z "$THEPEGPATH"; then
   if test -f "../ThePEG/Config/config.h"; then
     THEPEGPATH="\$(top_builddir)/../ThePEG"
     THEPEGBUILD="yes"
     AC_MSG_RESULT([no (found ../ThePEG)])
     AM_CPPFLAGS="-I\$(top_builddir)/include -I\$(top_builddir)/../ThePEG/include "
     SETUPTHEPEG="$THEPEGPATH/src/setupThePEG -L $THEPEGPATH/lib"
     RUNTHEPEG="$THEPEGPATH/src/runThePEG -L $THEPEGPATH/lib"
     THEPEGDOC="\$(top_builddir)/../ThePEG/Doc"
     THEPEGLIB="\$(top_builddir)/../ThePEG/lib"
   else
     for dirbase in / /usr $ac_default_prefix $prefix; do
       if test -f $dirbase/include/ThePEG/Config/config.h; then
         THEPEGPATH=$dirbase
       fi
     done
     if test -z "$THEPEGPATH"; then
       AC_MSG_RESULT([no])
       AC_MSG_ERROR(Could not find a valid ThePEG installation or build directory)
     else
       AC_MSG_RESULT([no (found $THEPEGPATH)])
     fi
   fi
 else
   AC_MSG_RESULT([yes ($THEPEGPATH)])
 fi
 
 if test "$THEPEGBUILD" == "no"; then
   AM_CPPFLAGS="-I\$(top_builddir)/include -I$THEPEGPATH/include "
   SETUPTHEPEG="$THEPEGPATH/bin/setupThePEG"
   RUNTHEPEG="$THEPEGPATH/bin/runThePEG"
   THEPEGDOC="$THEPEGPATH/share/ThePEG/Doc"
   THEPEGLIB="$THEPEGPATH/lib/ThePEG"
   AC_MSG_CHECKING([if the installed ThePEG works])
   if test -x $SETUPTHEPEG && $SETUPTHEPEG /dev/null; then
     AC_MSG_RESULT(yes)
   else
     AC_MSG_RESULT(no)
     AC_MSG_ERROR(ThePEG must be installed and THEPEGPATH set properly.)
   fi
 fi
 AC_ARG_VAR(THEPEGPATH,[The path to where ThePEG is installed. Default is $prefix unless we are working in a sister of the build directory of ThePEG.])
 
 pkglibdir="\$(libdir)/ThePEG"
 AC_SUBST(pkglibdir)
 AC_SUBST(THEPEGPATH)
 AC_SUBST(THEPEGINCLUDE)
 AC_SUBST(THEPEGDOC)
 AC_SUBST(THEPEGLIB)
 AC_SUBST(SETUPTHEPEG)
 AC_SUBST(RUNTHEPEG)
 AC_SUBST(AM_CPPFLAGS)
 ])
 
 AC_DEFUN([THEPEG_EMPTY_SUBST],
 [EMPTY=""
 AC_SUBST(EMPTY)
 ])
 
 AC_DEFUN([THEPEG_SEARCH_PREFIXDIR_FILES],
 [AC_MSG_CHECKING([if $1 and $2 is set])
 if test -z "$$1"; then
   for dirbase in / /usr $ac_default_prefix $prefix; do
     if test -z "$$2"; then
       for filename in $4; do
         if test -f $dirbase/$3/$filename; then
           $1=$dirbase/$3
 	  $2=$filename
         fi
       done
     else
       if test -f $dirbase/$3/$$2; then
         $1=$dirbase/$3
       fi
     fi
   done
   if test -z "$$1" -o -z "$$2"; then
     AC_MSG_ERROR(no. Could not guess appropriate value for $1 and $2)
   else
     AC_MSG_RESULT([no (found $$1 and $$2)])
   fi
 else
   if test -z "$$2"; then
     for filename in $4; do
       if test -f $$1/$filename; then
 	  $2=$filename
       fi
     done
     AC_MSG_RESULT([no (found $$1 and $$2)])
   else
     if test -f $$1/$$2; then
       AC_MSG_RESULT([yes ($$1 and $$2)])
     else
       AC_MSG_ERROR(no. Could not guess appropriate value for $1 and $2)
     fi
   fi
 fi
 AC_ARG_VAR($1,[$5])
 AC_ARG_VAR($2,[$6])
 ])
 
 AC_DEFUN([THEPEG_CHECK_PREFIXDIR],
 [AC_MSG_CHECKING([if $1 is set])
 if test -z "$$1"; then
    if test -d $prefix/$2; then
       $1=$prefix/$2
    elif test -d $ac_default_prefix/$2; then
       $1=$ac_default_prefix/$2
    elif test -d /usr/$2; then
       $1=/usr/$2
    elif test -d /$2; then
       $1=/$2
    else
      AC_MSG_ERROR(no. Could not guess appropriate value for $1)
    fi
    AC_MSG_RESULT([no (using $$1)])
 else
   AC_MSG_RESULT([yes ($$1)])
 fi
 AC_ARG_VAR($1,[$3])
 ])
 
 
 AC_DEFUN([THEPEG_CHECK_ENVDEFAULT],
 [AC_MSG_CHECKING([if $1 is set])
 if test -z "$$1"; then
   $1="$2"
   AC_MSG_RESULT([no (using $$1)])
 else
   AC_MSG_RESULT([yes ($$1)])
 fi
 AC_ARG_VAR($1,[$3])
 ])
 
 AC_DEFUN([THEPEG_DEFINE_ENVDEFAULT],
 [AC_MSG_CHECKING([if $2 is set])
 if test -z "$$2"; then
   $2="$3"
   AC_MSG_RESULT([no (using $$2)])
 else
   AC_MSG_RESULT([yes ($$2)])
 fi
 AC_ARG_VAR($2,[$4])
 AC_DEFINE_UNQUOTED($1,"$$2",[$4])
 ])
 
 AC_DEFUN([THEPEG_CHECK_EXPM1],
 [echo $ECHO_N "checking for expm1... $ECHO_C" 1>&6
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <cmath>
 ]], [[expm1(1.0);
 ]])],[AC_DEFINE(ThePEG_HAS_EXPM1,1,define if expm1 is available)
 echo "${ECHO_T}yes" 1>&6
 ],[echo "${ECHO_T}no" 1>&6])])
 
 AC_DEFUN([THEPEG_CHECK_LOG1P],
 [echo $ECHO_N "checking for log1p... $ECHO_C" 1>&6
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <cmath>
 ]], [[log1p(1.0);
 ]])],[AC_DEFINE(ThePEG_HAS_LOG1P,1,define if log1p is available)
 echo "${ECHO_T}yes" 1>&6
 ],[echo "${ECHO_T}no" 1>&6])])
 
 AC_DEFUN([THEPEG_CHECK_AIDA],
 [
 AC_REQUIRE([THEPEG_CHECK_RIVET])
 echo $ECHO_N "checking for installed AIDA headers... $ECHO_C" 1>&6
 dnl if test "x$with_rivet" != "xno"; then
 dnl    echo "using rivet aida"
 dnl    LWHINCLUDE="\$(RIVETINCLUDE)/LWH"
 dnl else
 LWHINCLUDE="-I\$(top_builddir)/include/ThePEG/Analysis/LWH"
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include "AIDA/IAnalysisFactory.h"
 ]], [[AIDA::IAnalysisFactory * af;
 ]])],[AC_DEFINE(LWH_USING_AIDA,1,define if AIDA headers are installed)
 echo "${ECHO_T}yes" 1>&6
 ],[echo "${ECHO_T}no" 1>&6])
 dnl fi
 AC_SUBST([LWHINCLUDE])
 ])
 
 AC_DEFUN([THEPEG_CHECK_DLOPEN],
 [echo $ECHO_N "checking for dlopen... $ECHO_C" 1>&6
 # do this with libtool!
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <dlfcn.h>
 ]], [[dlopen("", 1);
 ]])],[AC_DEFINE(ThePEG_HAS_DLOPEN,1,define if dlopen is available)
 echo "${ECHO_T}yes" 1>&6
 ],[echo "${ECHO_T}no" 1>&6])])
 
 AC_DEFUN([THEPEG_CHECK_SSTREAM],
 [echo $ECHO_N "checking for <sstream>... $ECHO_C" 1>&6
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sstream>
 ]], [[std::ostringstream os;
 ]])],[AC_DEFINE(ThePEG_HAS_SSTREAM,1,define if sstream is available)
 echo "${ECHO_T}yes" 1>&6
 ],[echo "${ECHO_T}no" 1>&6])])
 
 AC_DEFUN([THEPEG_CHECK_FPUCONTROL],
 [echo $ECHO_N "checking for <fpu_control>... $ECHO_C" 1>&6
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <fpu_control.h>
 ]], [[fpu_control_t cw; _FPU_GETCW(cw); cw &= ~(_FPU_MASK_IM|_FPU_MASK_DM|_FPU_MASK_ZM|_FPU_MASK_OM); _FPU_SETCW(cw);
 ]])],[AC_DEFINE(ThePEG_HAS_FPU_CONTROL,1,define if fpucontrol is available)
 echo "${ECHO_T}yes" 1>&6
 ],[echo "${ECHO_T}no" 1>&6])])
 
 AC_DEFUN([THEPEG_CHECK_FENV],
 [echo $ECHO_N "checking for <fenv.h>... $ECHO_C" 1>&6
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <fenv.h>
 ]], [[feenableexcept(FE_DIVBYZERO|FE_OVERFLOW|FE_INVALID);]])],[AC_DEFINE(ThePEG_HAS_FENV,1,define if fenv is available)
 echo "${ECHO_T}yes" 1>&6
 ],[echo "${ECHO_T}no" 1>&6])])
 
 AC_DEFUN([THEPEG_ADD_THEPEG_PATH],
 [if test "$THEPEGBUILD" == "yes"; then
   if test -f "../$2/Config/config.h"; then
     $1="\$(top_builddir)/../$2/lib"
     SETUPTHEPEG="$SETUPTHEPEG -L\$(top_builddir)/../$2/lib"
     RUNTHEPEG="$RUNTHEPEG -L\$(top_builddir)/../$2/lib"
     AM_CPPFLAGS="$AM_CPPFLAGS -I\$(top_builddir)/../$2/include"
   fi
 else
   $1="$THEPEGLIB"
 fi
 AC_SUBST($1)
 ])
 
 AC_DEFUN([THEPEG_HAS_JAVA],
 [  hasjava=yes
    AC_PATH_PROG(JAVAC, javac)
    AC_PATH_PROG(JAVA, java)
    AC_PATH_PROG(JAR, jar)
    if test -z "$JAR" -o -z "$JAVA" -o -z "$JAVAC"; then hasjava=no; else
      AC_MSG_CHECKING([if java works])
      echo 'public class conftest { public static void main(String[[]]arg){}}' > conftest.java
      $JAVAC -source $1 conftest.java 1>&5 2>&5
      if test $? -ne 0; then hasjava=no; fi
      echo "Main-Class: conftest" > conftest.manifest
      $JAR cmf conftest.manifest conftest.jar conftest.class 1>&5 2>&5
      if test $? -ne 0; then hasjava=no; fi
      $JAVA -jar conftest.jar 1>&5 2>&5
      if test $? -ne 0; then hasjava=no; fi
      rm -f conftest.java conftest.err conftest.class conftest.manifest conftest.jar
    fi
    if test "x$hasjava" != "xno"; then
      AC_MSG_RESULT([yes])
      $2
    else
      AC_MSG_RESULT([no])
      $3
    fi
 ])
 
 AC_DEFUN([THEPEG_LIBTOOL_VERSION_INFO],
 [  LIBTOOLVERSIONINFO="-version-info $1:$2:$3"
    AC_SUBST(LIBTOOLVERSIONINFO)])
 
 AC_DEFUN([THEPEG_UNIT_CHECKING],
 [
 AC_MSG_CHECKING([whether to include dimension checking])
 AC_ARG_ENABLE(unitchecks,
         AC_HELP_STRING([--enable-unitchecks],[turns on dimension checking for physical quantities.]),
         [],
         [enable_unitchecks=no]
         )
 AC_MSG_RESULT([$enable_unitchecks])
 if test "x$enable_unitchecks" = "xyes"; then
    AC_DEFINE([ThePEG_HAS_UNITS_CHECKING],[1],[define if units should be checked])
 fi
 ])
 
 AC_DEFUN([THEPEG_CHECK_GSL],
 [
 AC_MSG_CHECKING([for gsl location])
 GSLINCLUDE=""
 GSLLIBS=""
 
 AC_ARG_WITH(gsl,
         AC_HELP_STRING([--with-gsl=path],[location of gsl installation. Default: system lib]),
         [],
 	[with_gsl=system])
 
 if test "x$with_gsl" = "xno"; then
 AC_MSG_ERROR([libgsl is required. Please install the GNU scientific library and header files.])
 fi
 
 if test "x$with_gsl" = "xsystem"; then
 	AC_MSG_RESULT([in system libraries])
 	oldlibs="$LIBS"
 	AC_CHECK_LIB(m,sqrt)
 	AC_CHECK_LIB(gslcblas,cblas_srot)
 	AC_CHECK_LIB(gsl,gsl_ran_poisson,[],
 			[
 			AC_MSG_ERROR([Cannot find libgsl. Please install the GNU scientific library.])
 			]
 		     )
 	GSLLIBS="$LIBS"
 	LIBS=$oldlibs
 else
 	if test "`uname -m`" = "x86_64" -a -e "$with_gsl/lib64/libgsl.a" -a -d "$with_gsl/include/gsl"; then
 		AC_MSG_RESULT([found in $with_gsl])
 		GSLLIBS="-L$with_gsl/lib64 -R$with_gsl/lib64 -lgsl -lgslcblas"
 		GSLINCLUDE="-I$with_gsl/include"
 	elif test -e "$with_gsl/lib/libgsl.a" -a -d "$with_gsl/include/gsl"; then
 		AC_MSG_RESULT([found in $with_gsl])
 		GSLLIBS="-L$with_gsl/lib -R$with_gsl/lib -lgsl -lgslcblas"
 		GSLINCLUDE="-I$with_gsl/include"
 	else
 		AC_MSG_RESULT([not found])
 		AC_MSG_ERROR([Can't find $with_gsl/lib/libgsl.a or the headers in $with_gsl/include])
 	fi
 fi
 
 dnl AM_CONDITIONAL(HAVE_GSL,[test "x$with_HepMC" != "xno"])
 AC_SUBST(GSLINCLUDE)
 AC_SUBST(GSLLIBS)
 ])
 
 AC_DEFUN([THEPEG_OVERVIEW],
 [
 CXXSTRING=`$CXX --version | head -1`
 cat << _THEPEG_EOF_ > config.thepeg
 *****************************************************
 *** $PACKAGE_STRING configuration summary
 *** Please include this information in bug reports!
 ***--------------------------------------------------
 *** Prefix:		$prefix
 ***
 *** Dimension checks:	$enable_unitchecks
 ***
 *** GSL:		$with_gsl
 ***
-*** LHAPDF:		$lhaconfig
+*** LHAPDF:		$lhaconfig $warnlhapdf
 *** HepMC:		$with_hepmc
 *** Rivet:		$with_rivet
-*** FastJet:		$fjconfig
+*** FastJet:		$fjconfig $warnfastjet
 ***
 *** Host:		$host
 *** CXX:		$CXXSTRING
 ***
 *** CXXFLAGS:		$CXXFLAGS
 *****************************************************
 _THEPEG_EOF_
 ])