Commit in slic on MAIN
GNUmakefile+2-21.40 -> 1.41
GNUmakefile.local.in+1-81.13 -> 1.14
aclocal.m4+1-1891.33 -> 1.34
configure+400-4851.126 -> 1.127
configure.ac+1-91.111 -> 1.112
src/PhysicsListFactory.cc+47-1451.24 -> 1.25
   /PhysicsListManager.cc+7-161.23 -> 1.24
+459-854
7 modified files
remove LCPhys and make QGSP_BERT the new default; assume Geant4 9.2.p02 for physics lists

slic
GNUmakefile 1.40 -> 1.41
diff -u -r1.40 -r1.41
--- GNUmakefile	10 Apr 2008 20:33:28 -0000	1.40
+++ GNUmakefile	23 Nov 2009 23:13:33 -0000	1.41
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/slic/GNUmakefile,v 1.40 2008/04/10 20:33:28 jeremy Exp $
+# $Header: /cvs/lcd/slic/GNUmakefile,v 1.41 2009/11/23 23:13:33 jeremy Exp $
 #
 # Makefile for SLIC simulation package based on examples GNUmakefile by G. Cosmo.
 #
@@ -50,7 +50,7 @@
 include $(MAKEINCLUDES)/lcio.gmk
 
 # LCPhys
-include $(MAKEINCLUDES)/lcphys.gmk
+#include $(MAKEINCLUDES)/lcphys.gmk
 
 # G4 hadronic lists
 #include $(MAKEINCLUDES)/hadronic_lists.gmk

slic
GNUmakefile.local.in 1.13 -> 1.14
diff -u -r1.13 -r1.14
--- GNUmakefile.local.in	10 Apr 2008 20:33:28 -0000	1.13
+++ GNUmakefile.local.in	23 Nov 2009 23:13:33 -0000	1.14
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/slic/GNUmakefile.local.in,v 1.13 2008/04/10 20:33:28 jeremy Exp $
+# $Header: /cvs/lcd/slic/GNUmakefile.local.in,v 1.14 2009/11/23 23:13:33 jeremy Exp $
 #
 # Local build settings generated by configure
 #
@@ -15,9 +15,6 @@
 # SLIC base dir
 SLIC_BASE      = @SLIC_PREFIX@
 
-# LCPhys was enabled?
-enable_lcphys = @enable_lcphys@
-
 # LCIO base dir var
 LCIO           = @LCIO_PREFIX@
 
@@ -45,9 +42,6 @@
 # GDML lib dir
 GDML_LIB_DIR   = @GDML_PREFIX@/build/@G4SYSTEM@/lib
 
-# LCPhys base dir
-LCPHYS_BASE    = @LCPHYS_PREFIX@
-
 # HepPDT
 USE_HEPPDT     = @USE_HEPPDT@
 HEPPDT_BASE    = @HEPPDT_PREFIX@
@@ -57,4 +51,3 @@
 
 # Flag that CLHEP 2.x is being used.
 CLHEP_MAJOR_VERSION=@CLHEP_MAJOR_VERSION@
-

slic
aclocal.m4 1.33 -> 1.34
diff -u -r1.33 -r1.34
--- aclocal.m4	5 Nov 2009 23:55:55 -0000	1.33
+++ aclocal.m4	23 Nov 2009 23:13:33 -0000	1.34
@@ -1,4 +1,4 @@
-dnl $Header: /cvs/lcd/slic/aclocal.m4,v 1.33 2009/11/05 23:55:55 jeremy Exp $
+]dnl $Header: /cvs/lcd/slic/aclocal.m4,v 1.34 2009/11/23 23:13:33 jeremy Exp $
 
 dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
 dnl Autoconf macros for SLIC and its dependencies friends.
@@ -201,122 +201,6 @@
 
 ])
 
-dnl
-AC_DEFUN(AC_HAVE_G4PHYSICSLISTS, [
-
-AC_MSG_CHECKING(for Geant4 physics lists in main source tree)
-
-if test -e $G4INSTALL/source/physics_lists/lists/include/LHEP.hh; then
-  AC_DEFINE(HAVE_G4PHYSICSLISTS)
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
-fi
-
-])
-
-AC_DEFUN(AC_CHECK_G4PHYSICSLISTS, [
-
-g4physdir=$G4INSTALL/source/physics_lists/lists/include
-
-dnl AC_MSG_CHECKING(for FTFP_EMV)
-dnl if test -e $g4physdir/FTFP_EMV.hh; then
-dnl  AC_DEFINE(HAVE_FTFP_EMV)
-dnl  AC_MSG_RESULT(yes)
-dnl else
-dnl  AC_MSG_RESULT(no)
-dnl fi
-
-AC_MSG_CHECKING(for QGSP_BERT_EMV)
-if test -e $g4physdir/QGSP_BERT_EMV.hh; then
-  AC_DEFINE(HAVE_QGSP_BERT_EMV)
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
-fi
-
-AC_MSG_CHECKING(for QGSP_BERT_NQE)
-if test -e $g4physdir/QGSP_BERT_NQE.hh; then
-  AC_DEFINE(HAVE_QGSP_BERT_NQE)
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
-fi
-
-AC_MSG_CHECKING(for QGSP_BERT_TRV)
-if test -e $g4physdir/QGSP_BERT_TRV.hh; then
-  AC_DEFINE(HAVE_QGSP_BERT_TRV)
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
-fi
-
-AC_MSG_CHECKING(for QGSP_EMV_NQE)
-if test -e $g4physdir/QGSP_EMV_NQE.hh; then
-  AC_DEFINE(HAVE_QGSP_EMV_NQE)
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
-fi
-
-AC_MSG_CHECKING(for QGSP_NQE)
-if test -e $g4physdir/QGSP_NQE.hh; then
-  AC_DEFINE(HAVE_QGSP_NQE)
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
-fi
-
-AC_MSG_CHECKING(for FTFP_BERT)
-if test -e $g4physdir/FTFP_BERT.hh; then
-  AC_DEFINE(HAVE_FTFP_BERT)
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
-fi
-
-AC_MSG_CHECKING(for QGSC_BERT)
-if test -e $g4physdir/QGSC_BERT.hh; then
-  AC_DEFINE(HAVE_QGSC_BERT)
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
-fi
-
-AC_MSG_CHECKING(for QGSP_DIF)
-if test -e $g4physdir/QGSP_DIF.hh; then
-  AC_DEFINE(HAVE_QGSP_DIF)
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
-fi
-
-AC_MSG_CHECKING(for QGSP_BERT_DIF)
-if test -e $g4physdir/QGSP_BERT_DIF.hh; then
-  AC_DEFINE(HAVE_QGSP_BERT_DIF)
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
-fi
-
-AC_MSG_CHECKING(for QGS_BIC)
-if test -e $g4physdir/QGS_BIC.hh; then
-  AC_DEFINE(HAVE_QGS_BIC)
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
-fi
-
-AC_MSG_CHECKING(for FTF_BIC)
-if test -e $g4physdir/FTF_BIC.hh; then
-  AC_DEFINE(HAVE_FTF_BIC)
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
-fi
-
-])
-
 dnl Macro to extract the Geant4 version from G4Version.hh or G4RunManagerKernel.hh, if the former file does not exist.
 AC_DEFUN(AC_GEANT4_VERSION, [
 
@@ -575,78 +459,6 @@
 
 ])
 
-dnl LCPhys 
-AC_DEFUN(SIM_SETUP_LCPHYS, [
-
-AC_MSG_CHECKING(for LCPhys installation)
-
-AC_ARG_WITH(lcphys,
-	AC_HELP_STRING([--with-lcphys=<path>],[ LCPhys installation base [[LCPHYS_BASE]] ]),
-	[LCPHYS_PREFIX=$with_lcphys])
-
-dnl first check if LCPhys is enabled
-if test "$enable_lcphys" = "yes"
-then
-
-  dnl got no CL arg from with-lcphys
-  if test -z "${with_lcphys}"; then
-    if test -n "$LCPHYS_BASE"; then
-      LCPHYS_PREFIX=${LCPHYS_BASE} 
-    else
-      dnl turn off LCPhys because it wasn't found in LCPHYS_BASE or specified with arg
-      enable_lcphys="no"
-      AC_MSG_RESULT(no)
-      AC_MSG_WARN([[Failed to find LCPhys.  Specify using --with-lcphys or LCPHYS_BASE var.]])
-    fi
-  fi
-
-  dnl still enabled?
-  if test "$enable_lcphys" = "yes"
-  then 
-    LCPHYS_TEST_FILE=${LCPHYS_PREFIX}/include/LCPhysicsList.hh
-    if test -e "${LCPHYS_TEST_FILE}"; then
-      AC_MSG_RESULT(${LCPHYS_PREFIX})
-    else
-      dnl cause an error because LCPhys doesn't look right
-      AC_MSG_RESULT(no)
-      AC_MSG_ERROR(invalid LCPhys installation at ${LCPHYS_PREFIX})
-    fi
-  fi
-
-  dnl set LCPHYS dir
-  AC_SUBST(LCPHYS_PREFIX)
-else
-  AC_MSG_RESULT(disabled)
-fi
-
-AC_SUBST(enable_lcphys)
-
-])
-
-dnl macro to check whether LCPhys library should be enabled
-AC_DEFUN(SIM_ENABLE_LCPHYS, [
-
-AC_MSG_CHECKING(whether to enable LCPhys)
-
-AC_ARG_ENABLE(lcphys,
-              AC_HELP_STRING([--enable-lcphys=<yes|no>], [ enable LCPhys library ]),,)
-
-if test "X${enable_lcphys}" = "X"
-then
-  enable_lcphys=yes
-fi
-
-if test "${enable_lcphys}" = "yes"
-then
-  AC_MSG_RESULT(yes)
-  AC_DEFINE(HAVE_LCPHYS)
-  AC_DEFINE(SLIC_USE_LCPHYS)
-else
-  AC_MSG_RESULT(no)
-fi
-
-])
-
 dnl /\/\/\ GDML /\/\/\
 
 AC_DEFUN(SIM_SETUP_GDML, [

slic
configure 1.126 -> 1.127
diff -u -r1.126 -r1.127
--- configure	6 Nov 2009 18:07:30 -0000	1.126
+++ configure	23 Nov 2009 23:13:33 -0000	1.127
@@ -1,11 +1,10 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.57 for SLIC v2r7p4.
+# Generated by GNU Autoconf 2.59 for SLIC v2r7p4.
 #
 # Report bugs to <[log in to unmask]>.
 #
-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 2003 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
@@ -22,9 +21,10 @@
 elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
   set -o posix
 fi
+DUALCASE=1; export DUALCASE # for MKS sh
 
 # Support unset when possible.
-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
   as_unset=unset
 else
   as_unset=false
@@ -43,7 +43,7 @@
   LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
   LC_TELEPHONE LC_TIME
 do
-  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
     eval $as_var=C; export $as_var
   else
     $as_unset $as_var
@@ -220,16 +220,17 @@
 if mkdir -p . 2>/dev/null; then
   as_mkdir_p=:
 else
+  test -d ./-p && rmdir ./-p
   as_mkdir_p=false
 fi
 
 as_executable_p="test -f"
 
 # Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 
 # Sed expression to map a string onto a valid variable name.
-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
 # IFS
@@ -311,7 +312,7 @@
 #endif"
 
 ac_default_prefix=$SLIC_BASE
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC SET_MAKE CPP EGREP G4_PREFIX G4WORKDIR G4SYSTEM GEANT4_FULL_VERSION GEANT4_MAJOR_VERSION GEANT4_MINOR_VERSION GEANT4_PATCH_VERSION CLHEP_PREFIX CLHEP_MAJOR_VERSION XERCES_PREFIX XERCES_LIBNAME GDML_PREFIX LCDD_PREFIX LCIO_PREFIX LCPHYS_PREFIX enable_lcphys USE_HEPPDT HEPPDT_PREFIX SLIC_PREFIX DOXYGEN PACKAGE_AUTHORS PACKAGE_FULLNAME PACKAGE_INSTITUTION PACKAGE_DATE PACKAGE_WWW LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC SET_MAKE CPP EGREP G4_PREFIX G4WORKDIR G4SYSTEM GEANT4_FULL_VERSION GEANT4_MAJOR_VERSION GEANT4_MINOR_VERSION GEANT4_PATCH_VERSION CLHEP_PREFIX CLHEP_MAJOR_VERSION XERCES_PREFIX XERCES_LIBNAME GDML_PREFIX LCDD_PREFIX LCIO_PREFIX USE_HEPPDT HEPPDT_PREFIX SLIC_PREFIX DOXYGEN PACKAGE_AUTHORS PACKAGE_FULLNAME PACKAGE_INSTITUTION PACKAGE_DATE PACKAGE_WWW LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -670,7 +671,7 @@
 
 # Be sure to have absolute paths.
 for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-              localstatedir libdir includedir oldincludedir infodir mandir
+	      localstatedir libdir includedir oldincludedir infodir mandir
 do
   eval ac_val=$`echo $ac_var`
   case $ac_val in
@@ -710,10 +711,10 @@
   # Try the directory containing this script, then its parent.
   ac_confdir=`(dirname "$0") 2>/dev/null ||
 $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-         X"$0" : 'X\(//\)[^/]' \| \
-         X"$0" : 'X\(//\)$' \| \
-         X"$0" : 'X\(/\)' \| \
-         .     : '\(.\)' 2>/dev/null ||
+	 X"$0" : 'X\(//\)[^/]' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
 echo X"$0" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -813,9 +814,9 @@
   cat <<_ACEOF
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
+			  [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [PREFIX]
+			  [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -854,8 +855,6 @@
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-package-info   Rewrite include/PackageInfo.hh
   --enable-nist=<yes|no>  Enable NIST material lookup in Geant4.
-  --enable-lcphys=<yes|no>
-                          enable LCPhys library
   --enable-debug          turn on debug code by defining SLIC_DEBUG; default =
                           no
   --enable-gdb            enable debugging with gdb; default = no
@@ -878,7 +877,6 @@
   --with-gdml=<path>      GDML installation base [GDML_BASE]
   --with-lcdd=<path>      LCDD installation base [LCDD_BASE]
   --with-lcio=<path>      LCIO installation base [LCIO]
-  --with-lcphys=<path>    LCPhys installation base [LCPHYS_BASE]
   --with-heppdt=<path>    HepPDT installation base [HEPPDT_BASE]
 
 Some influential environment variables:
@@ -929,12 +927,45 @@
     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
     ac_top_srcdir=$ac_top_builddir$srcdir ;;
 esac
-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
-# absolute.
-ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
-ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
-ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
-ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir="$ac_dir";;
+*)
+  case "$ac_dir" in
+  .) ac_abs_builddir=`pwd`;;
+  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+  *) ac_abs_builddir=`pwd`/"$ac_dir";;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
+*)
+  case ${ac_top_builddir}. in
+  .) ac_abs_top_builddir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+  case $ac_srcdir in
+  .) ac_abs_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+  case $ac_top_srcdir in
+  .) ac_abs_top_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+  esac;;
+esac
 
     cd $ac_dir
     # Check for guested configure; otherwise get Cygnus style configure.
@@ -945,7 +976,7 @@
       echo
       $SHELL $ac_srcdir/configure  --help=recursive
     elif test -f $ac_srcdir/configure.ac ||
-           test -f $ac_srcdir/configure.in; then
+	   test -f $ac_srcdir/configure.in; then
       echo
       $ac_configure --help
     else
@@ -959,10 +990,9 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 SLIC configure v2r7p4
-generated by GNU Autoconf 2.57
+generated by GNU Autoconf 2.59
 
-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-Free Software Foundation, Inc.
+Copyright (C) 2003 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -974,7 +1004,7 @@
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by SLIC $as_me v2r7p4, which was
-generated by GNU Autoconf 2.57.  Invocation command line was
+generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
 
@@ -1051,19 +1081,19 @@
     2)
       ac_configure_args1="$ac_configure_args1 '$ac_arg'"
       if test $ac_must_keep_next = true; then
-        ac_must_keep_next=false # Got value, back to normal.
+	ac_must_keep_next=false # Got value, back to normal.
       else
-        case $ac_arg in
-          *=* | --config-cache | -C | -disable-* | --disable-* \
-          | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-          | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-          | -with-* | --with-* | -without-* | --without-* | --x)
-            case "$ac_configure_args0 " in
-              "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-            esac
-            ;;
-          -* ) ac_must_keep_next=true ;;
-        esac
+	case $ac_arg in
+	  *=* | --config-cache | -C | -disable-* | --disable-* \
+	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+	  | -with-* | --with-* | -without-* | --without-* | --x)
+	    case "$ac_configure_args0 " in
+	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+	    esac
+	    ;;
+	  -* ) ac_must_keep_next=true ;;
+	esac
       fi
       ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
       # Get rid of the leading space.
@@ -1097,12 +1127,12 @@
     case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
     *ac_space=\ *)
       sed -n \
-        "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
       ;;
     *)
       sed -n \
-        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
       ;;
     esac;
 }
@@ -1131,7 +1161,7 @@
       for ac_var in $ac_subst_files
       do
 	eval ac_val=$`echo $ac_var`
-        echo "$ac_var='"'"'$ac_val'"'"'"
+	echo "$ac_var='"'"'$ac_val'"'"'"
       done | sort
       echo
     fi
@@ -1150,7 +1180,7 @@
       echo "$as_me: caught signal $ac_signal"
     echo "$as_me: exit $exit_status"
   } >&5
-  rm -f core core.* *.core &&
+  rm -f core *.core &&
   rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
      ' 0
@@ -1230,7 +1260,7 @@
 # value.
 ac_cache_corrupted=false
 for ac_var in `(set) 2>&1 |
-               sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
+	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
   eval ac_old_set=\$ac_cv_env_${ac_var}_set
   eval ac_new_set=\$ac_env_${ac_var}_set
   eval ac_old_val="\$ac_cv_env_${ac_var}_value"
@@ -1247,13 +1277,13 @@
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-        { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-        { echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
+	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
 echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
+	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
 echo "$as_me:   current value: $ac_new_val" >&2;}
-        ac_cache_corrupted=:
+	ac_cache_corrupted=:
       fi;;
   esac
   # Pass precious variables to config.status.
@@ -1427,7 +1457,6 @@
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -1447,8 +1476,8 @@
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-echo "$as_me:$LINENO: checking for C++ compiler default output" >&5
-echo $ECHO_N "checking for C++ compiler default output... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5
+echo $ECHO_N "checking for C++ compiler default output file name... $ECHO_C" >&6
 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
@@ -1468,23 +1497,23 @@
   test -f "$ac_file" || continue
   case $ac_file in
     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
-        ;;
+	;;
     conftest.$ac_ext )
-        # This is the source file.
-        ;;
+	# This is the source file.
+	;;
     [ab].out )
-        # We found the default executable, but exeext='' is most
-        # certainly right.
-        break;;
+	# We found the default executable, but exeext='' is most
+	# certainly right.
+	break;;
     *.* )
-        ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-        # FIXME: I believe we export ac_cv_exeext for Libtool,
-        # but it would be cool to find out if it's true.  Does anybody
-        # maintain Libtool? --akim.
-        export ac_cv_exeext
-        break;;
+	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	# FIXME: I believe we export ac_cv_exeext for Libtool,
+	# but it would be cool to find out if it's true.  Does anybody
+	# maintain Libtool? --akim.
+	export ac_cv_exeext
+	break;;
     * )
-        break;;
+	break;;
   esac
 done
 else
@@ -1558,8 +1587,8 @@
   case $ac_file in
     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-          export ac_cv_exeext
-          break;;
+	  export ac_cv_exeext
+	  break;;
     * ) break;;
   esac
 done
@@ -1584,7 +1613,6 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -1635,7 +1663,6 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -1655,11 +1682,21 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -1672,7 +1709,7 @@
 
 ac_compiler_gnu=no
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
@@ -1688,7 +1725,6 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -1705,11 +1741,21 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -1722,7 +1768,7 @@
 
 ac_cv_prog_cxx_g=no
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
 echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
@@ -1742,8 +1788,7 @@
   fi
 fi
 for ac_declaration in \
-   ''\
-   '#include <stdlib.h>' \
+   '' \
    'extern "C" void std::exit (int) throw (); using std::exit;' \
    'extern "C" void std::exit (int); using std::exit;' \
    'extern "C" void exit (int) throw ();' \
@@ -1751,14 +1796,13 @@
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stdlib.h>
 $ac_declaration
+#include <stdlib.h>
 int
 main ()
 {
@@ -1769,11 +1813,21 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -1786,9 +1840,8 @@
 
 continue
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -1805,11 +1858,21 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -1821,7 +1884,7 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 rm -f conftest*
 if test -n "$ac_declaration"; then
@@ -2181,7 +2244,6 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2201,11 +2263,21 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2218,7 +2290,7 @@
 
 ac_compiler_gnu=no
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
@@ -2234,7 +2306,6 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2251,11 +2322,21 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2268,7 +2349,7 @@
 
 ac_cv_prog_cc_g=no
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
@@ -2295,7 +2376,6 @@
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2323,6 +2403,16 @@
   va_end (v);
   return s;
 }
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std1 is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std1.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
 int test (int i, double x);
 struct s1 {int (*f) (int a);};
 struct s2 {int (*f) (double a);};
@@ -2349,11 +2439,21 @@
   CC="$ac_save_CC $ac_arg"
   rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2366,7 +2466,7 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
-rm -f conftest.$ac_objext
+rm -f conftest.err conftest.$ac_objext
 done
 rm -f conftest.$ac_ext conftest.$ac_objext
 CC=$ac_save_CC
@@ -2394,19 +2494,28 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   for ac_declaration in \
-   ''\
-   '#include <stdlib.h>' \
+   '' \
    'extern "C" void std::exit (int) throw (); using std::exit;' \
    'extern "C" void std::exit (int); using std::exit;' \
    'extern "C" void exit (int) throw ();' \
@@ -2414,14 +2523,13 @@
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stdlib.h>
 $ac_declaration
+#include <stdlib.h>
 int
 main ()
 {
@@ -2432,11 +2540,21 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2449,9 +2567,8 @@
 
 continue
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2468,11 +2585,21 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2484,7 +2611,7 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 rm -f conftest*
 if test -n "$ac_declaration"; then
@@ -2498,7 +2625,7 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2508,7 +2635,7 @@
 #AC_PROG_INSTALL
 echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2565,7 +2692,6 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2576,7 +2702,7 @@
 #else
 # include <assert.h>
 #endif
-                     Syntax error
+		     Syntax error
 _ACEOF
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -2588,6 +2714,7 @@
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
   else
     ac_cpp_err=
   fi
@@ -2608,7 +2735,6 @@
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2626,6 +2752,7 @@
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
   else
     ac_cpp_err=
   fi
@@ -2672,7 +2799,6 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2683,7 +2809,7 @@
 #else
 # include <assert.h>
 #endif
-                     Syntax error
+		     Syntax error
 _ACEOF
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -2695,6 +2821,7 @@
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
   else
     ac_cpp_err=
   fi
@@ -2715,7 +2842,6 @@
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2733,6 +2859,7 @@
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
   else
     ac_cpp_err=
   fi
@@ -2793,7 +2920,6 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2814,11 +2940,21 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2831,12 +2967,11 @@
 
 ac_cv_header_stdc=no
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2858,7 +2993,6 @@
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2883,7 +3017,6 @@
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2895,9 +3028,9 @@
 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
 #else
 # define ISLOWER(c) \
-                   (('a' <= (c) && (c) <= 'i') \
-                     || ('j' <= (c) && (c) <= 'r') \
-                     || ('s' <= (c) && (c) <= 'z'))
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
 # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
 #endif
 
@@ -2908,7 +3041,7 @@
   int i;
   for (i = 0; i < 256; i++)
     if (XOR (islower (i), ISLOWER (i))
-        || toupper (i) != TOUPPER (i))
+	|| toupper (i) != TOUPPER (i))
       exit(2);
   exit (0);
 }
@@ -2933,7 +3066,7 @@
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
@@ -2958,7 +3091,7 @@
 
 
[truncated at 1000 lines; 743 more skipped]

slic
configure.ac 1.111 -> 1.112
diff -u -r1.111 -r1.112
--- configure.ac	6 Nov 2009 18:07:30 -0000	1.111
+++ configure.ac	23 Nov 2009 23:13:33 -0000	1.112
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/slic/configure.ac,v 1.111 2009/11/06 18:07:30 jeremy Exp $
+# $Header: /cvs/lcd/slic/configure.ac,v 1.112 2009/11/23 23:13:33 jeremy Exp $
 #
 # Process this file with autoconf to produce a configure script for SLIC.
 #
@@ -51,8 +51,6 @@
 AC_HAVE_G4VERSION
 AC_HAVE_G4NIST
 AC_USE_G4NIST
-AC_HAVE_G4PHYSICSLISTS
-AC_CHECK_G4PHYSICSLISTS
 
 # CLHEP
 SIM_SETUP_CLHEP
@@ -70,12 +68,6 @@
 # LCIO
 SIM_SETUP_LCIO
 
-# LCPhys enable
-SIM_ENABLE_LCPHYS
-
-# LCPhys
-SIM_SETUP_LCPHYS
-
 # HepPDT
 SIM_SETUP_HEPPDT
 

slic/src
PhysicsListFactory.cc 1.24 -> 1.25
diff -u -r1.24 -r1.25
--- PhysicsListFactory.cc	5 Mar 2008 21:53:46 -0000	1.24
+++ PhysicsListFactory.cc	23 Nov 2009 23:13:34 -0000	1.25
@@ -1,16 +1,10 @@
-// $Header: /cvs/lcd/slic/src/PhysicsListFactory.cc,v 1.24 2008/03/05 21:53:46 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/PhysicsListFactory.cc,v 1.25 2009/11/23 23:13:34 jeremy Exp $
 #include "PhysicsListFactory.hh"
 
-// geant4 physics lists
-#ifdef HAVE_G4PHYSICSLISTS
-
+// Geant4
 #include "FTFC.hh"
 #include "FTFP.hh"
-
-//#ifdef HAVE_FTFP_EMV
-//#include "FTFP_EMV.hh"
-//#endif
-
+#include "FTFP_EMV.hh"
 #include "LBE.hh"
 #include "LHEP.hh"
 #include "LHEP_BERT.hh"
@@ -23,67 +17,23 @@
 #include "QGSC_EMV.hh"
 #include "QGSP.hh"
 #include "QGSP_BERT.hh"
-
-#ifdef HAVE_QGSP_BERT_EMV
 #include "QGSP_BERT_EMV.hh"
-#endif
-
 #include "QGSP_BERT_HP.hh"
-
-#ifdef HAVE_QGSP_BERT_NQE
 #include "QGSP_BERT_NQE.hh"
-#endif
-
-#ifdef HAVE_QGSP_BERT_TRV
 #include "QGSP_BERT_TRV.hh"
-#endif
-
 #include "QGSP_BIC.hh"
 #include "QGSP_BIC_HP.hh"
 #include "QGSP_EMV.hh"
-
-#ifdef HAVE_QGSP_EMV_NQE
 #include "QGSP_EMV_NQE.hh"
-#endif
-
 #include "QGSP_EMX.hh"
-
-#ifdef HAVE_QGSP_NQE
 #include "QGSP_NQE.hh"
-#endif
-
 #include "QGSP_QEL.hh"
-
-#ifdef HAVE_FTFP_BERT
 #include "FTFP_BERT.hh"
-#endif 
-
-#ifdef HAVE_QGSC_BERT
 #include "QGSC_BERT.hh"
-#endif
-
-#ifdef HAVE_QGSP_DIF
 #include "QGSP_DIF.hh"
-#endif
-
-#ifdef HAVE_QGSP_BERT_DIF
 #include "QGSP_BERT_DIF.hh"
-#endif
-
-#ifdef HAVE_QGS_BIC
 #include "QGS_BIC.hh"
-#endif
-
-#ifdef HAVE_FTF_BIC
 #include "FTF_BIC.hh"
-#endif
-
-#endif // HAVE_G4PHYSICSLISTS
-
-// lcphys 
-#ifdef SLIC_USE_LCPHYS
-#include "LCPhysicsList.hh"
-#endif
 
 // slic
 #include "PhysicsListBuilder.hh"
@@ -94,12 +44,8 @@
  * A macro to add a TPhysicsListBuilder for a single physics list.
  *
  * @param list         The class name of the list.
- * @param name         The name of the list which will be used to instantiate it.
  * @param description  A short description of the list.
  */
-
-#define BUILDER_LCPHYS(list,name,description) this->addBuilder( new TPhysicsListBuilder<list>( name, description ) );
-
 #define BUILDER(list,description) this->addBuilder( new TPhysicsListBuilder<list>( #list, description ) );
 
 namespace slic
@@ -147,108 +93,64 @@
         log() << LOG::okay << "----------------------------------------------------------------------" << LOG::done;
         for ( BuilderMap::const_iterator it = m_builders.begin();
               it != m_builders.end();
-              it++ ) {
+              it++ ) 
+        {
             log().width(15);
             log() << LOG::okay << left << it->first;
             log() << LOG::okay << it->second->getDescription() << LOG::done;
         }
     }
 
+    /**
+     * Initialize all supported builders.  
+     * Based on lists from Geant4 9.2.p02.
+     */
     void PhysicsListFactory::initializeBuilders()
     {
+        BUILDER(FTFC,          "Fritiof with CHIPS")
+        BUILDER(FTFP,          "Fritiof with precompound")
+        BUILDER(FTFP_BERT,     "FTFP with Bertini Cascade")
+        BUILDER(FTFP_EMV,      "FTFP with v7.2 EM physics")
+        BUILDER(FTF_BIC,       "FTF with new Bertini developments")
+        BUILDER(LBE,           "Low backgrounds experiment with low energy EM")
+        BUILDER(LHEP,          "Low and High Energy Parameterised")
+        BUILDER(LHEP_BERT,     "LHEP with Bertini Cascade")
+        BUILDER(LHEP_BERT_HP,  "LHEP with Bertini Cascade and high precision neutrons")
+        BUILDER(LHEP_EMV,      "LHEP with v 7.1 EM processes")
+        BUILDER(LHEP_PRECO_HP, "LHEP_PRECO with HP")
+        BUILDER(QBBC,          "Uses best cross section data within QGSP")
+        BUILDER(QGSC,          "Quark Gluon-String (QGS) with CHIPS")
+        BUILDER(QGSC_BERT,     "QGSC with Bertini Cascade")
+        BUILDER(QGSC_EFLOW,    "QGSC using energy flow methods from CHIPS model")
+        BUILDER(QGSC_EMV,      "QGSC with v 7.1 EM processes")
+        BUILDER(QGSP,          "QGS with precompound")
+        BUILDER(QGSP_BERT,     "QGSP with Bertini Cascade")
+        BUILDER(QGSP_BERT_DIF, "QGSP_BERT with CHIPS diffractive scattering")
+        BUILDER(QGSP_BERT_EMV, "QGSP_BERT with v 7.1 EM processes")
+        BUILDER(QGSP_BERT_HP,  "QGSP with Bertini Cascade and high precision neutrons")
+        BUILDER(QGSP_BERT_NQE, "QGSP_BERT with quasi-elastic processes removed")
+        BUILDER(QGSP_BERT_TRV, "QGSP_BERT with transition to Bertini at 5 GeV")
+        BUILDER(QGSP_BIC,      "QGSP with Binary Cascade")
+        BUILDER(QGSP_BIC_HP,   "QGSP with Binary Cascade")
+        BUILDER(QGSP_DIF,      "QGSP with CHIPS diffractive scattering")
+        BUILDER(QGSP_EMV,      "LHEP with v 7.1 EM processes")
+        BUILDER(QGSP_EMV_NQE,  "QGSP with v 7.1 EM processes and quasi-elastic processes removed")
+        BUILDER(QGSP_EMX,      "QGSP with v 7.2 EM processes")
+        BUILDER(QGSP_NQE,      "QGSP with quasi-elastic processes removed")
+        BUILDER(QGSP_QEL,      "QGSP with elastic cross sections and model from CHIPS")
+        BUILDER(QGS_BIC,       "QGS with new Bertini developments")
+    }
 
-#ifdef SLIC_USE_LCPHYS
-        BUILDER_LCPHYS(LCPhysicsList, "LCPhys", "ILC Physics List by Dennis Wright.")
-#endif
-
-#ifdef HAVE_G4PHYSICSLISTS
-
-            BUILDER(FTFC,          "Fritiof with CHIPS")
-            BUILDER(FTFP,          "Fritiof with precompound")
-
-//#ifdef HAVE_FTFP_EMV
-//            BUILDER(FTFP_EMV,      "FTFP with v 7.1 EM processes")
-//#endif
-
-            BUILDER(LBE,           "Low backgrounds experiment with low energy EM")
-            BUILDER(LHEP,          "Low and High Energy Parameterised")
-            BUILDER(LHEP_BERT,     "LHEP with Bertini Cascade")
-            BUILDER(LHEP_BERT_HP,  "LHEP with Bertini Cascade and high precision neutrons")
-            BUILDER(LHEP_EMV,      "LHEP with v 7.1 EM processes")
-            BUILDER(LHEP_PRECO_HP, "LHEP_PRECO with HP")
-            BUILDER(QBBC,          "Uses best cross section data within QGSP")
-            BUILDER(QGSC,          "Quark Gluon-String (QGS) with CHIPS")
-            BUILDER(QGSC_EFLOW,    "QGSC using energy flow methods from CHIPS model")
-            BUILDER(QGSC_EMV,      "QGSC with v 7.1 EM processes")
-            BUILDER(QGSP,          "QGS with precompound")
-            BUILDER(QGSP_BERT,     "QGSP with Bertini Cascade")
-
-#ifdef HAVE_QGSP_BERT_EMV
-            BUILDER(QGSP_BERT_EMV, "QGSP_BERT with v 7.1 EM processes")
-#endif
-
-            BUILDER(QGSP_BERT_HP,  "QGSP with Bertini Cascade and high precision neutrons")
-
-#ifdef HAVE_QGSP_BERT_NQE
-            BUILDER(QGSP_BERT_NQE, "QGSP_BERT with quasi-elastic processes removed")
-#endif
-
-#ifdef HAVE_QGSP_BERT_TRV
-            BUILDER(QGSP_BERT_TRV, "QGSP_BERT with transition to Bertini at 5 GeV")
-#endif
-
-            BUILDER(QGSP_BIC,      "QGSP with Binary Cascade")
-            BUILDER(QGSP_BIC_HP,   "QGSP with Binary Cascade")
-            BUILDER(QGSP_EMV,      "LHEP with v 7.1 EM processes")
-
-#ifdef HAVE_QGSP_EMV_NQE
-            BUILDER(QGSP_EMV_NQE,  "QGSP with v 7.1 EM processes and quasi-elastic processes removed")
-#endif
-
-            BUILDER(QGSP_EMX,      "QGSP with v 7.2 EM processes")
-
-#ifdef HAVE_QGSP_NQE
-            BUILDER(QGSP_NQE,      "QGSP with quasi-elastic processes removed")
-#endif
-
-            BUILDER(QGSP_QEL,      "QGSP with elastic cross sections and model from CHIPS")
-
-#ifdef HAVE_FTFP_BERT
-            BUILDER(FTFP_BERT,     "FTFP with Bertini Cascade")
-#endif
-
-#ifdef HAVE_QGSC_BERT
-            BUILDER(QGSC_BERT,     "QGSC with Bertini Cascade")
-#endif
-
-#ifdef HAVE_QGSP_DIF
-            BUILDER(QGSP_DIF,      "QGSP with CHIPS diffractive scattering")
-#endif
-
-#ifdef HAVE_QGSP_BERT_DIF
-            BUILDER(QGSP_BERT_DIF, "QGSP_BERT with CHIPS diffractive scattering")
-#endif
-
-
-#ifdef HAVE_QGS_BIC
-            BUILDER(QGS_BIC,       "QGS with new Bertini developments")
-#endif
-
-#ifdef HAVE_FTF_BIC
-            BUILDER(FTF_BIC,       "FTF with new Bertini developments")
-#endif
-
-#endif
-            }
-
-    void PhysicsListFactory::addBuilder( VPhysicsListBuilder* builder)
+    void PhysicsListFactory::addBuilder(VPhysicsListBuilder* builder)
     {
         const G4String& name = builder->getName();
 
-        if ( m_builders.find( name ) != m_builders.end() ) {
+        if ( m_builders.find( name ) != m_builders.end() ) 
+        {
             log() << LOG::warning << "Ignoring duplicate physics list builder for <" << name << "> ." << LOG::done;
         }
-        else {
+        else 
+        {
             m_builders[ name ] = builder;
         }
     }

slic/src
PhysicsListManager.cc 1.23 -> 1.24
diff -u -r1.23 -r1.24
--- PhysicsListManager.cc	6 Aug 2009 20:03:26 -0000	1.23
+++ PhysicsListManager.cc	23 Nov 2009 23:13:34 -0000	1.24
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/PhysicsListManager.cc,v 1.23 2009/08/06 20:03:26 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/PhysicsListManager.cc,v 1.24 2009/11/23 23:13:34 jeremy Exp $
 #include "PhysicsListManager.hh"
 
 // geant4
@@ -17,14 +17,8 @@
 namespace slic
 {
 
-    // LCPhys is the default, or LHEP if LCPhys is not available.
-    const std::string PhysicsListManager::m_defaultListName =
-#ifdef SLIC_USE_LCPHYS 
-    std::string( "LCPhys" ) 
-#else 
-    std::string( "LHEP" )
-#endif
-        ;
+    // QGSP_BERT is the default physics list when none is selected at runtime.
+    const std::string PhysicsListManager::m_defaultListName = std::string("QGSP_BERT");
 
     PhysicsListManager::PhysicsListManager()
         : Module("PhysicsListManager"),
@@ -35,13 +29,13 @@
           m_setupLimits( false ),
           m_enableOptical( false )
     {
-        // set current to default
+        // Set the current list to the default.
         m_currentListName = m_defaultListName;
 
-        // new messenger
+        // Create the messenger class for the manager.
         m_messenger = new PhysicsMessenger();
 
-        /* Initialize a default (or dummy) physics list, for Geant4 initialization ordering. */
+        // Initialize a default (or dummy) physics list, for Geant4 initialization ordering.
         G4RunManager::GetRunManager()->SetUserInitialization( PhysicsListFactory::instance()->create( m_defaultListName ) );
     }
 
@@ -68,10 +62,7 @@
             // Create the physics list from the name argument.
             m_currentList = PhysicsListFactory::instance()->create( m_currentListName );
 
-            // Support for SUSY particles from PDT table.
-            //setupSUSY();
-
-            // Support for extended set of SM particles from PDT which Geant4 does not know about.
+            // Support for extended set of particles from PDT.
             setupExtended();
 
             // Enable optical processes.
CVSspam 0.2.8