From 6e74ba3338486038c77cb5dde92cccc2baa6f9d7 Mon Sep 17 00:00:00 2001
From: Rene Brun <Rene.Brun@cern.ch>
Date: Fri, 8 Feb 2008 15:03:20 +0000
Subject: [PATCH] Add configuration for the optional package pythia8. To select
pythia8, in your configure file add something like --enable-pythia8 \
--with-pythia8-incdir=$HOME/pythia8100/include \
--with-pythia8-libdir=$HOME/pythia8100/lib \
git-svn-id: http://root.cern.ch/svn/root/trunk@22069 27541ba8-7e3a-0410-8455-c3a389f83636
---
Makefile | 3 +++
config/Makefile.depend | 6 ++++++
config/Makefile.in | 5 +++++
configure | 43 ++++++++++++++++++++++++++++++++++++++++++
4 files changed, 57 insertions(+)
diff --git a/Makefile b/Makefile
index 51b97a90073..16e612e2bdb 100644
--- a/Makefile
+++ b/Makefile
@@ -132,6 +132,9 @@ endif
ifeq ($(BUILDFPYTHIA6),yes)
MODULES += pythia6
endif
+ifeq ($(BUILDFPYTHIA8),yes)
+MODULES += pythia8
+endif
ifeq ($(BUILDFFTW3),yes)
MODULES += fftw
endif
diff --git a/config/Makefile.depend b/config/Makefile.depend
index 2eb73111d7f..0a108052583 100644
--- a/config/Makefile.depend
+++ b/config/Makefile.depend
@@ -40,6 +40,7 @@ EGLIBDEPM = $(G3DLIB) $(GRAFLIB) $(GPADLIB)
VMCLIBDEPM = $(EGLIB) $(GEOMLIB)
PHYSICSLIBDEPM = $(MATRIXLIB)
PYTHIA6LIBDEPM = $(EGLIB) $(GRAFLIB) $(VMCLIB) $(PHYSICSLIB)
+PYTHIA8LIBDEPM = $(EGLIB) $(GRAFLIB) $(VMCLIB) $(PHYSICSLIB)
TABLELIBDEPM = $(TREELIB) $(GPADLIB) $(G3DLIB) $(GRAFLIB) $(HISTLIB) \
$(IOLIB)
MLPLIBDEPM = $(HISTLIB) $(MATRIXLIB) $(TREELIB) $(GRAFLIB) \
@@ -134,6 +135,7 @@ EGLIBDEP = $(EGLIBDEPM)
VMCLIBDEP = $(VMCLIBDEPM)
PHYSICSLIBDEP = $(PHYSICSLIBDEPM)
PYTHIA6LIBDEP = $(PYTHIA6LIBDEPM)
+PYTHIA8LIBDEP = $(PYTHIA8LIBDEPM)
TABLELIBDEP = $(TABLELIBDEPM)
MLPLIBDEP = $(MLPLIBDEPM)
SPECTRUMLIBDEP = $(SPECTRUMLIBDEPM)
@@ -225,6 +227,8 @@ VMCLIBEXTRA = lib/libEG.lib lib/libGeom.lib
PHYSICSLIBEXTRA = lib/libMatrix.lib
PYTHIA6LIBEXTRA = lib/libEG.lib lib/libGraf.lib lib/libVMC.lib \
lib/libPhysics.lib
+PYTHIA8LIBEXTRA = lib/libEG.lib lib/libGraf.lib lib/libVMC.lib \
+ lib/libPhysics.lib
TABLELIBEXTRA = lib/libTree.lib lib/libGpad.lib lib/libRIO.lib \
lib/libGraf3d.lib lib/libGraf.lib lib/libHist.lib
MLPLIBEXTRA = lib/libHist.lib lib/libMatrix.lib lib/libTree.lib \
@@ -321,6 +325,8 @@ VMCLIBEXTRA = -Llib -lEG -lGeom
PHYSICSLIBEXTRA = -Llib -lMatrix
PYTHIA6LIBEXTRA = -Llib -lEG -lGraf -lVMC -lPhysics $(FPYTHIA6LIBDIR) \
$(FPYTHIA6LIB)
+PYTHIA8LIBEXTRA = -Llib -lEG -lGraf -lVMC -lPhysics $(FPYTHIA8LIBDIR) \
+ $(FPYTHIA8LIB)
X11TTFLIBEXTRA = -Llib -lGX11 -lGraf
TABLELIBEXTRA = -Llib -lTree -lGpad -lGraf3d -lGraf -lHist -lRIO
GLLIBEXTRA = -Llib -lGpad -lGraf3d -lGui -lGraf -lHist -lGed
diff --git a/config/Makefile.in b/config/Makefile.in
index 23ea4738c2e..0ca59575b41 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -167,6 +167,11 @@ FPYTHIA6LIBDIR := @pythia6libdir@
FPYTHIA6LIB := @pythia6lib@
FPYTHIA6CPPFLAGS := @pythia6cppflags@
+BUILDFPYTHIA8 := @buildpythia8@
+FPYTHIA8INCDIR := @pythia8incdir@
+FPYTHIA8LIBDIR := @pythia8libdir@
+FPYTHIA8LIB := @pythia8lib@
+
BUILDFFTW3 := @buildfftw3@
FFTW3LIBDIR := @fftw3libdir@
FFTW3LIB := @fftw3lib@
diff --git a/configure b/configure
index 3aedc259f1b..1a5743130f0 100755
--- a/configure
+++ b/configure
@@ -65,6 +65,7 @@ options=" \
enable_peac \
enable_pgsql \
enable_pythia6 \
+ enable_pythia8 \
enable_python \
enable_qt \
enable_qtgsi \
@@ -136,6 +137,7 @@ G4ROOT \
GSL \
CERNLIB \
PYTHIA6 \
+PYTHIA8 \
FFTW3 \
PYTHONDIR \
DCACHE \
@@ -902,6 +904,7 @@ enable/disable options, prefix with either --enable- or --disable-
peac PEAC, PROOF Enabled Analysis Center, requires Clarens
pgsql PostgreSQL support, requires libpq
pythia6 Pythia6 EG support, requires libPythia6
+ pythia8 Pythia8 EG support, requires libPythia8
python Python ROOT bindings, requires python >= 2.2
qt Qt graphics backend, requires libqt >= 3
qtgsi GSI's Qt integration, requires libqt >= 3
@@ -970,6 +973,8 @@ with options, prefix with --with-, enables corresponding support
pgsql-incdir PostgreSQL support, location of libpq-fe.h
pgsql-libdir PostgreSQL support, location of libpq
pythia6-libdir PYHTIA6 support, location of libPythia6
+ pythia8-incdir PYHTIA8 support, location of Pythia8 includes
+ pythia8-libdir PYHTIA8 support, location of libpythia8.so
python-incdir Python support, location of Python.h
python-libdir Python support, location of libpython
qt-incdir Qt support, location of qt.h
@@ -1173,6 +1178,8 @@ if test $# -gt 0 ; then
--with-pgsql-libdir=*) pgsqllibdir=$optarg ; enable_pgsql="yes" ;;
--with-pythia6-libdir=*) pythia6libdir=$optarg ; enable_pythia6="yes" ;;
--with-pythia6-uscore=*) pythia6uscore=$optarg ; enable_pythia6="yes" ;;
+ --with-pythia8-incdir=*) pythia8incdir=$optarg ; enable_pythia8="yes" ;;
+ --with-pythia8-libdir=*) pythia8libdir=$optarg ; enable_pythia8="yes" ;;
--with-python-incdir=*) pythonincdir=$optarg ; enable_python="yes" ;;
--with-python-libdir=*) pythonlibdir=$optarg ; enable_python="yes" ;;
--with-qt-incdir=*) qtincdir=$optarg ; enable_qt="yes"; enable_qtgsi="yes" ;;
@@ -2504,6 +2511,38 @@ check_explicit "$enable_pythia6" "$enable_pythia6_explicit" \
"Explicitly required Pythia6 dependencies not fulfilled"
+
+######################################################################
+#
+### echo %%% Pythia8 Usage - Third party libraries
+#
+# (See http://root.cern.ch and Lund)
+#
+# Check for libpythia8
+#
+
+if test "x$enable_pythia8" = "xyes" || test ! "x$PYTHIA8" = "x" ; then
+ # Check for PYTHIA8 include and library
+ check_header "Pythia.h" "$pythia8incdir" $PYTHIA8 $PYTHIA8/include
+ pythia8incdir=$found_dir
+ enable_pythia8=yes
+ result "yes"
+ check_library "libpythia8" "$enable_shared" "$pythia8libdir" \
+ $PYTHIA8/lib /opt/pythia8 \
+ /usr/local/lib/pythia8 /usr/lib/pythia8 \
+ /usr/local/lib/pythia8 /usr/lib /usr/local/lib
+ pythia8lib=$found_lib
+ pythia8libdir=$found_dir
+
+ if test "x$pythia8lib" = "x" ; then
+ enable_pythia8=no
+ result "no"
+ fi
+fi
+check_explicit "$enable_pythia8" "$enable_pythia8_explicit" \
+ "Explicitly required Pythia8 dependencies not fulfilled"
+
+
######################################################################
#
### echo %%% dCache Support - Third party libraries
@@ -4643,6 +4682,9 @@ sed -e "s|@globusincdir@|$globusincdir|" \
-e "s|@pythia6lib@|$pythia6lib|" \
-e "s|@pythia6libdir@|$pythia6libdir|" \
-e "s|@pythia6cppflags@|$pythia6cppflags|" \
+ -e "s|@pythia8lib@|$pythia8lib|" \
+ -e "s|@pythia8incdir@|$pythia8incdir|" \
+ -e "s|@pythia8libdir@|$pythia8libdir|" \
-e "s|@pythonlib@|$pythonlib|" \
-e "s|@pythonlibdir@|$pythonlibdir|" \
-e "s|@pythonincdir@|$pythonincdir|" \
@@ -4714,6 +4756,7 @@ sed -e "s|@srcdir@|$srcdir|" \
-e "s|@buildalien@|$enable_alien|" \
-e "s|@buildasimage@|$enable_asimage|" \
-e "s|@buildpythia6@|$enable_pythia6|" \
+ -e "s|@buildpythia8@|$enable_pythia8|" \
-e "s|@buildpython@|$enable_python|" \
-e "s|@buildruby@|$enable_ruby|" \
-e "s|@buildxml@|$enable_xml|" \
--
GitLab