Commit in SimDist on MAIN
INSTALL+10-121.5 -> 1.6
README+1-11.5 -> 1.6
TODO+13-51.13 -> 1.14
aclocal.m4+3-11.15 -> 1.16
configure+570-2421.33 -> 1.34
configure.ac+5-21.12 -> 1.13
build/geant4.m4+74added 1.1
     /xerces.m4+37added 1.1
     /clhep.m4+14-71.2 -> 1.3
     /packages.m4+5-591.14 -> 1.15
packages/xerces/Makefile.in+11-41.6 -> 1.7
               /env.gmk.in+11.2 -> 1.3
+744-333
2 added + 10 modified, total 12 files
JM: SimDist updates.

SimDist
INSTALL 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- INSTALL	10 May 2006 23:00:14 -0000	1.5
+++ INSTALL	22 Jun 2006 00:39:35 -0000	1.6
@@ -1,13 +1,13 @@
-/\/\/\ Instructions /\/\/\
+INSTALLATION INSTRUCTIONS
 
-To build the Simulation Distribution package:
+To build the Simulation Distribution package, execute these commands from the base directory:
 
   ./configure
   gmake
 
 This should make a statically linked SLIC binary with no runtime dependencies.
 
-/\/\/\ Requirements /\/\/\
+REQUIREMENTS
 
 The build system requires the following tools:
 
@@ -20,11 +20,11 @@
 
 These tools should be present on most Linux systems.
 
-/\/\/\ Installing on Windows /\/\/\
+WINDOWS
 
 On Windows, you MUST install Cygwin beforehand.
 
-/\/\/\ Installing on OSX /\/\/\
+OSX
 
 On the Mac, wget will probably be missing.
 
@@ -34,18 +34,16 @@
 
 Because Make on OSX determines what is "up to date" in an interesting fashion. 
 
-/\/\/\ Configuring /\/\/\
+CONFIGURATION
 
-If you fiddle, changes will only stick in files with the ".in" extension.  
+To make changes to the gmk or makefiles, edit the corresponding ".in" file and rerun configure.  
 
-Rerun configure 
+If the m4 files are modified, rerun Autoconf using the helper script.
 
-> ./configure
-
-to regenerate the config files from the .in files.
+> ./ac.sh
 
 More options will be added as the build system evolves.
 
-/\/\/\ Contact /\/\/\
+CONTACT
 
 Report any errors to <[log in to unmask]>.

SimDist
README 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- README	31 Mar 2006 21:36:29 -0000	1.5
+++ README	22 Jun 2006 00:39:35 -0000	1.6
@@ -1,4 +1,4 @@
-/\/\/\ SimDist README /\/\/\
+SIMDIST README
 
 OVERVIEW
 

SimDist
TODO 1.13 -> 1.14
diff -u -r1.13 -r1.14
--- TODO	10 May 2006 23:00:14 -0000	1.13
+++ TODO	22 Jun 2006 00:39:35 -0000	1.14
@@ -1,6 +1,5 @@
 -usage of existing (external) packages
-  -clhep, geant4
-  -lcio
+  -ALL
 -package makefiles 
   -aim for generic and parameterised
   -generate package/$PACKAGE/package.gmk.in automatically e.g. $(package)_some_var for each package's settings
@@ -8,9 +7,12 @@
 -add test, check targets
   -so don't continually rebuild geant4
 -binary packages
-  -RPM build so Linux people don't have to feel squirmy. (easiest)
-    -Alien for debs (or whatever)
-  -Windows installer (unlikely but would be nice)
+  -Linux
+    -RPM 
+  -Windows = Windows installer 
+    -nullsoft
+  -OSX
+    -dmg 
 -geant4
   -add CLHEP sanity checks (check for headers, libs)
   -options using 
@@ -38,3 +40,9 @@
 -Windows
   -slic.exe instead of just slic for bin name (bindist)
 -don't check for existence of install dir until install target called and make install prefix optional
+-additional compilers
+  -icpc (Intel)
+  -cl (MS)
+  -cc (Solaris) 
+  -gcc
+    -3.4, 4.0, 4.1, 4.2

SimDist
aclocal.m4 1.15 -> 1.16
diff -u -r1.15 -r1.16
--- aclocal.m4	25 May 2006 01:06:04 -0000	1.15
+++ aclocal.m4	22 Jun 2006 00:39:35 -0000	1.16
@@ -1,5 +1,7 @@
 dnl include m4 macros from build area
-#builtin(include, build/clhep.m4)
+builtin(include, build/geant4.m4)
+builtin(include, build/clhep.m4)
+builtin(include, build/xerces.m4)
 builtin(include, build/mysql.m4)
 builtin(include, build/cvs.m4)
 builtin(include, build/util.m4)

SimDist
configure 1.33 -> 1.34
diff -u -r1.33 -r1.34
--- configure	20 Jun 2006 22:22:45 -0000	1.33
+++ configure	22 Jun 2006 00:39:35 -0000	1.34
@@ -1,10 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for SimDist v1r0p0.
+# Generated by GNU Autoconf 2.57 for SimDist v1r0p0.
 #
 # Report bugs to <[log in to unmask]>.
 #
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
@@ -21,10 +22,9 @@
 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 ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+if (FOO=FOO; unset FOO) >/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 -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
     eval $as_var=C; export $as_var
   else
     $as_unset $as_var
@@ -220,17 +220,16 @@
 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="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+as_tr_cpp="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="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
 
 
 # IFS
@@ -273,7 +272,7 @@
 PACKAGE_STRING='SimDist v1r0p0'
 [log in to unmask]
 
-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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os SET_MAKE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT have_cvs CVS have_java JAVA have_wget WGET have_scp SCP slic_binname platform compiler os_shared_libs_var sim_dist_dir_basename packages_dep_order packages_reverse_dep_order download_script cvs_script patch_script gen_files sim_dist_dir sim_packages_dir sim_build_dir sim_scripts_dir USE_OGL OGLHOME clhep_version_dot clhep clhep_version clhep_package_dir clhep_base_dir clep_build_dir clhep_tgz_local clhep_dir_orig clhep_download clhep_config_opts gdml gdml_version gdml!
 _package_dir gdml_base_dir gdml_build_dir gdml_tgz_local gdml_dir_orig gdml_download gdml_config_opts g4system ac_geant4_terminal geant4_version_download geant4 geant4_version geant4_package_dir geant4_base_dir geant4_build_dir geant4_tgz_local geant4_dir_orig geant4_download lcdd lcdd_version lcdd_package_dir lcdd_base_dir lcdd_build_dir lcdd_cvsroot lcio lcio_version lcio_package_dir lcio_base_dir lcio_build_dir lcio_cvsroot lcphys lcphys_version lcphys_package_dir lcphys_base_dir lcphys_cvsmodule lcphys_cvsroot slic slic_version slic_package_dir slic_base_dir slic_cvsroot mokka mokka_version mokka_package_dir mokka_base_dir mokka_build_dir mokka_download mokka_dir_orig mokka_tgz_local xerces_configure_args XERCES_OS xerces_version_underscore xerces xerces_version xerces_package_dir xerces_base_dir xerces_build_dir xerces_config xerces_tgz_local xerces_config_opts xerces_download xerces_dir_orig MYSQL_BASEDIR MYSQL_INCLUDEDIR MYSQL_LIBDIR dist_tarball dist_tarball_current!
  dist_version bin_tarball_current bin_tarball dist_dir LIBOBJS!
  LTLIBOB
JS'
+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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os SET_MAKE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT have_cvs CVS have_java JAVA have_wget WGET have_scp SCP slic_binname platform compiler os_shared_libs_var sim_dist_dir_basename packages_dep_order packages_reverse_dep_order download_script cvs_script patch_script gen_files sim_dist_dir sim_packages_dir sim_build_dir sim_scripts_dir USE_OGL OGLHOME clhep_version_dot clhep clhep_version clhep_package_dir clhep_base_dir clep_build_dir clhep_tgz_local clhep_dir_orig clhep_download clhep_config_opts gdml gdml_version gdml_p!
 ackage_dir gdml_base_dir gdml_build_dir gdml_tgz_local gdml_dir_orig gdml_download gdml_config_opts g4system ac_geant4_terminal geant4_version_download geant4 geant4_version geant4_package_dir geant4_base_dir geant4_build_dir geant4_tgz_local geant4_dir_orig geant4_download lcdd lcdd_version lcdd_package_dir lcdd_base_dir lcdd_build_dir lcdd_cvsroot lcio lcio_version lcio_package_dir lcio_base_dir lcio_build_dir lcio_cvsroot lcphys lcphys_version lcphys_package_dir lcphys_base_dir lcphys_cvsmodule lcphys_cvsroot slic slic_version slic_package_dir slic_base_dir slic_cvsroot mokka mokka_version mokka_package_dir mokka_base_dir mokka_build_dir mokka_download mokka_dir_orig mokka_tgz_local xerces_configure_args XERCES_OS xerces_version_underscore xerces xerces_version xerces_package_dir xerces_base_dir xerces_build_dir xerces_config xerces_tgz_local xerces_config_opts xerces_download xerces_dir_orig XERCES_OBJDIR CLHEP_CONFIG CLHEP_BASEDIR C!
 LHEP_INCLUDEDIR CLHEP_LIBDIR CLHEP_LIBNAME CLHE!
 P_VERSIO
N GEANT4_BASEDIR MYSQL_BASEDIR MYSQL_INCLUDEDIR MYSQL_LIBDIR dist_tarball dist_tarball_current dist_version bin_tarball_current bin_tarball dist_dir LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -632,7 +631,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
@@ -672,10 +671,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; }
@@ -730,6 +729,30 @@
 ac_env_CPPFLAGS_value=$CPPFLAGS
 ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
 ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+ac_env_CLHEP_BASEDIR_set=${CLHEP_BASEDIR+set}
+ac_env_CLHEP_BASEDIR_value=$CLHEP_BASEDIR
+ac_cv_env_CLHEP_BASEDIR_set=${CLHEP_BASEDIR+set}
+ac_cv_env_CLHEP_BASEDIR_value=$CLHEP_BASEDIR
+ac_env_CLHEP_INCLUDEDIR_set=${CLHEP_INCLUDEDIR+set}
+ac_env_CLHEP_INCLUDEDIR_value=$CLHEP_INCLUDEDIR
+ac_cv_env_CLHEP_INCLUDEDIR_set=${CLHEP_INCLUDEDIR+set}
+ac_cv_env_CLHEP_INCLUDEDIR_value=$CLHEP_INCLUDEDIR
+ac_env_CLHEP_LIBDIR_set=${CLHEP_LIBDIR+set}
+ac_env_CLHEP_LIBDIR_value=$CLHEP_LIBDIR
+ac_cv_env_CLHEP_LIBDIR_set=${CLHEP_LIBDIR+set}
+ac_cv_env_CLHEP_LIBDIR_value=$CLHEP_LIBDIR
+ac_env_CLHEP_LIBNAME_set=${CLHEP_LIBNAME+set}
+ac_env_CLHEP_LIBNAME_value=$CLHEP_LIBNAME
+ac_cv_env_CLHEP_LIBNAME_set=${CLHEP_LIBNAME+set}
+ac_cv_env_CLHEP_LIBNAME_value=$CLHEP_LIBNAME
+ac_env_CLHEP_VERSION_set=${CLHEP_VERSION+set}
+ac_env_CLHEP_VERSION_value=$CLHEP_VERSION
+ac_cv_env_CLHEP_VERSION_set=${CLHEP_VERSION+set}
+ac_cv_env_CLHEP_VERSION_value=$CLHEP_VERSION
+ac_env_GEANT4_BASEDIR_set=${GEANT4_BASEDIR+set}
+ac_env_GEANT4_BASEDIR_value=$GEANT4_BASEDIR
+ac_cv_env_GEANT4_BASEDIR_set=${GEANT4_BASEDIR+set}
+ac_cv_env_GEANT4_BASEDIR_value=$GEANT4_BASEDIR
 ac_env_MYSQL_BASEDIR_set=${MYSQL_BASEDIR+set}
 ac_env_MYSQL_BASEDIR_value=$MYSQL_BASEDIR
 ac_cv_env_MYSQL_BASEDIR_set=${MYSQL_BASEDIR+set}
@@ -775,9 +798,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
@@ -820,6 +843,19 @@
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-cvsuser=<path>   SLAC CVS user name. (Default is anonymous)
   --with-prefix=<path>    binary installation base area
+  --with-clhep-basedir=<path>
+                          absolute path to CLHEP base install directory
+  --with-clhep-includedir=<path>
+                          absolute path to CLHEP include directory
+  --with-clhep-libdir=<path>
+                          absolute path to CLHEP lib directory
+  --with-clhep-libname=<path>
+                          name of CLHEP library with (NO prefix or file
+                          extension)
+  --with-clhep-version=<version>
+                          dot-separated CLHEP version string
+  --with-geant4-basedir=<path>
+                          absolute path to Geant4 base install directory
   --with-mysql-basedir=<path>
                           absolute path to mysql base directory
   --with-mysql-includedir=<path>
@@ -836,6 +872,21 @@
               nonstandard directory <lib dir>
   CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
               headers in a nonstandard directory <include dir>
+  CLHEP_BASEDIR
+              base installation directory of CLHEP package, containing
+              directories bin, lib, include, etc.
+  CLHEP_INCLUDEDIR
+              directory containing the CLHEP headers, which should itself
+              contain a directory called CLHEP
+  CLHEP_LIBDIR
+              directory containing the CLHEP library
+  CLHEP_LIBNAME
+              name of the CLHEP library, without library prefix or static,
+              shared extension
+  CLHEP_VERSION
+              dot-separated CLHEP version string
+  GEANT4_BASEDIR
+              base installation directory of Geant4
   MYSQL_BASEDIR
               base mysql directory
   MYSQL_INCLUDEDIR
@@ -880,45 +931,12 @@
     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
     ac_top_srcdir=$ac_top_builddir$srcdir ;;
 esac
-
-# 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
+# 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`
 
     cd $ac_dir
     # Check for guested configure; otherwise get Cygnus style configure.
@@ -929,7 +947,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
@@ -943,9 +961,10 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 SimDist configure v1r0p0
-generated by GNU Autoconf 2.59
+generated by GNU Autoconf 2.57
 
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -957,7 +976,7 @@
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by SimDist $as_me v1r0p0, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
+generated by GNU Autoconf 2.57.  Invocation command line was
 
   $ $0 $@
 
@@ -1034,19 +1053,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.
@@ -1080,12 +1099,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;
 }
@@ -1114,7 +1133,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
@@ -1133,7 +1152,7 @@
       echo "$as_me: caught signal $ac_signal"
     echo "$as_me: exit $exit_status"
   } >&5
-  rm -f core *.core &&
+  rm -f core core.* *.core &&
   rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
      ' 0
@@ -1213,7 +1232,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"
@@ -1230,13 +1249,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.
@@ -1382,7 +1401,7 @@
 
 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
@@ -1524,6 +1543,7 @@
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -1543,8 +1563,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 file name" >&5
-echo $ECHO_N "checking for C++ compiler default output file name... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for C++ compiler default output" >&5
+echo $ECHO_N "checking for C++ compiler default output... $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
@@ -1564,23 +1584,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
@@ -1654,8 +1674,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
@@ -1680,6 +1700,7 @@
   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
@@ -1730,6 +1751,7 @@
   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
@@ -1749,21 +1771,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   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 -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'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -1776,7 +1788,7 @@
 
 ac_compiler_gnu=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
@@ -1792,6 +1804,7 @@
   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
@@ -1808,21 +1821,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   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 -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'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -1835,7 +1838,7 @@
 
 ac_cv_prog_cxx_g=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f 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
@@ -1855,7 +1858,8 @@
   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 ();' \
@@ -1863,13 +1867,14 @@
    '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.  */
-$ac_declaration
 #include <stdlib.h>
+$ac_declaration
 int
 main ()
 {
@@ -1880,21 +1885,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   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 -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'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -1907,8 +1902,9 @@
 
 continue
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -1925,21 +1921,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   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 -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'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -1951,7 +1937,7 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 done
 rm -f conftest*
 if test -n "$ac_declaration"; then
@@ -3499,7 +3485,7 @@
   ;;
 
 mokka )
-  mokka_base_url=http://polywww.in2p3.fr/activites/physique/geant4/tesla/www/mokka/software/mokka_tags/
+  mokka_base_url=http://mokka.in2p3.fr/software/mokka_tags/
   mokka_tgz=Mokka-mokka-${package_version}.tgz
 
 
@@ -3664,6 +3650,21 @@
   XERCES_OS=$(uname | tr [a-z] [A-Z])
 fi
 
+if test $host_os == "Darwin"
+then
+  XERCES_USE_SHARED_LIB=1
+  cat >>confdefs.h <<\_ACEOF
+#define XERCES_USE_SHARED_LIB 1
+_ACEOF
+
+else
+  XERCES_USE_STATIC_LIB=1
+  cat >>confdefs.h <<\_ACEOF
+#define XERCES_USE_STATIC_LIB 1
+_ACEOF
+
+fi
+
 
 
 
@@ -3849,6 +3850,9 @@
 
 
 
+  XERCES_OBJDIR=${xerces_base_dir}/obj/${XERCES_OS}
+
+
   ;;
 
 * )
@@ -3863,7 +3867,356 @@
 
 
 
-#AC_CLHEP
+# Package configuration.
+
+  # Extract the first word of "clhep-config", so it can be a program name with args.
+set dummy clhep-config; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CLHEP_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$CLHEP_CONFIG"; then
+  ac_cv_prog_CLHEP_CONFIG="$CLHEP_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CLHEP_CONFIG=""
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+CLHEP_CONFIG=$ac_cv_prog_CLHEP_CONFIG
+if test -n "$CLHEP_CONFIG"; then
+  echo "$as_me:$LINENO: result: $CLHEP_CONFIG" >&5
+echo "${ECHO_T}$CLHEP_CONFIG" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+
+  if test -z "$CLHEP_CONFIG"
+  then
+    if test -n "$CLHEP_BASEDIR"
+    then
+      as_ac_File=`echo "ac_cv_file_$CLHEP_BASEDIR/bin/clhep-config" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $CLHEP_BASEDIR/bin/clhep-config" >&5
+echo $ECHO_N "checking for $CLHEP_BASEDIR/bin/clhep-config... $ECHO_C" >&6
+if eval "test \"\${$as_ac_File+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  test "$cross_compiling" = yes &&
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
+if test -r "$CLHEP_BASEDIR/bin/clhep-config"; then
+  eval "$as_ac_File=yes"
+else
+  eval "$as_ac_File=no"
+fi
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+if test `eval echo '${'$as_ac_File'}'` = yes; then
+
+                      CLHEP_CONFIG=$CLHEP_BASEDIR/bin/clhep-config
+
+
+
+fi
+
+    fi
+  fi
+
+  if test -n "$CLHEP_CONFIG"
+  then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_CLHEP_CONFIG 1
+_ACEOF
+
+  fi
+
+
+
+
+
+
+  echo "$as_me:$LINENO: checking for CLHEP_BASEDIR" >&5
+echo $ECHO_N "checking for CLHEP_BASEDIR... $ECHO_C" >&6
+
+    if test -z "$CLHEP_BASEDIR"
+  then
+
+# Check whether --with-clhep-basedir or --without-clhep-basedir was given.
+if test "${with_clhep_basedir+set}" = set; then
+  withval="$with_clhep_basedir"
+
+                  if test "$withval" != "yes"
+                  then
+                    CLHEP_BASEDIR="$withval"
+                  fi
+
+
+fi;
+  fi
+
+    if test -z "$CLHEP_BASEDIR"
+  then
+    if test -n "$CLHEP_BASE_DIR"
+    then
+      CLHEP_BASEDIR=$CLHEP_BASE_DIR
+    fi
+  fi
+
+    if test -z "$CLHEP_BASEDIR"
+  then
+    if test -n "$CLHEP_CONFIG"
+    then
+      CLHEP_BASEDIR=$(${CLHEP_CONFIG} --prefix)
+    fi
+  fi
+
+
+  echo "$as_me:$LINENO: result: $CLHEP_BASEDIR" >&5
+echo "${ECHO_T}$CLHEP_BASEDIR" >&6
+
+
+
+
+
+
+
+  echo "$as_me:$LINENO: checking for CLHEP_INCLUDEDIR" >&5
+echo $ECHO_N "checking for CLHEP_INCLUDEDIR... $ECHO_C" >&6
+
+    if test -z "$CLHEP_INCLUDEDIR"
+  then
+
+# Check whether --with-clhep-includedir or --without-clhep-includedir was given.
+if test "${with_clhep_includedir+set}" = set; then
+  withval="$with_clhep_includedir"
+   if test "$withval" != "yes"
+                  then
+                    CLHEP_INCLUDEDIR="$withval"
+                  fi
+
+
+fi;
+  fi
+
+    if test -n "$CLHEP_INCLUDE_DIR"
+  then
+    CLHEP_INCLUDEDIR=$CLHEP_INCLUDE_DIR
+  fi
+
+    if test -z "$CLHEP_INCLUDEDIR"
+  then
+    if test -n "$CLHEP_CONFIG"
+    then
+      CLHEP_INCLUDEDIR=$(${CLHEP_CONFIG} --include | sed 's/-I//g')
+    fi
+  fi
+
+    if test -z "$CLHEP_INCLUDEDIR"
+  then
+    if test -z "$CLHEP_INCLUDEDIR"
+    then
+      CLHEP_INCLUDEDIR=$CLHEP_BASEDIR/include
+    fi
+  fi
+
+  echo "$as_me:$LINENO: result: $CLHEP_INCLUDEDIR" >&5
+echo "${ECHO_T}$CLHEP_INCLUDEDIR" >&6
+
+
+
+
+
+
+
+
+
+
+
+
+  echo "$as_me:$LINENO: checking for CLHEP_LIBDIR directory" >&5
+echo $ECHO_N "checking for CLHEP_LIBDIR directory... $ECHO_C" >&6
+
+    if test -z "$CLHEP_LIBDIR"
+  then
+
+# Check whether --with-clhep-libdir or --without-clhep-libdir was given.
+if test "${with_clhep_libdir+set}" = set; then
+  withval="$with_clhep_libdir"
+   if test "$withval" != "yes"
+                  then
+                    CLHEP_LIBDIR="$withval"
+                  fi
+
+
+fi;
+  fi
+
+    if test -z "$CLHEP_LIBDIR"
+  then
+    if test -n "$CLHEP_LIB_DIR"
+    then
+      CLHEP_LIBDIR=$CLHEP_LIB_DIR
+    fi
+  fi
+
+    if test -z "$CLHEP_LIBDIR"
+  then
+    if test -n "$CLHEP_CONFIG"
+    then
+      CLHEP_LIBDIR=$(${CLHEP_CONFIG} --libs | grep -o "\-L[a-zA-Z0-9/-]*" | sed 's/-L//g')
+    fi
+  fi
+
+    if test -z "$CLHEP_LIBDIR"
+  then
+    if test -n "$CLHEP_LIBDIR"
+    then
+      CLHEP_LIBDIR=$CLHEP_BASEDIR/lib
+    fi
+  fi
+
+  echo "$as_me:$LINENO: result: $CLHEP_LIBDIR" >&5
+echo "${ECHO_T}$CLHEP_LIBDIR" >&6
+
+
+
+
+
+
+
+  echo "$as_me:$LINENO: checking for CLHEP_LIBNAME" >&5
+echo $ECHO_N "checking for CLHEP_LIBNAME... $ECHO_C" >&6
+
+    if test -z "$CLHEP_LIBNAME"
+  then
+
+# Check whether --with-clhep-libname or --without-clhep-libname was given.
+if test "${with_clhep_libname+set}" = set; then
+  withval="$with_clhep_libname"
+
+                  if test "$withval" != "yes"
+                  then
+                    CLHEP_LIBNAME="$withval"
+                  fi
+
+
+fi;
+  fi
+
+    if test -z "$CLHEP_LIBNAME"
+  then
+    if test -n "$CLHEP_CONFIG"
+    then
+      CLHEP_LIBNAME=$(${CLHEP_CONFIG} --libs | grep -o "\-l[a-zA-Z0-9-].*" | sed 's/-l//g')
+    fi
+  fi
+
+
+  echo "$as_me:$LINENO: result: $CLHEP_LIBNAME" >&5
+echo "${ECHO_T}$CLHEP_LIBNAME" >&6
+
+
+
+
+
+
+  echo "$as_me:$LINENO: checking for CLHEP_VERSION" >&5
+echo $ECHO_N "checking for CLHEP_VERSION... $ECHO_C" >&6
+
+  if test -z "$CLHEP_VERSION"
+  then
+
+# Check whether --with-clhep-version or --without-clhep-version was given.
+if test "${with_clhep_version+set}" = set; then
+  withval="$with_clhep_version"
+   if test "$withval" != "yes"
+		  then
+		    CLHEP_VERSION="$withval"
+		  fi
+
+
+fi;
+  fi
+
+  if test -z "$CLHEP_VERSION"
+  then
+    if test -n "$CLHEP_CONFIG"
+    then
+      CLHEP_VERSION=$(${CLHEP_CONFIG} --version | awk '{print }')
+    fi
+  fi
+
+  echo "$as_me:$LINENO: result: $CLHEP_VERSION" >&5
+echo "${ECHO_T}$CLHEP_VERSION" >&6
+
+
+
+
+
+
+
+#  AC_REQUIRE([AC_CLHEP_COMPILE])
+
+  cat >>confdefs.h <<\_ACEOF
+#define HAVE_CLHEP 1
+_ACEOF
+
+
+
+
+
+  echo "$as_me:$LINENO: checking for GEANT4_BASEDIR" >&5
+echo $ECHO_N "checking for GEANT4_BASEDIR... $ECHO_C" >&6
+
+  if test -z "$GEANT4_BASEDIR"
+  then
+
+# Check whether --with-geant4-basedir or --without-geant4-basedir was given.
+if test "${with_geant4_basedir+set}" = set; then
+  withval="$with_geant4_basedir"
+
+                  if test "$withval" != "yes"
+                  then
+                    GEANT4_BASEDIR="$withval"
+                  fi
+
+
+fi;
+  fi
+
+  if test -z "$GEANT4_BASEDIR"
+  then
+    if test -n "$G4INSTALL"
+    then
+      GEANT4_BASEDIR=$G4INSTALL
+    fi
+  fi
+
+  echo "$as_me:$LINENO: result: $GEANT4_BASEDIR" >&5
[truncated at 1000 lines; 323 more skipped]

SimDist
configure.ac 1.12 -> 1.13
diff -u -r1.12 -r1.13
--- configure.ac	25 May 2006 01:06:04 -0000	1.12
+++ configure.ac	22 Jun 2006 00:39:36 -0000	1.13
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/SimDist/configure.ac,v 1.12 2006/05/25 01:06:04 jeremy Exp $
+# $Header: /cvs/lcd/SimDist/configure.ac,v 1.13 2006/06/22 00:39:36 jeremy Exp $
 #
 # Process this file with autoconf to produce a configure script for SimDist.
 #
@@ -45,7 +45,9 @@
 # config the individual packages
 CONFIG_PACKAGES
 
-#AC_CLHEP
+# Package configuration.
+AC_CLHEP
+AC_GEANT4
 AC_MYSQL
 
 # setup name of tarball
@@ -60,6 +62,7 @@
 ADD_CONFIG_FILE(Makefile)
 ADD_CONFIG_FILE(packages/Makefile)
 ADD_CONFIG_FILE(build/package.gmk)
+#ADD_CONFIG_FILE(build/xerces.gmk)
 
 #ADD_CONFIG_FILE(build/clhep.gmk)
 

SimDist/build
geant4.m4 added at 1.1
diff -N geant4.m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ geant4.m4	22 Jun 2006 00:39:37 -0000	1.1
@@ -0,0 +1,74 @@
+AC_DEFUN([AC_GEANT4],
+[
+  AC_REQUIRE([AC_GEANT4_BASEDIR])
+])
+
+AC_DEFUN([AC_GEANT4_BASEDIR],
+[
+  AC_ARG_VAR([GEANT4_BASEDIR],[base installation directory of Geant4])
+
+  AC_MSG_CHECKING(for GEANT4_BASEDIR)
+
+  if test -z "$GEANT4_BASEDIR"
+  then
+    AC_ARG_WITH(geant4-basedir,
+                AC_HELP_STRING([--with-geant4-basedir=<path>],
+                               [absolute path to Geant4 base install directory]),
+                [
+                  if test "$withval" != "yes"
+                  then
+                    GEANT4_BASEDIR="$withval"
+                  fi
+                ]
+               )
+  fi
+
+  if test -z "$GEANT4_BASEDIR"
+  then
+    if test -n "$G4INSTALL"
+    then
+      GEANT4_BASEDIR=$G4INSTALL
+    fi
+  fi
+
+  AC_MSG_RESULT($GEANT4_BASEDIR)
+
+  AC_SUBST(GEANT4_BASEDIR)
+
+])
+
+AC_DEFUN([AC_GEANT4_SYSTEM],
+[
+  AC_ARG_VAR([GEANT4_SYSTEM],[G4SYSTEM])
+
+  AC_MSG_CHECKING(for GEANT4_SYSTEM)
+])
+
+dnl macro to setup Geant4
+AC_DEFUN(CONFIG_GEANT4, [
+
+g4system=$platform
+
+AC_SUBST(g4system)
+
+dnl setup the Geant4 terminal type according to platform
+SET_GEANT4_TERMINAL
+
+])
+
+dnl macro to setup a Geant4 terminal type
+AC_DEFUN(SET_GEANT4_TERMINAL, [
+
+AC_MSG_CHECKING(for type of Geant4 UI terminal to use)
+
+if test $host_os == "Linux" || test $host_os == "Darwin"; then
+  ac_geant4_terminal="TCSH"
+else
+  ac_geant4_terminal="CSH"
+fi
+
+AC_MSG_RESULT(${ac_geant4_terminal})
+
+AC_SUBST(ac_geant4_terminal)
+
+])
\ No newline at end of file

SimDist/build
xerces.m4 added at 1.1
diff -N xerces.m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ xerces.m4	22 Jun 2006 00:39:37 -0000	1.1
@@ -0,0 +1,37 @@
+dnl Macro to setup Xerces configure arguments.
+AC_DEFUN(CONFIG_XERCES, [
+
+if test $host_os == "Linux"
+then
+  xerces_configure_args="-plinux -cgcc -xg++ -minmem -nsocket -tnative -rnone -P \$(PACKAGE_BASEDIR)"
+elif test $host_os == "WIN32"
+then
+  xerces_configure_args="-pcygwin -cgcc -xg++ -minmem -nsocket -tnative -rnone -P \$(PACKAGE_BASEDIR)"
+elif test $host_os == "Darwin"
+then
+  xerces_configure_args="-p macosx -nnative -tnative -rnone -P \$(xerces_base_dir) -P \$(PACKAGE_BASEDIR)"
+fi
+
+AC_SUBST(xerces_configure_args)
+
+dnl Xerces OS string for object dir.
+if test $host_os == "Darwin"
+then
+  XERCES_OS=MACOSX
+else
+  XERCES_OS=$(uname | tr [[a-z]] [[A-Z]])
+fi
+
+dnl Can Xerces be linked in statically?
+if test $host_os = "Darwin"
+then
+  XERCES_USE_SHARED_LIB=1
+  AC_DEFINE(XERCES_USE_SHARED_LIB)
+else
+  XERCES_USE_STATIC_LIB=1
+  AC_DEFINE(XERCES_USE_STATIC_LIB)
+fi
+
+AC_SUBST(XERCES_OS)
+
+])

SimDist/build
clhep.m4 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- clhep.m4	26 May 2006 22:20:14 -0000	1.2
+++ clhep.m4	22 Jun 2006 00:39:37 -0000	1.3
@@ -1,4 +1,4 @@
-dnl $Id: clhep.m4,v 1.2 2006/05/26 22:20:14 jeremy Exp $
+dnl $Id: clhep.m4,v 1.3 2006/06/22 00:39:37 jeremy Exp $
 
 dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/
 dnl
@@ -24,7 +24,7 @@
   AC_REQUIRE([AC_CLHEP_INCLUDEDIR])
   AC_REQUIRE([AC_CLHEP_LIBDIR])
   AC_REQUIRE([AC_CLHEP_LIBNAME])
-  AC_REQUIRE([AC_CLHEP_COMPILE])
+#  AC_REQUIRE([AC_CLHEP_COMPILE])
   AC_REQUIRE([AC_CLHEP_VERSION])
   AC_DEFINE(HAVE_CLHEP)
 ])
@@ -60,10 +60,13 @@
                )
   fi
 
-  dnl If wasn not set, maybe can get from CLHEP env var.
-  if test -n "$CLHEP_BASE_DIR"
+  dnl If wasn not set, maybe can get from CLHEP env var used by Geant4.
+  if test -z "$CLHEP_BASEDIR"
   then
-    CLHEP_BASEDIR=$CLHEP_BASE_DIR
+    if test -n "$CLHEP_BASE_DIR"
+    then
+      CLHEP_BASEDIR=$CLHEP_BASE_DIR
+    fi
   fi
 
   dnl Use clhep-config --prefix.
@@ -180,6 +183,8 @@
     fi
   fi
 
+  AC_MSG_RESULT($CLHEP_INCLUDEDIR)
+
   dnl If not set by now then there is a problem.
   dnl if test -z "$CLHEP_INCLUDEDIR"
   dnl then
@@ -365,7 +370,7 @@
   AC_ARG_VAR([CLHEP_VERSION],[dot-separated CLHEP version string])
 
   AC_MSG_CHECKING([for CLHEP_VERSION])
-  
+
   if test -z "$CLHEP_VERSION"
   then
     AC_ARG_WITH(clhep-version,
@@ -378,7 +383,7 @@
 		]
 	       )
   fi
-  
+
   if test -z "$CLHEP_VERSION"
   then
     if test -n "$CLHEP_CONFIG"
@@ -386,4 +391,6 @@
       CLHEP_VERSION=$(${CLHEP_CONFIG} --version | awk '{print $2}')
     fi
   fi
+
+  AC_MSG_RESULT($CLHEP_VERSION)
 ])

SimDist/build
packages.m4 1.14 -> 1.15
diff -u -r1.14 -r1.15
--- packages.m4	20 Jun 2006 23:15:51 -0000	1.14
+++ packages.m4	22 Jun 2006 00:39:37 -0000	1.15
@@ -1,3 +1,4 @@
+
 dnl macro to do common configuration for each package
 AC_DEFUN(CONFIG_PACKAGE_BASE, [
 
@@ -37,7 +38,6 @@
 > ${sim_packages_dir}/${package_name}/package.gmk.in
 
 dnl Most package-specific substitutions and configuration happens here.
-dnl TODO: Each package should have its own m4 file with specific config options.
 case "$package_name" in
 
 clhep )
@@ -154,7 +154,7 @@
   PACKAGE_MAKEVAR(mokka, PACKAGE_BUILDDIR,  mokka_build_dir,   ${package_base_dir}/source)
   PACKAGE_MAKEVAR(mokka, PACKAGE_DOWNLOAD,  mokka_download,    ${mokka_base_url}/${mokka_tgz})
   PACKAGE_MAKEVAR(mokka, PACKAGE_DIR_ORIG,  mokka_dir_orig,    Mokka)
-  PACKAGE_MAKEVAR(mokka, PACKAGE_TGZ_LOCAL, mokka_tgz_local,   [mokka.tar.gz]) 
+  PACKAGE_MAKEVAR(mokka, PACKAGE_TGZ_LOCAL, mokka_tgz_local,   [mokka.tar.gz])
   ;;
 
 xerces )
@@ -177,6 +177,9 @@
   PACKAGE_MAKEVAR(xerces, PACKAGE_DOWNLOAD,    xerces_download,    ${xerces_url}/${xerces_tgz})
   PACKAGE_MAKEVAR(xerces, PACKAGE_DIR_ORIG,    xerces_dir_orig,    xerces-c-src_${xerces_version_underscore})
 
+  XERCES_OBJDIR=${xerces_base_dir}/obj/${XERCES_OS}
+  AC_SUBST(XERCES_OBJDIR)
+
   ;;
 
 * )
@@ -196,63 +199,6 @@
 
 ])
 
-dnl macro to setup Geant4
-AC_DEFUN(CONFIG_GEANT4, [
-
-g4system=$platform
-
-AC_SUBST(g4system)
-
-dnl setup the Geant4 terminal type according to platform
-SET_GEANT4_TERMINAL
-
-])
-
-dnl macro to setup a Geant4 terminal type
-AC_DEFUN(SET_GEANT4_TERMINAL, [
-
-AC_MSG_CHECKING(for type of Geant4 UI terminal to use)
-
-if test $host_os == "Linux" || test $host_os == "Darwin"; then
-  ac_geant4_terminal="TCSH"
-else
-  ac_geant4_terminal="CSH"
-fi
-
-AC_MSG_RESULT(${ac_geant4_terminal})
-
-AC_SUBST(ac_geant4_terminal)
-
-])
-
-dnl macro to setup Xerces
-AC_DEFUN(CONFIG_XERCES, [
-
-if test $host_os == "Linux"
-then
-  xerces_configure_args="-plinux -cgcc -xg++ -minmem -nsocket -tnative -rnone -P \$(PACKAGE_BASEDIR)"
-elif test $host_os == "WIN32"
-then
-  xerces_configure_args="-pcygwin -cgcc -xg++ -minmem -nsocket -tnative -rnone -P \$(PACKAGE_BASEDIR)"
-elif test $host_os == "Darwin"
-then
-  xerces_configure_args="-p macosx -nnative -tnative -rnone -P \$(xerces_base_dir) -P \$(PACKAGE_BASEDIR)"
-fi
-
-AC_SUBST(xerces_configure_args)
-
-dnl Xerces obj dir.
-if test $host_os == "Darwin"
-then
-  XERCES_OS=MACOSX
-else
-  XERCES_OS=$(uname | tr [[a-z]] [[A-Z]])
-fi
-
-AC_SUBST(XERCES_OS)
-
-])
-
 dnl define a package make var using autoconf substitution
 dnl arg1 make variable name without "PACKAGE_" prefix
 dnl arg2 autoconf substitution varible without @@ enclosing chars

SimDist/packages/xerces
Makefile.in 1.6 -> 1.7
diff -u -r1.6 -r1.7
--- Makefile.in	21 Jun 2006 18:53:13 -0000	1.6
+++ Makefile.in	22 Jun 2006 00:39:38 -0000	1.7
@@ -1,19 +1,26 @@
-# $Header: /cvs/lcd/SimDist/packages/xerces/Makefile.in,v 1.6 2006/06/21 18:53:13 jeremy Exp $
+# $Header: /cvs/lcd/SimDist/packages/xerces/Makefile.in,v 1.7 2006/06/22 00:39:38 jeremy Exp $
 
 # generic package targets
 include ../../build/package.gmk
 
+XERCES_TARGETS = download patch config compile install
+
 # default compile rule
-all: download patch config compile install build_static_lib
+ifdef XERCES_USE_STATIC_LIB
+all: $(XERCES_TARGETS)
+else
+all: $(XERCES_TARGETS) build_static_lib delete_shared_libs
+endif
 
 # delete_shared_libs
 
 delete_shared_libs:
 	cd $(PACKAGE_BASEDIR)/lib; \
-	rm -rf *.so* *.dylib*
+	rm -rf *.so* *.dylib*;
 
 build_static_lib:
-	cd $(PACKAGE_BASEDIR)/obj/$(XERCES_OS); \
+	echo XERCES_OBJDIR=$(XERCES_OBJDIR) ; \
+	cd $(XERCES_OBJDIR) ; \
 	ar -rc libxerces-c.a *.o; \
 	ranlib libxerces-c.a; \
 	cp libxerces-c.a $(PACKAGE_BASEDIR)/lib

SimDist/packages/xerces
env.gmk.in 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- env.gmk.in	20 Jun 2006 22:22:46 -0000	1.2
+++ env.gmk.in	22 Jun 2006 00:39:38 -0000	1.3
@@ -2,3 +2,4 @@
 export XERCESCROOT=@xerces_base_dir@
 export XERCES_LIB_DIR=@xerces_base_dir@/lib
 export XERCES_OS=@XERCES_OS@
+export XERCES_OBJDIR=@XERCES_OBJDIR@
CVSspam 0.2.8