Page MenuHomeHEPForge
Files F7879822

No OneTemporary
Actions

View Options

diff --git a/Interfaces/Makefile.am b/Interfaces/Makefile.am
--- a/Interfaces/Makefile.am
+++ b/Interfaces/Makefile.am
@@ -1,18 +1,18 @@
pkglib_LTLIBRARIES =
if WANT_LIBAMEGIC
pkglib_LTLIBRARIES += HwAmegic.la
endif
if WANT_LIBKTJET
-AM_CPPFLAGS+= -I$(KTJETPATH)
+AM_CPPFLAGS+= $(KTJETINCLUDE)
pkglib_LTLIBRARIES += HwKtJet.la
endif
HwAmegic_la_SOURCES = AmegicInterface.cc AmegicInterface.icc \
AmegicInterface.h
HwAmegic_la_LDFLAGS = -module
HwKtJet_la_SOURCES = KtJetInterface.cc KtJetInterface.h
HwKtJet_la_LIBADD = -L$(KTJETPATH)/lib -lKtEvent
HwKtJet_la_LDFLAGS = -module
diff --git a/acinclude.m4 b/acinclude.m4
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,197 +1,203 @@
AC_DEFUN([AC_CHECK_CLHEP],
[
AC_MSG_CHECKING([for CLHEPPATH])
if test -z "$CLHEPPATH"; then
AC_MSG_RESULT([none])
AC_MSG_ERROR([CLHEPPATH not set])
fi
AC_MSG_RESULT([$CLHEPPATH])
AC_MSG_CHECKING([for CLHEPLIB])
if test -z "$CLHEPLIB"; then
for filename in $CLHEPPATH/lib/libCLHEP-?.?.?.?.{so,dylib} $CLHEPPATH/lib/libCLHEP.{so,dylib}; do
if test -e $filename; then
CLHEPLIB=`basename $filename | sed -e 's/^lib/-l/' -e 's/\.\(so\|dylib\)$//'`
fi
done
if test -z "$CLHEPLIB"; then
AC_MSG_RESULT([none])
AC_MSG_ERROR([Cannot find libCLHEP at $CLHEPPATH/lib.])
fi
fi
CLHEPLDFLAGS=-L$CLHEPPATH/lib
AC_MSG_RESULT([$CLHEPLIB])
AC_MSG_CHECKING([for CLHEPINCLUDE])
if test -z "$CLHEPINCLUDE"; then
CLHEPINCLUDE=-I$CLHEPPATH/include
fi
AC_MSG_RESULT([$CLHEPINCLUDE])
# Now lets see if the libraries work properly
oldLIBS="$LIBS"
oldLDFLAGS="$LDFLAGS"
oldCPPFLAGS="$CPPFLAGS"
LIBS="$LIBS $CLHEPLIB"
LDFLAGS="$LDFLAGS $CLHEPLDFLAGS"
CPPFLAGS="$CPPFLAGS $CLHEPINCLUDE"
# check CLHEP first
AC_MSG_CHECKING([that CLHEP works])
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <CLHEP/Random/Random.h>]],[[using namespace CLHEP; HepRandom r; r.flat();]])],[AC_MSG_RESULT([yes])],[AC_MSG_RESULT([no])
AC_MSG_ERROR([CLHEP must be installed to continue.])
])
LIBS="$oldLIBS"
LDFLAGS="$oldLDFLAGS"
CPPFLAGS="$oldCPPFLAGS"
AC_SUBST(CLHEPLIB)
AC_SUBST(CLHEPLDFLAGS)
AC_SUBST(CLHEPINCLUDE)
])
AC_DEFUN([AC_CHECK_THEPEG],
[
AC_MSG_CHECKING([for THEPEGPATH])
if test -z "$THEPEGPATH"; then
AC_MSG_RESULT([none])
AC_MSG_ERROR([THEPEGPATH not set])
fi
AC_MSG_RESULT([$THEPEGPATH])
THEPEGLIB="-lThePEG"
THEPEGLDFLAGS="-L$THEPEGPATH/lib/ThePEG"
AC_MSG_CHECKING([for THEPEGINCLUDE])
if test -z "$THEPEGINCLUDE"; then
THEPEGINCLUDE=-I$THEPEGPATH/include
fi
AC_MSG_RESULT([$THEPEGINCLUDE])
dnl ###############################
dnl ###############################
dnl Now lets see if the libraries work properly
oldLIBS="$LIBS"
oldLDFLAGS="$LDFLAGS"
oldCPPFLAGS="$CPPFLAGS"
LIBS="$oldLIBS $THEPEGLIB $CLHEPLIB -ldl"
LDFLAGS="$oldLDFLAGS $THEPEGLDFLAGS $CLHEPLDFLAGS"
CPPFLAGS="$oldCPPFLAGS $CLHEPINCLUDE $THEPEGINCLUDE"
AC_MSG_CHECKING([that ThePEG works])
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ThePEG/Repository/Repository.h>
]], [[breakThePEG();
]])],[AC_MSG_RESULT([yes])
],[AC_MSG_RESULT([no])
AC_MSG_ERROR([ThePEG must be installed to continue.])])
LIBS="$oldLIBS"
LDFLAGS="$oldLDFLAGS"
CPPFLAGS="$oldCPPFLAGS"
AC_SUBST(THEPEGLIB)
AC_SUBST(THEPEGLDFLAGS)
AC_SUBST(THEPEGINCLUDE)
])
AC_DEFUN([AC_CHECK_KTJET],[AC_MSG_CHECKING([KTJETPATH is])
if test -z "$KTJETPATH"; then
AC_MSG_RESULT([*** No KtJet path set... won't build KtJet interface ***])
else
AC_MSG_RESULT("$KTJETPATH")
AC_MSG_CHECKING([KTJETLIBS is])
if test -z "$KTJETLIBS"; then
KTJETLIBS="-L$KTJETPATH/lib -lKtEvent"
fi
AC_MSG_RESULT("$KTJETLIBS")
+
+ AC_MSG_CHECKING([KTJETINCLUDE is])
+ if test -z "$KTJETINCLUDE"; then
+ KTJETINCLUDE=-I$KTJETPATH/include
+ fi
+ AC_MSG_RESULT("$KTJETINCLUDE")
fi
AM_CONDITIONAL(WANT_LIBKTJET,[test ! -z "$KTJETPATH"])
AC_SUBST(KTJETPATH)
AC_SUBST(KTJETLIBS)
-
+AC_SUBST(KTJETINCLUDE)
])
AC_DEFUN([AC_CHECK_AMEGIC],
[
AC_MSG_CHECKING([AMEGICPATH is])
if test -z "$AMEGICPATH"; then
AC_MSG_RESULT([*** No AMEGIC path set... won't build AMEGIC interface ***])
else
AMEGICLIBS="-lAmegic -lAmplitude -lAmplTools -lISR -lModel -lPhasespace -lProcess -lString -lVector -lZfunctions"
AC_MSG_RESULT("$AMEGICPATH")
fi
AM_CONDITIONAL(WANT_LIBAMEGIC,[test ! -z "$AMEGICPATH"])
AC_SUBST(AMEGICPATH)
AC_SUBST(AMEGICLIBS)
])
AC_DEFUN([AC_CHECK_EVTGEN],
[
AC_MSG_CHECKING([EVTGENPATH is])
if test -z "$EVTGENPATH"; then
AC_MSG_RESULT([*** No EvtGen path set... won't build EvtGen interface ***])
else
EVTGENLIBS="-lHwEvtGen -lEvtGenBase -lEvtGenModels"
AC_MSG_RESULT("$EVTGENPATH")
fi
AM_CONDITIONAL(WANT_LIBEVTGEN,[test ! -z "$EVTGENPATH"])
AC_SUBST(EVTGENPATH)
AC_SUBST(EVTGENLIBS)
])
AC_DEFUN([AC_CHECK_NEWDECAYERS],
[
AC_MSG_CHECKING([whether to build new decayers])
AC_ARG_ENABLE(new-decayers,
AC_HELP_STRING([--enable-new-decayers],[build the new decayers.]),
[],
[enable_new_decayers=no]
)
AC_MSG_RESULT([$enable_new_decayers])
AM_CONDITIONAL(WANT_NEWDECAYERS,[test "x$enable_new_decayers" = "xyes"])
])
AC_DEFUN([AC_LOOPTOOLS],
[
AC_MSG_CHECKING([whether to build Looptools dependent parts])
AC_ARG_ENABLE(looptools,
AC_HELP_STRING([--disable-looptools],[turn off Looptools-dependent parts.]),
[],
[enable_looptools=yes]
)
AC_MSG_RESULT([$enable_looptools])
AM_CONDITIONAL(WANT_LOOPTOOLS,[test "x$enable_looptools" = "xyes"])
])
AC_DEFUN([AC_PDF_PATH],
[
AC_MSG_CHECKING([which Herwig++ PDF data to use])
AC_ARG_WITH(PDF,
AC_HELP_STRING([--with-PDF=path],[installation path of Herwig++PDF data tarball]),
[],
[with_PDF=${prefix}]
)
HERWIG_PDF_DEFAULT=${with_PDF}/share/Herwig++PDF/mrst/1998/lo05a.dat
if test -f "${HERWIG_PDF_DEFAULT}"; 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_DEFAULT=../PDF/mrst/1998/lo05a.dat
localPDFneeded=true
fi
AM_CONDITIONAL(WANT_LOCAL_PDF,[test "x$localPDFneeded" = "xtrue"])
AC_SUBST(HERWIG_PDF_DEFAULT)
])

File Metadata

Mime Type
text/x-diff
Expires
Tue, Nov 19, 9:10 PM (22 h, 34 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3790384
Default Alt Text
(6 KB)

Event Timeline