Commit 510a01dd authored by Lynn Garren's avatar Lynn Garren

merging changes from 1.9

parent 01a7fa48
......@@ -5,3 +5,5 @@ autom4te.cache
install-sh
missing
mkinstalldirs
config.guess
config.sub
......@@ -2,15 +2,14 @@
# platform specific issues
#-------------------------------------------------------------
Support for shared libraries with CC 5.4 on Solaris requires libtool 1.9b
or later. This also implies the use of autoconf 2.59 or later and
automake 1.9.1 or later. If you bootstrap, you will probably have to build
these yourself. See "building autotools" below.
This package requires autoconf 2.59 or later and automake 1.9.1 or later.
If you bootstrap, you will probably have to build these yourself.
See "building autotools" below.
The new libtool no longer properly supports shared libraries for gcc 2.95.2.
If you build CLHEP with gcc 2.95.2, you must configure --disable-shared.
To build for Solaris CC, configure with CXX=CC CC=cc LIBS=-lsunmath.
To build for Solaris CC, configure with CXX=CC CC=cc and use gmake.
#-------------------------------------------------------------
# installing from a source code tar ball
......
......@@ -14,10 +14,31 @@ AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/itos.cc])
AM_INIT_AUTOMAKE(1.9 foreign)
AC_PROG_LIBTOOL
AC_PROG_LN_S
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_RANLIB
# ----------------------------------------------------------------------
# --enable-shared and --enable-static
# both shared and static libraries are built by default
# ----------------------------------------------------------------------
AC_ARG_ENABLE(shared,
AC_HELP_STRING([--disable-shared],[do not build shared libraries]),
[case "${enableval}" in
yes) build_shared="yes";;
no) build_shared="no";;
*) build_shared="yes";;
esac],
[build_shared="yes"])
AC_ARG_ENABLE(static,
AC_HELP_STRING([--disable-static],[do not build static libraries]),
[case "${enableval}" in
yes) build_static="yes";;
no) build_static="no";;
*) build_static="yes";;
esac],
[build_static="yes"])
# ----------------------------------------------------------------------
# Identify the files that 'configure' is to produce:
......@@ -133,37 +154,83 @@ AC_SUBST(DIFF_Q)
case "$CXX" in
g++)
case "$target" in
*-*-linux*) AM_CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE";;
*) AM_CXXFLAGS="-O -ansi -pedantic -Wall"
*-*-linux*)
AM_CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
;;
*-*-darwin*)
AM_CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=dylib
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
;;
*)
AM_CXXFLAGS="-O -ansi -pedantic -Wall"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
esac;;
c++)
case "$target" in
*-*-linux*) AM_CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE";;
*) AM_CXXFLAGS="-O -ansi -pedantic -Wall"
*-*-linux*)
AM_CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
;;
*-*-darwin*)
AM_CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=dylib
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
;;
*)
AM_CXXFLAGS="-O -ansi -pedantic -Wall"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
esac;;
cl)
AM_CXXFLAGS="-EHsc"
AM_CXXFLAGS="-EHsc -nologo -GR -GX -MD"
build_shared="no"
;;
CC)
case "$target" in
*-*-solaris*) AM_CXXFLAGS="-O";;
*-*-hpux*) AM_CXXFLAGS="+O3 +DAportable +a1 -z -pta +Onolimit";;
*-*-irix*) AM_CXXFLAGS="-O -OPT:Olimit=0 -pta";;
*-*-solaris*)
AM_CXXFLAGS="-O"
MY_SHFLAGS="-KPIC -DPIC"; MY_SHLINK="-G"; SHEXT=so
MY_SHNAME="-h"; MY_LD="-R"
AM_LDFLAGS="-lsunmath"
;;
*-*-hpux*) AM_CXXFLAGS="+O3 +DAportable +a1 -z -pta +Onolimit"
build_shared="no"
;;
*-*-irix*) AM_CXXFLAGS="-O -OPT:Olimit=0 -pta"
build_shared="no"
;;
*) echo UNEXPECTED CHOICE OF OPERATING SYSTEM FOR $CXX: $target
esac;;
aCC)
AM_CXXFLAGS="-O -Aa +DAportable +Onolimit"
build_shared="no"
;;
cxx)
AM_CXXFLAGS="-O -std strict_ansi -timplicit_local"
build_shared="no"
;;
xlC)
AM_CXXFLAGS="-O3 -qtwolink -+"
build_shared="no"
;;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac
AM_CONDITIONAL(BUILD_SHARED, test x$build_shared = xyes)
AM_CONDITIONAL(BUILD_STATIC, test x$build_static = xyes)
AC_SUBST(AM_CXXFLAGS)
AC_SUBST(AM_LDFLAGS)
AC_SUBST(MY_SHFLAGS)
AC_SUBST(MY_SHLINK)
AC_SUBST(MY_SHNAME)
AC_SUBST(MY_LD)
AC_SUBST(SHEXT)
# ----------------------------------------------------------------------
# Set system-dependent options:
......
## Process this file with automake to produce Makefile.in
INCLUDES = -I$(top_builddir)
libCLHEP_Cast_@VERSION@_a_SOURCES = \
itos.cc
lib_LTLIBRARIES = libCLHEP-Cast-@VERSION@.la
libCLHEP_Cast_@VERSION@_so_OBJECTS = $(patsubst %.cc,$(shareddir)/%.$(OBJEXT),$(libCLHEP_Cast_@VERSION@_a_SOURCES))
libCLHEP_Cast_@VERSION@_la_SOURCES = \
itos.cc
# these if/else blocks will be parsed by automake and translated
if BUILD_SHARED
shareddir = shared
lib_shared = libCLHEP-Cast-@VERSION@.$(SHEXT)
SHFLAGS = @MY_SHFLAGS@
SHLINK = @MY_SHLINK@
SHNAME = @MY_SHNAME@
endif
if BUILD_STATIC
lib_LIBRARIES = libCLHEP-Cast-@VERSION@.a
endif
CLEANFILES = $(lib_shared)
all-local: $(shareddir) $(lib_shared)
$(shareddir):
test -d $(shareddir) || mkdir $(shareddir)
$(lib_shared): $(libCLHEP_Cast_@VERSION@_so_OBJECTS)
$(CXXLINK) $(SHLINK) $(SHNAME)$@ $(libCLHEP_Cast_@VERSION@_so_OBJECTS) -o $@
$(shareddir)/%.$(OBJEXT): %.cc
$(CXXCOMPILE) $(SHFLAGS) -c -o $@ $<
install-exec-local: $(lib_shared)
@$(NORMAL_INSTALL)
test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
@list='$(lib_shared)'; for p in $$list; do \
if test -f $$p; then \
echo " $(INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$p'"; \
$(INSTALL) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
else :; fi; \
done
clean-local:
-test -d $(shareddir) && rm -f $(shareddir)/*.$(OBJEXT)
distclean-local:
-test -d $(shareddir) && rm -rf ./$(shareddir)
2005-03-15 Mark Fischler <mf@fnal.gov>
* engineIDulong.cc, engineIDulong.h
DoubConv.cc, DoubConv.h
EngineFactory.cc, ranRestoreTest.cc
all Random Engine classes
Add put() and get() methods to every engine transfering state to a
vector of unsigned longs.
Thu Mar 10 2005 Andreas Pfeiffer <andreas.pfeiffer@cern.ch>
* Geometry/BasicVector3D.h : added operator to convert to Hep3Vector
for backward compatibility (savannah bug id 6740)
* Geometry/config.in, Geometry/test/testBug6740.cc, Geometry/test/testBug6740.sh,
Geometry/test/testBug6740.output, Geometry/test/Makefile.am: added test for bug ID 6740
2005-02-14 Mark Fischler <mf@fnal.gov>
* JamesRandom.cc
Check that seed is non-negative.
Negative seeds give terrible sequences.
2005-02-11 Mark Fischler <mf@fnal.gov>
* RandPoissonQ.cc RandPoissonT.cc RandomEngine.cc
Added missing implementations, per bug # 1806
(FireArray(), shootArray(), getTableSeeds)
2005-03-15 Mark Fischler <mf@fnal.gov>
* SymMatrix.cc, testBug7328.cc
Repair of bug 7328, a memory leak encountered when inverting symmetric
matrices above the size of 6x6.
2005-02-25 Mark Fischler <mf@fnal.gov>
* Matrix.cc, testBug6181.cc
Repair of bug 6181, a serious error in inverting matrices above the
size of 6x6.
2005-02-18 Lynn Garren <garren@fnal.gov>
* configure.in, Makefile.am: Stop using libtool.
The newer releases of libtool seem to have dropped support for
Windows Visual C++.
2005-02-14 Lynn Garren <garren@fnal.gov>
* */configure.in: Visual C++ flags are now "-EHsc -nologo -GR -GX -MD"
2005-02-03 Lynn Garren <garren@fnal.gov>
* configure.in: install step creates libCLHEP.a, libCLHEP.so,
and/or libCLHEP.dylib by adding a symbolic link.
* HepMC/GenParticle.h: define HepMC::GenParticle::setParticleID
* HepPDT: define HepPDT::QQDecayTable::writeTable,
HepPDT::QQChannel::write, and HepPDT::QQDecay::write
2005-02-02 Andreas PFEIFFER <andreas.pfeiffer@cern.ch>
* */configure.in: modified compiler flags for windows:
added "-O -GR -GX -MD" as this is needed for the multi-thread
environments used.
2005-02-01 Lynn Garren <garren@fnal.gov>
* config: remove HEP_CC_NEED_SUB_WITHOUT_CONST from config/CLHEP.h.
HEP_CC_NEED_SUB_WITHOUT_CONST has been defined to 1 in all cases for
a long time.
* Matrix: remove HEP_CC_NEED_SUB_WITHOUT_CONST ifdefs
2005-02-01 Andreas PFEIFFER <andreas.pfeiffer@cern.ch>
* Geometry/Geometry/BasicVector3D.h : changed template specialisations for
multiplication of vector<float> with scalar and division of vector<float>
by scalar to use float scalars instead of double (savannah bug id 6523)
2005-01-31 Andreas PFEIFFER <andreas.pfeiffer@cern.ch>
* Matrix/src/Matrix.h: fixed error in sub(int, int, int, int), savannah
bug id 6176, added corresponding files (testBug6176*) in test/,
updated Makefile.am accordingly to generate tests.
Mon Dec 27 2004 Mark Fischler <mf@fnal.gov>
* *.cc and .h for all the engine classes.
* Random.cc EngineFactory.cc StaticRandomStates.cc
Ability to restore engines and distributions without knowing in
the restoring program which type of engine was used in the saving
program.
Wed Dec 22 2004 Mark Fischler <mf@fnal.gov>
* Random.h StaticRandomState.h Random.cc StaticRandomState.cc
Added HepRandom::saveStaticRandomState(ostream) and restore to istream.
Mon Dec 20 2004 Mark Fischler <mf@fnal.gov>
* Random.h RandGauss.h RandFlat.h RandFlat.icc RandBit.h
Random.cc RandGauss.cc RandFlat.cc
Added static methods for save/restore to streams.
Thu Dec 16 2004 Mark Fischler <mf@fnal.gov>
* Random/*.cc for all engines and distributions.
* Random/test/ranRestoreTest.cc
Added put and get methods, as well as ostream operations, so that
engine and distribution instances can be saved and restored to/from
streams.
Thu Dec 16
Wed Dec 15 2004 Mark Fischler <mf@fnal.gov>
* RandPoissonQ.cc (RandPoissonT.cc)
RandPoissonQ has a path, potentially taken when mean is more
than 100, where an additional gaussian random number is needed.
Instead we use the engine owned by the RandPoissonQ instance.
This will affect in rare cases the values of random variates
delivered by **instances** (not the shoot() methods) of RandPoissonQ
and RandPoissonT.
Thu Dec 16
Tue Dec 14 2004 Mark Fischler <mf@fnal.gov>
* RandGeneral.cc
Modify local variable theIntegralPdf, using a std::vector instead
of a double* pointing to a new-ed array. No behavioral change.
Thu Dec 16
Fri Dec 3 2004 Mark Fischler <mf@fnal.gov>
* Random/*.cc for all engines
* Random/test/ranRestoreTest.cc
Modified engines and additional-state distributions so that
restoreENgineState behaves better (error message and return
instead of hang up) when file requested is not found.
==============================
30.11.04 Release CLHEP-2.0.1.2
==============================
......
......@@ -2,15 +2,14 @@
# platform specific issues
#-------------------------------------------------------------
Support for shared libraries with CC 5.4 on Solaris requires libtool 1.9b
or later. This also implies the use of autoconf 2.59 or later and
automake 1.9.1 or later. If you bootstrap, you will probably have to build
these yourself. See "building autotools" below.
This package requires autoconf 2.59 or later and automake 1.9.1 or later.
If you bootstrap, you will probably have to build these yourself.
See "building autotools" below.
The new libtool no longer properly supports shared libraries for gcc 2.95.2.
If you build CLHEP with gcc 2.95.2, you must configure --disable-shared.
To build for Solaris CC, configure with CXX=CC CC=cc LIBS=-lsunmath.
To build for Solaris CC, configure with CXX=CC CC=cc and use gmake.
#-------------------------------------------------------------
# installing from a source code tar ball
......
......@@ -14,10 +14,31 @@ AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/Evaluator.cc])
AM_INIT_AUTOMAKE(1.9 foreign)
AC_PROG_LIBTOOL
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_RANLIB
# ----------------------------------------------------------------------
# --enable-shared and --enable-static
# both shared and static libraries are built by default
# ----------------------------------------------------------------------
AC_ARG_ENABLE(shared,
AC_HELP_STRING([--disable-shared],[do not build shared libraries]),
[case "${enableval}" in
yes) build_shared="yes";;
no) build_shared="no";;
*) build_shared="yes";;
esac],
[build_shared="yes"])
AC_ARG_ENABLE(static,
AC_HELP_STRING([--disable-static],[do not build static libraries]),
[case "${enableval}" in
yes) build_static="yes";;
no) build_static="no";;
*) build_static="yes";;
esac],
[build_static="yes"])
# ----------------------------------------------------------------------
# Identify the files that 'configure' is to produce:
......@@ -135,37 +156,83 @@ AC_SUBST(DIFF_Q)
case "$CXX" in
g++)
case "$target" in
*-*-linux*) AM_CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE";;
*) AM_CXXFLAGS="-O -ansi -pedantic -Wall"
*-*-linux*)
AM_CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
;;
*-*-darwin*)
AM_CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=dylib
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
;;
*)
AM_CXXFLAGS="-O -ansi -pedantic -Wall"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
esac;;
c++)
case "$target" in
*-*-linux*) AM_CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE";;
*) AM_CXXFLAGS="-O -ansi -pedantic -Wall"
*-*-linux*)
AM_CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
;;
*-*-darwin*)
AM_CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=dylib
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
;;
*)
AM_CXXFLAGS="-O -ansi -pedantic -Wall"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
esac;;
cl)
AM_CXXFLAGS="-EHsc"
AM_CXXFLAGS="-EHsc -nologo -GR -GX -MD"
build_shared="no"
;;
CC)
case "$target" in
*-*-solaris*) AM_CXXFLAGS="-O";;
*-*-hpux*) AM_CXXFLAGS="+O3 +DAportable +a1 -z -pta +Onolimit";;
*-*-irix*) AM_CXXFLAGS="-O -OPT:Olimit=0 -pta";;
*-*-solaris*)
AM_CXXFLAGS="-O"
MY_SHFLAGS="-KPIC -DPIC"; MY_SHLINK="-G"; SHEXT=so
MY_SHNAME="-h"; MY_LD="-R"
AM_LDFLAGS="-lsunmath"
;;
*-*-hpux*) AM_CXXFLAGS="+O3 +DAportable +a1 -z -pta +Onolimit"
build_shared="no"
;;
*-*-irix*) AM_CXXFLAGS="-O -OPT:Olimit=0 -pta"
build_shared="no"
;;
*) echo UNEXPECTED CHOICE OF OPERATING SYSTEM FOR $CXX: $target
esac;;
aCC)
AM_CXXFLAGS="-O -Aa +DAportable +Onolimit"
build_shared="no"
;;
cxx)
AM_CXXFLAGS="-O -std strict_ansi -timplicit_local"
build_shared="no"
;;
xlC)
AM_CXXFLAGS="-O3 -qtwolink -+"
build_shared="no"
;;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac
AM_CONDITIONAL(BUILD_SHARED, test x$build_shared = xyes)
AM_CONDITIONAL(BUILD_STATIC, test x$build_static = xyes)
AC_SUBST(AM_CXXFLAGS)
AC_SUBST(AM_LDFLAGS)
AC_SUBST(MY_SHFLAGS)
AC_SUBST(MY_SHLINK)
AC_SUBST(MY_SHNAME)
AC_SUBST(MY_LD)
AC_SUBST(SHEXT)
# ----------------------------------------------------------------------
# Set system-dependent options:
......
......@@ -2,9 +2,50 @@
INCLUDES = -I$(top_builddir)
lib_LTLIBRARIES = libCLHEP-Evaluator-@VERSION@.la
libCLHEP_Evaluator_@VERSION@_la_SOURCES = \
libCLHEP_Evaluator_@VERSION@_a_SOURCES = \
Evaluator.cc \
setStdMath.cc \
setSystemOfUnits.cc
libCLHEP_Evaluator_@VERSION@_so_OBJECTS = $(patsubst %.cc,$(shareddir)/%.$(OBJEXT),$(libCLHEP_Evaluator_@VERSION@_a_SOURCES))
# these if/else blocks will be parsed by automake and translated
if BUILD_SHARED