merging configuration changes from 1.9

Cast/Cast-config.in

@@ -8,7 +8,7 @@ includedir=@includedir@
 
 usage()
 {
-    cat <<EOF
+    cat  <<EOF
 Usage: Cast-config [OPTION]
 
 Known values for OPTION are:
@@ -64,7 +64,7 @@ while test $# -gt 0; do
        	;;
 
     --cppflags)
-       	echo @AM_CPPFLAGS@ @CPPFLAGS@ @Cast_CPPFLAGS@
+       	echo @CPPFLAGS@ @Cast_CPPFLAGS@
        	;;
 
     --cxxflags)
@@ -72,7 +72,7 @@ while test $# -gt 0; do
        	;;
 
     --ldflags)
-       	echo @AM_LDFLAGS@ @LDFLAGS@ @Cast_LDFLAGS@
+       	echo  @LDFLAGS@ @Cast_LDFLAGS@
        	;;
 
     --libs)

Cast/INSTALL

+#-------------------------------------------------------------
+#  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.
+
+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.
+
 #-------------------------------------------------------------
 #  installing from a source code tar ball
 #-------------------------------------------------------------
@@ -65,11 +77,13 @@ Now continue with directions as if you unpacked a source code tarball.
 # building autotools
 #-------------------------------------------------------------
 
-If you do not have at least autoconf 2.57 and automake 1.6, you will 
+If you do not have at least autoconf 2.59 and automake 1.9.1, you will 
 need to build autoconf, automake, and libtool.  On some platforms, 
 you may also need to build m4 and texinfo.
 
-Download the relevant tarballs from gnu.org.
+Download the relevant tarballs from gnu.org 
+(http://www.gnu.org/software/autoconf/, http://www.gnu.org/software/automake/,
+and http://www.gnu.org/software/libtool/)
 Untar them in a common source code tree.
 Decide whether you want to install them in /usr/local or your own
 install directory.  If you use your own install directory, use

Cast/bootstrap

 #! /bin/sh
 
-# run autotool commands
 set -x
+# cleanup should not be necessary
+# however, in some cases strange results are found if you do not start clean
+rm -rf autom4te.cache
+rm -f aclocal.m4
+rm -f Makefile.in */Makefile.in */defs.h.in
+rm -f autotools/config* autotools/depcomp autotools/install-sh autotools/m*
+rm -f configure config.*
+# run autotool commands
 aclocal -I autotools
 autoheader
 automake --add-missing --copy

Cast/configure.in

@@ -8,12 +8,12 @@
 # Identify the package and initialize the autotools:
 # ----------------------------------------------------------------------
 
-AC_PREREQ(2.57)
+AC_PREREQ(2.59)
 AC_INIT(CLHEP Cast, 2.0.1.1, CLHEP@cern.ch, Cast)
 AC_CONFIG_AUX_DIR(autotools)
 AC_CANONICAL_TARGET
 AC_CONFIG_SRCDIR([src/itos.cc])
-AM_INIT_AUTOMAKE(1.6 foreign)
+AM_INIT_AUTOMAKE(1.9 foreign)
 AC_PROG_LIBTOOL
 AC_PROG_LN_S
 AC_PROG_INSTALL
@@ -51,9 +51,6 @@ AC_SUBST(Cast_CPPFLAGS)
 AC_SUBST(Cast_LIBS)
 AC_SUBST(Cast_LDFLAGS)
 
-AC_SUBST(COPY_P)
-AC_SUBST(DIFF_Q)
-
 # ----------------------------------------------------------------------
 # Supply boilerplate for Cast/defs.h source header:
 # ----------------------------------------------------------------------
@@ -111,72 +108,63 @@ AC_LANG(C++)
 # Ensure we've found a preprocessor:
 AC_REQUIRE_CPP
 
-# worry about compiler flags
+# copy and diff
 case "$target" in
 *-*-win32*)
-  case "$CXX" in
-  cl)  CXXFLAGS="-DWIN32 -O -GX -GR -MD";COPY_P="copy -p";DIFF_Q="diff -q -b";;
-  g++) CXXFLAGS="-O";COPY_P="copy -p";DIFF_Q="diff -q -b";;
-  c++) CXXFLAGS="-O";COPY_P="copy -p";DIFF_Q="diff -q -b";;
-  *)   echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
-  esac;;
+  COPY_P="copy -p";DIFF_Q="diff -q -b"
+  ;;
 *-*-cygwin*)
-  case "$CXX" in
-  cl)  CXXFLAGS="-DWIN32 -O -GX -GR -MD";COPY_P="cp -p";DIFF_Q="diff -q -b";;
-  g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";DIFF_Q="diff -q -b";;
-  c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";DIFF_Q="diff -q -b";;
-  *)   echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
-  esac;;
+  COPY_P="cp -p";DIFF_Q="diff -q -b"
+  ;;
 *-*-solaris*)
-  case "$CXX" in
-  CC)  CXXFLAGS="-O";COPY_P="cp -p";DIFF_Q="diff -b";;
-  g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";DIFF_Q="diff -b";;
-  c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";DIFF_Q="diff -b";;
-  *)   echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
-  esac;;
+  COPY_P="cp -p";DIFF_Q="diff -b"
+  ;;
 *-*-linux*)
-  case "$CXX" in
-  g++) CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE";COPY_P="cp -p";DIFF_Q="diff -q -b";;
-  c++) CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE";COPY_P="cp -p";DIFF_Q="diff -q -b";;
-  *)   echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
-  esac;;
-alpha*-dec-osf*)
-  case "$CXX" in
-  cxx) CXXFLAGS="-O -std strict_ansi -timplicit_local";COPY_P="cp -p";DIFF_Q="diff -q -b";;
-  g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";DIFF_Q="diff -q -b";;
-  c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";DIFF_Q="diff -q -b";;
-  *)   echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
-  esac;;
-*-*-hpux*)
-  case "$CXX" in
-  aCC) CXXFLAGS="-O -Aa +DAportable +Onolimit";COPY_P="cp -p";DIFF_Q="diff -q -b";;
-  CC)  CXXFLAGS="+O3 +DAportable +a1 -z -pta +Onolimit";COPY_P="cp -p";DIFF_Q="diff -q -b";;
-  g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";DIFF_Q="diff -q -b";;
-  c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";DIFF_Q="diff -q -b";;
-  *)   echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
-  esac;; 
-*-*-aix*)
-  case "$CXX" in
-  xlC) CXXFLAGS="-O3 -qtwolink -+";COPY_P="cp -p";DIFF_Q="diff -q -b";;
-  g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";DIFF_Q="diff -q -b";;
-  c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";DIFF_Q="diff -q -b";;
-  *)   echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
-  esac;; 
-*-*-irix*)
-  case "$CXX" in
-  CC)  CXXFLAGS="-O -OPT:Olimit=0 -pta";COPY_P="cp -p";DIFF_Q="diff -q -b";;
-  g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";DIFF_Q="diff -q -b";;
-  c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";DIFF_Q="diff -q -b";;
-  *)   echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
-  esac;; 
-powerpc-apple-darwin*)
-  case "$CXX" in
-  g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";DIFF_Q="diff -q -b";;
-  c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";DIFF_Q="diff -q -b";;
-  *)   echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
-  esac;; 
+  COPY_P="cp -p";DIFF_Q="diff -q -b"
+  ;;
+*)
+  COPY_P="cp -p";DIFF_Q="diff -q -b"
 esac
 
+AC_SUBST(COPY_P)
+AC_SUBST(DIFF_Q)
+
+# worry about compiler flags
+case "$CXX" in
+g++) 
+   case "$target" in
+   *-*-linux*) AM_CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE";;
+   *) AM_CXXFLAGS="-O -ansi -pedantic -Wall"
+   esac;;
+c++) 
+   case "$target" in
+   *-*-linux*) AM_CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE";;
+   *) AM_CXXFLAGS="-O -ansi -pedantic -Wall"
+   esac;;
+cl)  
+   AM_CXXFLAGS="-EHsc"
+   ;;
+CC)  
+   case "$target" in
+   *-*-solaris*) AM_CXXFLAGS="-O";DIFF_Q="diff -b";;
+   *-*-hpux*) AM_CXXFLAGS="+O3 +DAportable +a1 -z -pta +Onolimit";;
+   *-*-irix*) AM_CXXFLAGS="-O -OPT:Olimit=0 -pta";;
+   *)   echo UNEXPECTED CHOICE OF OPERATING SYSTEM FOR $CXX: $target
+   esac;;
+aCC) 
+   AM_CXXFLAGS="-O -Aa +DAportable +Onolimit"
+   ;;
+cxx) 
+   AM_CXXFLAGS="-O -std strict_ansi -timplicit_local"
+   ;;
+xlC) 
+   AM_CXXFLAGS="-O3 -qtwolink -+"
+   ;;
+*)   echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
+esac
+
+AC_SUBST(AM_CXXFLAGS)
+
 # ----------------------------------------------------------------------
 # Set system-dependent options:
 # ----------------------------------------------------------------------

ChangeLog

+Fri Sep 24          2004 Lynn Garren <garren@fnal.gov>
+
+	* use AM_CXXFLAGS
+	* require autoconf 2.59, automake 1.9.1, and libtool 1.9b
+
+	* Matrix: remove unnecessary copy and disable allocator
+
 Tue Aug 31         2004 Lynn Garren <garren@fnal.gov>
 	
 	* change Solaris CC compile flags from "-O -mt" to "-O"

Evaluator/ChangeLog

+Fri Sep 24          2004 Lynn Garren <garren@fnal.gov>
+
+	* use AM_CXXFLAGS
+	* require autoconf 2.59, automake 1.9.1, and libtool 1.9b
+
+==============================
+23.07.04 Release CLHEP-2.0.1.0
+==============================
+
 ==============================
 11.05.04 Release CLHEP-2.0.0.2
 ==============================

Evaluator/Evaluator-config.in

+#! /bin/sh
+# @configure_input@
+
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+includedir=@includedir@
+
+usage()
+{
+    cat  <<EOF
+Usage: Evaluator-config [OPTION]
+
+Known values for OPTION are:
+
+  --prefix              show installation prefix
+  --cxx                 print compilation command
+  --cppflags            print pre-processor flags
+  --cxxflags            print C++ compiler flags
+  --ldflags             print linker flags
+  --libs                print libraries to link against
+  --help                display this help and exit
+  --version             output version information
+
+EOF
+
+    exit $1
+}
+
+if test $# -eq 0; then
+    usage 1
+fi
+
+while test $# -gt 0; do
+    case "$1" in
+    -*=*)
+        optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'`
+	;;
+    *) 
+        optarg=
+	;;
+    esac
+
+    case "$1" in
+    --prefix=*)
+	prefix="$optarg"
+	;;
+
+    --prefix)
+	echo "$prefix"
+	;;
+
+    --version)
+	echo @PACKAGE@ @VERSION@
+	exit 0
+	;;
+
+    --help)
+	usage 0
+	;;
+
+    --cxx)
+       	echo "CXX:    " @CXX@
+       	echo "CC:     " @CC@
+       	echo "CPP:    " @CPP@
+       	echo "CXXCPP: " @CXXCPP@
+       	;;
+
+    --cppflags)
+       	echo @CPPFLAGS@ @Evaluator_CPPFLAGS@
+       	;;
+
+    --cxxflags)
+       	echo @AM_CXXFLAGS@ @CXXFLAGS@
+       	;;
+
+    --ldflags)
+       	echo  @LDFLAGS@ @Evaluator_LDFLAGS@
+       	;;
+
+    --libs)
+       	echo @LIBS@ @Evaluator_LIBS@ -lm
+       	;;
+
+    *)
+	usage
+	exit 1
+	;;
+    esac
+    shift
+done
+
+exit 0

Evaluator/INSTALL

+#-------------------------------------------------------------
+#  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.
+
+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.
+
 #-------------------------------------------------------------
 #  installing from a source code tar ball
 #-------------------------------------------------------------
@@ -65,11 +77,13 @@ Now continue with directions as if you unpacked a source code tarball.
 # building autotools
 #-------------------------------------------------------------
 
-If you do not have at least autoconf 2.57 and automake 1.6, you will 
+If you do not have at least autoconf 2.59 and automake 1.9.1, you will 
 need to build autoconf, automake, and libtool.  On some platforms, 
 you may also need to build m4 and texinfo.
 
-Download the relevant tarballs from gnu.org.
+Download the relevant tarballs from gnu.org 
+(http://www.gnu.org/software/autoconf/, http://www.gnu.org/software/automake/,
+and http://www.gnu.org/software/libtool/)
 Untar them in a common source code tree.
 Decide whether you want to install them in /usr/local or your own
 install directory.  If you use your own install directory, use

Evaluator/Makefile.am

@@ -4,6 +4,10 @@ includedir = $(prefix)/include/CLHEP
 
 # put . first so that CLHEP directory is built before anything else
 SUBDIRS = Evaluator . src test
+# list all subdirectories - for distribution and cleaning
+DIST_SUBDIRS = Evaluator . src test
+
+bin_SCRIPTS = Evaluator-config
 
 all-local: $(top_builddir)/CLHEP
 

Evaluator/bootstrap

 #! /bin/sh
 
-# run autotool commands
 set -x
+# cleanup should not be necessary
+# however, in some cases strange results are found if you do not start clean
+rm -rf autom4te.cache
+rm -f aclocal.m4
+rm -f Makefile.in */Makefile.in */defs.h.in
+rm -f autotools/config* autotools/depcomp autotools/install-sh autotools/m*
+rm -f configure config.*
+# run autotool commands
 aclocal -I autotools
 autoheader
 automake --add-missing --copy

Evaluator/configure.in

@@ -8,12 +8,12 @@
 # Identify the package and initialize the autotools:
 # ----------------------------------------------------------------------
 
-AC_PREREQ(2.57)
+AC_PREREQ(2.59)
 AC_INIT(CLHEP Evaluator, 2.0.1.1, CLHEP@cern.ch, Evaluator)
 AC_CONFIG_AUX_DIR(autotools)
 AC_CANONICAL_TARGET
 AC_CONFIG_SRCDIR([src/Evaluator.cc])
-AM_INIT_AUTOMAKE(1.6 foreign)
+AM_INIT_AUTOMAKE(1.9 foreign)
 AC_PROG_LIBTOOL
 AC_PROG_INSTALL
 AC_PROG_LN_S
@@ -34,6 +34,9 @@ AC_CONFIG_FILES([test/Makefile])
 AC_CONFIG_FILES([Evaluator-deps])
 AC_CONFIG_FILES([Evaluator/copy-header.pl], [chmod +x Evaluator/copy-header.pl])
 
+# Configuration inquiry program/script:
+AC_CONFIG_FILES([Evaluator-config], [chmod +x Evaluator-config])
+
 # Test driver program/script:
 AC_CONFIG_FILES([test/testEvaluator.sh], [chmod +x test/testEvaluator.sh])
 
@@ -49,9 +52,6 @@ AC_SUBST(Evaluator_CPPFLAGS)
 AC_SUBST(Evaluator_LIBS)
 AC_SUBST(Evaluator_LDFLAGS)
 
-AC_SUBST(COPY_P)
-AC_SUBST(DIFF_Q)
-
 # ----------------------------------------------------------------------
 # Supply boilerplate for Evaluator/defs.h source header:
 # ----------------------------------------------------------------------
@@ -110,73 +110,63 @@ AC_LANG(C++)
 # Ensure we've found a preprocessor:
 AC_REQUIRE_CPP
 
-
-# worry about compiler flags
+# copy and diff
 case "$target" in
 *-*-win32*)
-  case "$CXX" in
-  cl)  CXXFLAGS="-DWIN32 -O -GX -GR -MD";COPY_P="copy -p";DIFF_Q="diff -q -b";;
-  g++) CXXFLAGS="-O";COPY_P="copy -p";DIFF_Q="diff -q -b";;
-  c++) CXXFLAGS="-O";COPY_P="copy -p";DIFF_Q="diff -q -b";;
-  *)   echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
-  esac;;
+  COPY_P="copy -p";DIFF_Q="diff -q -b"
+  ;;
 *-*-cygwin*)
-  case "$CXX" in
-  cl)  CXXFLAGS="-DWIN32 -O -GX -GR -MD";COPY_P="cp -p";DIFF_Q="diff -q -b";;
-  g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";DIFF_Q="diff -q -b";;
-  c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";DIFF_Q="diff -q -b";;
-  *)   echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
-  esac;;
+  COPY_P="cp -p";DIFF_Q="diff -q -b"
+  ;;
 *-*-solaris*)
-  case "$CXX" in
-  CC)  CXXFLAGS="-O";COPY_P="cp -p";DIFF_Q="diff -b";;
-  g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";DIFF_Q="diff -b";;
-  c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";DIFF_Q="diff -b";;
-  *)   echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
-  esac;;
+  COPY_P="cp -p";DIFF_Q="diff -b"
+  ;;
 *-*-linux*)
-  case "$CXX" in
-  g++) CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE";COPY_P="cp -p";DIFF_Q="diff -q -b";;
-  c++) CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE";COPY_P="cp -p";DIFF_Q="diff -q -b";;
-  *)   echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
-  esac;;
-alpha*-dec-osf*)
-  case "$CXX" in
-  cxx) CXXFLAGS="-O -std strict_ansi -timplicit_local";COPY_P="cp -p";DIFF_Q="diff -q -b";;
-  g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";DIFF_Q="diff -q -b";;
-  c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";DIFF_Q="diff -q -b";;
-  *)   echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
-  esac;;
-*-*-hpux*)
-  case "$CXX" in
-  aCC) CXXFLAGS="-O -Aa +DAportable +Onolimit";COPY_P="cp -p";DIFF_Q="diff -q -b";;
-  CC)  CXXFLAGS="+O3 +DAportable +a1 -z -pta +Onolimit";COPY_P="cp -p";DIFF_Q="diff -q -b";;
-  g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";DIFF_Q="diff -q -b";;
-  c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";DIFF_Q="diff -q -b";;
-  *)   echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
-  esac;; 
-*-*-aix*)
-  case "$CXX" in
-  xlC) CXXFLAGS="-O3 -qtwolink -+";COPY_P="cp -p";DIFF_Q="diff -q -b";;
-  g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";DIFF_Q="diff -q -b";;
-  c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";DIFF_Q="diff -q -b";;
-  *)   echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
-  esac;; 
-*-*-irix*)
-  case "$CXX" in
-  CC)  CXXFLAGS="-O -OPT:Olimit=0 -pta";COPY_P="cp -p";DIFF_Q="diff -q -b";;
-  g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";DIFF_Q="diff -q -b";;
-  c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";DIFF_Q="diff -q -b";;
-  *)   echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
-  esac;; 
-powerpc-apple-darwin*)
-  case "$CXX" in
-  g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";DIFF_Q="diff -q -b";;
-  c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";DIFF_Q="diff -q -b";;
-  *)   echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
-  esac;; 
+  COPY_P="cp -p";DIFF_Q="diff -q -b"
+  ;;
+*)
+  COPY_P="cp -p";DIFF_Q="diff -q -b"
 esac
 
+AC_SUBST(COPY_P)
+AC_SUBST(DIFF_Q)
+
+# worry about compiler flags
+case "$CXX" in
+g++) 
+   case "$target" in
+   *-*-linux*) AM_CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE";;
+   *) AM_CXXFLAGS="-O -ansi -pedantic -Wall"
+   esac;;
+c++) 
+   case "$target" in
+   *-*-linux*) AM_CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE";;
+   *) AM_CXXFLAGS="-O -ansi -pedantic -Wall"
+   esac;;
+cl)  
+   AM_CXXFLAGS="-EHsc"
+   ;;
+CC)  
+   case "$target" in
+   *-*-solaris*) AM_CXXFLAGS="-O";DIFF_Q="diff -b";;
+   *-*-hpux*) AM_CXXFLAGS="+O3 +DAportable +a1 -z -pta +Onolimit";;
+   *-*-irix*) AM_CXXFLAGS="-O -OPT:Olimit=0 -pta";;
+   *)   echo UNEXPECTED CHOICE OF OPERATING SYSTEM FOR $CXX: $target
+   esac;;
+aCC) 
+   AM_CXXFLAGS="-O -Aa +DAportable +Onolimit"
+   ;;
+cxx) 
+   AM_CXXFLAGS="-O -std strict_ansi -timplicit_local"
+   ;;
+xlC) 
+   AM_CXXFLAGS="-O3 -qtwolink -+"
+   ;;
+*)   echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
+esac
+
+AC_SUBST(AM_CXXFLAGS)
+
 # ----------------------------------------------------------------------
 # Set system-dependent options:
 # ----------------------------------------------------------------------

Exceptions/ChangeLog

+Fri Sep 24          2004 Lynn Garren <garren@fnal.gov>
+
+	* use AM_CXXFLAGS
+	* require autoconf 2.59, automake 1.9.1, and libtool 1.9b
+
+==============================
+23.07.04 Release CLHEP-2.0.1.0
+==============================
+
 ==============================
 11.05.04 Release CLHEP-2.0.0.2
 ==============================

Exceptions/Exceptions-config.in

@@ -64,7 +64,7 @@ while test $# -gt 0; do
        	;;
 
     --cppflags)
-       	echo @AM_CPPFLAGS@ @CPPFLAGS@ @Exceptions_CPPFLAGS@
+       	echo @CPPFLAGS@ @Exceptions_CPPFLAGS@
        	;;
 
     --cxxflags)
@@ -72,7 +72,7 @@ while test $# -gt 0; do
        	;;
 
     --ldflags)
-       	echo @AM_LDFLAGS@ @LDFLAGS@ @Exceptions_LDFLAGS@
+       	echo @LDFLAGS@ @Exceptions_LDFLAGS@
        	;;
 
     --libs)

Exceptions/INSTALL

+#-------------------------------------------------------------
+#  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.
+
+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.
+
 #-------------------------------------------------------------
 #  installing from a source code tar ball
 #-------------------------------------------------------------
@@ -65,11 +77,13 @@ Now continue with directions as if you unpacked a source code tarball.
 # building autotools
 #-------------------------------------------------------------
 
-If you do not have at least autoconf 2.57 and automake 1.6, you will 
+If you do not have at least autoconf 2.59 and automake 1.9.1, you will 
 need to build autoconf, automake, and libtool.  On some platforms, 
 you may also need to build m4 and texinfo.
 
-Download the relevant tarballs from gnu.org.
+Download the relevant tarballs from gnu.org 
+(http://www.gnu.org/software/autoconf/, http://www.gnu.org/software/automake/,
+and http://www.gnu.org/software/libtool/)
 Untar them in a common source code tree.
 Decide whether you want to install them in /usr/local or your own
 install directory.  If you use your own install directory, use

Exceptions/bootstrap

 #! /bin/sh
 
-# run autotool commands
 set -x
+# cleanup should not be necessary
+# however, in some cases strange results are found if you do not start clean
+rm -rf autom4te.cache
+rm -f aclocal.m4
+rm -f Makefile.in */Makefile.in */defs.h.in
+rm -f autotools/config* autotools/depcomp autotools/install-sh autotools/m*
+rm -f configure config.*
+# run autotool commands
 aclocal -I autotools
 autoheader
 automake --add-missing --copy

Exceptions/configure.in

@@ -8,12 +8,12 @@
 # Identify the package and initialize the autotools:
 # ----------------------------------------------------------------------
 
-AC_PREREQ(2.57)
+AC_PREREQ(2.59)
 AC_INIT(CLHEP Exceptions, 2.0.1.1, CLHEP@cern.ch, Exceptions)
 AC_CONFIG_AUX_DIR(autotools)
 AC_CANONICAL_TARGET