Page MenuHomeHEPForge
Files F7879635

No OneTemporary
Actions

View Options

Index: trunk/m4/lhapdf.m4
===================================================================
--- trunk/m4/lhapdf.m4 (revision 5875)
+++ trunk/m4/lhapdf.m4 (revision 5876)
@@ -1,136 +1,170 @@
dnl lhapdf.m4 -- checks for LHAPDF library
dnl
### Determine paths to LHAPDF components
### Sets LDFLAGS_LHAPDF and the conditional LHAPDF_AVAILABLE if successful
### Also: LHAPDF_ROOT LHAPDF_VERSION LHAPDF_PDFSETS_PATH
AC_DEFUN([WO_PROG_LHAPDF],
[dnl
AC_REQUIRE([AC_PROG_FC])
AC_ARG_ENABLE([lhapdf],
[AS_HELP_STRING([--enable-lhapdf],
[enable LHAPDF for structure functions [[yes]]])],
[], [enable_lhapdf="yes"])
if test "$enable_lhapdf" = "yes"; then
if test -n "$LHAPDF_DIR"; then
wo_lhapdf_config_path=$LHAPDF_DIR/bin:$PATH
else
wo_lhapdf_config_path=$PATH
fi
- AC_PATH_PROG([LHAPDF_CONFIG], [lhapdf-config], [no],
- [$wo_lhapdf_config_path])
+ AC_PATH_PROG([LHAPDF], [lhapdf], [no],
+ [$wo_lhapdf_config_path])
- if test "$LHAPDF_CONFIG" != "no"; then
- LHAPDF_ROOT=`$LHAPDF_CONFIG --prefix`
+ if test "$LHAPDF" != "no"; then
+ AC_CACHE_CHECK([the LHAPDF version],
+ [wo_cv_lhapdf_version],
+ [dnl,
+ wo_cv_lhapdf_version=[`$LHAPDF --version | $SED -e 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/'`]
+ ])
+ LHAPDF_FULL_VERSION="wo_cv_lhapdf_version"
+ AC_SUBST([LHAPDF_FULL_VERSION])
+
+ AC_CACHE_CHECK([the major version],
+ [wo_cv_lhapdf_major_version],
+ [wo_cv_lhapdf_major_version=[`echo $wo_cv_lhapdf_version | $SED -e 's/\([0-9][0-9]*\)\..*/\1/'`]
+ ])
+ LHAPDF_MAJOR_VERSION="$wo_cv_lhapdf_major_version"
+ AC_SUBST([LHAPDF_MAJOR_VERSION])
- AC_MSG_CHECKING([the LHAPDF version])
- LHAPDF_VERSION=`$LHAPDF_CONFIG --version`
- if test -n "$LHAPDF_VERSION"; then
- AC_MSG_RESULT([$LHAPDF_VERSION])
- else
- AC_MSG_RESULT([unknown])
- fi
-
- AC_MSG_CHECKING([the LHAPDF pdfsets path])
- LHAPDF_PDFSETS_PATH=`$LHAPDF_CONFIG --pdfsets-path`
- if test "$LHAPDF_VERSION" = "5.5.0"; then
- LHAPDF_PDFSETS_PATH=`$LHAPDF_CONFIG --datarootdir`$LHAPDF_PDFSETS_PATH
- fi
- AC_MSG_RESULT([$LHAPDF_PDFSETS_PATH])
-
- AC_MSG_CHECKING([the standard PDF sets])
- if test -f "$LHAPDF_PDFSETS_PATH/cteq61.LHpdf" -a -f "$LHAPDF_PDFSETS_PATH/cteq5l.LHgrid" -a -f "$LHAPDF_PDFSETS_PATH/GSG961.LHgrid" -a -f "$LHAPDF_PDFSETS_PATH/cteq6ll.LHpdf"; then
- AC_MSG_RESULT([ all standard PDF sets installed])
- else
- AC_MSG_RESULT([ not all standard PDF sets installed])
- AC_MSG_NOTICE([error: *************************************************************])
- AC_MSG_NOTICE([error: LHAPDF standard PDF sets not installed, please install these ])
- AC_MSG_NOTICE([error: PDF sets: cteq61.LHpdf, cteq6ll.LHpdf, cteq5l.LHgrid, ])
- AC_MSG_NOTICE([error: GSG961.LHgrid. ])
- AC_MSG_NOTICE([error: *************************************************************])
- enable_lhapdf="no"
- AC_MSG_CHECKING([for LHAPDF])
- AC_MSG_RESULT([(disabled)])
- fi
else
- enable_lhapdf="no"
- fi
-
+
+ AC_PATH_PROG([LHAPDF_CONFIG], [lhapdf-config], [no],
+ [$wo_lhapdf_config_path])
+
+ if test "$LHAPDF_CONFIG" != "no"; then
+ LHAPDF_ROOT=`$LHAPDF_CONFIG --prefix`
+
+ AC_CACHE_CHECK([the LHAPDF version],
+ [wo_cv_lhapdf_version],
+ [dnl,
+ wo_cv_lhapdf_version=[`$LHAPDF_CONFIG --version | $SED -e 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/'`]
+ ])
+ LHAPDF_FULL_VERSION="wo_cv_lhapdf_version"
+ AC_SUBST([LHAPDF_FULL_VERSION])
+
+ AC_CACHE_CHECK([the major version],
+ [wo_cv_lhapdf_major_version],
+ [wo_cv_lhapdf_major_version=[`echo $wo_cv_lhapdf_version | $SED -e 's/\([0-9][0-9]*\)\..*/\1/'`]
+ ])
+ LHAPDF_MAJOR_VERSION="$wo_cv_lhapdf_major_version"
+ AC_SUBST([LHAPDF_MAJOR_VERSION])
+
+ AC_MSG_CHECKING([the LHAPDF pdfsets path])
+ LHAPDF_PDFSETS_PATH=`$LHAPDF_CONFIG --pdfsets-path`
+ if test "$LHAPDF_VERSION" = "5.5.0"; then
+ LHAPDF_PDFSETS_PATH=`$LHAPDF_CONFIG --datarootdir`$LHAPDF_PDFSETS_PATH
+ fi
+ AC_MSG_RESULT([$LHAPDF_PDFSETS_PATH])
+
+ AC_MSG_CHECKING([the standard PDF sets])
+ if test -f "$LHAPDF_PDFSETS_PATH/cteq61.LHpdf" -a -f "$LHAPDF_PDFSETS_PATH/cteq5l.LHgrid" -a -f "$LHAPDF_PDFSETS_PATH/GSG961.LHgrid" -a -f "$LHAPDF_PDFSETS_PATH/cteq6ll.LHpdf"; then
+ AC_MSG_RESULT([ all standard PDF sets installed])
+ else
+ AC_MSG_RESULT([ not all standard PDF sets installed])
+ AC_MSG_NOTICE([error: *************************************************************])
+ AC_MSG_NOTICE([error: LHAPDF standard PDF sets not installed, please install these ])
+ AC_MSG_NOTICE([error: PDF sets: cteq61.LHpdf, cteq6ll.LHpdf, cteq5l.LHgrid, ])
+ AC_MSG_NOTICE([error: GSG961.LHgrid. ])
+ AC_MSG_NOTICE([error: *************************************************************])
+ enable_lhapdf="no"
+ AC_MSG_CHECKING([for LHAPDF])
+ AC_MSG_RESULT([(disabled)])
+ fi
+ else
+ enable_lhapdf="no"
+ fi
+ fi
+
else
AC_MSG_CHECKING([for LHAPDF])
AC_MSG_RESULT([(disabled)])
fi
AC_SUBST(LHAPDF_ROOT)
AC_SUBST(LHAPDF_VERSION)
AC_SUBST(LHAPDF_PDFSETS_PATH)
dnl LHAPDF requires the STD C++ library, when linking statically
if test "$enable_lhapdf" = "yes"; then
### Checking for static C++ libraries for the static version
### This is only necessary for MAC OS X and BSD-like OS
case $host in
*-darwin*)
case "$XCODE_VERSION" in
1.*|2.*|3.*)
wo_ldflags_stdcpp="-lstdc++-static" ;;
*)
wo_ldflags_stdcpp="-lstdc++" ;;
esac ;;
*-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
wo_ldflags_stdcpp="-lstdc++-static" ;;
*)
wo_ldflags_stdcpp="-lstdc++" ;;
esac
AC_MSG_CHECKING([for wo_ldflags_stdcpp: host system is $host_os: static flag])
AC_MSG_RESULT([$wo_ldflags_stdcpp])
fi
if test "$enable_lhapdf" = "yes"; then
wo_lhapdf_libdir="-L$LHAPDF_ROOT/lib"
AC_LANG([Fortran])
AC_CHECK_LIB([LHAPDF],[getxminm],[LDFLAGS_LHAPDF="$wo_lhapdf_libdir -lLHAPDF"],
[dnl
AC_MSG_NOTICE([warning: ********************************************************])
AC_MSG_NOTICE([warning: Either your LHAPDF version is too old (you need 5.3.0 or])
AC_MSG_NOTICE([warning: higher), or LHAPDF was compiled with a different FORTRAN])
AC_MSG_NOTICE([warning: compiler you and forgot to add the proper runtime to ])
AC_MSG_NOTICE([warning: LIBS / LD_LIBRARY_PATH. Disabling LHAPDF support... ])
AC_MSG_NOTICE([warning: ********************************************************])
enable_lhapdf=no
],[$wo_lhapdf_libdir])
fi
AC_SUBST(LDFLAGS_LHAPDF)
dnl Determine whether we need to stub photon-as-parton related bits of LHAPDF
if test "$enable_lhapdf" = "yes"; then
AC_LANG([Fortran])
AC_CHECK_LIB([LHAPDF],[has_photon],[test],[dnl
AC_MSG_NOTICE([warning: ********************************************************])
AC_MSG_NOTICE([warning: Your LHAPDF version is not supported for PDF sets like ])
AC_MSG_NOTICE([warning: MRTS2004QED which include the photon as a parton --- ])
AC_MSG_NOTICE([warning: don't try to use those! ])
AC_MSG_NOTICE([warning: ********************************************************])
LHAPDF_HAS_PHOTON_DUMMY=true
],[$wo_lhapdf_libdir])
fi
if test "$enable_lhapdf" = "yes"; then
LHAPDF_AVAILABLE_FLAG=".true."
else
LHAPDF_AVAILABLE_FLAG=".false."
fi
AC_SUBST(LHAPDF_AVAILABLE_FLAG)
AM_CONDITIONAL([LHAPDF_AVAILABLE], [test "$enable_lhapdf" = "yes"])
+AM_CONDITIONAL([LHAPDF6_AVAILABLE], [
+ test "$enable_lhapdf" = "yes" -a "$LHAPDF_MAJOR_VERSION" = "6"])
+AM_CONDITIONAL([LHAPDF5_AVAILABLE], [
+ test "$enable_lhapdf" = "yes" -a "$LHAPDF_MAJOR_VERSION" = "5" || \
+ test "$enable_lhapdf" = "yes" -a "$LHAPDF_MAJOR_VERSION" = "4"])
AM_CONDITIONAL([LHAPDF_FULL_DUMMY], [test "$enable_lhapdf" = "no"])
AM_CONDITIONAL([LHAPDF_HAS_PHOTON_DUMMY], [test -n "$LHAPDF_HAS_PHOTON_DUMMY"])
AM_CONDITIONAL([LHAPDF_DUMMY], [
test -n "$LHAPDF_HAS_PHOTON_DUMMY" || \
test "$enable_lhapdf" = "no" dnl
])
])
Index: trunk/synchronize.sh
===================================================================
--- trunk/synchronize.sh (revision 5875)
+++ trunk/synchronize.sh (revision 5876)
@@ -1,58 +1,58 @@
#!/bin/sh
### Consider it safer to explicitly mention all files that contain
### email addresses or copyright tags.
OLD_YEAR="Copyright (C) 1999-2013";
NEW_YEAR="Copyright (C) 1999-2014";
OLD_YEAR2="Copyright (C) 2001-2013";
NEW_YEAR2="Copyright (C) 2001-2014";
OLD_ADDRESS="Fabian Bach <fabian.bach@cern.ch>"
NEW_ADDRESS="Fabian Bach <fabian.bach@desy.de>"
OLD_DATE="June 3 2014"
NEW_DATE="July 1 2014"
OLD_VERSION="2.2.1"
NEW_VERSION="2.2.2"
#OLD_STATUS="PACKAGE_STATUS=\"alpha\""
#NEW_STATUS="PACKAGE_STATUS=\"beta\""
OLD_STATUS="PACKAGE_STATUS=\"release\""
#NEW_STATUS="PACKAGE_STATUS=\"rc1\""
NEW_STATUS="PACKAGE_STATUS=\"alpha\""
## We should add an option to add an author here.
## share/doc/manual.tex should be changed manually
## We have to discuss the entries in gamelan/manual
## We have to discuss the entries in src/shower
MAIN_FILES="AUTHORS BUGS Makefile.am README update tests/Makefile.am"
CONFIGURE_FILES="configure.ac src/circe1/configure.ac src/circe2/configure.ac src/omega/configure.ac src/vamp/configure.ac libtool-config/configure.ac"
VERSION_FILES="NEWS src/omega/NEWS"
SCRIPTS_FILES="scripts/Makefile.am scripts/whizard-config.in scripts/whizard-setup.csh.in scripts/whizard-setup.sh.in scripts/libtool-config.sh.in scripts/libtool-relocate.sh.in scripts/whizard-relocate.sh.in"
SHARE_FILES="share/Makefile.am share/doc/Makefile.am share/examples/HERA_DIS.sin share/examples/LEP_cc10.sin share/examples/LEP_higgs.sin share/examples/W-endpoint.sin share/examples/Z-lineshape.sin share/examples/Zprime.sin share/examples/casc_dec.sin share/examples/eeww_polarized.sin share/examples/DrellYanMatchingP.sin share/examples/DrellYanMatchingW.sin share/examples/DrellYanNoMatchingP.sin share/examples/DrellYanNoMatchingW.sin share/examples/EEMatching2P.sin share/examples/EEMatching2W.sin share/examples/EEMatching3P.sin share/examples/EEMatching3W.sin share/examples/EEMatching4P.sin share/examples/EEMatching4W.sin share/examples/EEMatching5P.sin share/examples/EEMatching5W.sin share/examples/EENoMatchingP.sin share/examples/EENoMatchingW.sin share/tests/Makefile.am share/interfaces/Makefile.am"
-SRC_FILES="src/Makefile.am src/feynmf/Makefile.am src/hepmc/Makefile.am src/hepmc/HepMCWrap_dummy.f90 src/lhapdf/Makefile.am src/pdf_builtin/Makefile.am src/pdf_builtin/pdf_builtin.f90 src/pythia/Makefile.am src/stdhep/Makefile.am src/whizard-core/Makefile.am src/whizard-core/whizard.nw"
+SRC_FILES="src/Makefile.am src/feynmf/Makefile.am src/hepmc/Makefile.am src/hepmc/HepMCWrap_dummy.f90 src/lhapdf/Makefile.am src/lhapdf5/Makefile.am src/pdf_builtin/Makefile.am src/pdf_builtin/pdf_builtin.f90 src/pythia/Makefile.am src/stdhep/Makefile.am src/whizard-core/Makefile.am src/whizard-core/whizard.nw"
SRC_CIRCE1_FILES="src/circe1/AUTHORS src/circe1/Makefile.am src/circe1/update src/circe1/share/Makefile.am src/circe1/share/doc/Makefile.am src/circe1/src/Makefile.am src/circe1/src/circe1.nw src/circe1/minuit/Makefile.am src/circe1/src/kinds.f90.in src/circe1/src/minuit.nw src/circe1/tools/Makefile.am"
SRC_CIRCE2_FILES="src/circe2/AUTHORS src/circe2/Makefile.am src/circe2/update src/circe2/share/Makefile.am src/circe2/share/doc/Makefile.am src/circe2/src/Makefile.am src/circe2/src/Makefile.ocaml src/circe2/src/circe2.nw src/circe2/src/Makefile.sources src/circe2/tools/Makefile.am src/circe2/src/kinds.f90.in src/circe2/src/postlude.nw"
SRC_GAMELAN_FILES="src/gamelan/Makefile.am src/gamelan/gml.in"
SRC_MISC_FILES="src/misc/Makefile.am src/misc/constants.f90 src/misc/iso_fortran_env_stub.f90 src/misc/kinds.f90.in src/misc/system_dependencies.f90.in"
SRC_MODELS_FILES="src/models/threeshl_bundle/Makefile.am src/models/threeshl_bundle/threeshl_bundle.f90 src/models/threeshl_bundle/threeshl_bundle_lt.f90 src/models/external.Test.f90 src/models/external.Threeshl.f90 src/models/Makefile.am src/models/parameters.2HDM.f90 src/models/parameters.GravTest.f90 src/models/parameters.Littlest.f90 src/models/parameters.Littlest_Eta.f90 src/models/parameters.Littlest_Tpar.f90 src/models/parameters.MSSM.f90 src/models/parameters.MSSM_4.f90 src/models/parameters.MSSM_CKM.f90 src/models/parameters.MSSM_Grav.f90 src/models/parameters.MSSM_Hgg.f90 src/models/parameters.NMSSM.f90 src/models/parameters.NMSSM_CKM.f90 src/models/parameters.NMSSM_Hgg.f90 src/models/parameters.PSSSM.f90 src/models/parameters.QCD.f90 src/models/parameters.QED.f90 src/models/parameters.SM.f90 src/models/parameters.SM_CKM.f90 src/models/parameters.SM_ac.f90 src/models/parameters.SM_ac_CKM.f90 src/models/parameters.SM_rx.f90 src/models/parameters.NoH_rx.f90 src/models/parameters.AltH.f90 src/models/parameters.SSC.f90 src/models/parameters.SM_top.f90 src/models/parameters.SM_top_anom.f90 src/models/parameters.SM_Higgs.f90 src/models/parameters.Simplest.f90 src/models/parameters.Simplest_univ.f90 src/models/parameters.Template.f90 src/models/parameters.Test.f90 src/models/parameters.Threeshl.f90 src/models/parameters.UED.f90 src/models/parameters.Xdim.f90 src/models/parameters.Zprime.f90"
SRC_OMEGA_FILES="src/omega/AUTHORS src/omega/Makefile.am src/omega/update src/omega/share/Makefile.am src/omega/share/doc/Makefile.am src/omega/src/Makefile.am src/omega/src/Makefile.ocaml src/omega/src/Makefile.sources src/omega/bin/Makefile.am src/omega/extensions/Makefile.am src/omega/extensions/people/Makefile.am src/omega/extensions/people/jr/Makefile.am src/omega/extensions/people/jr/f90_SAGT.ml src/omega/extensions/people/jr/f90_SQED.ml src/omega/extensions/people/jr/f90_WZ.ml src/omega/extensions/people/tho/Makefile.am src/omega/extensions/people/tho/f90_O2.ml src/omega/lib/Makefile.am src/omega/models/Makefile.am src/omega/scripts/Makefile.am src/omega/scripts/omega-config.in src/omega/tools/Makefile.am src/omega/tests/MSSM/Makefile.am src/omega/tests/SM/Makefile.am src/omega/tests/people/Makefile.am src/omega/tests/people/jr/Makefile.am src/omega/tests/people/tho/Makefile.am src/omega/tests/parameters_QED.f90 src/omega/tests/parameters_QCD.f90 src/omega/tests/parameters_SM.f90 src/omega/tests/parameters_SYM.f90 src/omega/tests/parameters_SM_top_anom.f90 src/omega/tests/test_openmp.f90 src/omega/tests/tao_random_numbers.f90 src/omega/tests/test_qed_eemm.f90 src/omega/tests/Makefile.am src/omega/tests/benchmark.f90 src/omega/tests/compare.f90 src/omega/tests/color_test_lib.f90 src/omega/tests/compare_lib.f90 src/omega/tests/omega_interface.f90 src/omega/tests/ward.f90 src/omega/tests/ward_lib.f90 src/omega/tests/omega_unit.ml"
SRC_OMEGA_SRC_FILES="src/omega/src/algebra.ml src/omega/src/algebra.mli src/omega/src/bundle.ml src/omega/src/bundle.mli src/omega/src/cache.ml src/omega/src/cache.mli src/omega/src/cascade.ml src/omega/src/cascade.mli src/omega/src/cascade_lexer.mll src/omega/src/cascade_parser.mly src/omega/src/cascade_syntax.ml src/omega/src/cascade_syntax.mli src/omega/src/charges.ml src/omega/src/charges.mli src/omega/src/color.ml src/omega/src/color.mli src/omega/src/colorize.ml src/omega/src/colorize.mli src/omega/src/combinatorics.ml src/omega/src/combinatorics.mli src/omega/src/comphep.ml src/omega/src/comphep.mli src/omega/src/comphep_lexer.mll src/omega/src/comphep_parser.mly src/omega/src/comphep_syntax.ml src/omega/src/comphep_syntax.mli src/omega/src/complex.ml src/omega/src/complex.mli src/omega/src/config.ml.in src/omega/src/config.mli src/omega/src/count.ml src/omega/src/coupling.mli src/omega/src/dAG.ml src/omega/src/dAG.mli src/omega/src/fusion.ml src/omega/src/fusion.mli src/omega/src/linalg.ml src/omega/src/linalg.mli src/omega/src/model.mli src/omega/src/modellib_BSM.ml src/omega/src/modellib_NoH.ml src/omega/src/modellib_NoH.mli src/omega/src/modellib_BSM.mli src/omega/src/modellib_MSSM.ml src/omega/src/modellib_MSSM.mli src/omega/src/modellib_NMSSM.ml src/omega/src/modellib_NMSSM.mli src/omega/src/modellib_PSSSM.ml src/omega/src/modellib_PSSSM.mli src/omega/src/modellib_SM.ml src/omega/src/modellib_SM.mli src/omega/src/modeltools.ml src/omega/src/modeltools.mli src/omega/src/momentum.ml src/omega/src/momentum.mli src/omega/src/oVM.ml src/omega/src/oVM.mli src/omega/src/ogiga.ml src/omega/src/omega.ml src/omega/src/omega.mli src/omega/src/omega_2HDM.ml src/omega/src/omega_CQED.ml src/omega/src/omega_Comphep.ml src/omega/src/omega_GravTest.ml src/omega/src/omega_Littlest.ml src/omega/src/omega_Littlest_Eta.ml src/omega/src/omega_Littlest_Tpar.ml src/omega/src/omega_Littlest_Zprime.ml src/omega/src/omega_MSSM.ml src/omega/src/omega_MSSM_CKM.ml src/omega/src/omega_MSSM_Grav.ml src/omega/src/omega_MSSM_Hgg.ml src/omega/src/omega_NMSSM.ml src/omega/src/omega_NMSSM_CKM.ml src/omega/src/omega_NMSSM_Hgg.ml src/omega/src/omega_PSSSM.ml src/omega/src/omega_Phi3.ml src/omega/src/omega_Phi3h.ml src/omega/src/omega_Phi4.ml src/omega/src/omega_Phi4h.ml src/omega/src/omega_QCD.ml src/omega/src/omega_QED.ml src/omega/src/omega_SM.ml src/omega/src/omega_SM_CKM.ml src/omega/src/omega_SM_Maj.ml src/omega/src/ovm_SM.ml src/omega/src/process.ml src/omega/src/process.mli src/omega/src/thoFilename.ml src/omega/src/thoFilename.mli src/omega/src/omega_SM_Higgs.ml src/omega/src/omega_SM_Rxi.ml src/omega/src/omega_SM_ac.ml src/omega/src/omega_SM_ac_CKM.ml src/omega/src/omega_SM_clones.ml src/omega/src/omega_SM_rx.ml src/omega/src/omega_NoH_rx.ml src/omega/src/omega_AltH.ml src/omega/src/omega_SSC.ml src/omega/src/omega_SM_top.ml src/omega/src/omega_SM_top_anom.ml src/omega/src/omega_SMh.ml src/omega/src/omega_SYM.ml src/omega/src/omega_Simplest.ml src/omega/src/omega_Simplest_univ.ml src/omega/src/omega_Template.ml src/omega/src/omega_Threeshl.ml src/omega/src/omega_Threeshl_nohf.ml src/omega/src/omega_UED.ml src/omega/src/omega_Xdim.ml src/omega/src/omega_Zprime.ml src/omega/src/omega_logo.mp src/omega/src/omega_parameters_tool.nw src/omega/src/omegalib.nw src/omega/src/options.ml src/omega/src/options.mli src/omega/src/partition.ml src/omega/src/partition.mli src/omega/src/phasespace.ml src/omega/src/phasespace.mli src/omega/src/pmap.ml src/omega/src/pmap.mli src/omega/src/powSet.ml src/omega/src/powSet.mli src/omega/src/product.ml src/omega/src/product.mli src/omega/src/progress.ml src/omega/src/progress.mli src/omega/src/rCS.ml src/omega/src/rCS.mli src/omega/src/target.mli src/omega/src/targets.ml src/omega/src/targets.mli src/omega/src/targets_Kmatrix.ml src/omega/src/targets_Kmatrix.mli src/omega/src/test_linalg.ml src/omega/src/thoArray.ml src/omega/src/thoFilename.ml src/omega/src/thoArray.mli src/omega/src/thoGButton.ml src/omega/src/thoGButton.mli src/omega/src/thoGDraw.ml src/omega/src/thoGDraw.mli src/omega/src/thoGMenu.ml src/omega/src/thoGMenu.mli src/omega/src/thoGWindow.ml src/omega/src/thoGWindow.mli src/omega/src/thoList.ml src/omega/src/thoList.mli src/omega/src/thoString.ml src/omega/src/thoString.mli src/omega/src/topology.ml src/omega/src/topology.mli src/omega/src/tree.ml src/omega/src/tree.mli src/omega/src/tree2.ml src/omega/src/tree2.mli src/omega/src/trie.ml src/omega/src/trie.mli src/omega/src/tuple.ml src/omega/src/tuple.mli src/omega/src/vertex.ml src/omega/src/vertex.mli src/omega/src/vertex_lexer.mll src/omega/src/vertex_parser.mly src/omega/src/vertex_syntax.ml src/omega/src/vertex_syntax.mli src/omega/src/whizard.ml src/omega/src/whizard.mli src/omega/src/whizard_tool.ml src/omega/src/kinds.f90.in src/omega/src/constants.f90"
SRC_PDF_BUILTIN_FILES="src/pdf_builtin/pdf_builtin.f90"
SRC_VAMP_FILES="src/vamp/AUTHORS src/vamp/Makefile.am src/vamp/update src/vamp/share/Makefile.am src/vamp/share/doc/Makefile.am src/vamp/src/Makefile.am src/vamp/src/iso_fortran_env_stub.f90 src/vamp/src/kinds.f90.in"
LIBTOOL_CONFIG_FILES="libtool-config/Makefile.am libtool-config/update"
FILES="$MAIN_FILES $CONFIGURE_FILES $VERSION_FILES $SHARE_FILES $SRC_OMEGA_FILES $SCRIPTS_FILES $SRC_FILES $SRC_CIRCE1_FILES $SRC_CIRCE2_FILES $SRC_GAMELAN_FILES $SRC_PDF_BUILTIN_FILES $SRC_VAMP_FILES $SRC_MISC_FILES $SRC_MODELS_FILES $SRC_OMEGA_SRC_FILES $LIBTOOL_CONFIG_FILES"
for f in $FILES; do
sed -e "s/$OLD_YEAR/$NEW_YEAR/g" -e "s/$OLD_YEAR2/$NEW_YEAR2/g" -e "s/$OLD_ADDRESS/$NEW_ADDRESS/g" $f > $f.tmp;
cp -f $f.tmp $f;
rm -f $f.tmp;
done
CHANGE_FILES="$CONFIGURE_FILES $VERSION_FILES"
for f in $CHANGE_FILES; do
sed -e "s/$OLD_DATE/$NEW_DATE/g" -e "s/$OLD_VERSION/$NEW_VERSION/g" -e "s/$OLD_STATUS/$NEW_STATUS/g" $f > $f.tmp;
cp -f $f.tmp $f;
rm -f $f.tmp;
done
Index: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am (revision 5875)
+++ trunk/src/Makefile.am (revision 5876)
@@ -1,150 +1,150 @@
## Makefile.am -- Makefile for WHIZARD
##
## Process this file with automake to produce Makefile.in
#
# Copyright (C) 1999-2014 by
# Wolfgang Kilian <kilian@physik.uni-siegen.de>
# Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
# Juergen Reuter <juergen.reuter@desy.de>
# with contributions from
# Christian Speckner <cnspeckn@googlemail.com>
#
# WHIZARD is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# WHIZARD is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#
########################################################################
## Subdirectories to configure
SUBDIRS = \
pythia hepmc lhapdf5 stdhep hoppet \
circe1 circe2 misc fastjet pdf_builtin vamp \
shower muli whizard-core prebuilt omega models
if MPOST_AVAILABLE
SUBDIRS += gamelan feynmf
endif
## -------------------------------------------------------------------
## Build the toplevel WHIZARD library, which wraps various libraries
## built in the subdirectories
## and the wrapper O'Mega library, which contains omegalib and
## the W/O interface modules for the various models
lib_LTLIBRARIES = libwhizard.la libomega.la
libwhizard_la_SOURCES =
libwhizard_la_LDFLAGS = $(LIBRARY_VERSION)
libomega_la_SOURCES =
## Collect the various partial libraries
libwhizard_la_LIBADD = \
whizard-core/libwhizard_core.la \
vamp/src/libvamp.la \
circe1/src/libcirce1.la \
circe2/src/libcirce2.la \
misc/libaux.la \
pdf_builtin/libpdf_builtin.la
if SHOWER_AVAILABLE
libwhizard_la_LIBADD += \
shower/libshower.la
else
libwhizard_la_LIBADD += \
shower/libshower_dummy.la
endif
if MPI_AVAILABLE
libwhizard_la_LIBADD += \
muli/libmuli.la
else
libwhizard_la_LIBADD += \
muli/libmuli_dummy.la
endif
if HEPMC_AVAILABLE
libwhizard_la_LIBADD += hepmc/libHepMCWrap.la
else
libwhizard_la_LIBADD += hepmc/libHepMCWrap_dummy.la
endif
libomega_la_LIBADD = \
omega/src/libomega_core.la \
models/libmodels.la
## If (parts of) LHAPDF is not available, link in a dummy as replacements
-if LHAPDF_AVAILABLE
+if LHAPDF5_AVAILABLE
libwhizard_la_LIBADD += $(LDFLAGS_LHAPDF)
endif
if LHAPDF_DUMMY
libwhizard_la_LIBADD += lhapdf5/libLHAPDF5_dummy.la
endif
## If STDHEP is not available, link in a dummy as replacements
if STDHEP_AVAILABLE
libwhizard_la_LIBADD += $(LDFLAGS_STDHEP)
else
libwhizard_la_LIBADD += stdhep/libstdhep_dummy.la
endif
if HOPPET_AVAILABLE
libwhizard_la_LIBADD += $(LDFLAGS_HOPPET) hoppet/libhoppet.la
else
libwhizard_la_LIBADD += hoppet/libhoppet_dummy.la
endif
if FASTJET_AVAILABLE
libwhizard_la_LIBADD += $(FASTJET_LIBS) fastjet/libFastjetWrap.la
else
libwhizard_la_LIBADD += fastjet/libFastjetWrap_dummy.la
endif
## -------------------------------------------------------------------
## Build a standalone program
bin_PROGRAMS = whizard
whizard_SOURCES =
## A dummy source tells libtool that the F90 compiler is used for linking
## Without dummy, libtool uses the C linker (default: ld)
nodist_EXTRA_whizard_SOURCES = dummy.f90
whizard_LDADD = whizard-core/libwhizard_main.la
whizard_LDADD += ./libwhizard.la
whizard_LDADD += prebuilt/libwhizard_prebuilt.la
whizard_LDADD += $(LDFLAGS_LHAPDF)
whizard_LDADD += $(LDFLAGS_STDHEP)
whizard_LDADD += $(LDFLAGS_HEPMC)
whizard_LDADD += $(LDFLAGS_HOPPET)
whizard_LDADD += $(FASTJET_LIBS)
AM_FCFLAGS =
########################################################################
## Default Fortran compiler options
## Profiling
if FC_USE_PROFILING
AM_FCFLAGS += $(FCFLAGS_PROFILING)
endif
## OpenMP
if FC_USE_OPENMP
AM_FCFLAGS += $(FCFLAGS_OPENMP)
endif
########################################################################
## Non-standard cleanup tasks
## Remove backup files
maintainer-clean-local:
-rm -f *~

File Metadata

Mime Type
text/x-diff
Expires
Tue, Nov 19, 8:39 PM (1 d, 2 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3806104
Default Alt Text
(25 KB)

Event Timeline