No OneTemporary
Actions

Size

51 KB

Subscribers

None

View Options

	diff --git a/configure.ac b/configure.ac
	--- a/configure.ac
	+++ b/configure.ac
	@@ -1,264 +1,244 @@
	dnl Process this file with autoconf to produce a configure script.

	AC_PREREQ([2.63])
	AC_INIT([Herwig],[trunk],[herwig@projects.hepforge.org],[Herwig])
	AC_CONFIG_SRCDIR([Utilities/HerwigStrategy.cc])
	AC_CONFIG_AUX_DIR([Config])
	AC_CONFIG_MACRO_DIR([m4])
	AC_CONFIG_HEADERS([Config/config.h])
	dnl AC_PRESERVE_HELP_ORDER
	AC_CANONICAL_HOST

	dnl === disable debug symbols by default =====
	if test "x$CXXFLAGS" = "x"; then
	CXXFLAGS=-O3
	fi
	if test "x$CFLAGS" = "x"; then
	CFLAGS=-O3
	fi

	AC_LANG([C++])

	AM_INIT_AUTOMAKE([1.11 subdir-objects gnu dist-bzip2 no-dist-gzip -Wall])
	m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
	m4_ifdef([AM_PROG_AR], [AM_PROG_AR])

	dnl Checks for C++ compiler. Handle C++11 flags.
	-AC_PROG_CXX([g++])
	-
	-dnl this block can go once we decide to have C++11 always on
	-AC_MSG_CHECKING([whether to include C++11 flag for testing])
	-AC_ARG_ENABLE(stdcxx11,
	- AC_HELP_STRING([--enable-stdcxx11],
	- [turn on C++11 flag (only for testing, do not use in production!)]),
	- [],
	- [enable_stdcxx11=no]
	- )
	-
	-
	-if test "x$enable_stdcxx11" = "xyes"; then
	-AC_MSG_RESULT([yes])
	-dnl remove the wrapper if block and "optional" once we decide to have C++11 always on
	-AX_CXX_COMPILE_STDCXX_11([noext],[optional])
	-if test "x$HAVE_CXX11" != "x1"; then
	-AC_MSG_ERROR([compiler does not recognize requested c++11 option])
	-fi
	-else
	-AC_MSG_RESULT([no])
	-fi
	+AC_PROG_CXX
	+AX_CXX_COMPILE_STDCXX([11],[noext],[mandatory])

	dnl check for POSIX
	AC_CHECK_HEADER([unistd.h],[],
	[AC_MSG_ERROR([Herwig needs "unistd.h". Non-POSIX systems are not supported.])])

	dnl Checks for programs.
	AC_PROG_INSTALL
	AC_PROG_MAKE_SET
	AC_PROG_LN_S

	dnl modified search order
	AC_PROG_FC([gfortran g95 g77])
	dnl xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn xlf90 f90 pgf90 pghpf epcf90 xlf f77 frt pgf77 cf77 fort77 fl32 af77])
	AC_LANG_PUSH([Fortran])
	AC_MSG_CHECKING([if the Fortran compiler ($FC) works])
	AC_COMPILE_IFELSE(
	AC_LANG_PROGRAM([],[ print *[,]"Hello"]),
	[AC_MSG_RESULT([yes])],
	[AC_MSG_RESULT([no])
	AC_MSG_ERROR([A Fortran compiler is required to build Herwig.])
	]
	)
	AC_LANG_POP([Fortran])


	LT_PREREQ([2.2.6])
	LT_INIT([disable-static dlopen pic-only])

	dnl ####################################
	dnl ####################################

	dnl for Doc/fixinterfaces.pl
	AC_PATH_PROG(PERL, perl)

	dnl for Models/Feynrules
	AM_PATH_PYTHON([2.6],, [:])
	AM_CONDITIONAL([HAVE_PYTHON], [test "x$PYTHON" != "x:"])

	HERWIG_CHECK_GSL

	HERWIG_CHECK_THEPEG

	BOOST_REQUIRE([1.41])
	BOOST_FIND_HEADER([boost/array.hpp])
	BOOST_FIND_HEADER([boost/numeric/ublas/io.hpp])
	BOOST_FIND_HEADER([boost/numeric/ublas/matrix.hpp])
	BOOST_FIND_HEADER([boost/numeric/ublas/matrix_proxy.hpp])
	BOOST_FIND_HEADER([boost/numeric/ublas/matrix_sparse.hpp])
	BOOST_FIND_HEADER([boost/numeric/ublas/symmetric.hpp])
	BOOST_FIND_HEADER([boost/numeric/ublas/vector.hpp])
	BOOST_FIND_HEADER([boost/operators.hpp])
	BOOST_FIND_HEADER([boost/progress.hpp])
	BOOST_FIND_HEADER([boost/scoped_array.hpp])
	BOOST_FIND_HEADER([boost/scoped_ptr.hpp])
	BOOST_FIND_HEADER([boost/utility.hpp])
	BOOST_FILESYSTEM([mt])
	BOOST_TEST()

	HERWIG_CHECK_VBFNLO

	HERWIG_CHECK_NJET

	HERWIG_CHECK_GOSAM

	HERWIG_CHECK_GOSAM_CONTRIB

	HERWIG_CHECK_OPENLOOPS

	HERWIG_CHECK_MADGRAPH

	HERWIG_CHECK_EVTGEN
	HERWIG_CHECK_PYTHIA

	HERWIG_COMPILERFLAGS

	HERWIG_LOOPTOOLS

	HERWIG_PDF_PATH

	FASTJET_CHECK_FASTJET

	HERWIG_CHECK_ABS_BUG

	HERWIG_ENABLE_MODELS

	SHARED_FLAG=-shared
	AM_CONDITIONAL(NEED_APPLE_FIXES,
	[test "xx${host/darwin/foundit}xx" != "xx${host}xx"])
	if test "xx${host/darwin/foundit}xx" != "xx${host}xx"; then
	APPLE_DSO_FLAGS=-Wl,-undefined,dynamic_lookup
	SHARED_FLAG=-bundle
	fi
	AC_SUBST([APPLE_DSO_FLAGS])
	AC_SUBST([SHARED_FLAG])

	AC_CONFIG_FILES([UnderlyingEvent/Makefile
	Models/Makefile
	Models/StandardModel/Makefile
	Models/RSModel/Makefile
	Models/General/Makefile
	Models/Susy/Makefile
	Models/Susy/NMSSM/Makefile
	Models/Susy/RPV/Makefile
	Models/UED/Makefile
	Models/LH/Makefile
	Models/LHTP/Makefile
	Models/Transplanckian/Makefile
	Models/Leptoquarks/Makefile
	Models/Zprime/Makefile
	Models/TTbAsymm/Makefile
	Models/Feynrules/Makefile
	Models/Feynrules/python/Makefile-FR
	Models/ADD/Makefile
	Models/Sextet/Makefile
	Decay/Makefile
	Decay/FormFactors/Makefile
	Decay/Tau/Makefile
	Decay/Baryon/Makefile
	Decay/VectorMeson/Makefile
	Decay/Perturbative/Makefile
	Decay/ScalarMeson/Makefile
	Decay/TensorMeson/Makefile
	Decay/WeakCurrents/Makefile
	Decay/Partonic/Makefile
	Decay/General/Makefile
	Decay/Radiation/Makefile
	Decay/EvtGen/Makefile
	Doc/refman.conf
	Doc/refman.h
	PDT/Makefile
	PDF/Makefile
	MatrixElement/Makefile
	MatrixElement/General/Makefile
	MatrixElement/Lepton/Makefile
	MatrixElement/Hadron/Makefile
	MatrixElement/DIS/Makefile
	MatrixElement/Powheg/Makefile
	MatrixElement/Gamma/Makefile
	MatrixElement/Reweighters/Makefile
	MatrixElement/Matchbox/Makefile
	MatrixElement/Matchbox/Base/Makefile
	MatrixElement/Matchbox/Utility/Makefile
	MatrixElement/Matchbox/Phasespace/Makefile
	MatrixElement/Matchbox/Dipoles/Makefile
	MatrixElement/Matchbox/InsertionOperators/Makefile
	MatrixElement/Matchbox/Matching/Makefile
	MatrixElement/Matchbox/Cuts/Makefile
	MatrixElement/Matchbox/Scales/Makefile
	MatrixElement/Matchbox/Scales/MatchboxScale.cc
	MatrixElement/Matchbox/ColorFull/Makefile
	MatrixElement/Matchbox/CVolver/Makefile
	MatrixElement/Matchbox/Builtin/Makefile
	MatrixElement/Matchbox/Builtin/Amplitudes/Makefile
	MatrixElement/Matchbox/Tests/Makefile
	MatrixElement/Matchbox/External/Makefile
	MatrixElement/Matchbox/External/BLHAGeneric/Makefile
	MatrixElement/Matchbox/External/VBFNLO/Makefile
	MatrixElement/Matchbox/External/NJet/Makefile
	MatrixElement/Matchbox/External/GoSam/Makefile
	MatrixElement/Matchbox/External/OpenLoops/Makefile
	MatrixElement/Matchbox/External/MadGraph/Makefile
	MatrixElement/Matchbox/External/MadGraph/mg2herwig.py
	Sampling/Makefile
	Sampling/CellGrids/Makefile
	Shower/Makefile
	Shower/Matching/Makefile
	DipoleShower/Makefile
	DipoleShower/Base/Makefile
	DipoleShower/Kernels/Makefile
	DipoleShower/Kinematics/Makefile
	DipoleShower/Utility/Makefile
	DipoleShower/AlphaS/Makefile
	Utilities/Makefile
	Utilities/XML/Makefile
	Utilities/Statistics/Makefile
	Hadronization/Makefile
	lib/Makefile
	include/Makefile
	src/Makefile
	src/defaults/Makefile
	src/snippets/Makefile
	src/Matchbox/Makefile
	src/herwig-config
	Doc/Makefile
	Doc/HerwigDefaults.in
	Looptools/Makefile
	Analysis/Makefile
	src/Makefile-UserModules
	src/defaults/Analysis.in
	src/defaults/MatchboxDefaults.in
	src/defaults/Decays.in
	src/defaults/decayers.in
	src/defaults/setup.gosam.in
	src/Matchbox/LO-DefaultShower.in
	src/Matchbox/LO-DipoleShower.in
	src/Matchbox/MCatLO-DefaultShower.in
	src/Matchbox/MCatLO-DipoleShower.in
	src/Matchbox/LO-NoShower.in
	src/Matchbox/MCatNLO-DefaultShower.in
	src/Matchbox/MCatNLO-DipoleShower.in
	src/Matchbox/NLO-NoShower.in
	src/Matchbox/Powheg-DefaultShower.in
	src/Matchbox/Powheg-DipoleShower.in
	Contrib/Makefile
	Contrib/make_makefiles.sh
	Tests/Makefile
	Makefile])

	AC_CONFIG_LINKS([Doc/BSMlibs.in:Doc/BSMlibs.in])
	AC_CONFIG_FILES([Doc/fixinterfaces.pl],[chmod +x Doc/fixinterfaces.pl])

	HERWIG_OVERVIEW

	AC_CONFIG_COMMANDS([summary],[cat config.herwig])

	AC_OUTPUT
	diff --git a/m4/ax_cxx_compile_stdcxx_11.m4 b/m4/ax_cxx_compile_stdcxx.m4
	rename from m4/ax_cxx_compile_stdcxx_11.m4
	rename to m4/ax_cxx_compile_stdcxx.m4
	--- a/m4/ax_cxx_compile_stdcxx_11.m4
	+++ b/m4/ax_cxx_compile_stdcxx.m4
	@@ -1,133 +1,562 @@
	-# ============================================================================
	-# http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html
	-# ============================================================================
	+# ===========================================================================
	+# http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html
	+# ===========================================================================
	#
	# SYNOPSIS
	#
	-# AX_CXX_COMPILE_STDCXX_11([ext\|noext],[mandatory\|optional])
	+# AX_CXX_COMPILE_STDCXX(VERSION, [ext\|noext], [mandatory\|optional])
	#
	# DESCRIPTION
	#
	-# Check for baseline language coverage in the compiler for the C++11
	-# standard; if necessary, add switches to CXXFLAGS to enable support.
	+# Check for baseline language coverage in the compiler for the specified
	+# version of the C++ standard. If necessary, add switches to CXX and
	+# CXXCPP to enable support. VERSION may be '11' (for the C++11 standard)
	+# or '14' (for the C++14 standard).
	#
	-# The first argument, if specified, indicates whether you insist on an
	+# The second argument, if specified, indicates whether you insist on an
	# extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
	# -std=c++11). If neither is specified, you get whatever works, with
	# preference for an extended mode.
	#
	-# The second argument, if specified 'mandatory' or if left unspecified,
	-# indicates that baseline C++11 support is required and that the macro
	-# should error out if no mode with that support is found. If specified
	-# 'optional', then configuration proceeds regardless, after defining
	-# HAVE_CXX11 if and only if a supporting mode is found.
	+# The third argument, if specified 'mandatory' or if left unspecified,
	+# indicates that baseline support for the specified C++ standard is
	+# required and that the macro should error out if no mode with that
	+# support is found. If specified 'optional', then configuration proceeds
	+# regardless, after defining HAVE_CXX${VERSION} if and only if a
	+# supporting mode is found.
	#
	# LICENSE
	#
	# Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
	# Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
	# Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
	+# Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <sokolov@google.com>
	+# Copyright (c) 2015 Paul Norman <penorman@mac.com>
	+# Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu>
	#
	# Copying and distribution of this file, with or without modification, are
	# permitted in any medium without royalty provided the copyright notice
	-# and this notice are preserved. This file is offered as-is, without any
	+# and this notice are preserved. This file is offered as-is, without any
	# warranty.

	-#serial 3
	+#serial 4

	-m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [
	- template <typename T>
	- struct check
	- {
	- static_assert(sizeof(int) <= sizeof(T), "not big enough");
	- };
	+dnl This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro
	+dnl (serial version number 13).

	- typedef check<check<bool>> right_angle_brackets;
	-
	- int a;
	- decltype(a) b;
	-
	- typedef check<int> check_type;
	- check_type c;
	- check_type&& cr = static_cast<check_type&&>(c);
	-
	- auto d = a;
	-])
	-
	-AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl
	- m4_if([$1], [], [],
	- [$1], [ext], [],
	- [$1], [noext], [],
	- [m4_fatal([invalid argument `$1' to AX_CXX_COMPILE_STDCXX_11])])dnl
	- m4_if([$2], [], [ax_cxx_compile_cxx11_required=true],
	- [$2], [mandatory], [ax_cxx_compile_cxx11_required=true],
	- [$2], [optional], [ax_cxx_compile_cxx11_required=false],
	- [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX_11])])dnl
	+AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
	+ m4_if([$1], [11], [],
	+ [$1], [14], [],
	+ [$1], [17], [m4_fatal([support for C++17 not yet implemented in AX_CXX_COMPILE_STDCXX])],
	+ [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl
	+ m4_if([$2], [], [],
	+ [$2], [ext], [],
	+ [$2], [noext], [],
	+ [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX])])dnl
	+ m4_if([$3], [], [ax_cxx_compile_cxx$1_required=true],
	+ [$3], [mandatory], [ax_cxx_compile_cxx$1_required=true],
	+ [$3], [optional], [ax_cxx_compile_cxx$1_required=false],
	+ [m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])])
	AC_LANG_PUSH([C++])dnl
	ac_success=no
	- AC_CACHE_CHECK(whether $CXX supports C++11 features by default,
	- ax_cv_cxx_compile_cxx11,
	- [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
	- [ax_cv_cxx_compile_cxx11=yes],
	- [ax_cv_cxx_compile_cxx11=no])])
	- if test x$ax_cv_cxx_compile_cxx11 = xyes; then
	+ AC_CACHE_CHECK(whether $CXX supports C++$1 features by default,
	+ ax_cv_cxx_compile_cxx$1,
	+ [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
	+ [ax_cv_cxx_compile_cxx$1=yes],
	+ [ax_cv_cxx_compile_cxx$1=no])])
	+ if test x$ax_cv_cxx_compile_cxx$1 = xyes; then
	ac_success=yes
	fi

	- m4_if([$1], [noext], [], [dnl
	+ m4_if([$2], [noext], [], [dnl
	if test x$ac_success = xno; then
	- for switch in -std=gnu++11 -std=gnu++0x; do
	- cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
	- AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
	+ for switch in -std=gnu++$1 -std=gnu++0x; do
	+ cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
	+ AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
	$cachevar,
	- [ac_save_CXXFLAGS="$CXXFLAGS"
	- CXXFLAGS="$CXXFLAGS $switch"
	- AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
	+ [ac_save_CXX="$CXX"
	+ CXX="$CXX $switch"
	+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
	[eval $cachevar=yes],
	[eval $cachevar=no])
	- CXXFLAGS="$ac_save_CXXFLAGS"])
	+ CXX="$ac_save_CXX"])
	if eval test x\$$cachevar = xyes; then
	- CXXFLAGS="$CXXFLAGS $switch"
	+ CXX="$CXX $switch"
	+ if test -n "$CXXCPP" ; then
	+ CXXCPP="$CXXCPP $switch"
	+ fi
	ac_success=yes
	break
	fi
	done
	fi])

	- m4_if([$1], [ext], [], [dnl
	+ m4_if([$2], [ext], [], [dnl
	if test x$ac_success = xno; then
	- for switch in -std=c++11 -std=c++0x; do
	- cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
	- AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
	+ dnl HP's aCC needs +std=c++11 according to:
	+ dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf
	+ dnl Cray's crayCC needs "-h std=c++11"
	+ for switch in -std=c++$1 -std=c++0x +std=c++$1 "-h std=c++$1"; do
	+ cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
	+ AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
	$cachevar,
	- [ac_save_CXXFLAGS="$CXXFLAGS"
	- CXXFLAGS="$CXXFLAGS $switch"
	- AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
	+ [ac_save_CXX="$CXX"
	+ CXX="$CXX $switch"
	+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
	[eval $cachevar=yes],
	[eval $cachevar=no])
	- CXXFLAGS="$ac_save_CXXFLAGS"])
	+ CXX="$ac_save_CXX"])
	if eval test x\$$cachevar = xyes; then
	- CXXFLAGS="$CXXFLAGS $switch"
	+ CXX="$CXX $switch"
	+ if test -n "$CXXCPP" ; then
	+ CXXCPP="$CXXCPP $switch"
	+ fi
	ac_success=yes
	break
	fi
	done
	fi])
	AC_LANG_POP([C++])
	- if test x$ax_cxx_compile_cxx11_required = xtrue; then
	+ if test x$ax_cxx_compile_cxx$1_required = xtrue; then
	if test x$ac_success = xno; then
	- AC_MSG_ERROR([*** A compiler with support for C++11 language features is required.])
	+ AC_MSG_ERROR([*** A compiler with support for C++$1 language features is required.])
	fi
	+ fi
	+ if test x$ac_success = xno; then
	+ HAVE_CXX$1=0
	+ AC_MSG_NOTICE([No compiler with C++$1 support was found])
	else
	- if test x$ac_success = xno; then
	- HAVE_CXX11=0
	- AC_MSG_NOTICE([No compiler with C++11 support was found])
	- else
	- HAVE_CXX11=1
	- AC_DEFINE(HAVE_CXX11,1,
	- [define if the compiler supports basic C++11 syntax])
	- fi
	+ HAVE_CXX$1=1
	+ AC_DEFINE(HAVE_CXX$1,1,
	+ [define if the compiler supports basic C++$1 syntax])
	+ fi
	+ AC_SUBST(HAVE_CXX$1)
	+])

	- AC_SUBST(HAVE_CXX11)
	- fi
	-])
	+
	+dnl Test body for checking C++11 support
	+
	+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_11],
	+ _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
	+)
	+
	+
	+dnl Test body for checking C++14 support
	+
	+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14],
	+ _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
	+ _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
	+)
	+
	+
	+dnl Tests for new features in C++11
	+
	+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_11], [[
	+
	+// If the compiler admits that it is not ready for C++11, why torture it?
	+// Hopefully, this will speed up the test.
	+
	+#ifndef __cplusplus
	+
	+#error "This is not a C++ compiler"
	+
	+#elif __cplusplus < 201103L
	+
	+#error "This is not a C++11 compiler"
	+
	+#else
	+
	+namespace cxx11
	+{
	+
	+ namespace test_static_assert
	+ {
	+
	+ template <typename T>
	+ struct check
	+ {
	+ static_assert(sizeof(int) <= sizeof(T), "not big enough");
	+ };
	+
	+ }
	+
	+ namespace test_final_override
	+ {
	+
	+ struct Base
	+ {
	+ virtual void f() {}
	+ };
	+
	+ struct Derived : public Base
	+ {
	+ virtual void f() override {}
	+ };
	+
	+ }
	+
	+ namespace test_double_right_angle_brackets
	+ {
	+
	+ template < typename T >
	+ struct check {};
	+
	+ typedef check<void> single_type;
	+ typedef check<check<void>> double_type;
	+ typedef check<check<check<void>>> triple_type;
	+ typedef check<check<check<check<void>>>> quadruple_type;
	+
	+ }
	+
	+ namespace test_decltype
	+ {
	+
	+ int
	+ f()
	+ {
	+ int a = 1;
	+ decltype(a) b = 2;
	+ return a + b;
	+ }
	+
	+ }
	+
	+ namespace test_type_deduction
	+ {
	+
	+ template < typename T1, typename T2 >
	+ struct is_same
	+ {
	+ static const bool value = false;
	+ };
	+
	+ template < typename T >
	+ struct is_same<T, T>
	+ {
	+ static const bool value = true;
	+ };
	+
	+ template < typename T1, typename T2 >
	+ auto
	+ add(T1 a1, T2 a2) -> decltype(a1 + a2)
	+ {
	+ return a1 + a2;
	+ }
	+
	+ int
	+ test(const int c, volatile int v)
	+ {
	+ static_assert(is_same<int, decltype(0)>::value == true, "");
	+ static_assert(is_same<int, decltype(c)>::value == false, "");
	+ static_assert(is_same<int, decltype(v)>::value == false, "");
	+ auto ac = c;
	+ auto av = v;
	+ auto sumi = ac + av + 'x';
	+ auto sumf = ac + av + 1.0;
	+ static_assert(is_same<int, decltype(ac)>::value == true, "");
	+ static_assert(is_same<int, decltype(av)>::value == true, "");
	+ static_assert(is_same<int, decltype(sumi)>::value == true, "");
	+ static_assert(is_same<int, decltype(sumf)>::value == false, "");
	+ static_assert(is_same<int, decltype(add(c, v))>::value == true, "");
	+ return (sumf > 0.0) ? sumi : add(c, v);
	+ }
	+
	+ }
	+
	+ namespace test_noexcept
	+ {
	+
	+ int f() { return 0; }
	+ int g() noexcept { return 0; }
	+
	+ static_assert(noexcept(f()) == false, "");
	+ static_assert(noexcept(g()) == true, "");
	+
	+ }
	+
	+ namespace test_constexpr
	+ {
	+
	+ template < typename CharT >
	+ unsigned long constexpr
	+ strlen_c_r(const CharT *const s, const unsigned long acc) noexcept
	+ {
	+ return *s ? strlen_c_r(s + 1, acc + 1) : acc;
	+ }
	+
	+ template < typename CharT >
	+ unsigned long constexpr
	+ strlen_c(const CharT *const s) noexcept
	+ {
	+ return strlen_c_r(s, 0UL);
	+ }
	+
	+ static_assert(strlen_c("") == 0UL, "");
	+ static_assert(strlen_c("1") == 1UL, "");
	+ static_assert(strlen_c("example") == 7UL, "");
	+ static_assert(strlen_c("another\0example") == 7UL, "");
	+
	+ }
	+
	+ namespace test_rvalue_references
	+ {
	+
	+ template < int N >
	+ struct answer
	+ {
	+ static constexpr int value = N;
	+ };
	+
	+ answer<1> f(int&) { return answer<1>(); }
	+ answer<2> f(const int&) { return answer<2>(); }
	+ answer<3> f(int&&) { return answer<3>(); }
	+
	+ void
	+ test()
	+ {
	+ int i = 0;
	+ const int c = 0;
	+ static_assert(decltype(f(i))::value == 1, "");
	+ static_assert(decltype(f(c))::value == 2, "");
	+ static_assert(decltype(f(0))::value == 3, "");
	+ }
	+
	+ }
	+
	+ namespace test_uniform_initialization
	+ {
	+
	+ struct test
	+ {
	+ static const int zero {};
	+ static const int one {1};
	+ };
	+
	+ static_assert(test::zero == 0, "");
	+ static_assert(test::one == 1, "");
	+
	+ }
	+
	+ namespace test_lambdas
	+ {
	+
	+ void
	+ test1()
	+ {
	+ auto lambda1 = [](){};
	+ auto lambda2 = lambda1;
	+ lambda1();
	+ lambda2();
	+ }
	+
	+ int
	+ test2()
	+ {
	+ auto a = [](int i, int j){ return i + j; }(1, 2);
	+ auto b = []() -> int { return '0'; }();
	+ auto c = [=](){ return a + b; }();
	+ auto d = [&](){ return c; }();
	+ auto e = [a, &b](int x) mutable {
	+ const auto identity = [](int y){ return y; };
	+ for (auto i = 0; i < a; ++i)
	+ a += b--;
	+ return x + identity(a + b);
	+ }(0);
	+ return a + b + c + d + e;
	+ }
	+
	+ int
	+ test3()
	+ {
	+ const auto nullary = [](){ return 0; };
	+ const auto unary = [](int x){ return x; };
	+ using nullary_t = decltype(nullary);
	+ using unary_t = decltype(unary);
	+ const auto higher1st = [](nullary_t f){ return f(); };
	+ const auto higher2nd = [unary](nullary_t f1){
	+ return [unary, f1](unary_t f2){ return f2(unary(f1())); };
	+ };
	+ return higher1st(nullary) + higher2nd(nullary)(unary);
	+ }
	+
	+ }
	+
	+ namespace test_variadic_templates
	+ {
	+
	+ template <int...>
	+ struct sum;
	+
	+ template <int N0, int... N1toN>
	+ struct sum<N0, N1toN...>
	+ {
	+ static constexpr auto value = N0 + sum<N1toN...>::value;
	+ };
	+
	+ template <>
	+ struct sum<>
	+ {
	+ static constexpr auto value = 0;
	+ };
	+
	+ static_assert(sum<>::value == 0, "");
	+ static_assert(sum<1>::value == 1, "");
	+ static_assert(sum<23>::value == 23, "");
	+ static_assert(sum<1, 2>::value == 3, "");
	+ static_assert(sum<5, 5, 11>::value == 21, "");
	+ static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, "");
	+
	+ }
	+
	+ // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae
	+ // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function
	+ // because of this.
	+ namespace test_template_alias_sfinae
	+ {
	+
	+ struct foo {};
	+
	+ template<typename T>
	+ using member = typename T::member_type;
	+
	+ template<typename T>
	+ void func(...) {}
	+
	+ template<typename T>
	+ void func(member<T>*) {}
	+
	+ void test();
	+
	+ void test() { func<foo>(0); }
	+
	+ }
	+
	+} // namespace cxx11
	+
	+#endif // __cplusplus >= 201103L
	+
	+]])
	+
	+
	+dnl Tests for new features in C++14
	+
	+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_14], [[
	+
	+// If the compiler admits that it is not ready for C++14, why torture it?
	+// Hopefully, this will speed up the test.
	+
	+#ifndef __cplusplus
	+
	+#error "This is not a C++ compiler"
	+
	+#elif __cplusplus < 201402L
	+
	+#error "This is not a C++14 compiler"
	+
	+#else
	+
	+namespace cxx14
	+{
	+
	+ namespace test_polymorphic_lambdas
	+ {
	+
	+ int
	+ test()
	+ {
	+ const auto lambda = [](auto&&... args){
	+ const auto istiny = [](auto x){
	+ return (sizeof(x) == 1UL) ? 1 : 0;
	+ };
	+ const int aretiny[] = { istiny(args)... };
	+ return aretiny[0];
	+ };
	+ return lambda(1, 1L, 1.0f, '1');
	+ }
	+
	+ }
	+
	+ namespace test_binary_literals
	+ {
	+
	+ constexpr auto ivii = 0b0000000000101010;
	+ static_assert(ivii == 42, "wrong value");
	+
	+ }
	+
	+ namespace test_generalized_constexpr
	+ {
	+
	+ template < typename CharT >
	+ constexpr unsigned long
	+ strlen_c(const CharT *const s) noexcept
	+ {
	+ auto length = 0UL;
	+ for (auto p = s; *p; ++p)
	+ ++length;
	+ return length;
	+ }
	+
	+ static_assert(strlen_c("") == 0UL, "");
	+ static_assert(strlen_c("x") == 1UL, "");
	+ static_assert(strlen_c("test") == 4UL, "");
	+ static_assert(strlen_c("another\0test") == 7UL, "");
	+
	+ }
	+
	+ namespace test_lambda_init_capture
	+ {
	+
	+ int
	+ test()
	+ {
	+ auto x = 0;
	+ const auto lambda1 = [a = x](int b){ return a + b; };
	+ const auto lambda2 = [a = lambda1(x)](){ return a; };
	+ return lambda2();
	+ }
	+
	+ }
	+
	+ namespace test_digit_seperators
	+ {
	+
	+ constexpr auto ten_million = 100'000'000;
	+ static_assert(ten_million == 100000000, "");
	+
	+ }
	+
	+ namespace test_return_type_deduction
	+ {
	+
	+ auto f(int& x) { return x; }
	+ decltype(auto) g(int& x) { return x; }
	+
	+ template < typename T1, typename T2 >
	+ struct is_same
	+ {
	+ static constexpr auto value = false;
	+ };
	+
	+ template < typename T >
	+ struct is_same<T, T>
	+ {
	+ static constexpr auto value = true;
	+ };
	+
	+ int
	+ test()
	+ {
	+ auto x = 0;
	+ static_assert(is_same<int, decltype(f(x))>::value, "");
	+ static_assert(is_same<int&, decltype(g(x))>::value, "");
	+ return x;
	+ }
	+
	+ }
	+
	+} // namespace cxx14
	+
	+#endif // __cplusplus >= 201402L
	+
	+]])
	diff --git a/m4/herwig.m4 b/m4/herwig.m4
	--- a/m4/herwig.m4
	+++ b/m4/herwig.m4
	@@ -1,954 +1,954 @@
	# check for gcc bug http://gcc.gnu.org/bugzilla/show_bug.cgi?id=34130
	AC_DEFUN([HERWIG_CHECK_ABS_BUG],
	[
	AC_REQUIRE([HERWIG_COMPILERFLAGS])
	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
	])

	dnl ##### THEPEG #####
	AC_DEFUN([HERWIG_CHECK_THEPEG],
	[
	defaultlocation="${prefix}"
	test "x$defaultlocation" = xNONE && defaultlocation="${ac_default_prefix}"
	AC_MSG_CHECKING([for libThePEG in])
	AC_ARG_WITH(thepeg,
	AC_HELP_STRING([--with-thepeg=DIR],[location of ThePEG installation]),
	[],
	[with_thepeg="${defaultlocation}"])
	AC_MSG_RESULT([$with_thepeg])

	if test "x$with_thepeg" = "xno"; then
	AC_MSG_ERROR([Cannot build Herwig++ without ThePEG. Please set --with-thepeg.])
	fi

	THEPEGLDFLAGS="-L${with_thepeg}/lib/ThePEG"

	THEPEGHASLHAPDF="no"
	if test -e ${with_thepeg}/lib/ThePEG/ThePEGLHAPDF.so ; then
	THEPEGHASLHAPDF="yes"
	fi
	if test "${host_cpu}" == "x86_64" -a -e ${with_thepeg}/lib64/ThePEG/libThePEG.so ; then
	THEPEGLDFLAGS="-L${with_thepeg}/lib64/ThePEG"
	if test -e ${with_thepeg}/lib64/ThePEG/ThePEGLHAPDF.so ; then
	THEPEGHASLHAPDF="yes"
	fi
	fi

	if test "x$THEPEGHASLHAPDF" == "xno" ; then
	AC_MSG_ERROR([Herwig++ requires ThePEG to be build with lhapdf.])
	fi

	THEPEGHASFASTJET="no"
	if test -e ${with_thepeg}/lib/ThePEG/FastJetFinder.so ; then
	THEPEGHASFASTJET="yes"
	fi
	if test "${host_cpu}" == "x86_64" -a -e ${with_thepeg}/lib64/ThePEG/libThePEG.so ; then
	THEPEGLDFLAGS="-L${with_thepeg}/lib64/ThePEG"
	if test -e ${with_thepeg}/lib64/ThePEG/FastJetFinder.so ; then
	THEPEGHASFASTJET="yes"
	fi
	fi

	if test "x$THEPEGHASFASTJET" == "xno" ; then
	AC_MSG_ERROR([Herwig++ requires ThePEG to be build with FastJet.])
	fi

	THEPEGPATH="${with_thepeg}"

	oldldflags="$LDFLAGS"
	oldlibs="$LIBS"

	LDFLAGS="$LDFLAGS $THEPEGLDFLAGS"
	AC_CHECK_LIB([ThePEG],[debugThePEG],[],
	[AC_MSG_ERROR([No ThePEG libraries in $THEPEGLDFLAGS. Please set --with-thepeg.])])

	AC_SUBST([THEPEGLIB],[-lThePEG])
	AC_SUBST(THEPEGLDFLAGS)
	AC_SUBST(THEPEGPATH)
	AC_SUBST(THEPEGHASLHAPDF)
	AC_SUBST(THEPEGHASFASTJET)

	LIBS="$oldlibs"
	LDFLAGS="$oldldflags"

	AC_MSG_CHECKING([for ThePEG headers in])
	AC_ARG_WITH([thepeg-headers],
	AC_HELP_STRING([--with-thepeg-headers=DIR],[location of ThePEG include directory]),
	[],
	[with_thepeg_headers="${with_thepeg}/include"])
	AC_MSG_RESULT([$with_thepeg_headers])

	if test "x$with_thepeg_headers" = "xno"; then
	AC_MSG_ERROR([Cannot build Herwig++ without ThePEG headers. Please set --with-thepeg-headers.])
	fi

	THEPEGINCLUDE="-I$with_thepeg_headers"

	oldcppflags="$CPPFLAGS"
	CPPFLAGS="$CPPFLAGS $THEPEGINCLUDE"
	AC_CHECK_HEADER([ThePEG/Config/ThePEG.h],[],
	[AC_MSG_ERROR([No ThePEG headers in $with_thepeg_headers. Please set --with-thepeg-headers.])])
	CPPFLAGS="$oldcppflags"

	AC_SUBST(THEPEGINCLUDE)

	AC_MSG_CHECKING([for HepMCAnalysis.so in ThePEG])

	THEPEGHASHEPMC="no"
	if test -e ${with_thepeg}/lib/ThePEG/HepMCAnalysis.so ; then
	THEPEGHASHEPMC="yes"
	fi
	if test "${host_cpu}" == "x86_64" -a -e ${with_thepeg}/lib64/ThePEG/libThePEG.so ; then
	THEPEGLDFLAGS="-L${with_thepeg}/lib64/ThePEG"
	if test -e ${with_thepeg}/lib64/ThePEG/HepMCAnalysis.so ; then
	THEPEGHASHEPMC="yes"
	fi
	fi

	if test "x$THEPEGHASHEPMC" == "xno" ; then
	CREATE_HEPMC="# create"
	AC_MSG_RESULT([not found])
	else
	CREATE_HEPMC="create"
	AC_MSG_RESULT([found])
	fi

	AC_SUBST([CREATE_HEPMC])

	AC_MSG_CHECKING([for RivetAnalysis.so in ThePEG])

	THEPEGHASRIVET="no"
	if test -e ${with_thepeg}/lib/ThePEG/RivetAnalysis.so ; then
	THEPEGHASRIVET="yes"
	fi
	if test "${host_cpu}" == "x86_64" -a -e ${with_thepeg}/lib64/ThePEG/libThePEG.so ; then
	THEPEGLDFLAGS="-L${with_thepeg}/lib64/ThePEG"
	if test -e ${with_thepeg}/lib64/ThePEG/RivetAnalysis.so ; then
	THEPEGHASRIVET="yes"
	fi
	fi

	if test "x$THEPEGHASRIVET" == "xno" ; then
	CREATE_RIVET="# create"
	AC_MSG_RESULT([not found])
	else
	CREATE_RIVET="create"
	AC_MSG_RESULT([found])
	fi

	AC_SUBST([CREATE_RIVET])
	])

	dnl ##### LOOPTOOLS #####
	AC_DEFUN([HERWIG_LOOPTOOLS],
	[
	AC_REQUIRE([AC_PROG_FC])
	AC_REQUIRE([AC_FC_LIBRARY_LDFLAGS])
	AC_REQUIRE([AC_PROG_CC])
	AC_REQUIRE([HERWIG_COMPILERFLAGS])

	AC_MSG_CHECKING([if Looptools build works])
	enable_looptools=yes

	if test "x$GCC" = "xyes"; then
	case "${host}" in
	x86_64-\|-darwin1*)
	AM_FCFLAGS="$AM_FCFLAGS -fdefault-integer-8"
	;;
	esac

	AC_LANG_PUSH([Fortran])
	oldFCFLAGS="$FCFLAGS"
	FCFLAGS="$AM_FCFLAGS"
	AC_COMPILE_IFELSE(
	AC_LANG_PROGRAM([],[ print *[,]"Hello"]),
	[],
	[AC_MSG_RESULT([no])
	AC_MSG_ERROR([needs gfortran on 64bit machines])]
	)
	FCFLAGS="$oldFCFLAGS"
	AC_LANG_POP([Fortran])
	fi
	AC_MSG_RESULT([$enable_looptools])

	AC_SUBST([F77],[$FC])
	AC_SUBST([FFLAGS],[$FCFLAGS])
	AC_SUBST([AM_FFLAGS],[$AM_FCFLAGS])
	AC_SUBST([FLIBS],[$FCLIBS])
	])

	dnl ##### VBFNLO #####
	AC_DEFUN([HERWIG_CHECK_VBFNLO],
	[
	AC_MSG_CHECKING([for VBFNLO])

	AC_ARG_WITH([vbfnlo],
	AS_HELP_STRING([--with-vbfnlo=DIR], [Installation path of VBFNLO]),
	[],
	[with_vbfnlo=no]

	)

	AC_MSG_RESULT([$with_vbfnlo])

	AS_IF([test "x$with_vbfnlo" != "xno"],
	[AC_CHECK_FILES(
	${with_vbfnlo}/lib/VBFNLO/libVBFNLO.so,
	[have_vbfnlo=lib], [have_vbfnlo=no])],
	[have_vbfnlo=no])

	AS_IF([test "x$with_vbfnlo" != "xno" -a "x$have_vbfnlo" = "xno" ],
	[AC_CHECK_FILES(
	${with_vbfnlo}/lib64/VBFNLO/libVBFNLO.so,
	[have_vbfnlo=lib64], [have_vbfnlo=no])])

	AS_IF([test "x$with_vbfnlo" != "xno" -a "x$have_vbfnlo" = "xno" ],
	[AC_CHECK_FILES(
	${with_vbfnlo}/lib/VBFNLO/libVBFNLO.dylib,
	[have_vbfnlo=lib], [have_vbfnlo=no])])

	AS_IF([test "x$with_vbfnlo" != "xno" -a "x$have_vbfnlo" = "xno" ],
	[AC_CHECK_FILES(
	${with_vbfnlo}/lib64/VBFNLO/libVBFNLO.dylib,
	[have_vbfnlo=lib64], [have_vbfnlo=no])])

	AS_IF([test "x$have_vbfnlo" = "xlib"],
	[VBFNLOLIBS=${with_vbfnlo}/lib/VBFNLO
	AC_SUBST(VBFNLOLIBS)
	])

	AS_IF([test "x$have_vbfnlo" = "xlib64"],
	[VBFNLOLIBS=${with_vbfnlo}/lib64/VBFNLO
	AC_SUBST(VBFNLOLIBS)
	])

	AS_IF([test "x$with_vbfnlo" != "xno" -a "x$have_vbfnlo" = "xno"],
	[AC_MSG_ERROR([vbfnlo requested but not found])])

	AM_CONDITIONAL(HAVE_VBFNLO,[test "x$have_vbfnlo" = "xlib" -o "x$have_vbfnlo" = "xlib64"])

	if test "x$have_vbfnlo" = "xlib" -o "x$have_vbfnlo" = "xlib64" ; then
	VBFNLOINCLUDE=${with_vbfnlo}/include
	AC_SUBST(VBFNLOINCLUDE)
	VBFNLOLIB=${with_vbfnlo}/${have_vbfnlo}/VBFNLO
	AC_SUBST(VBFNLOLIB)
	LOAD_VBFNLO="library"
	CREATE_VBFNLO="create"
	INSERT_VBFNLO="insert"
	SET_VBFNLO="set"
	DO_VBFNLO="do"
	MKDIR_VBFNLO="mkdir"
	else
	LOAD_VBFNLO="# library"
	CREATE_VBFNLO="# create"
	INSERT_VBFNLO="# insert"
	SET_VBFNLO="# set"
	DO_VBFNLO="# do"
	MKDIR_VBFNLO="# mkdir"
	fi

	AC_SUBST([LOAD_VBFNLO])
	AC_SUBST([CREATE_VBFNLO])
	AC_SUBST([INSERT_VBFNLO])
	AC_SUBST([SET_VBFNLO])
	AC_SUBST([DO_VBFNLO])
	AC_SUBST([MKDIR_VBFNLO])

	])

	dnl ##### njet #####
	AC_DEFUN([HERWIG_CHECK_NJET],
	[
	AC_MSG_CHECKING([for njet])

	AC_ARG_WITH([njet],
	AS_HELP_STRING([--with-njet=DIR], [Installation path of njet]),
	[],
	[with_njet=no]

	)

	AC_MSG_RESULT([$with_njet])

	AS_IF([test "x$with_njet" != "xno"],
	[AC_CHECK_FILES(
	${with_njet}/lib/libnjet2.so,
	[have_njet=lib], [have_njet=no])],
	[have_njet=no])

	AS_IF([test "x$with_njet" != "xno" -a "x$have_njet" = "xno" ],
	[AC_CHECK_FILES(
	${with_njet}/lib64/libnjet2.so,
	[have_njet=lib64], [have_njet=no])])

	AS_IF([test "x$with_njet" != "xno" -a "x$have_njet" = "xno" ],
	[AC_CHECK_FILES(
	${with_njet}/lib/libnjet2.dylib,
	[have_njet=lib], [have_njet=no])])

	AS_IF([test "x$have_njet" = "xlib"],
	[NJETLIBPATH=${with_njet}/lib
	AC_SUBST(NJETLIBPATH)
	NJETINCLUDEPATH=${with_njet}/include
	AC_SUBST(NJETINCLUDEPATH)
	NJETPREFIX=${with_njet}
	AC_SUBST(NJETPREFIX)
	])

	AS_IF([test "x$have_njet" = "xlib64"],
	[NJETLIBPATH=${with_njet}/lib64
	AC_SUBST(NJETLIBPATH)
	NJETINCLUDEPATH=${with_njet}/include
	AC_SUBST(NJETINCLUDEPATH)
	NJETPREFIX=${with_njet}
	AC_SUBST(NJETPREFIX)
	])

	AS_IF([test "x$with_njet" != "xno" -a "x$have_njet" = "xno"],
	[AC_MSG_ERROR([njet requested but not found])])

	AM_CONDITIONAL(HAVE_NJET,[test "x$have_njet" = "xlib" -o "x$have_njet" = "xlib64"])

	if test "x$have_njet" = "xlib" -o "x$have_njet" = "xlib64" ; then
	LOAD_NJET="library"
	CREATE_NJET="create"
	INSERT_NJET="insert"
	DO_NJET="do"
	else
	LOAD_NJET="# library"
	CREATE_NJET="# create"
	INSERT_NJET="# insert"
	DO_NJET="# do"
	fi

	AC_SUBST([LOAD_NJET])
	AC_SUBST([CREATE_NJET])
	AC_SUBST([INSERT_NJET])
	AC_SUBST([DO_NJET])

	])



	dnl ##### gosam #####
	AC_DEFUN([HERWIG_CHECK_GOSAM],
	[
	AC_MSG_CHECKING([for gosam])

	AC_ARG_WITH([gosam],
	AS_HELP_STRING([--with-gosam=DIR], [Installation path of gosam]),
	[],
	[with_gosam=no]
	)

	AC_MSG_RESULT([$with_gosam])

	AS_IF([test "x$with_gosam" != "xno"],
	[AC_CHECK_FILES(
	${with_gosam}/bin/gosam.py,
	[have_gosam=lib], [have_gosam=no])],
	[have_gosam=no])

	AS_IF([test "x$have_gosam" = "xlib"],
	[GOSAMPREFIX=${with_gosam}
	AC_SUBST(GOSAMPREFIX)
	])

	AS_IF([test "x$with_gosam" != "xno" -a "x$have_gosam" = "xno"],
	[AC_MSG_ERROR([GoSam requested but not found])])

	AM_CONDITIONAL(HAVE_GOSAM,[test "x$have_gosam" = "xlib" ])

	if test "x$have_gosam" = "xlib" ; then
	LOAD_GOSAM="library"
	CREATE_GOSAM="create"
	INSERT_GOSAM="insert"
	DO_GOSAM="do"
	else
	LOAD_GOSAM="# library"
	CREATE_GOSAM="# create"
	INSERT_GOSAM="# insert"
	DO_GOSAM="# do"
	fi

	AC_SUBST([LOAD_GOSAM])
	AC_SUBST([CREATE_GOSAM])
	AC_SUBST([INSERT_GOSAM])
	AC_SUBST([DO_GOSAM])


	])


	dnl ##### gosam-contrib #####
	AC_DEFUN([HERWIG_CHECK_GOSAM_CONTRIB],
	[
	AC_MSG_CHECKING([for gosam-contrib])

	AC_ARG_WITH([gosam-contrib],
	AS_HELP_STRING([--with-gosam-contrib=DIR], [Installation path of gosam-contrib]),
	[],
	[with_gosam_contrib=no]
	)

	AC_MSG_RESULT([$with_gosam_contrib])

	AS_IF([test "x$with_gosam_contrib" = "xno" -a "x$with_gosam" != "xno"],
	[AC_CHECK_FILES(
	${with_gosam}/lib/libsamurai.so,
	[with_gosam_contrib=${with_gosam}], [])
	])

	AS_IF([test "x$with_gosam_contrib" = "xno" -a "x$with_gosam" != "xno"],
	[AC_CHECK_FILES(
	${with_gosam}/lib64/libsamurai.so,
	[with_gosam_contrib=${with_gosam}], [])
	])

	AS_IF([test "x$with_gosam_contrib" = "xno" -a "x$with_gosam" != "xno"],
	[AC_CHECK_FILES(
	${with_gosam}/lib/libsamurai.dylib,
	[with_gosam_contrib=${with_gosam}], [])
	])

	AS_IF([test "x$with_gosam_contrib" = "xno" -a "x$with_gosam" != "xno"],
	[AC_CHECK_FILES(
	${with_gosam}/lib64/libsamurai.dylib,
	[with_gosam_contrib=${with_gosam}], [])
	])

	AS_IF([test "x$with_gosam_contrib" = "xno" -a "x$with_gosam" != "xno"],
	[AC_MSG_ERROR([GoSam requested without requesting GoSam-Contrib])])

	AS_IF([test "x$with_gosam_contrib" != "xno"],
	[AC_CHECK_FILES(
	${with_gosam_contrib}/lib/libsamurai.so,
	[have_gosam_contrib=lib], [have_gosam_contrib=no])],
	[have_gosam_contrib=no])

	AS_IF([test "x$with_gosam_contrib" != "xno" -a "x$have_gosam_contrib" = "xno" ],
	[AC_CHECK_FILES(
	${with_gosam_contrib}/lib64/libsamurai.so,
	[have_gosam_contrib=lib64], [have_gosam_contrib=no])])

	AS_IF([test "x$with_gosam_contrib" != "xno" -a "x$have_gosam_contrib" = "xno" ],
	[AC_CHECK_FILES(
	${with_gosam_contrib}/lib/libsamurai.dylib,
	[have_gosam_contrib=lib], [have_gosam_contrib=no])])

	AS_IF([test "x$with_gosam_contrib" != "xno" -a "x$have_gosam_contrib" = "xno" ],
	[AC_CHECK_FILES(
	${with_gosam_contrib}/lib64/libsamurai.dylib,
	[have_gosam_contrib=lib64], [have_gosam_contrib=no])])







	AS_IF([test "x$have_gosam_contrib" != "xno"],
	[GOSAMCONTRIBPREFIX=${with_gosam_contrib}
	AC_SUBST(GOSAMCONTRIBPREFIX)
	])

	AS_IF([test "x$have_gosam_contrib" = "xlib"],
	[GOSAMCONTRIBLIBS=${with_gosam_contrib}/lib
	AC_SUBST(GOSAMCONTRIBLIBS)
	])

	AS_IF([test "x$have_gosam_contrib" = "xlib64"],
	[GOSAMCONTRIBLIBS=${with_gosam_contrib}/lib64
	AC_SUBST(GOSAMCONTRIBLIBS)
	])

	AS_IF([test "x$with_gosam_contrib" != "xno" -a "x$have_gosam_contrib" = "xno"],
	[AC_MSG_ERROR([GoSam-Contrib requested but not found])])

	AM_CONDITIONAL(HAVE_GOSAM_CONTRIB,[test "x$have_gosam_contrib" = "xlib" -o "x$have_gosam_contrib" = "xlib64"])

	if test "x$have_gosam_contrib" = "xlib" -o "x$have_gosam_contrib" = "xlib64" ; then
	LOAD_GOSAM_CONTRIB="library"
	CREATE_GOSAM_CONTRIB="create"
	INSERT_GOSAM_CONTRIB="insert"
	else
	LOAD_GOSAM_CONTRIB="# library"
	CREATE_GOSAM_CONTRIB="# create"
	INSERT_GOSAM_CONTRIB="# insert"
	fi

	AC_SUBST([LOAD_GOSAM_CONTRIB])
	AC_SUBST([CREATE_GOSAM_CONTRIB])
	AC_SUBST([INSERT_GOSAM_CONTRIB])


	])


	dnl ##### OpenLoops #####
	AC_DEFUN([HERWIG_CHECK_OPENLOOPS],
	[
	AC_MSG_CHECKING([for OpenLoops])

	AC_ARG_WITH([openloops],
	AS_HELP_STRING([--with-openloops=DIR], [Installation path of OpenLoops]),
	[],
	[with_openloops=no]

	)

	AC_MSG_RESULT([$with_openloops])

	AS_IF([test "x$with_openloops" != "xno"],
	[AC_CHECK_FILES(
	${with_openloops}/lib/libopenloops.so,
	[have_openloops=lib], [have_openloops=no])],
	[have_openloops=no])

	AS_IF([test "x$with_openloops" != "xno" -a "x$have_openloops" = "xno" ],
	[AC_CHECK_FILES(
	${with_openloops}/lib/libopenloops.dylib,
	[have_openloops=lib], [have_openloops=no])])

	AS_IF([test "x$with_openloops" != "xno" -a "x$have_openloops" = "xno" ],
	[AC_CHECK_FILES(
	${with_openloops}/lib64/libopenloops.so,
	[have_openloops=lib64], [have_openloops=no])])


	AS_IF([test "x$with_openloops" != "xno" -a "x$have_openloops" = "xno" ],
	[AC_CHECK_FILES(
	${with_openloops}/lib64/libopenloops.dylib,
	[have_openloops=lib64], [have_openloops=no])])





	AS_IF([test "x$have_openloops" = "xlib"],
	[OPENLOOPSLIBS=${with_openloops}/lib
	AC_SUBST(OPENLOOPSLIBS)
	])

	AS_IF([test "x$have_openloops" = "xlib64"],
	[OPENLOOPSLIBS=${with_openloops}/lib64
	AC_SUBST(OPENLOOPSLIBS)
	])

	AS_IF([test "x$with_openloops" != "xno" -a "x$have_openloops" = "xno"],
	[AC_MSG_ERROR([OpenLoops requested but not found])])

	AM_CONDITIONAL(HAVE_OPENLOOPS,[test "x$have_openloops" = "xlib" -o "x$have_openloops" = "xlib64"])

	if test "x$have_openloops" = "xlib" -o "x$have_openloops" = "xlib64" ; then
	OPENLOOPSPREFIX=${with_openloops}
	LOAD_OPENLOOPS="library"
	CREATE_OPENLOOPS="create"
	INSERT_OPENLOOPS="insert"
	SET_OPENLOOPS="set"
	DO_OPENLOOPS="do"
	MKDIR_OPENLOOPS="mkdir"
	else
	LOAD_OPENLOOPS="# library"
	CREATE_OPENLOOPS="# create"
	INSERT_OPENLOOPS="# insert"
	SET_OPENLOOPS="# set"
	DO_OPENLOOPS="# do"
	MKDIR_OPENLOOPS="# mkdir"
	fi

	AC_SUBST([OPENLOOPSPREFIX])
	AC_SUBST([LOAD_OPENLOOPS])
	AC_SUBST([CREATE_OPENLOOPS])
	AC_SUBST([INSERT_OPENLOOPS])
	AC_SUBST([SET_OPENLOOPS])
	AC_SUBST([DO_OPENLOOPS])
	AC_SUBST([MKDIR_OPENLOOPS])

	])

	#########################################

	dnl ##### madgraph #####
	AC_DEFUN([HERWIG_CHECK_MADGRAPH],
	[
	AC_MSG_CHECKING([for MadGraph])

	AC_ARG_WITH([madgraph],
	AS_HELP_STRING([--with-madgraph=DIR], [Installation path of MadGraph]),
	[],
	[with_madgraph=no]
	)

	AC_MSG_RESULT([$with_madgraph])

	AS_IF([test "x$with_madgraph" != "xno"],
	[AC_CHECK_FILES(
	${with_madgraph}/bin/mg5_aMC,
	[have_madgraph=yes], [have_madgraph=no])],
	[have_madgraph=no])

	AS_IF([test "x$have_madgraph" = "xyes"],
	[MADGRAPHPREFIX=${with_madgraph}
	AC_SUBST(MADGRAPHPREFIX)
	])

	AS_IF([test "x$with_madgraph" != "xno" -a "x$have_madgraph" = "xno"],
	[AC_MSG_ERROR([MadGraph requested but not found])])

	AM_CONDITIONAL(HAVE_MADGRAPH,[test "x$have_madgraph" = "xyes" ])

	if test "x$have_madgraph" = "xyes" ; then
	LOAD_MADGRAPH="library"
	CREATE_MADGRAPH="create"
	INSERT_MADGRAPH="insert"
	SET_MADGRAPH="set"
	DO_MADGRAPH="do"
	else
	LOAD_MADGRAPH="# library"
	CREATE_MADGRAPH="# create"
	INSERT_MADGRAPH="# insert"
	SET_MADGRAPH="# set"
	DO_MADGRAPH="# do"
	fi

	AC_SUBST([LOAD_MADGRAPH])
	AC_SUBST([CREATE_MADGRAPH])
	AC_SUBST([INSERT_MADGRAPH])
	AC_SUBST([SET_MADGRAPH])
	AC_SUBST([DO_MADGRAPH])

	])


	dnl ##### EvtGen #####
	AC_DEFUN([HERWIG_CHECK_EVTGEN],
	[
	AC_MSG_CHECKING([for evtgen])

	AC_ARG_WITH([evtgen],
	AS_HELP_STRING([--with-evtgen=DIR], [Installation path of EvtGen]),
	[],
	[with_evtgen=no]
	)

	AC_MSG_RESULT([$with_evtgen])

	AS_IF([test "x$with_evtgen" != "xno"],
	[AC_CHECK_FILES(
	${with_evtgen}/lib/libEvtGenExternal.so,
	[have_evtgen=lib], [have_evtgen=no])],
	[have_evtgen=no])

	AS_IF([test "x$have_evtgen" = "xlib"],
	[EVTGENPREFIX=${with_evtgen}
	AC_SUBST(EVTGENPREFIX)
	])

	AS_IF([test "x$with_evtgen" != "xno" -a "x$have_evtgen" = "xno"],
	[AC_MSG_ERROR([EvtGen requested but not found])])

	AM_CONDITIONAL(HAVE_EVTGEN,[test "x$have_evtgen" = "xlib" ])

	if test "x$have_evtgen" = "xlib" ; then
	LOAD_EVTGEN_DECAYS="read EvtGenBDecays.in"
	LOAD_EVTGEN_DECAYER="read EvtGenDecayer.in"
	EVTGENLIBS="-L$with_evtgen/lib -lEvtGen -lEvtGenExternal"
	else
	LOAD_EVTGEN_DECAYS="read HerwigBDecays.in"
	LOAD_EVTGEN_DECAYER="#read EvtGenDecayer.in"
	EVTGENLIBS=""
	fi

	AC_SUBST([LOAD_EVTGEN_DECAYS])
	AC_SUBST([LOAD_EVTGEN_DECAYER])
	AC_SUBST([EVTGENLIBS])


	])

	AC_DEFUN([HERWIG_CHECK_PYTHIA],
	[
	dnl check if a directory is specified for Pythia
	AC_ARG_WITH(pythia,
	[AC_HELP_STRING([--with-pythia=dir],
	[Assume the given directory for Pythia])])

	dnl search for the pythia-config script
	if test "$with_pythia" = ""; then
	AC_PATH_PROG(pythiaconfig, pythia8-config, no)
	else
	AC_PATH_PROG(pythiaconfig, pythia8-config, no, ${with_pythia}/bin)
	fi

	if test "${pythiaconfig}" = "no"; then
	AC_MSG_CHECKING(Pythia)
	AC_MSG_RESULT(no);
	# $2
	else

	PYTHIA8DATA=`${pythiaconfig} --datadir`/xmldoc

	fi

	AC_SUBST(PYTHIA8DATA)

	])

	dnl CHECK PYTHIA END

	dnl ##### PDF PATH #####
	AC_DEFUN([HERWIG_PDF_PATH],
	[
	AC_MSG_CHECKING([which Herwig++ PDF data to use])
	AC_ARG_WITH(pdf,
	AC_HELP_STRING([--with-pdf=DIR],[installation path of Herwig++PDF data tarball]),
	[],
	[with_pdf=${prefix}]
	)
	HERWIG_PDF_PREFIX=${with_pdf}/share/Herwig++PDF

	if test -f "${HERWIG_PDF_PREFIX}/mrst/2008/mrstMCal.dat"; then
	AC_MSG_RESULT([$with_pdf])
	localPDFneeded=false
	else
	AC_MSG_RESULT([Using built-in PDF data set. For other data sets, set --with-pdf.])
	HERWIG_PDF_PREFIX=PDF
	localPDFneeded=true
	fi
	HERWIG_PDF_DEFAULT=${HERWIG_PDF_PREFIX}/mrst/2008/mrstMCal.dat
	HERWIG_PDF_NLO=${HERWIG_PDF_PREFIX}/mrst/2002/mrst2002nlo.dat
	HERWIG_PDF_POMERON=${HERWIG_PDF_PREFIX}/diffraction/

	AM_CONDITIONAL(WANT_LOCAL_PDF,[test "x$localPDFneeded" = "xtrue"])
	AC_SUBST(HERWIG_PDF_DEFAULT)
	AC_SUBST(HERWIG_PDF_NLO)
	AC_SUBST(HERWIG_PDF_POMERON)
	])

	dnl ###### GSL ######
	AC_DEFUN([HERWIG_CHECK_GSL],
	[
	AC_MSG_CHECKING([for gsl location])
	GSLINCLUDE=""
	GSLLIBS=""

	AC_ARG_WITH(gsl,
	AC_HELP_STRING([--with-gsl=DIR],[location of gsl installation @<:@default=system libs@:>@]),
	[],
	[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,main)
	AC_CHECK_LIB(gslcblas,main)
	AC_CHECK_LIB(gsl,main,[],
	[
	AC_MSG_ERROR([Cannot find libgsl. Please install the GNU scientific library and header files or use --with-gsl=.])
	]
	)
	GSLLIBS="$LIBS"
	GSLPATH="$with_gsl"
	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 -lgslcblas -lgsl"
	GSLINCLUDE="-I$with_gsl/include"
	GSLPATH="$with_gsl"
	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 -lgslcblas -lgsl"
	GSLINCLUDE="-I$with_gsl/include"
	GSLPATH="$with_gsl"
	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

	AC_SUBST(GSLINCLUDE)
	AC_SUBST(GSLLIBS)
	AC_SUBST(GSLPATH)
	])

	dnl ##### COMPILERFLAGS #####
	AC_DEFUN([HERWIG_COMPILERFLAGS],
	[
	AC_REQUIRE([HERWIG_CHECK_GSL])
	AC_REQUIRE([HERWIG_CHECK_THEPEG])
	AC_REQUIRE([BOOST_REQUIRE])
	AC_REQUIRE([AX_COMPILER_VENDOR])

	AM_CPPFLAGS="-I\$(top_builddir)/include $THEPEGINCLUDE \$(GSLINCLUDE) \$(BOOST_CPPFLAGS)"

	AC_MSG_CHECKING([for debugging mode])
	AC_ARG_ENABLE(debug,
	AC_HELP_STRING([--enable-debug],[debug mode, use --enable-debug=slow for additional options that slow down the run.]),
	[],
	[enable_debug=no]
	)
	AC_MSG_RESULT([$enable_debug])

	if test "x$enable_debug" = "xno"; then
	debugflags=""
	else
	debugflags="-g"
	fi

	dnl -Wfloat-equal -fvisibility-inlines-hidden -Wctor-dtor-privacy -Weffc++
	if test -n "$GCC"; then
	- warnflags="-ansi -pedantic -Wall -Wextra -Wno-overloaded-virtual"
	+ warnflags="-pedantic -Wall -Wextra -Wno-overloaded-virtual"

	if test "x$enable_debug" = "xslow"; then
	debugflags="$debugflags -fno-inline"
	AM_CPPFLAGS="$AM_CPPFLAGS -D_GLIBCXX_DEBUG"
	fi
	fi

	dnl do an actual capability check on ld instead of this workaround
	case "${host}" in
	-darwin)
	;;
	*)
	AM_LDFLAGS="-Wl,--enable-new-dtags"
	;;
	esac

	case "${ax_cv_cxx_compiler_vendor}" in
	gnu)
	- AM_CXXFLAGS="-ansi -pedantic -Wall -W"
	+ AM_CXXFLAGS="-pedantic -Wall -W"
	;;
	clang)
	- AM_CXXFLAGS="-ansi -pedantic -Wall -Wno-overloaded-virtual -Wno-unused-function"
	+ AM_CXXFLAGS="-pedantic -Wall -Wno-overloaded-virtual -Wno-unused-function"
	dnl -Wno-unneeded-internal-declaration
	;;
	intel)
	AM_CXXFLAGS="-strict-ansi -Wall -wd13000,1418,981,444,383,1599,1572,2259,980"
	;;
	esac



	AC_SUBST(AM_CPPFLAGS)
	AC_SUBST(AM_CFLAGS, ["$warnflags $debugflags"])
	AC_SUBST(AM_CXXFLAGS,["$AM_CXXFLAGS $warnflags $debugflags"])
	AC_SUBST(AM_FCFLAGS, ["$debugflags"])
	AC_SUBST(AM_LDFLAGS)
	])

	AC_DEFUN([HERWIG_ENABLE_MODELS],
	[
	AC_MSG_CHECKING([if BSM models should be built])

	AC_ARG_ENABLE(models,
	AC_HELP_STRING([--disable-models],[Turn off compilation of BSM models.]),
	[],
	[enable_models=yes]
	)
	AC_MSG_RESULT([$enable_models])

	LOAD_BSM=""
	if test "$enable_models" = "yes"; then
	LOAD_BSM="read BSMlibs.in"
	fi
	AC_SUBST(LOAD_BSM)

	AM_CONDITIONAL(WANT_BSM,[test "$enable_models" = "yes"])
	])

	AC_DEFUN([HERWIG_OVERVIEW],
	[
	FCSTRING=`$FC --version \| head -1`
	CXXSTRING=`$CXX --version \| head -1`
	CCSTRING=`$CC --version \| head -1`
	if test "x$PYTHON" != "x:"
	then
	python_was_found="yes, using Python $PYTHON_VERSION"
	else
	python_was_found="no, requires Python >= 2.6"
	fi
	cat << _HW_EOF_ > config.herwig
	*****************************************************
	*** $PACKAGE_STRING configuration summary
	*** Please include this information in bug reports!
	***--------------------------------------------------
	*** Prefix: $prefix
	***
	*** BSM models: $enable_models
	*** UFO converter: ${python_was_found}
	***
	*** Herwig debug mode: $enable_debug
	***
	*** ThePEG: $with_thepeg
	*** ThePEG headers: $with_thepeg_headers
	***
	*** GoSam: $with_gosam
	*** GoSam-Contrib: $with_gosam_contrib
	*** MadGraph: $with_madgraph
	*** njet: $with_njet
	*** OpenLoops: $with_openloops
	*** VBFNLO: $with_vbfnlo
	***
	*** EvtGen: $with_evtgen
	*** GSL: $with_gsl
	*** boost: ${BOOST_CPPFLAGS:-system}
	*** Fastjet: ${fjconfig}
	***
	*** Host: $host
	*** CC: $CCSTRING
	*** CXX: $CXXSTRING
	*** FC: $FCSTRING
	***
	*** CXXFLAGS: $CXXFLAGS
	*****************************************************
	_HW_EOF_
	])

File Metadata

Mime Type: text/x-diff
Expires: Tue, Nov 19, 2:59 PM (1 d, 14 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 3797506
Default Alt Text: (51 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions