diff -u -r1.92 -r1.93
--- configure	28 Mar 2011 20:37:38 -0000	1.92
+++ configure	21 Apr 2011 22:29:42 -0000	1.93
@@ -273,7 +273,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 OS_SHARED_LIBS_VAR SET_MAKE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT have_cvs CVS have_java JAVA JAVA_HOME JDK_HOME have_wget WGET have_scp SCP have_cmake CMAKE SLACCVSROOT SLACCVSUSER 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 OGLHOME QTHOME clhep_version_dot CLHEP_BASEDIR CLHEP_BUILDDIR CLHEP_CONFIG_OPTS CLHEP_DIR_ORIG CLHEP_DOWNLOAD GDML_BASEDIR GDML_BUILDDIR GDML_CONFIG_OPTS GDML_!
 CVSMODULE GEANT4_VERSION_DOWNLOAD GEANT4_VERSION GEANT4_BUILDDIR GEANT4_DIR_ORIG GEANT4_DOWNLOAD G4NEUTRONHP_NEGLECT_DOPPLER G4SYSTEM G4INSTALL G4INCLUDE G4LIB G4LEVELGAMMADATA G4RADIOACTIVEDATA G4LEDATA G4ELASTICDATA G4DEBUG G4ANALYSIS_USE G4UI_BUILD_XAW_SESSION G4UI_USE_XAW G4UI_BUILD_XM_SESSION G4UI_USE_XM G4UI_BUILD_WIN32_SESSION G4UI_USE_WIN32 G4VIS_BUILD_DAWN_DRIVER G4VIS_BUILD_OPENGLX_DRIVER G4VIS_BUILD_OPENGLXM_DRIVER G4VIS_BUILD_OPENGLWIN32_DRIVER G4VIS_BUILD_OIX_DRIVER G4VIS_BUILD_RAYTRACERX_DRIVER G4VIS_BUILD_OIWIN32_DRIVER G4VIS_BUILD_VRML_DRIVER G4VIS_USE_DAWN G4VIS_USE_OPENGLX G4VIS_USE_OPENGLXM G4VIS_USE_OPENGLWIN32 G4VIS_USE_OIX G4VIS_USE_RAYTRACERX G4VIS_USE_OIWIN32 G4VIS_USE_VRML G4LIB_BUILD_G3TOG4 G4LIB_USE_G3TOG4 G4LIB_BUILD_ZLIB G4LIB_USE_ZLIB G4LIB_BUILD_SHARED G4LIB_BUILD_STATIC G4LIB_USE_GRANULAR G4UI_USE_TCSH G4WORKDIR G4UI_NONE G4VIS_NONE G4VIS_BUILD_OPENGL_DRVIER G4VIS_USE_OPENGL G4VIS_BUILD_OPENGL G4VERBOSE G4U!
 I_BUILD_QT_SESSION G4UI_USE_QT G4VIS_BUILD_OPENGLQT_DRIVER G4V!
 IS_USE_O
PENGLQT LCDD_BASEDIR LCDD_VERSION LCIO_BASEDIR LCIO_BUILDDIR SLIC_BINNAME SLIC_VERSION SLIC_BASEDIR xerces_version_dot XERCES_VERSION XERCES_BASEDIR XERCES_BUILDDIR XERCES_DIR_ORIG XERCES_DOWNLOAD XERCES_CONFIG XERCES_CONFIG_OPTS HEPPDT_CONFIG_OPTS HEPPDT_BASEDIR HEPPDT_BUILDDIR HEPPDT_DOWNLOAD HEPPDT_VERSION HEPPDT_DIR_ORIG LCDETECTORS_BASEDIR LCDETECTORS_VERSION dist_tarball dist_dir 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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os OS_SHARED_LIBS_VAR SET_MAKE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT have_cvs CVS have_java JAVA JAVA_HOME JDK_HOME have_wget WGET have_scp SCP have_cmake CMAKE SLACCVSROOT SLACCVSUSER 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 OGLHOME QTHOME clhep_version_dot CLHEP_BASEDIR CLHEP_BUILDDIR CLHEP_CONFIG_OPTS CLHEP_DIR_ORIG CLHEP_DOWNLOAD GDML_BASEDIR GDML_BUILDDIR GDML_CONFIG_OPTS GDML_CV!
 SMODULE GEANT4_VERSION_DOWNLOAD GEANT4_VERSION GEANT4_BUILDDIR GEANT4_DIR_ORIG GEANT4_DOWNLOAD G4SYSTEM G4INSTALL G4INCLUDE G4LIB G4LEVELGAMMADATA G4RADIOACTIVEDATA G4LEDATA G4ELASTICDATA G4DEBUG G4ANALYSIS_USE G4UI_BUILD_XAW_SESSION G4UI_USE_XAW G4UI_BUILD_XM_SESSION G4UI_USE_XM G4UI_BUILD_WIN32_SESSION G4UI_USE_WIN32 G4VIS_BUILD_DAWN_DRIVER G4VIS_BUILD_OPENGLX_DRIVER G4VIS_BUILD_OPENGLXM_DRIVER G4VIS_BUILD_OPENGLWIN32_DRIVER G4VIS_BUILD_OIX_DRIVER G4VIS_BUILD_RAYTRACERX_DRIVER G4VIS_BUILD_OIWIN32_DRIVER G4VIS_BUILD_VRML_DRIVER G4VIS_USE_DAWN G4VIS_USE_OPENGLX G4VIS_USE_OPENGLXM G4VIS_USE_OPENGLWIN32 G4VIS_USE_OIX G4VIS_USE_RAYTRACERX G4VIS_USE_OIWIN32 G4VIS_USE_VRML G4LIB_BUILD_G3TOG4 G4LIB_USE_G3TOG4 G4LIB_BUILD_ZLIB G4LIB_USE_ZLIB G4LIB_BUILD_SHARED G4LIB_BUILD_STATIC G4LIB_USE_GRANULAR G4UI_USE_TCSH G4WORKDIR G4UI_NONE G4VIS_NONE G4VIS_BUILD_OPENGL_DRVIER G4VIS_USE_OPENGL G4VIS_BUILD_OPENGL G4VERBOSE G4UI_BUILD_QT_SESSION G4UI_USE_QT G4VIS_BUILD_OPENGLQT_DRIVER G4VIS_U!
 SE_OPENGLQT LCDD_BASEDIR LCDD_VERSION LCIO_BASEDIR LCIO_BUILDD!
 IR SLIC_
BINNAME SLIC_VERSION SLIC_BASEDIR xerces_version_dot XERCES_VERSION XERCES_BASEDIR XERCES_BUILDDIR XERCES_DIR_ORIG XERCES_DOWNLOAD XERCES_CONFIG XERCES_CONFIG_OPTS HEPPDT_CONFIG_OPTS HEPPDT_BASEDIR HEPPDT_BUILDDIR HEPPDT_DOWNLOAD HEPPDT_VERSION HEPPDT_DIR_ORIG LCDETECTORS_BASEDIR LCDETECTORS_VERSION dist_tarball dist_dir LIBOBJS LTLIBOBJS'

 ac_subst_files=''
 
 # Initialize some variables set by options.

@@ -815,9 +815,6 @@

 
   --enable-g4verbose      Enable or disable setting G4VERBOSE.
 

-  --enable-g4neutronhp-neglect-doppler
-                          Set to yes to turn off doppler in neutron physics.
-

 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]

@@ -2909,33 +2906,6 @@

-echo "$as_me:$LINENO: checking whether to set G4NEUTRONHP_NEGLECT_DOPPLER" >&5
-echo $ECHO_N "checking whether to set G4NEUTRONHP_NEGLECT_DOPPLER... $ECHO_C" >&6
-
-# Check whether --enable-g4neutronhp-neglect-doppler or --disable-g4neutronhp-neglect-doppler was given.
-if test "${enable_g4neutronhp_neglect_doppler+set}" = set; then
-  enableval="$enable_g4neutronhp_neglect_doppler"
-
-fi;
-
-G4NEUTRONHP_NEGLECT_DOPPLER=1
-
-if test "${enable_g4neutronhp_neglect_doppler}" == "no"; then
-  G4NEUTRONHP_NEGLECT_DOPPLER=0
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-else
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-fi
-
-
-
-
-
-
-
-

@@ -3209,6 +3179,18 @@

+
+if test -z scripts/slic-setup.sh
+then
+  { { echo "$as_me:$LINENO: error: \"Missing config file to add.\"" >&5
+echo "$as_me: error: \"Missing config file to add.\"" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+config_files="$config_files"scripts/slic-setup.sh" "
+
+
+

 config_files=${config_files%\ }
 
           ac_config_files="$ac_config_files ${config_files}"

@@ -3907,7 +3889,6 @@

 s,@GEANT4_BUILDDIR@,$GEANT4_BUILDDIR,;t t
 s,@GEANT4_DIR_ORIG@,$GEANT4_DIR_ORIG,;t t
 s,@GEANT4_DOWNLOAD@,$GEANT4_DOWNLOAD,;t t

-s,@G4NEUTRONHP_NEGLECT_DOPPLER@,$G4NEUTRONHP_NEGLECT_DOPPLER,;t t

 s,@G4SYSTEM@,$G4SYSTEM,;t t
 s,@G4INSTALL@,$G4INSTALL,;t t
 s,@G4INCLUDE@,$G4INCLUDE,;t t

diff -N slic-setup.sh.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ slic-setup.sh.in	21 Apr 2011 22:29:42 -0000	1.1
@@ -0,0 +1,76 @@

+#!/bin/sh
+
+#
+# Portable setup script for SLIC.  It does not run the binary but sets up necessary environment variables.
+#
+# Directory resolution is taken from the Apache Ant run script at src/script/ant .
+#
+
+# name of script
+PRG="$0"
+
+# directory of script
+progname=`basename "$0"`
+
+# resolve relative symlinks
+while [ -h "$PRG" ] ; do
+  ls=`ls -ld "$PRG"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    PRG="$link"
+  else
+    PRG=`dirname "$PRG"`"/$link"
+  fi
+done
+
+# sim dir is one back from scripts
+SIM_HOME=`dirname "$PRG"`/..
+
+# make it fully qualified
+SIM_HOME=`cd "$SIM_HOME" && pwd`
+
+# slic base
+SLIC_BASE=${SIM_HOME}/packages/slic/@SLIC_VERSION@
+
+# xerces lib
+XERCES_LIB_DIR=${SIM_HOME}/packages/xerces/@XERCES_VERSION@/lib
+export @OS_SHARED_LIBS_VAR@=$XERCES_LIB_DIR:$@OS_SHARED_LIBS_VAR@
+
+# Qt lib
+QT_LIB_DIR=@QTHOME@/lib
+export @OS_SHARED_LIBS_VAR@=$QT_LIB_DIR:$@OS_SHARED_LIBS_VAR@
+
+# Setup Geant4 data directory locations.
+export GEANT4_DATA_ROOT=${SIM_HOME}/packages/geant4/data
+export G4LEVELGAMMADATA=$(ls -d $GEANT4_DATA_ROOT/PhotonEvaporation*)
+export G4RADIOACTIVEDATA=$(ls -d $GEANT4_DATA_ROOT/RadioactiveDecay*)
+export G4LEDATA=$(ls -d $GEANT4_DATA_ROOT/G4EMLOW*)
+export G4NEUTRONHPDATA=$(ls -d $GEANT4_DATA_ROOT/G4NDL*)
+
+# local GDML schemas
+GDML_SCHEMA_DIR=${SIM_HOME}/packages/lcdd/${LCDD_VERSION}
+echo "GDML_SCHEMA_DIR=${GDML_SCHEMA_DIR}"
+
+# Set location of particle table.  
+# Allow external variable if a modified version is needed.
+if [ -z "$PARTICLE_TBL" ]
+then
+    PARTICLE_TBL=${SIM_HOME}/packages/slic/@[log in to unmask]
+    if [ ! -e "$PARTICLE_TBL" ]
+    then
+        echo "The file $PARTICLE_TBL does not exist!"
+        exit 1
+    fi
+fi
+
+# print
+echo SIM_HOME=$SIM_HOME
+echo SLIC_BASE=$SLIC_BASE
+echo G4LEVELGAMMADATA=$G4LEVELGAMMADATA
+echo G4RADIOACTIVEDATA=$G4RADIOACTIVEDATA
+echo G4LEDATA=$G4LEDATA
+echo G4NEUTRONHPDATA=$G4NEUTRONHPDATA
+echo PARTICLE_TBL=$PARTICLE_TBL
+echo GDML_SCHEMA_DIR=$GDML_SCHEMA_DIR
+echo XERCES_LIB_DIR=$XERCES_LIB_DIR
+echo LD_LIBRARY_PATH=$LD_LIBRARY_PATH