Index: trunk/geant4/config/G4UI_BUILD.gmk
===================================================================
--- trunk/geant4/config/G4UI_BUILD.gmk	(revision 472)
+++ trunk/geant4/config/G4UI_BUILD.gmk	(revision 472)
@@ -0,0 +1,63 @@
+# $Id: G4UI_BUILD.gmk,v 1.4 2003/10/17 10:17:10 gbarrand Exp $
+# -------------------------------------------------------------
+# Interfaces-specific CPPFLAGS for BUILD phase.
+#   John Allison, 6th July 1998.
+# Include this *after*  architecture.gmk
+# Include this *before* interactivity.gmk
+
+ifndef G4UI_NONE
+  G4UI_BUILD = 1
+  CPPFLAGS += -DG4UI_BUILD
+
+# The following sessions are built by default (no environment
+#   variables needed)...
+# GAG_SESSION
+# TERMINAL_SESSION
+
+ifdef G4UI_BUILD_XM_SESSION
+  G4UI_BUILD = 1
+  G4UI_BUILD_BASIC_SESSION = 1
+  G4INTY_BUILD_XT = 1
+  INC_XM = 1
+  CPPFLAGS += -DG4UI_BUILD_XM_SESSION
+endif
+
+ifdef G4UI_BUILD_XAW_SESSION
+  G4UI_BUILD = 1
+  G4UI_BUILD_BASIC_SESSION = 1
+  G4INTY_BUILD_XT = 1
+  INC_XAW = 1
+  CPPFLAGS += -DG4UI_BUILD_XAW_SESSION
+endif
+
+ifdef G4UI_BUILD_WIN32_SESSION
+  G4UI_BUILD = 1
+  G4UI_BUILD_BASIC_SESSION = 1
+  G4INTY_BUILD_WIN32 = 1
+  CPPFLAGS += -DG4UI_BUILD_WIN32_SESSION
+endif
+
+########################### interfaces/XVT - not currently implemented #####
+
+############################################################################
+
+ifdef G4LIB_BUILD_SHARED
+
+   ifdef G4UI_BUILD_XM_SESSION
+     G4UI_USE_XM = 1
+   endif
+
+   ifdef G4UI_BUILD_XAW_SESSION
+     G4UI_USE_XAW = 1
+   endif
+
+   ifdef G4UI_BUILD_WIN32_SESSION
+     G4UI_USE_WIN32 = 1
+   endif
+
+  include $(G4INSTALL)/config/G4UI_USE.gmk
+
+endif # G4LIB_BUILD_SHARED
+
+endif #G4UI_NONE
+
Index: trunk/geant4/config/G4UI_USE.gmk
===================================================================
--- trunk/geant4/config/G4UI_USE.gmk	(revision 472)
+++ trunk/geant4/config/G4UI_USE.gmk	(revision 472)
@@ -0,0 +1,86 @@
+# $Id: G4UI_USE.gmk,v 1.8 2003/10/17 10:17:10 gbarrand Exp $
+# -------------------------------------------------------------
+# GNUmakefile for CPPFLAGS for interfaces USE phase.
+#   John Allison, 6th July 1998.
+
+########################### interfaces/basic #######################
+ifndef G4UI_USE_INCLUDED
+  G4UI_USE_INCLUDED = 1
+  
+ifndef G4UI_NONE
+
+UILIBS :=
+
+# Sessions not needing external packages or libraries.  These
+# libraries are always built (see G4UI_BUILD.gmk) and linked so the
+# user can instantiate one of these sessions without rebuilding the
+# libraries.  For backwards compatibility with user code, as typified
+# by geant4/examples main programs, the C-pre-processor variables
+# corresponding to the original environment variables are set, but
+# there is no dependency in the Geant4 kernel; a user may instantiate
+# a session from this list without setting any environment variables.
+# However, if he/she sets no environment variables, then the
+# C-pre-processor variable G4UI_USE_TERMINAL is set by default, although
+# there is no need to use it.
+
+ifneq ($(G4INCLUDE_EXEC),1)
+  CPPFLAGS += -I$(G4BASE)/interfaces/basic/include
+  CPPFLAGS += -I$(G4BASE)/interfaces/common/include
+  CPPFLAGS += -I$(G4BASE)/interfaces/GAG/include
+endif
+UILIBS   += -lG4UIbasic
+UILIBS   += -lG4UIcommon
+UILIBS   += -lG4UIGAG
+
+ifdef G4UI_USE_TERMINAL
+  G4UI_USE  = 1
+  CPPFLAGS += -DG4UI_USE_TERMINAL
+endif
+
+ifdef G4UI_USE_TCSH
+  G4UI_USE  = 1
+  CPPFLAGS += -DG4UI_USE_TCSH
+endif
+
+ifdef G4UI_USE_GAG
+  G4UI_USE  = 1
+  CPPFLAGS += -DG4UI_USE_GAG
+endif
+
+# Other sessions: environment variables *must* be used to control the build
+# and the usage, becuase they need external packages or libraries.
+
+ifdef G4UI_USE_XM
+  G4UI_USE  = 1
+  G4INTY_USE_XT = 1
+  INC_XM    = 1
+  LOAD_XM   = 1
+  CPPFLAGS += -DG4UI_USE_XM
+endif
+
+ifdef G4UI_USE_XAW
+  G4UI_USE  = 1
+  G4INTY_USE_XT = 1
+  INC_XAW   = 1
+  LOAD_XAW  = 1
+  CPPFLAGS += -DG4UI_USE_XAW
+endif
+
+ifdef G4UI_USE_WIN32
+  G4UI_USE  = 1
+  G4INTY_USE_WIN32 = 1
+  CPPFLAGS    += -DG4UI_USE_WIN32
+endif
+
+########################### interfaces/XVT - not currently implemented #####
+
+##################### Default to TERMINAL if no environment variables set ##
+##################### (No need actually to use it - see above.) ############
+
+ifndef G4UI_USE
+  G4UI_USE  = 1
+  CPPFLAGS += -DG4UI_USE_TERMINAL
+endif
+
+endif #G4UI_NONE
+endif # G4UI_USE_INCLUDED
Index: trunk/geant4/config/G4VIS_BUILD.gmk
===================================================================
--- trunk/geant4/config/G4VIS_BUILD.gmk	(revision 472)
+++ trunk/geant4/config/G4VIS_BUILD.gmk	(revision 472)
@@ -0,0 +1,117 @@
+# $Id: G4VIS_BUILD.gmk,v 1.19 2005/10/05 17:35:40 allison Exp $
+# -------------------------------------------------------------
+# Visualization-specific CPPFLAGS for BUILD phase.
+#   John Allison, 24th January 1998.
+# Include this *after*  architecture.gmk
+# Include this *before* interactivity.gmk
+
+ifndef G4VIS_NONE
+  G4VIS_BUILD = 1
+  CPPFLAGS += -DG4VIS_BUILD
+
+# The following drivers are built by default (no environment
+#   variables needed)...
+# G4VIS_BUILD_ASCIITREE_DRIVER
+# G4VIS_BUILD_DAWNFILE_DRIVER
+# G4VIS_BUILD_GAGTREE_DRIVER
+# G4VIS_BUILD_HEPREPFILE_DRIVER
+# G4VIS_BUILD_RAYTRACER_DRIVER
+# G4VIS_BUILD_VRMLFILE_DRIVER
+
+ifdef G4VIS_BUILD_DAWN_DRIVER
+  CPPFLAGS += -DG4VIS_BUILD_DAWN_DRIVER
+endif
+
+ifdef G4VIS_BUILD_OPENGLXM_DRIVER
+  # OPENGLXM requires OPENGLX...
+  G4VIS_BUILD_OPENGLX_DRIVER = 1
+  G4INTY_BUILD_XT = 1
+  INC_XM = 1
+  CPPFLAGS += -DG4VIS_BUILD_OPENGLXM_DRIVER
+endif
+ifdef G4VIS_BUILD_OPENGLX_DRIVER
+  G4VIS_BUILD_OPENGL_DRIVER = 1
+  INC_X11 = 1
+  CPPFLAGS += -DG4VIS_BUILD_OPENGLX_DRIVER
+endif
+ifdef G4VIS_BUILD_OPENGLWIN32_DRIVER
+  G4VIS_BUILD_OPENGL_DRIVER = 1
+  G4INTY_BUILD_WIN32 = 1
+  CPPFLAGS += -DG4VIS_BUILD_OPENGLWIN32_DRIVER
+endif
+ifdef G4VIS_BUILD_OPENGL_DRIVER
+  INC_GL      = 1
+  CPPFLAGS   += -DG4VIS_BUILD_OPENGL_DRIVER
+endif
+
+ifdef G4VIS_BUILD_OIX_DRIVER
+  G4VIS_BUILD_OI_DRIVER = 1
+  G4INTY_BUILD_XT  = 1
+  CPPFLAGS += -DG4VIS_BUILD_OIX_DRIVER
+endif
+ifdef G4VIS_BUILD_OIWIN32_DRIVER
+  G4VIS_BUILD_OI_DRIVER = 1
+  G4INTY_BUILD_WIN32  = 1
+  CPPFLAGS += -DG4VIS_BUILD_OIWIN32_DRIVER
+endif
+ifdef G4VIS_BUILD_OI_DRIVER
+  INC_IV      = 1
+  CPPFLAGS   += -DG4VIS_BUILD_OI_DRIVER
+endif
+
+ifdef G4VIS_BUILD_RAYTRACERX_DRIVER
+  CPPFLAGS += -DG4VIS_BUILD_RAYTRACERX_DRIVER
+  INC_X11 = 1
+endif
+
+ifdef G4VIS_BUILD_VRML_DRIVER
+  CPPFLAGS += -DG4VIS_BUILD_VRML_DRIVER
+endif
+
+ifdef G4LIB_BUILD_SHARED
+# build shared libs MUST resolve external libs at library build time
+  ifdef G4VIS_BUILD_DAWN_DRIVER
+    G4VIS_USE_DAWN = 1
+  endif
+
+  ifdef G4VIS_BUILD_OPENGLX_DRIVER
+    G4VIS_USE_OPENGLX = 1
+  endif
+
+  ifdef G4VIS_BUILD_OPENGLWIN32_DRIVER
+    G4VIS_USE_OPENGLWIN32 = 1
+  endif
+
+  ifdef G4VIS_BUILD_OPENGLXM_DRIVER
+    G4VIS_USE_OPENGLXM = 1
+  endif
+
+  ifdef G4VIS_BUILD_OPENGL_DRIVER
+    G4VIS_USE_OPENGL = 1
+  endif
+
+  ifdef G4VIS_BUILD_OIX_DRIVER
+    G4VIS_USE_OIX = 1
+  endif
+
+  ifdef G4VIS_BUILD_OIWIN32_DRIVER
+    G4VIS_USE_OIWIN32 = 1
+  endif
+
+  ifdef G4VIS_BUILD_OI_DRIVER
+    G4VIS_USE_OI = 1
+  endif
+
+  ifdef G4VIS_BUILD_RAYTRACERX_DRIVER
+    G4VIS_USE_RAYTRACERX = 1
+  endif
+
+  ifdef G4VIS_BUILD_VRML_DRIVER
+    G4VIS_USE_VRML = 1
+  endif
+
+include $(G4INSTALL)/config/G4VIS_USE.gmk
+
+endif  # G4LIB_BUILD_SHARED
+
+endif #G4VIS_NONE
Index: trunk/geant4/config/G4VIS_USE.gmk
===================================================================
--- trunk/geant4/config/G4VIS_USE.gmk	(revision 472)
+++ trunk/geant4/config/G4VIS_USE.gmk	(revision 472)
@@ -0,0 +1,117 @@
+# $Id: G4VIS_USE.gmk,v 1.22 2005/10/05 17:35:40 allison Exp $
+# -------------------------------------------------------------
+# GNUmakefile for CPPFLAGS for visualization USE phase.
+#   John Allison, 24th January 1998.
+
+ifndef G4VIS_NONE
+
+ifndef G4VIS_USE_INCLUDED
+G4VIS_USE_INCLUDED = 1
+
+ifndef VISLIBS 
+ VISLIBS :=
+endif
+
+# Not needing external packages or libraries...
+# Set old USE C-pre-processor flags for backwards compatibility of user code...
+
+CPPFLAGS += -DG4VIS_USE_DAWNFILE
+VISLIBS  += -lG4FR
+
+CPPFLAGS += -DG4VIS_USE_HEPREPFILE
+VISLIBS  += -lG4visHepRep
+
+CPPFLAGS += -DG4VIS_USE_RAYTRACER
+VISLIBS  += -lG4RayTracer
+
+CPPFLAGS += -DG4VIS_USE_VRMLFILE
+VISLIBS  += -lG4VRML
+
+CPPFLAGS += -DG4VIS_USE_ASCIITREE
+CPPFLAGS += -DG4VIS_USE_GAGTREE
+VISLIBS  += -lG4Tree
+
+ifneq ($(G4INCLUDE_EXEC),1)
+  CPPFLAGS += -I$(G4BASE)/visualization/FukuiRenderer/include
+  CPPFLAGS += -I$(G4BASE)/visualization/HepRep/include
+  CPPFLAGS += -I$(G4BASE)/visualization/RayTracer/include
+  CPPFLAGS += -I$(G4BASE)/visualization/VRML/include
+  CPPFLAGS += -I$(G4BASE)/visualization/Tree/include
+endif
+
+ifdef G4VIS_USE_DAWN
+  CPPFLAGS += -DG4VIS_USE_DAWN
+  # CPPFLAGS += -I... and VISLIBS += set above.
+endif
+
+ifdef G4VIS_USE_OPENGLX
+  G4VIS_USE_OPENGL = 1
+  CPPFLAGS += -DG4VIS_USE_OPENGLX
+  INC_X11   = 1
+  LOAD_X11  = 1
+endif
+ifdef G4VIS_USE_OPENGLXM
+  G4VIS_USE_OPENGL = 1
+  CPPFLAGS += -DG4VIS_USE_OPENGLXM
+  INC_XM    = 1
+  LOAD_XM   = 1
+endif
+ifdef G4VIS_USE_OPENGLWIN32
+  G4VIS_USE_OPENGL = 1
+  CPPFLAGS += -DG4VIS_USE_OPENGLWIN32
+endif
+ifdef G4VIS_USE_OPENGL
+  CPPFLAGS += -DG4VIS_USE_OPENGL
+  ifneq ($(G4INCLUDE_EXEC),1)
+    CPPFLAGS += -I$(G4BASE)/visualization/OpenGL/include
+  endif
+  VISLIBS  += -lG4OpenGL
+  INC_GL    = 1
+  LOAD_GL   = 1
+endif
+
+ifdef G4VIS_USE_OIX
+  G4VIS_USE_OI = 1
+  CPPFLAGS += -DG4VIS_USE_OIX
+  INC_XM    = 1
+  LOAD_XM   = 1
+endif
+ifdef G4VIS_USE_OIWIN32
+  G4VIS_USE_OI = 1
+  CPPFLAGS += -DG4VIS_USE_OIWIN32
+endif
+ifdef G4VIS_USE_OI
+  CPPFLAGS += -DG4VIS_USE_OI
+  ifneq ($(G4INCLUDE_EXEC),1)
+    CPPFLAGS += -I$(G4BASE)/visualization/OpenInventor/include
+  endif
+  VISLIBS += -lG4OpenInventor
+  INC_IV    = 1
+  LOAD_IV   = 1
+endif
+
+ifdef G4VIS_USE_RAYTRACERX
+  CPPFLAGS += -DG4VIS_USE_RAYTRACERX
+  # CPPFLAGS += -I... and VISLIBS += set above.
+  INC_X11 = 1
+  LOAD_X11  = 1
+endif
+
+ifdef G4VIS_USE_VRML
+  CPPFLAGS += -DG4VIS_USE_VRML
+  # CPPFLAGS += -I... and VISLIBS += set above.
+endif
+
+########################### and finally... #######################
+
+G4VIS_USE   = 1
+CPPFLAGS += -DG4VIS_USE
+ifneq ($(G4INCLUDE_EXEC),1)
+  CPPFLAGS += -I$(G4BASE)/visualization/management/include
+  CPPFLAGS += -I$(G4BASE)/visualization/modeling/include
+endif
+VISLIBS  += -lG4vis_management
+VISLIBS  += -lG4modeling
+
+endif # G4VIS_USE_INCLUDED
+endif # G4VIS_NONE
Index: trunk/geant4/config/History
===================================================================
--- trunk/geant4/config/History	(revision 472)
+++ trunk/geant4/config/History	(revision 472)
@@ -0,0 +1,1372 @@
+$Id: History,v 1.278 2006/06/13 15:37:35 gcosmo Exp $
+-------------------------------------------------------------------
+
+     =========================================================
+     Geant4 - an Object-Oriented Toolkit for Simulation in HEP
+     =========================================================
+
+                      Category History file
+                      ---------------------
+
+History file for Geant4 configuration scripts.
+It DOES NOT substitute the  CVS log-message one should put at every
+committal in the CVS repository !
+
+     ----------------------------------------------------------
+     * Reverse chronological order (last date on top), please *
+     ----------------------------------------------------------
+
+13th June 2006  Gabriele Cosmo (config-V08-00-02)
+- Removed defaults for X11, XM, XAW flags in architecture.gmk and added
+  explicit settings in sys/*.gmk setups protected by ifndef statements for
+  optional customisation.
+- Upgraded Configure internal scripts.
+
+24th April 2006  Gabriele Cosmo (config-V08-00-01)
+- binmake.gmk: fixed old-standing warning on WIN32-VC for file extension of
+  target object file. Defined TARGOBJEXT internal variable defining the
+  actual extension: .o for UNIX, .OBJ for Windows platforms.
+
+6th April 2006  Gabriele Cosmo (config-V08-00-00)
+- Darwin-g++: corrected linker options for generation of dynamic libraries.
+  Now dynamic libraries on MacOSX finally work. Tested on MacOS 10.4.5 with
+  gcc-4.0.1.
+
+12th December 2005  Gabriele Cosmo (config-V07-01-07)
+- binmake.gmk: added workaround to allow for physics-lists to link
+  with DLLs on Windows.
+
+7th December 2005  Gabriele Cosmo (config-V07-01-06)
+- Added G4LIB_NO_SHARED protection for cases where installation of
+  shared libs are not allowed.
+
+2nd December 2005  Gabriele Cosmo (config-V07-01-05)
+- Replaced -GX with -EHsc compilation option in WIN32-VC setup for
+  porting on VC++8 compiler.
+
+29th November 2005  Gabriele Cosmo (config-V07-01-04)
+- Added -D_CRT_SECURE_NO_DEPRECATE to WIN32-VC setup to allow for
+  porting on VC++8 compiler.
+
+21st November 2005  Makoto Asai (config-V07-01-03)
+- binmake.gmk: added 'digits_hits/utils' module to INCFLAGS.
+
+5th October 2005 John Allison (config-V07-01-02)
+- G4VIS*.gmk: added G4VIS_BUILD_RAYTRACERX_DRIVER and G4VIS_USE_RAYTRACERX.
+
+29th July 2005 Mark Donszelmann (config-V07-01-01)
+- Synchronized CXXFLAGS warning options of WIN32-g++ with Linux-g++.
+
+18th July 2005 Gabriele Cosmo (config-V07-01-00)
+- Excluded usage of unnecessary 'ranlib' at creation of the libraries for
+  WIN32-VC system. Fixes an observed problem of debug-symbols corruption.
+
+16th June 2005 Sergey Sadilov (config-V07-00-05)
+- Updated Configure script and support files:
+  o Added new data sets for low-energy-EM and elastic data.
+  o Set unique entry point for path to data.
+  o Updated variable settings for g3tog4 and zlib.
+
+15th June 2005 Gunter Folger (config-V07-00-04)
+- Changed clean(_..) targets to be :: rules, to allow multiple clean targets.
+
+10th June 2005 Gabriele Cosmo (config-V07-00-03)
+- Updated configuration script SUN-CC.gmk:
+  o Removed obsolete compilation option -ptr$(G4TREP) for redirection to
+    template repository, no longer necessary.
+  o Added -lsunmath to LOADLIBS now required with CLHEP-1.9.X for static
+    libraries.
+
+17th May 2005 Gabriele Cosmo (config-V07-00-02)
+- Corrected settings of G4LIB_BUILD/USE_ZLIB:
+  o G4LIB_BUILD_ZLIB is mandatory for Windows, if zlib is required;
+  o if G4LIB_BUILD_ZLIB is set, the G4-zlib module is used (all platforms);
+  o if only G4LIB_USE_ZLIB is set, the system zlib is used (UNIX only);
+  o if none is set, zlib is not used (all platforms).
+- Updated compilation options on Darwin-g++, now similar to Linux-g++ setup.
+- Still requiring tag "source-gmk-V07-00-01" for source/GNUmakefile to build
+  the g3tog4 module.
+
+13th May 2005 Gabriele Cosmo (config-V07-00-01)
+- Added G4LIB_BUILD_ZLIB/G4LIB_USE_ZLIB. Modified architecture.gmk
+  and binmake.gmk scripts.
+- Changed G4USE_G4TOG4 to G4LIB_USE_G3TOG4 to conform to standard flag names.
+  Requires tag "source-gmk-V07-00-01" for source/GNUmakefile to build the
+  g3tog4 module.
+
+10th May 2005 John Allison (config-V07-00-00)
+- Made OPENGLXM require OPENGLX.
+
+8th December 2004 John Allison (config-V06-02-03)
+- Darwin-g++.gmk: fixes on setup for dynamic libraries.
+
+30th November 2004 Gabriele Cosmo (config-V06-02-02)
+- binmake.gmk: added electromagnetic/highenergy module to INCLUDE path.
+
+27th November 2004 Gabriele Cosmo (config-V06-02-01)
+- binmake.gmk: added parameterisations/trd_clusters and
+  parameterisations/gflash modules to INCLUDE path.
+
+29th October 2004 Gabriele Cosmo (config-V06-02-00)
+- Archived setup for Windows/VC++6. WIN32-VC now corresponds to WIN32-VC7.
+  Archived WIN32-VC7.gmk.
+- Removed strict compilation options for SUN-CC and thread specific.
+
+12th October 2004 John Allison
+- Darwin-g++.gmk : added -lXi to X11LIBS.
+
+08th July 2004 Guy Barrand
+- Darwin-g++.gmk : correct options to build granular shared libs.
+  Have "-undefined define_a_way" instead of "-undefined error" since
+  granular libs are not linked for the moment.
+
+23rd June 2004 Gabriele Cosmo (config-V06-01-10)
+- Updated win32def.c program to fix retrivial of public static data for
+  building DLLs on Windows (G.Barrand).
+- Updated Configure scripts.
+
+17th June 2004 Gabriele Cosmo (config-V06-01-09)
+- Darwin-g++.gmk: use twolevel_namespace and GLOBLIBS for shared-libs
+  build on MacOS. Shared-libs build are possible only global libraries
+  and requires shared-lib version of CLHEP build with compatible options
+  (G.Barrand).
+
+14th June 2004 Gabriele Cosmo (config-V06-01-08)
+- architecture.gmk: added specification for G4LIB_USE_DLL.
+
+11th June 2004 Gabriele Cosmo (config-V06-01-07)
+- binmake.gmk: activated shared-libs mechanism for Windows platforms;
+  forced creation of static library for examples/applications for the
+  usage with DLLs.
+
+8th June 2004 Gabriele Cosmo (config-V06-01-06)
+- binmake.gmk: restored global lib for interfaces which was missing
+  from linking list.
+- common.gmk, globlib.gmk: fixed clean/clean_libs target.
+- architecture.gmk: added definition of G4LIB_BUILD_DLL flag.
+- WIN32-VC.gmk: added targets for DLLs build.
+- Linux-g++.gmk: made -O2 the default optimisation mode.
+  Archived temporary setup Linux-gO2 introduced in "config-V06-01-01".
+
+7th June 2004 Gabriele Cosmo (config-V06-01-05)
+- Corrected setup for WIN32-VC7 for building of DLLs.
+- Cosmetics in build printout...
+
+1st June 2004 Gabriele Cosmo (config-V06-01-04)
+- binmake.gmk, added include paths to new hadronic models for
+  abrasion, em_dissociation, de_excitation/ablation and
+  de_excitation/fission.
+- architecture.gmk: updated comments to header.
+
+26th May 2004 Mark Donszelmann (config-V06-01-03)
+- Fixed small problem in previous fix.
+
+26th May 2004  Gunter Folger (config-V06-01-02)
+- binmake.gmk: fixed problem for WIN32 such that also LDLIBS (including
+  EXTRALIBS) will be mangled to replace -L by its WIN32 correspondance
+  libpath.
+
+11th May 2004  Gabriele Cosmo (config-V06-01-01)
+- Added new experimental setup for Linux-g++ using -O2 optimisation
+  as default. To trigger this setup G4SYSTEM must be set to "Linux-gO2".
+  It also includes (deactivated by default) Pentium4 chip specific options
+  for using chips-specific floating-point arithmetics based on the SSE unit.
+
+8th April 2004  Guy Barrand
+- architecture.gmk: revisited Inventor default. Removed HEPVis dependencies
+  (Inventor visualization driver does not need these libraries any longer).
+
+7th April 2004  Guy Barrand
+- Darwin-g++.gmk:
+  o Corrected options to build shared libraries (.dyn); use
+    "-dynamic -single_module" to have faster startup when Geant4 is
+    embedded in an external framework.
+  o Corrected options to retrieve Motif. 
+
+5th April 2004  Gabriele Cosmo (config-V06-01-00)
+- architecture.gmk: added check for definition of LDFLAGS.
+  Fixes bug report #603.
+
+24th February 2004  Gabriele Cosmo (config-V06-00-03)
+- Fixed link rpath definition in Linux-icc.gmk.
+
+11th February 2004  Gabriele Cosmo (config-V06-00-02)
+- Added configuration file Linux-icc.gmk for Intel/icc compiler
+  on Linux systems.
+
+10th February 2004  Guy Barrand
+- WIN32-VC7.gmk: added material to build shared libs for Windows (DLLs).
+- Added program win32def.c to help building DLLs, built from
+  source/GNUmakefile through a specialised target and placed in
+  $G4LIB/$G4SYSTEM.
+- source/materials/GNUmakefile: modified to provide an example of macro
+  GLOBLIBS used by the DLL builder in order to have global lib dependencies.
+
+9th February 2004  Gunter Folger (config-V06-00-01)
+- architecture.gmk:
+  o Protect OGLFLAGS against containing -I/usr/include; this may cause 
+    wrong includes to be picked up.
+   
+26th January 2004  Guy Barrand (config-V06-00-00)
+- Darwin-g++.gmk:
+  o Use "g++" as a default compiler (in order to take the MacOSX
+    default compiler).
+  o Corrected procedure for building .dylib shared libs.
+    Previous default Linux commands do not work on MacOSX.
+
+18th November 2003  Gabriele Cosmo (config-V05-02-05)
+- Updated binmake.gmk to include new hadronics modules.
+  Coworks with "ghad-V05-02-00" and HEAD of processes/GNUmakefile.
+
+4th November 2003  Gabriele Cosmo (config-V05-02-04)
+- Include removal of OPACS setup. Cowork with tags "interfaces-V05-02-00"
+  and "vis-V05-02-02".
+
+29th October 2003  Gabriele Cosmo (config-V05-02-03)
+- binmake.gmk:
+  o Added particles/utils module.
+- Does NOT include removal of OPACS setup yet.
+
+22th October 2003  Guy Barrand
+- OPACS : rm interfaces OPACS related things.
+
+17th October 2003  Guy Barrand
+- OPACS being (for long) deprecated, the OPACS related things
+  had been removed in the Geant4 repository.
+
+30th September 2003  Gabriele Cosmo (config-V05-02-02)
+- architecture.gmk, binmake.gmk:
+  o Added geometry/navigation module.
+  o Removed setup for STEP, now archived.
+  o Adopt new module and library "digits_hits", replacing "digits+hits".
+- Configure installation script:
+  o Fixed correct default name for data sets.
+  o Implemented automatic detection of OpenGL and CLHEP installations.
+  o Fixed behavior of script on Windows system, corrected definition of
+    paths and defaults.
+  o Cleared not allowed configuration drivers.
+
+19th September 2003  Gabriele Cosmo (config-V05-02-01)
+- binmake.gmk:
+  o added processes/cuts module.
+- architecture.gmk:
+  o fixed setup for OpenInventor libraries.
+
+1st July 2003  Gabriele Cosmo (config-V05-02-00)
+- WIN32-VC.gmk, WIN32-VC7.gmk:
+  o reinstated options "-D_CONSOLE -D_WIN32 -DOS" to allow correct
+    treatment/opening of data files from applications.
+
+24th June 2003  Gabriele Cosmo (config-V05-01-05)
+- Added UI32LIBS to interactivity.gmk to handle UI libraries on WIN32
+  platforms.
+- Added libraries for OpenGL and UI to default setup of WIN32-VC and
+  WIN32-VC7. Removed some obsolete compilation options.
+
+18th June 2003  Gabriele Cosmo (config-V05-01-04)
+- Removed flag G4USE_STD_NAMESPACE from specific setups in sys.
+  Follows migration from G4std apported in source/global and whole code.
+
+16th June 2003  Gabriele Cosmo
+- binmake.gmk: added module geometry/divisions in $INCFLAGS list.
+
+11th June 2003  Gunter Folger (config-V05-01-03)
+- G4VIS_BUILD.gmk, G4VIS_USE.gmk, G4UI_BUILD.gmk, G4UI_USE.gmk, and
+  sys/{Linux-g++,SU-CC}.gmk:
+  When building shared libraries needing external libs like OpenGL..., 
+  add these at shared library building, so these libs know about these 
+  dependency and have this resolved.
+
+6th June 2003  Gabriele Cosmo (config-V05-01-02)
+- architecture.gmk and specific setups in sys: get rid of G4_HAVE_BOOL
+  macro. Now using default 'bool' type, defined in all supported compilers.
+
+28th May 2003  Gabriele Cosmo (config-V05-01-01)
+- architecture.gmk, binmake.gmk: added flags G4LIB_BUILD_STEP/G4USE_STEP
+  to make optional the compilation of the STEP library and interface module.
+  By default the libraries will not be built.
+
+31st March 2003  Gabriele Cosmo (config-V05-01-00)
+- Added more strict compiler options for Linux-g++ platform.
+- Removed obsolete usage of GNU_GCC specific option for g++ compilers.
+
+22nd January 2003  Gabriele Cosmo (config-V05-00-00)
+- Added experimental setup WIN32-VC7.gmk for Windows .NET VC++ compiler.
+- Generalised identification of WIN32 specific setups in core scripts.
+- Forced silent generation of dependencies (added -w option to calls to g++).
+
+4th December 2002  Gabriele Cosmo (config-V04-01-08)
+- Removed obsolete setup for ObjectSpace-STL (G4USE_OSPACE and related
+  variables). Removed obsolete variable G4USE_STL.
+- Updated Configure scripts.
+
+2nd December 2002  John Allison (config-V04-01-07)
+- common.gmk, binmake.gmk: New dependency file algorithm that avoids
+  leaving corrupt .d files when #include'd files cannot be found.
+- Removed obsolete schema targets in common.gmk.
+
+25th November 2002  Gabriele Cosmo (config-V04-01-06)
+- Removed ODBMS setup. Now library for persistency is built as part of the
+  kernel and specific implementations for persistency have been moved to
+  examples. Setup for ODBMS no more required. G4USE_HEPODBMS is no longer
+  used.
+- Updated configuration file AIX-xlC.gmk to port code on AIX with xlC 6.0
+  (K.Murakami).
+
+22nd November 2002  Gabriele Cosmo (config-V04-01-05)
+- liblist.c:
+  o Enhanced script to provide the whole list of installed libraries
+    in the correct order, without requiring parsing of dependencies.
+    The functionality is achieved by invoking "liblist" with option '-m",
+      i.e. - liblist -m [libpath] < libname.map
+    where [libpath] is the path where libraries are placed
+    (i.e. $G4LIB/$G4SYSTEM).
+- binmake.gmk:
+  o Use "liblist -m [libpath]" to retrieve the list of libraries to link in
+    case headers are installed in $G4INCLUDE, and granular libraries are used.
+- G4UI_USE.gmk, G4VIS_USE.gmk:
+  o Protected specification of -I paths for headers, in case $G4INCLUDE is
+    used. A single -I$G4INCLUDE path will be used for compilation in such case.
+
+16th November 2002  Hans-Peter Wellisch
+- binmake.gmk:
+  o Added hadronic/models/cascade/cascade and
+    hadronic/models/generator/scattering include paths.
+
+8th November 2002  Gabriele Cosmo (config-V04-01-04)
+- Darwin-g++.gmk:
+  o Updated setup to support MacOS 10.2 (H.Burkhardt).
+
+30th October 2002  Gabriele Cosmo (config-V04-01-03)
+- architecture.gmk:
+  o Issue an error if G4SYSTEM is not defined in the environment or not valid.
+  o Define G4LIB_BUILD_G3TOG4 and G4USE_G3TOG4 for optional installation and
+    usage of the g3tog4 module.
+  o Updated list of supported systems/compilers.
+- binmake.gmk:
+  o Include path and library for g3tog4 module only if G4USE_G3TOG4 is defined.
+    Implies proper handling of G4USE_G3TOG4 in source/GNUmakefile.
+- Removed obsolete OSPACE setup for WIN32-VC, HP-aCC, DEC-cxx. Still kept for
+  platforms with ODBMS setup.
+- SUN-CC.gmk: removed -L/usr/lib path specification from LOADLIBS definition.
+
+10th September 2002  Gabriele Cosmo (config-V04-01-02)
+- Linux-g++.gmk: added assignment 'CC := gcc' for default 'cc' compiler.
+
+26th August 2002  Gabriele Cosmo (config-V04-01-01)
+- binmake.gmk: added include path to persistency/run/include which was
+  missing. Removed unnecessary processes/general/include.
+
+8th July 2002  John Allison
+- liblist.c: added protection and warning for file/directory not found
+  in parsedir.  Also small cosmetic improvements.
+
+4th July 2002  Gabriele Cosmo (config-V04-01-00)
+- Upgraded WIN32-g++ to compile with -ansi and gcc-2.95.3 for most recent versions
+  of CygWin.
+
+26th June 2002  Gabriele Cosmo (config-V04-00-10)
+- Moved STEP PERL scripts to examples/extended/geometry/cad/scripts.
+- Updated scripts for Configure.
+
+18th June 2002  Gabriele Cosmo (config-V04-00-09)
+- Added -DG4USE_OSPACE for obsolete systems using ObjectSpace STL.
+
+17th June 2002  Gabriele Cosmo (config-V04-00-08)
+- Added flag G4NO_ISO_VECDIST for compilers (SUN-CC, HP-aCC) with non ISO
+  call to vector::distance() method.
+
+14th June 2002  Gabriele Cosmo (config-V04-00-07)
+- binmake.gmk: added include path to "leading_particle" hadronic module.
+  Retagged with correct numbering...
+
+3rd May 2002  Gabriele Cosmo (config-V04-00-06)
+- liblist.c: added patch to port code on MacOS-X.
+  Defined buffer[BUFSIZE] as "char static".
+- Added Darwin-g++.gmk configuration file for MacOS-X systems running
+  with GNU g++ compiler.
+- Removed SUN-CC4.gmk configuration file, no longer supported.
+- Updated description header to system configuration files.
+
+27th March 2002  Gabriele Cosmo (config-V04-00-05)
+- binmake.gmk: added include path to new module geometry/biasing.
+  Co-works with "geometry-V04-00-01" and "transport-V04-00-00".
+
+26th March 2002  Gabriele Cosmo (config-V04-00-04)
+- liblist.c: cancelled changes made in previous tag.
+  Restored usage of function 'gets(buffer)', correctly adopted in this case.
+
+14th March 2002  Gabriele Cosmo (config-V04-00-03)
+- liblist.c: replaced usage of function 'gets(buffer)' with the safer
+  'fgets(buffer,BUFSIZE,stdin)'.
+
+9th March 2002  John Allison (config-V04-00-02)
+- Fixed bug in G4VIS_USE.gmk for G4VIS_USE_OPENGLWIN32.
+- Corrected perl script g4sort_step_file.pl to specify correct path for perl.
+
+07th February 2002 Gabriele Cosmo (config-V04-00-01)
+- liblist.c: added flags __CYGWIN__ and __CYGWIN32__ for triggering proper
+  parsing algorithm on Windows systems, also on most recent versions of Cygwin.
+- WIN32-VC.gmk: use g77 instead of f77 as default fortran compiler.
+
+25th January 2002 Gabriele Cosmo (config-V04-00-00)
+- sys/HP-aCC.gmk: removed include path to global/management/include/std/wrappers,
+  which was unused and not neccessary.
+
+10th December 2001 Gabriele Cosmo (config-V03-02-15)
+- architecture.gmk:
+  o updated list of supported compilers
+  o removed obsolete setup for STL ObjectSpace and STLport for Win/VC++.
+- binmake.gmk: activated mechanism for using $G4INCLUDE effectively for
+  building examples/applications. Currently activated only for global compound
+  libraries; for granular libraries it requires re-engineering of liblist,
+  feature which will be added in future.
+  This mechanism allows to considerably reduce the compilation/linking command
+  length and the number of -I options fed to the compiler.
+- Added G4PROFILE options to Linux-g++ and Linux-egcs setups.
+- Removed binmake.EXTRALIBS.README, now part of User's Guide.
+- Updated sources for Configure installation script.
+
+3rd December 2001 Guy Barrand (config-V03-02-14)
+- G4VIS_USE.gmk : -lG4HepRep replaced by -lG4visHepRep.
+
+29th November 2001 Gabriele Cosmo (config-V03-02-13)
+- Removed SUN-CC5.gmk configuration file. Now replaced by SUN-CC architecture
+
+21st Novemver 2001 Gabriele Cosmo (config-V03-02-12)
+- On top of "config-V03-02-11", added paths in binmake.gmk including
+  new hadronic models for cascade, CHIPS and coherent_elastic.
+  Does not include changes to analysis.gmk.
+
+19th November 2001 Guy Barrand
+- analysis.gmk : then remove all system specifc flags, have
+   only the AIDA ones. Have G4ANALYSIS_USE to drive the insertion of 
+   CPP and libs in the Geant4 GNUmakefile system.
+
+19th November 2001  John Allison  (config-V03-02-11)
+- Does not include Guy's changes of 16rd November.
+- Re-instated creation of CPPFLAGS (see 6th November) but conditonal
+  on existence of corresponding environment variable.  If no environmet
+  variable is set, CPPFLAGS += -DG4UI_USE_TERMINAL.
+
+16rd November 2001  Guy Barrand
+- analysis.gmk : add flags to use an AIDA 2.2 compliant analysis system.
+
+6th November 2001  John Allison  (config-V03-02-10)
+- Removed CPPFLAGS += -DG4UI_USE_GAG -DG4UI_USE_TCSH -DG4UI_USE_TERMINAL.
+
+6th November 2001  John Allison  (config-V03-02-09)
+- Removed references to HepRep, added code for HepRepFile, thus
+  needed by vis-V03-02-15.
+
+23rd October 2001  Gabriele Cosmo  (config-V03-02-08)
+- Merged changes in "config-V03-02-07" for removal of STLInterface.
+
+22nd October 2001  Gabriele Cosmo  (config-V03-02-06b)
+- binmake.gmk: added include path for geometry/verification
+  according to tag "geometry-V03-02-01".
+
+1st October 2001  Gabriele Cosmo  (config-V03-02-06a)
+- binmake.gmk: removed include path for processes/electromagnetic/integral
+  according to tag "em-V03-02-02".
+
+30th September 2001  Gabriele Cosmo  (config-V03-02-07)
+- Removed references to STLInterface module in architecture.gmk
+  and architecture setups. Coworks with tag "global-V03-02-03" where
+  STLInterface module has been removed.
+
+29th August 2001  John Allison/Joseph Perl  (config-V03-02-06)
+- Needed by vis-V03-02-14.
+- First developers release of HepRep graphics driver.
+
+27th August 2001  John Allison
+- Tidied HepRep configuration in G4VIS*, moving stuff to interactivity.gmk.
+
+24th August 2001  Joseph Perl  (config-V03-02-05)
+- Introduced HepRep graphics driver
+
+11th August 2001  John Allison  (config-V03-02-04)
+- Re-engineered G4UI variables.  Coworks with interfaces-V03-02-00.
+- Introduced environment variable G4UI_NONE that, if set, no UI
+  sessions nor any UI libraries are built, not even libG4UIbasic.a nor
+  libG4UIcommon.a.  (This would only happen in a pure batch job or,
+  perhaps, in a user framework having its own UI system.)
+- Removed the need to specify environment variables for UI sessions
+  which do not need external packages or libraries, namely :
+    G4UI_BUILD_GAG_SESSION
+    G4UI_BUILD_TERMINAL_SESSION
+  with associated G4UI_USE environment variables:
+    G4UI_USE_GAG
+    G4UI_USE_TCSH
+    G4UI_USE_TERMINAL
+  In other words, the above environment variables become redundant and are
+  ignored.  
+  For backwards compatibility, unless G4UI_NONE is set, the corresponding
+  G4UI_USE C-pre-processor variables are automatically set.  Also, the
+  C-pre-processor variables G4UI_BUILD and G4UI_USE are set.
+- As before, environment variables for other sessions still need positive
+  setting of their G4UI_BUILD and G4UI_USE environment variables.  In this
+  category are:
+    G4UI_BUILD_WIN32_SESSION
+    G4UI_BUILD_WO_SESSION
+    G4UI_BUILD_XAW_SESSION
+    G4UI_BUILD_XM_SESSION
+  with associated G4UI_USE environment variables:
+    G4UI_USE_WIN32
+    G4UI_USE_WO
+    G4UI_USE_XAW
+    G4UI_USE_XM
+- Note: The user must still instantiate and SessionStart only *one*
+  session, but if it is to be one in the category needing external
+  packages or libraries, the corresponding G4UI_USE must be set to
+  trigger inclusion oflibraries.  Otherwise the user need not set any
+  environment variables.
+
+3rd August 2001 Gabriele Cosmo (config-V03-02-03)
+- architecture.gmk:
+  o updated list of supported systems/compilers.
+  o made Linux-g++ architecture the default G4SYSTEM. Replaced SUN-CC.
+- Added SUN-CC4.gmk for old SUN architectures based on CC-4.2 compiler.
+- Added Linux-egcs for old Linux architectures based on egcs-1.1.2 compiler.
+- Made SUN-CC.gmk a copy of SUN-CC5.gmk (kept for backward compatibility,
+  will be removed soon). CC-5.2 compiler is now the default on SUN systems.
+- Made Linux-g++.gmk specific to gcc-2.95.2 compiler, from now on the default
+  compiler on Linux systems.
+
+1st August 2001 Gabriele Cosmo (config-V03-02-02)
+- Included recent updates to scripts sources for 'Configure'.
+
+27th July 2001  John Allison  (config-V03-02-01)
+- Introduced environment variable G4VIS_NONE that, if set, no visualization
+  drivers are built and no vis libraries are built, not even
+  libG4vis_management.  (libG4modeling is still built.)  The C-pre-processor
+  variables G4VIS_BUILD and G4VIS_USE are *not* set.
+- Removed the need to specify environment variables for visualization drivers
+  which do not need external packages or libraries, namely :
+      G4VIS_BUILD_DAWNFILE_DRIVER
+      G4VIS_BUILD_RAYTRACER_DRIVER
+      G4VIS_BUILD_VRMLFILE_DRIVER
+      G4VIS_BUILD_ASCIITREE_DRIVER
+      G4VIS_BUILD_GAGTREE_DRIVER
+    with associated G4VIS_USE environment variables:
+      G4VIS_USE_DAWNFILE
+      G4VIS_USE_RAYTRACER
+      G4VIS_USE_VRMLFILE
+      G4VIS_USE_ASCIITREE
+      G4VIS_USE_GAGTREE
+  In other words, the above environment variables become redundant and are
+  ignored.  
+  For backwards compatibility, unless G4VIS_NONE is set, the corresponding
+  G4VIS_USE C-pre-processor variables are automatically set.  Also, the
+  C-pre-processor variables G4VIS_BUILD and G4VIS_USE are set.
+- As before, environment variables for other drivers still need positive
+  setting of their G4VIS_BUILD and G4VIS_USE environment variables.  In this
+  category are:
+      G4VIS_BUILD_DAWN_DRIVER
+      G4VIS_BUILD_OPACS_DRIVER
+      G4VIS_BUILD_OPENGLX_DRIVER
+      G4VIS_BUILD_OPENGLWIN32_DRIVER
+      G4VIS_BUILD_OPENGLXM_DRIVER
+      G4VIS_BUILD_OIX_DRIVER
+      G4VIS_BUILD_OIWIN32_DRIVER
+      G4VIS_BUILD_VRML_DRIVER
+    with associated G4VIS_USE environment variables:
+      G4VIS_USE_DAWN
+      G4VIS_USE_OPACS
+      G4VIS_USE_OPENGLX
+      G4VIS_USE_OPENGLWIN32
+      G4VIS_USE_OPENGLXM
+      G4VIS_USE_OIX
+      G4VIS_USE_OIWIN32
+      G4VIS_USE_VRML
+  In this case G4VIS_NONE must *not* be set.
+- Added binmake.EXTRALIBS.README.
+
+5th July 2001 Youhei Morita (config-V03-02-00)
+- Linux-g++.gmk: Use -pedantic (G.Cosmo)
+- Linux-g++.gmk, SUN-CC.gmk, SUN-CC5.gmk: added -DG4std in G4DDLX_FLAGS
+
+29th June 2001 Gabriele Cosmo (config-V03-01-10)
+- Updated source scripts for 'Configure'.
+
+26th June 2001 Youhei Morita (config-V03-01-09)
+- globlib.gmk: added block for copying headers for persistency in $G4INCLUDE
+  when invoking the 'includes' target.
+
+25th June 2001 Youhei Morita (config-V03-01-08)
+- Restored lib_d target (again) in common.gmk with a protection of G4ODBMS.
+- Linux-g++.gmk (G.Cosmo)
+  o Commented out -ansi setup for public release
+  o Fixed logic for activating G4OODDLX_FLAGS on egcs compiler
+
+22nd June Gabriele Cosmo (config-V03-01-07)
+- common.gmk (G.Folger):
+  o removed lib_d target (again).
+  o restored G4SKIP_DEPEND.
+- Linux-g++.gmk:
+  o added temporary cludge for identify compiler version
+    and define G4DDLX_FLAGS for egcs-1.1.2.
+- binmake.gmk:
+  o added mechanism to correctly handle include paths when source headers
+    are centrally installed in $G4INCLUDE. Temporarly disabled, requires
+    update (re-design?) of liblist.c to properly generate the list of
+    libraries from the map.
+    Once activated, also G4UI_USE.gmk, G4VIS_USE.gmk and analysis.gmk
+    have to be modified accordingly.
+
+22nd June 2001 Youhei Morita (config-V03-01-06)
+- Restored lib_d target in common.gmk with a protection of G4ODBMS.
+- Get rid of G4SKIP_DEPEND in binmake.gmk.
+- Comment out G4DDLX_FLAGS options in sys/Linux-g++.gmk for gcc-2.95.2.
+
+21st June 2001 Gunter Folger (config-V03-01-05)
+- Removed bin_d and lib_d targets and thus the re-start of make.
+
+21st June 2001 Gunter Folger (config-V03-01-04)
+- common.gmk, binmake.gmk: run gmake via $(MAKE).
+
+19th June 2001 John Allison (config-V03-01-03)
+- Added GAG_TREE to G4VIS_BUILD.gmk and G4VIS_USE.gmk.
+
+20th June 2001 (Japan Time - still 19th in Europe!)
+               Youhei Morita (config-V03-01-02)
+- A few bug fixes in binmake.gmk, common_objy.gmk, sys/SUN-CC5.gmk,
+  sys/Linux-g++.gmk, sys/Win32-g++.gmk.
+
+19th June 2001 Gabriele Cosmo
+- Removed G4_NO_CBRT flag from WIN32-VC setup. No more necessary.
+
+30th May 2001 Gunter Folger
+- Do changes for persistency from Youhei: common.gmk is now split in three,
+  one general, and one for specific for transient and persistent each. 
+  Dependencies now much better handled in persistency.
+
+2nd May 2001 Gabriele Cosmo (config-V03-01-01)
+- Added options "-Wall -ansi -pedantic" to Linux-g++ setup.
+
+10th April 2001  John Allison  (config-V03-01-00)
+- Added G4VIS_BUILD_ASCIITREE_DRIVER and G4VIS_USE_ASCIITREE to G4VIS*gmk.
+
+22nd March 2001 Gunter Folger (config-V03-00-03)
+- binmake.gmk, only store in executable PATH to libs from example/test; 
+  other libs should be taken/found from LD_LIBRARY_PATH
+- sys/{Linux-g++,SUN-CC}.gmk: enable storing of PATH to libs in executable 
+
+06th March 2001 Gabriele Cosmo (config-V03-00-02)
+- binmake.gmk: added include path for processes/electromagnetic/integral
+  the new subcategory introduced with tag em-V03-00-04.
+
+13th February 2001 Gabriele Cosmo (config-V03-00-01)
+- binmake.gmk: added include path for processes/photolepton_hadron
+  which was missing!
+
+08th January 2001 Gabriele Cosmo (config-V03-00-00)
+- sys/WIN32-VC.gmk: introduced -GR compiler option to allow usage of
+  dynamic casting and type-info at run-time.
+
+13th December 2000 Gunter Folger (config-V02-00-14)
+- common.gmk: fix to rule for building dependencies, parsing is skip
+  if $(dependencies) is empty.
+- globlib.gmk: added "includes" to PHONY target list and fixed typo.
+- Added comments to "includes" rules.
+
+8th December 2000 Gabriele Cosmo (config-V02-00-13)
+- Changed G4LIB_BUILD_ARCHIVE to G4LIB_BUILD_STATIC in architecture.gmk,
+  common.gmk and globlib.gmk.
+
+7th December 2000 Gabriele Cosmo (config-V02-00-12)
+- Added options to SUN-CC5.gmk to handle multithreading and persistency.
+
+5th December 2000 Youhei Morita (config-V02-00-11)
+- Introduced GPPFLAGS to set -M or -MM according to G4ODBMS.
+
+5th December 2000 Gabriele Cosmo (config-V02-00-10)
+- Restored -MM option to g++ for making dependencies. -M was introduced in
+  tag config-V02-00-02 to allow dependency search on system headers as well
+  (#include<...> statements). This however introduces serious clashes with
+  Objectivity schema generation for the persistency module.
+
+4th December 2000 Gunter Folger (config-V02-00-09)
+- Disable G4RUNPATHOPTION (internal variable) for all but SUN. This is/will 
+  be used when linking with G4 shared libraries to store the path to these 
+  libraries in the executable. 
+
+1st December 2000  Gabriele Cosmo (config-V02-00-08)
+- Added G4UI_USE_TCSH and related settings to G4UI_USE.gmk (M.Maire).
+- Merged SUN-CC6.gmk to SUN-CC5.gmk and removed SUN-CC6.gmk.
+
+1st December 2000  Gunter Folger (config-V02-00-07)
+- Change -M to -M -MG in common.gmk, binmake.gmk. This will output a "correct"
+  dependency file even when missing  header files are missing. Correct in the
+  sense that liblist will work, and that the missing header is supposed to be
+  (made) in the source directory.
+
+17th November 2000  Gunter Folger (config-V02-00-06)
+- Link with CLHEP using -L/-l instead of absolute filename; this allows 
+  to link with shared lib of Anaphe, or static lib of Geant4.
+- Added shared-lib settings to sys configurations.
+
+14th November 2000  Gabriele Cosmo (config-V02-00-05)
+- Added reference to new "parameterisations" top category.
+  Modified files: binmake.gmk.
+- Removed makeshlib.sh script, now obsolete.
+
+7th November 2000  Guy Barrand
+- analysis.gmk : renamed OpenScientist things to "Lab" ; 
+  Lab is the concrete package where analysis is done.
+
+3rd November 2000  Gunter Folger (config-V02-00-04)
+- common.gmk: fix for shared-library build.
+- common.gmk, globlib.gmk: added rules for "includes" gmake target.
+- architecture.gmk: introduced new user settable variable G4INCLUDE
+  to specify path where headers (files or symbolic-links) should be installed.
+
+1st November 2000  Guy Barrand
+- analysis.gmk: declared Lizard.
+
+24th October 2000  Gunter Folger (config-V02-00-03)
+- architecture.gmk, common.gmk, globlib.gmk, sys/*:
+  o merged building shared libraries into makefiles.
+    The MAKESHLIB script is no longer used.
+- Introduced new variables steering the building of archive/shared libs:
+   G4LIB_BUILD_SHARED
+   G4LIB_BUILD_ARCHIVE  (still default)
+     note that G4MAKESHLIB set will internally set G4LIB_BUILD_SHARED for
+     backwards compatiblity.
+- Introduced new variable (G4LIB_USE_GRANULAR) to force using of granular 
+  libraries, even when libG4global.a/.so exists.
+
+14th September 2000  Guy Barrand 
+- Introduced changes to handle analysis module.
+  o added analysis.gmk.
+  o sys/Linux-g++.gmk: added macro DLDLIBS for library dynamic loading.
+  o binmake.gmk: added inclusion of analysis.gmk.
+  o binmake.gmk: place LDLIBS3 += $(ANALYSISLIBS) after LDLIBS3 += $(INTYLIBS).
+
+22nd August 2000  John Allison (config-V02-00-02)
+- Changed -MM to -M in dependency file making in binmake.gmk and common.gmk.
+  This causes dependencies of both #include "..." and #include <...> to be
+  followed.  This is the safer option, since some users might/should use,
+  e.g., #include <g4std/...>, but even these files change sometime.
+
+22nd August 2000  Gunter Folger
+- globlib.gmk: fix for protection from infinite loops when a dir does
+  not exist (G.Folger).
+
+1st August 2000  Gabriele Cosmo (config-V02-00-01)
+- Added setup WIN32-g++ for Windows/NT/9X with Cygwin and g++ compiler.
+  Configuration non officially supported (courtesy of S.Agostinelli and
+  IST group, Genova).
+
+24th July 2000  Gabriele Cosmo (config-V02-00-00)
+- Added path to g3tog4 for global libs.
+
+23rd May 2000  John Allison (config-V01-01-04)
+- Added -I$(G4BASE)/processes/hadronic/models/radiative_decay/include to
+  binmake.gmk.
+
+19th May 2000  Gabriele Cosmo (config-V01-01-03)
+- architecture.gmk:
+  o changed -pic option to -KPIC for SUN architectures.
+  o fixed HP-aCC setup to cope with new CLHEP version 1.5.
+  o implemented modular setup. Now system specific configurations are
+    grouped in separated files $G4SYSTEM.gmk and placed in the new
+    directory config/sys.
+
+7th April 2000  Gabriele Cosmo (config-V01-01-02)
+- binmake.gmk: added include path to the new directory
+  geometry/solids/specific.
+- Updated PERL script g4step_correct.pl for parsing STEP files.
+
+30th March 2000  Gabriele Cosmo (config-V01-01-01)
+- makeshlib.sh:
+  o added few corrections to the script in order to allow
+    creation of shared libraries without need of the static archive on
+    platforms which allow this.
+  o added section for SunOS systems.
+  (courtesy of I.G.Caballero)
+- architecture.gmk:
+  o on SUN-CC and SUN-CC5, added -pic to CXXFLAGS for building shared
+    libraries.
+
+21st March 2000  Gabriele Cosmo
+- makeshlib.sh: corrected invokation of compiler for HP-aCC setup.
+  Changed CC to aCC (fixes bug-report #68).
+
+13th March 2000  Gabriele Cosmo (config-V01-01-00)
+- architecture.gmk: corrected FCLIBS for Linux-g++
+  o added -lg2c -lnsl and removed -lf2c.
+
+14th February 2000  Gabriele Cosmo (config-V01-00-02)
+- architecture.gmk: added option '+W823' to HP-aCC compilation setup to
+  discard warnings for macros parameter definition as used in the new
+  NIST STEP reader.
+- binmake.gmk: moved $EXTRALIBS to be included on top of the linking list,
+  just after the user application library.
+
+31st January 2000  Gabriele Cosmo (config-V01-00-01)
+- Added control for the Ray-tracer driver. Introduced G4VIS_USE_RAYTRACER
+  in G4VIS_USE.gmk and G4VIS_BUILD_RAYTRACER_DRIVER in G4VIS_BUILD.gmk (M.Asai).
+- binmake.gmk: fixed dependency order for compound libraries.
+  Moved -lG4particles and -lG4materials downstream in the list.
+- architecture.gmk: added G4NO_OPTIMISE for allowing compilation without
+  any level of optimisation or debug. G4DEBUG if defined takes precedence.
+  G4DEBUG and G4OPTIMISE are now defined also as CPPFLAGS.
+
+3rd January 2000  Gabriele Cosmo (config-V01-00-00)
+- Syncronized with HEAD.
+
+16th December 1999  John Allison
+- Cosmetic improvement to echo line in binmake.gmk.
+
+7th December 1999  Gabriele Cosmo (config-V00-01-19)
+- architecture.gmk: minor fix on OSPACELIBS path for Win/NT.
+
+5th December 1999  Youhei Morita (config-V00-01-18) 
+- architecture.gmk: defined G4OODDLX_FLAGS
+- common.gmk: use G4OODDLX_FLAGS
+
+5th December 1999  Gabriele Cosmo (config-V00-01-17)
+- architecture.gmk: fixes for Win/NT.
+  o fixed path for OSPACELIBS
+  o removed -DG4NOT_ISO_DELETES flag
+
+3rd December 1999  Gabriele Cosmo (config-V00-01-16)
+- architecture.gmk: set G4_HAVE_BOOL for SUN-CC5.
+
+3rd December 1999  Youhei Morita
+- common.gmk: fixed minor typo in G4OODDLX_SCHEMA_NAME
+
+1st December 1999  Gabriele Cosmo (config-V00-01-15)
+- architecture.gmk:
+  o added new G4SYSTEM flavor SUN-CC5, used for testing on the new C++
+    compiler v5.0 on SunOS. Requires ISO/ANSI-C++ installation and native
+    STL by default. Compatibility with old no ISO/ANSI code is assured
+    through the -compat compiler option and the usage of ObjectSpace STL
+    (i.e. G4USE_OSPACE set).
+  o added new flag G4NO_STD_NAMESPACE.
+    HP-aCC setup with native STL assumes the ISO-ANSI installation by default,
+    the new flag should be explicitly set in the environment to avoid this.
+  o upgraded SGI-CC setup to IRIX 6.5.5, CC 7.2.1 and ObjectSpace STL.
+    Tests on this configuration has NOT been tested though.
+
+1st December 1999  Youhei Morita
+- architecture.gmk: added G4EXAMPLE_BOOT and G4EXAMPLE_FD
+- common.gmk: copy only the .hh files
+- binmake.gmk: added persistent include paths
+               added new targed cleandb, newboot, newfd
+               added G4SKIP_DEPEND for dependencies
+
+29th November 1999  Youhei Morita
+- architecture.gmk: added G4SYSTEM to G4SCHEMA_DIR, G4TMPSCHEMA_DIR
+- common.gmk: changed G4SCHEMA_HEADER_DIR from G4TMPSCHEMA_INCLUDE to G4TMPDIR
+              added target install_schema for schema copying
+- globlib.gmk: create schema header files at G4TMPDIR, then install
+
+29th November 1999  John Allison
+- Introduced LDLIBS2EXTRA so that granular libraries are not
+  expanded too soon.
+
+25th November 1999  Gabriele Cosmo (config-V00-01-14)
+- architecture.gmk: redefined OSPACEDIR as OSPACE_BASE_DIR to conform to
+  an omogeneous format. Added existence check for OSPACE and CLHEP paths.
+
+23rd November 1999  Gabriele Cosmo (config-V00-01-13)
+- architecture.gmk: added setup for ISO/ANSI installation on DEC-cxx.
+  If using native STL (i.e. G4USE_OSPACE not set), G4USE_STD_NAMESPACE is
+  implicitly defined and a strict-ANSI installation is assumed. Note that
+  in this case, also CLHEP must have been installed in strict-ANSI mode.
+
+20th November 1999  Youhei Morita (config-V00-01-12)
+- common.gmk: added G4OODDLX_SCHEMA_NAME to use Geant4 named schema
+
+19th November 1999  Youhei Morita
+- liblist.c: avoid coredumps when it was given non-existing directly.
+
+18th November 1999  Gabriele Cosmo (config-V00-01-11)
+- architecture.gmk: added -e option to $ECHO for Linux-g++ setup.
+
+17th November 1999  John Allison (config-V00-01-10)
+- binmake.gnk: added isotope_production/include to -I list (Hans-Peter).
+
+17th November 1999  Youhei Morita (config-V00-01-09)
+- moved schema header files to G4INSTALL/schema/include
+  architecture.gmk: introduced G4SCHEMA_INCLUDE and G4TMPSCHEMA_INCLUDE
+  common.gmk: introduced G4SCHEMA_HEADER_DIR and G4SCHEMA_SRC_DIR 
+  globlib.gmk: added tmp schema header copying
+
+15th November 1999  Gabriele Cosmo (config-V00-01-08)
+- Tagged.
+
+14th November 1999  Youhei Morita
+- globlib.gmk: moved contruction of libmap for G4ODBMS to
+               source/GNUmakefile
+
+12th November 1999  Youhei Morita
+- common.gmk: introduced G4ODBMS_DEPEND and G4SKIP_DEPEND for
+              better handling of dependencies
+- globlib.gmk: use G4ODBMS_DEPEND, automatic rebuilding of libmap
+
+11th November 1999  Gabriele Cosmo (config-V00-01-07)
+- Migration RWT->G4RWT performed:
+  o Removed every occurence of Rogue-Wave from configuration, replaced
+    RWBASE with G4STLBASE. Modified scripts: architecture.gmk, common.gmk
+    and binmake.gmk.
+  o Made setup for Native-STL the default, removed test on conditional
+    flag G4USE_STL.
+  o Removed setup for Win/NT-g++, no longer supported.
+
+10th November 1999  Youhei Morita (config-V00-01-06)
+- binmake.gmk: added path to persistency/global/include.
+- common.gmk: Change G4ODBMS_DEPEND to G4ODBMS_NODDL
+- globlib.gmk: removed G4ODBMS_DEPEND, modified target "global"
+
+10th November 1999  Gabriele Cosmo (config-V00-01-05)
+- binmake.gmk: added path to HEPNumerics/include which was missing.
+
+29th October 1999  Guy Barrand
+- architecture.gmk, interactivity.gmk: introduced
+  "G4_OPACS_WIDGET_SET lesstif" logic to handle the case
+  of using, on Linux, the bugged lesstif with the non bugged OPACS.
+
+29th October 1999  Gabriele Cosmo
+- Introduced fixes for shared library setup (courtesy of F.Carminati).
+  Modified files: architecture.gmk, common.gmk, globlib.gmk, makeshlib.sh.
+
+28th October 1999  Gabriele Cosmo (config-V00-01-04)
+- architecture.gmk: removed G4STREAM and G4STREAM_STREAMBUF_IMPLEMENTATION
+  flags, now no longer needed. Streambuf implementation is the default for
+  every platform. (by H.Yoshida)
+
+26th October 1999  John Allison
+- Augmented liblist to look for dependencies on auto-generated
+  headers in $G4TMP.
+
+26th October 1999  Gabriele Cosmo (config-V00-01-03)
+- Removed AIX-xlC as default platform for G4SYSTEM in architecture.gmk.
+  Configuration is still kept but no longer supported.
+
+26th October 1999  Youhei Morita
+- architecture.gmk: include $(HEP_ODBMS_DIR)/etc/$(OS).mk instead of
+  defininig load module separately.  Defined G4ODBMS_LIBS.
+- binmake.gmk: Use G4ODBMS_LIBS.
+
+20th October 1999  Gabriele Cosmo (config-V00-01-02)
+- architecture.gmk: removed option -DOS_NO_TYPEDEF_5 from HP-aCC
+  OSpace setup. Not anymore needed.
+
+20th October 1999  John Allison
+- architecture.gmk: removed G4USE_EXPLICIT_TYPES_IN_TEMPLATES (was needed
+                    only for HP aCC; now not needed at all).
+
+19th Octobre 1999  Youhei Morita
+- common.gmk: Surpress verbose output for G4ODBMS if CPPVERBOSE 
+              is not defined.
+
+7th October 1999  John Allison (config-V00-01-01)
+- Removed WARNINGs about granular libraries.  Now standard usage.  Simple
+  using messages printed.
+
+17th Sep 1999  Youhei Morita
+- architecture.gmk: Defined G4TMPSCHEMA_DIR, G4TMPSCHEMA_BOOT
+                    Added OBJY_LDLIB definition for Objectivity 5.1
+- binmake.gmk: LDLIBS1 += -lG4persistency
+- common.gmk: Changed ooddlx boot file option to G4OODDLX_BOOT
+- globlib.gmk: Changed G4EXAMPLE_BOOT to G4TMPSCHEMA_BOOT
+- G4ODBMS_BUILD.gmk: Defined HEP_ODBMS_EXPORT for HepODBMS 0.3.0.x
+
+27th July 1999  Gonzalo Gracia Abril
+- Changed OSPACELIBS := '-libpath:c:\dev\ospace\lib std-2.1-vc5.0-mt.lib'
+  to      OSPACELIBS := '-libpath:$(OSPACEDIR)\lib std-2.1-vc5.0-mt.lib'
+  in architecture.gmk for NT  
+
+20th July 1999  John Allison (config-V00-01-00)
+- Added EXTRA_LINK_DEPENDENCIES to binmake.gmk.
+
+6th July 1999  John Allison (config-01-00-10)
+- Changed -L/usr/X11/lib to -L/usr/X11R6/lib for Linux.
+
+6th July 1999  Gunter Folger (config-01-00-09)
+- Adapt architecture.gmk for use of STL with WIN32-VC
+  Remove NICE from G4SYSTEM name WIN32-VC in architecture, globlib and 
+  binmake.gmk
+
+3rd July 1999  John Allison (config-01-00-08a)
+- Added full-stop after i.e in binmake.gmk.
+
+2nd July 1999  John Allison (config-01-00-08)
+- Protected liblist against duplicate library names.
+
+29th June 1999  Gabriele Cosmo (config-01-00-07)
+- architecture.gmk: fixed bug in SUN-CC setup concerning XMLIBS and XMFLAGS.
+  -lXm was missing.
+
+25th June 1999  Gabriele Cosmo
+- Use $G4LIB/$G4SYSTEM instead of $G4LIBDIR in binmake.gmk for invoking
+  liblist and search for libname.map (granular libraries setup).
+
+24th June 1999  John Allison
+- Use liblist and libname.map in $G4LIBDIR.
+
+19th June 1999  John Allison
+- Removed references to G4Ray in G4VIS_BUILD.gmk and G4VIS_USE.gmk.
+
+9th June 1999  Gunter Folger
+- Adapt liblist.c for Windows, all changes contained withing #ifdef WIN32 blocks. 
+
+4th June 1999  John Allison
+- Corrected USER_DEFINED_LDLIBS action.
+- Changed `export G4TMP=$(G4TMP);' to `G4TMP=$(G4TMP); export G4TMP;'
+- Added -I$(G4BASE)/geometry/solids/Boolean/include.
+- Introduced LDLIBS_PREFINAL (Gunter).
+
+2nd June 1999  John Allison
+- Changed more occurrences of := to = to fix crash of liblist at startup.
+
+1st June 1999  John Allison
+- Changed LDLIBS2 := to LDLIBS2 = in binmake.gmk.
+- Reverted $(G4WORKDIR)/tmp/$(G4SYSTEM)/$(G4TARGET) to $(G4TMPDIR).
+- Added /$(G4TARGET) to liblist -d $(G4WORKDIR)/tmp/$(G4SYSTEM) in binmake.gmk.
+
+31st May 1999  John Allison
+- Added -I$(G4BASE)/processes/electromagnetic/lowenergy/include.
+
+27th May 1999  Gabriele Cosmo (config-01-00-06)
+- architecture.gmk: set default $G4INSTALL path to $HOME/geant4 (was still referring
+  to geant4beta...).
+- Restored default CLHEP_BASE_DIR to /afs/cern.ch/sw/geant4/dev/CLHEP/$G4SYSTEM/pro.
+- architecture.gmk: added -DG4NOT_ISO_DELETES for NT setup (G.Folger).
+
+25th May 1999  Gabriele Cosmo
+- architecture.gmk: fixed bug in SUN-CC setup. Replaced VISLIBS with LOADLIBS to
+  specify inclusion of socket libraries -lsocket -lnsl.
+- binmake.gmk: fixed path to libname.map in the definition of LDLIBS2 for the
+  granular libs setup.
+
+19th May 1999  John Allison
+- Force linking of static library, libCLHEP.a.
+
+18th May 1999  John Allison
+- Specify -DG4NOT_ISO_DELETES in any case (not just G4USE_STL) and only
+  for HP, Sun and AIX.
+
+17th May 1999  Gabriele Cosmo
+- Added -DG4NOT_ISO_DELETES for DEC and AIX and moved inside G4USE_STL or
+  G4USE_OSPACE scope for all platforms which need it.
+- Added path to wrappers for AIX.
+
+17th May 1999  John Allison
+- Added -DG4NOT_ISO_DELETES for Sun and HP.
+- Changed order of -I$(OSPACEDIR)/ospace/std and -I$(OSPACEDIR)/ospace/stl.
+
+13th May 1999  Gabriele Cosmo (config-01-00-05)
+- architecture.gmk: G4USE_OSPACE setup is now independent from G4USE_STL which
+  is now devoted for generic STL setup. Added -DOS_NO_TYPEDEF_5 option to HP-aCC
+  for ObjectSpace.
+
+12th May 1999  Gabriele Cosmo
+- architecture.gmk: modified path to STL wrapper files directory to point to
+  $RWINC/wrappers/$G4SYSTEM. Wrappers are now differenciated according to
+  the architecture type.
+
+11th May 1999  Gabriele Cosmo
+- architecture.gmk: merged Isidro's OSPACE setup for HP-aCC.
+  Reorganised OSPACE options by introducing OSPACEINC variable.
+
+10th May 1999  Guy Barrand
+- interactivity.gmk ; put OpenGL things after OPACS things to have 
+  correct link order.
+
+10th May 1999  John Allison
+- Added -I$(OSPACEDIR)/ospace/stl for Sun.
+
+7th May 1999  John Allison
+- Added GREP := grep except for SUN.
+- Introduced STLInterface/wrappers directory. Testing on OSF+ObjectSpace (G.Cosmo).
+
+6th May 1999  Gabriele Cosmo
+- Introduced G4USE_OSPACE for ObjectSpace STL. If defined G4USE_STL is
+  set as well. Modified architecture.gmk and binmake.gmk.
+
+6th May 1999  John Allison
+- Removed extra library for circular dependencies.  Now all solved!
+
+5th May 1999  Gabriele Cosmo
+- Fixed typo in architecture.gmk and defined OSPACEDIR to point to the G4
+  dev area where links to the ObjectSpace installations at CERN have been
+  created for all platforms. "pro" version points to ObjectSpace 2.1.
+
+5th May 1999  John Allison
+- Eliminated all references to RW in the case of G4USE_STL.
+- Added OSPACE variables.
+
+28th April 1999  Gabriele Cosmo (config-01-00-04)
+- architecture.gmk: moved link for CLHEP to "new" to test the new version
+  1.4 of CLHEP. It will become "pro" again as soon as the new CLHEP will be
+  validated. NOTE: for DEC-cxx a custom CLHEP installation is used in order
+  to deactivate the ISO-ANSI options now set by default in CLHEP.
+
+19th April 1999  Gabriele Cosmo (config-01-00-03)
+- architecture.gmk: introduced CCFLAGS for all platforms. Set CCFLAGS to
+  "-Ae +DAportable" for HP-aCC to overcome compilation problems on liblist.c
+
+18th April 1999  Youhei Morita
+- architecture.gmk, binmake.gmk: introduced OBJY_LDLIB variable for
+  defining Objectivity library within G4ODBMS.
+
+13th April 1999  Gabriele Cosmo
+- architecture.gmk: added the following options in compilation:
+  o HP-aCC, SGI-CC: +Onolimit, -Olimit 5000 respectively.
+    Not suppress any optimization specifying a high or unlimited memory
+    limitation.
+  o DEC-cxx: -timplicit_local.
+    Get rid of the template repository by generating explicit template
+    instantiations used in the code with internal linkage.
+    
+13th April 1999  John Allison
+- In binmake.gmk: - moved libmap target to source/GNUmakefile.
+                  - extensive tidying.
+
+12th April 1999  John Allison
+- In liblist.c:  - fixed bug to distinguish, e.g., track from tracking.
+                 - improved printing.
+                 - improved "Usage" comments.
+                 - improved protection against bad input format.
+- In binmake.gmk, used $(ECHO) to solve platform dependency of echo.
+- In binmake.gmk for granular libraries:
+   - fully implemented -d option.
+   - Gave /tmp files a unique name.
+   - Removed repeated libraries - no longer necessary, all circular
+       dependencies seem solved.
+
+9th April 1999  Frank Behner
+- Fixed bug in liblist in -d option
+- Changed binmake.gmk to use liblist -d
+
+18th February 1999  John Allison
+- Added G4USE_STL flag.
+- Added code for linking granular libraries.
+
+1st January 1999  Gunter Folger (config-01-00-02)
+- Add FCLIBS for SUN.
+
+January 29th 1999 - John Allison (config-01-00-01)
+- Changed rd44 to sw/geant4.
+
+December 15th, 1998 - G.Cosmo (config-00-04-11)
+- Added G4_HAVE_BOOL to DEC-cxx.
+- Cosmetic changes.
+
+December 12th, 1998 - J.Allison (config-00-04-10)
+- Fixed bug in OGLFLAGS and OGLLIBS user override mechanism.
+
+December 11th, 1998 - J.Allison (config-00-04-09)
+- Removed -fnonstd for SUN-CC.
+
+December 10th, 1998 - G.Cosmo (config-00-04-08)
+- architecture.gmk: introduced $G4DATA variable which can be user
+  defined. Default is set to $G4INSTALL/data.
+- architecture.gmk: introduced $G4LEVELGAMMADATA set as default to
+  $G4DATA/PhotonEvaporation.
+- globlib.gmk: fixed minor bug (courtesy of V.Krylov).
+
+December 10th, 1998 - J.Allison (config-00-04-07)
+- architecture.gmk: allowed environment variables OGLFLAGS and OGLLIBS.
+
+December 7th, 1998 - S.Tanaka, G.Cosmo (config-00-04-06)
+- architecture.gmk: fixed setting of VISLIBS.
+
+December 7th, 1998 - S.Tanaka 
+- Update of architecture.gmk and G4VIS_USE.gmk:
+  In SUN-CC, "-L/usr/lib -lsocket -lnsl"  is  moved from X11LIBS to VISLIBS.
+
+December 5th, 1998 - G.Cosmo (config-00-04-05)
+- architecture.gmk: introduced -fnonstd compiler option for SUN-CC.
+  This option causes non-standard initialization of floating-point
+  arithmetic hardware; it enables hardware traps for floating-point
+  overflow, division by zero, and invalid operation exceptions.
+
+December 4th, 1998 - G.Barrand
+- architecture.gmk: corrected paths for HepVis and HepInventor.
+- interactivity.gmk: fixed setup for LOAD_IV.
+
+December 3rd, 1998 - S.Tanaka
+- Revision to make compilation of DAWN (network) driver 
+  at Solaris and IRIX automatic. See below.
+- Added the following line to SUN-CC and SGI-CC
+  CPPFLAGS += -DSOCKET_IRIX_SOLARIS
+- Added -L/usr/lib -lsocket -lnsl  in X11LIBS for SUN-CC.
+  (This place is strange. But I cannot think of a better place.) 
+
+December 3rd, 1998 - J.Allison (config-00-04-04)
+- Set G4STREAM for all platforms.
+- Set G4STREAM_STREAMBUF_IMPLEMENTATION for selected platforms.
+
+December 3rd, 1998 - S.Sadilov
+- Updated architecture.gmk : G4STREAM_STREAMBUF_IMPLEMENTATION for WIN32.
+- Updated globlib.gmk : right incremental LIB for WIN32.
+
+December 1st, 1998 - G.Cosmo (config-00-04-03)
+- Updated architecture.gmk and binmake.gmk: G4SYSTEM revision.
+- Added +DAportable compiler option to HP-aCC setup to support HPPA 2.0
+  for PA8000 CPUs.
+
+December 1st, 1998 - J.Allison (config-00-04-02)
+- Added generators/include to binmake.gmk.
+
+November 30th, 1998 - J.Allison (config-00-04-01)
+- Added neutron_hp/include to binmake.gmk.
+- CLHEP_BASE_DIR and RWBASE for WIN32 (Serguei Sadilov).
+
+November 18th, 1998 - J.Allison (config-00-03-06)
+- Changed CXXFLAGS for DEC6-AFS debug from -g to -gall.
+
+October 30th, 1998 - G.Cosmo (config-00-03-05)
+- architecture.gmk: added G4STREAM_STREAMBUF_IMPLEMENTATION variable. (G.Barrand)
+- G4UI_BUILD.gmk: removed G4UI_BUILD_XM_REDIRECT_COUT. (G.Barrand)
+
+October 13th, 1998  J.Allison (config-00-03-04)
+- Changed ifdef G4_USE_G4STREAM to ifneq ($(findstring AIX,$(G4SYSTEM)),AIX)
+
+October 13th, 1998  J.Allison (config-00-03-03)
+- Removed G4VIS_DONT_USE. (G.Barrand)
+- Added if G4_USE_G4STREAM, CPPFLAGS += -DG4STREAM. (M.Nagamatu)
+
+October 9th  J.Allison (config-00-03-02)
+- Tagged.
+
+October 2nd, 1998 - M.Asai
+- G4_NO_STORE_TRAJECTORY option is added to architecture.gmk.
+
+September 30th, 1998 - G.Barrand
+- G4VIS_USE.gmk: bracket everything with "ifndef G4VIS_DONT_USE" in order
+  to be able to disconnect easily visualization for tests programs.
+
+September 18th, 1998 - G.Cosmo (config-00-03-01)
+- architecture.gmk: introduced G4DUMMY_VARIABLE to hide $(shell)
+  command not compatible with the new version 3.77 of GMAKE (G.Folger).
+
+September 14th, 1998 - G.Cosmo
+- binmake.gmk: placed digits+hits library in the correct link order
+  according to the category diagram.
+
+August 31st, 1998 - G.Cosmo (config-00-02-05)
+- architecture.gmk: Changed first CPPFLAGS statement from := to +=,
+  to allow additional CPPFLAGS to be defined by the user. Needed for test
+  (F.Behner)
+- binmake.gmk: Added EXTRALIBS to allow a user to add own libraries in the
+  link path. Needed for test.
+  (F.Behner)
+- binmake.gmk: inverted link order of processes and particles libraries
+  which was wrong. (G.Cosmo)
+
+August 26th, 1998 - John Allison (config-00-02-04)
+- Backed out 22nd August change (G4UIGAG as default) - G4UIterminal
+  is now default.
+
+August 24th, 1998 - Y.Morita (config-00-02-03)
+- globlib.gmk: added $(G4LIBDIR)/lib$(name).a for target "global".
+
+August 22nd, 1998 - J.Allison (config-00-02-02)
+- Set GAG variables by default.
+
+August 11th, 1998 - G.Cosmo (config-00-02-01)
+- Tagged.
+
+August 7th, 1998 - John Allison/Michel Maire.
+- Added -I/usr/include before -I/usr/local/include to OGLFLAGS for DEC-AFS.
+- Changed -lGl to -lMesaGL, etc., for DEC-AFS.
+
+August 6th, 1998 - John Allison
+- Added UILIBS := to G4UI_USE.gmk and VISLIBS := to G4VIS_USE.gmk.
+
+August 5th, 1998 - Guy Barrand
+- Added LOAD_XM = 1 and LOAD_XAW = 1 to G4UI_USE.gmk.
+
+July 30th, 1998 - G.Cosmo (config-b01)
+- globlib.gmk: added phony target "wipe_libs". Now target "global"
+  effectively deletes all existent granular libraries.
+- common.gmk: archiving of libraries is silent now by default.
+
+July 23th, 1998 - Y.Morita (config-00-01-16)
+- globlib.gmk: fixed target "global" for G4ODBMS
+- binmake.gmk: fixes for Win/NT.
+
+July 20th, 1998 - John Allison (config-00-01-15)
+- Removed LDFLAGS += -Wl,-Bstatic for G++-Linux introduced by Larry
+  Felawka on July 10th for g++ 2.8.  No longer thought to be necessary.
+
+July 19th, 1998 - G.Cosmo (config-00-01-14)
+- common.gmk: introduced CPPVERBOSE flag.
+- architecture.gmk: protected creation of $G4SCHEMA_DIR and
+  $G4EXAMPLE_BOOT_DIR directories with G4ODBMS.
+- binmake.gmk: fixed bug in creation of $G4TARGET.
+
+July 18th, 1998 - G.Cosmo (config-00-01-13)
+- Added fix to binmake.gmk for WIN32-VC-NICE (G.Folger)
+
+July 16th, 1998 - John Allison
+- Added GNU_GCC makefile flags where omitted.
+
+July 15th, 1998 - Youhei Morita (config-00-01-12)
+- architecture.gmk  added G4EXAMPLE_BOOT_DIR and G4EXAMPLE_BOOT
+- globlib.gmk  revised cleandb target
+
+July 14th, 1998 - Peter Urban (config-00-01-11)
+- added two Perl scripts that correct STEP exchange files.
+
+July 14th, 1998 - Youhei Morita (config-00-01-10)
+- architecture.gmk  added definition of G4SCHEMA_DIR
+- globlib.gmk  added new target G4SCHEMA.FDDB for G4ODBMS
+
+July 10th, 1998 - Youhei Morita (config-00-01-09)
+- binmake.gmk  added following to INCFLAGS
+      -I$(G4BASE)/persistency/digits+hits/hits/include \
+      -I$(G4TMP)/$(G4SYSTEM)/G4phits \
+- binmake.gmk  moved persistency include path to ifdef G4ODBMS block
+
+July 10th, 1998 - John Allison??
+- binmake.gmk  added geometry/solids/STEPinterface/include 
+
+July 10th, 1998 - Youehi Morita (config-00-01-08)
+- globlib.gmk  added new targets 'headers' and 'd_files' for G4ODBMS
+- common.gmk   added new target 'headers'
+               added $(schema_hh) dependency to $(G4TMPDIR)/%.o
+- binmake.gmk  added INCFLAGS, LDLIBS and LDFLAGS for G4ODBMS
+
+July 10th, 1998 - L.Felawka
+- architecture.gmk: updated compilation flags for g++.
+
+July 9th, 1998 - G.Cosmo (config-00-01-07)
+- Removed bug in "all" target in globlib.gmk, introduced recently.
+- Modified "all" target in globlib.gmk to handle G4ODBMS.
+- Added fix for G4ODBMS to common.gmk.
+
+July 9th, 1998 - Youehi Morita
+- Added G4ODBMS_BUILD.gmk for HepODBMS and Objectivity/DB CPPFLAGS.
+
+July 7th, 1998 - John Allison (config-00-01-06)
+- Incorporated Makoto's patches for ifndef G4UI_BUILD_TERMINAL_SESSION and
+  ifndef G4UI_USE_TERMINAL.
+
+July 7th, 1998 - G.Cosmo (config-00-01-05)
+- Added $(schema_hh) target and dependency to it in case of G4ODBMS
+  set when building .d files.
+
+July 7th, 1998 - John Allison (config-00-01-04)
+- Tagged.
+
+July 7th, 1998 - Guy Barrand
+- Introduced interactivity.gmk.
+
+July 6th, 1998 - J.Allison (config-00-01-03)
+- Added G4UI_BUILD.gmk and G4UI_BUILD.gmk.
+
+July 6th, 1998 - G.Cosmo (config-00-01-02)
+- Introduced "glob" and "objs" targets in globlib.gmk. Modified
+  rule to build global library, does not depend anymore on "libs".
+  (by J.Allison)
+- Moved G4VIS_USE.gmk and G4VIS_BUILD.gmk from source/visualization.
+ 
+July 3rd, 1998 - G.Cosmo (config-00-01-01)
+- Created
Index: trunk/geant4/config/analysis.gmk
===================================================================
--- trunk/geant4/config/analysis.gmk	(revision 472)
+++ trunk/geant4/config/analysis.gmk	(revision 472)
@@ -0,0 +1,15 @@
+#   Guy Barrand, 20th Mai 2000
+#
+# Analysis variables...
+#
+
+ANALYSISLIBS := 
+
+ifdef G4ANALYSIS_USE
+  CPPFLAGS += -DG4ANALYSIS_USE
+  CPPFLAGS += $(G4ANALYSIS_AIDA_CONFIG_CFLAGS)
+  ANALYSISLIBS += $(G4ANALYSIS_AIDA_CONFIG_LIBS)
+endif
+
+
+
Index: trunk/geant4/config/architecture.gmk
===================================================================
--- trunk/geant4/config/architecture.gmk	(revision 472)
+++ trunk/geant4/config/architecture.gmk	(revision 472)
@@ -0,0 +1,342 @@
+# $Id: architecture.gmk,v 1.105 2006/06/13 15:36:30 gcosmo Exp $
+# ------------------------------------------------------------------------
+#       GEANT 4 - Architecture configuration script for GNU Make
+#
+#       First implementation: July 7th 1995
+#
+# Description
+# -----------
+# to override variables defined in this script, use "gmake -e", this will
+# cause environment variables to take precedence. In this case watch for
+# inadvertant overrides!
+#
+# List of the supported architectures/compilers and related flavors for
+# the environment variable G4SYSTEM:
+#
+#          Linux-g++   Linux (Red Hat Enterprise/SCL3), gcc-3.2.3 (default)
+#
+#          SUN-CC      SunOS 5.8, CC 5.4
+#
+#          WIN32-VC    Windows/XP and Microsoft Visual C++ 7.1 .NET
+#                      Adding CYGWIN32 tools
+# -------------------------------------------------------------------------
+
+MAKEFLAGS= --no-print-directory
+
+# If not specified, the default path for G4 installation G4INSTALL is
+# set to $HOME/geant4 ...
+#
+ifndef G4INSTALL
+  G4INSTALL := $(HOME)/geant4
+endif
+
+# If not specified, the default path for G4 source G4BASE is
+# set to $G4INSTALL/source ...
+#
+ifndef G4BASE
+  G4BASE := $(G4INSTALL)/source
+endif
+
+# If not specified, the default path for the user's workdir is the same
+# as G4INSTALL ...
+#
+ifndef G4WORKDIR
+  G4WORKDIR := $(G4INSTALL)
+endif
+
+# If not specified, the default path for temporary files G4TMP is
+# set to $G4WORKDIR/tmp/$G4SYSTEM ...
+#
+ifndef G4TMP
+  G4TMP := $(G4WORKDIR)/tmp
+endif
+G4DUMMY_VARIABLE:=$(shell [ ! -d $(G4TMP) ] && mkdir -p $(G4TMP) )
+	
+# If not specified, the default path for G4 libraries G4LIB is
+# set to $G4INSTALL/lib/$G4SYSTEM ...
+#
+ifndef G4LIB
+  G4LIB := $(G4INSTALL)/lib
+endif
+G4DUMMY_VARIABLE:=$(shell [ ! -d $(G4LIB) ] && mkdir -p $(G4LIB) )
+G4DUMMY_VARIABLE:=$(shell [ ! -d $(G4LIB)/$(G4SYSTEM) ] && mkdir -p $(G4LIB)/$(G4SYSTEM) )
+
+# If not specified, the default path to install G4 include files is G4INCLUDE 
+# set to $G4INSTALL/include ...
+#
+ifndef G4INCLUDE
+  G4INCLUDE := $(G4INSTALL)/include
+endif
+G4DUMMY_VARIABLE:=$(shell [ ! -d $(G4INCLUDE) ] && mkdir -p $(G4INCLUDE) )
+
+# Backwards compatibility
+#
+ifneq ($(G4MAKESHLIB),)
+  ifeq ($(G4LIB_NO_SHARED),)
+    G4LIB_BUILD_SHARED = 1
+  endif
+endif
+
+# Defaults for library BUILD. No default for USE, ie. take what is found.
+# Default is building static libraries.
+#
+ifeq ($(G4LIB_BUILD_SHARED),)
+  ifeq ($(G4LIB_BUILD_STATIC),)
+    G4LIB_BUILD_STATIC = 1
+  endif  
+endif
+
+# Specify if to build the DLL libraries on Windows. Default is NO.
+#
+ifneq ($(G4LIB_USE_DLL),)
+  G4LIB_BUILD_DLL = 1
+  CPPFLAGS += -DG4LIB_BUILD_DLL
+endif
+ifneq ($(G4LIB_BUILD_DLL),)
+  G4LIB_BUILD_DLL = 1
+  CPPFLAGS += -DG4LIB_BUILD_DLL
+  G4LIB_USE_DLL = 1
+endif
+
+# Specify if to build the G3TOG4 module or not. Default is NO.
+#
+ifneq ($(G4LIB_BUILD_G3TOG4),)
+  G4LIB_BUILD_G3TOG4 = 1
+  G4LIB_USE_G3TOG4 = 1
+endif
+
+# Specify if to build the ZLIB module or not. Default is NO.
+#
+ifneq ($(G4LIB_BUILD_ZLIB),)
+  G4LIB_BUILD_ZLIB = 1
+  G4LIB_USE_ZLIB = 1
+endif
+
+# If not specified, the default path for G4 binaries G4BIN is
+# set to $G4WORKDIR/bin/$G4SYSTEM ...
+#
+ifndef G4BIN
+  G4BIN := $(G4WORKDIR)/bin
+endif
+G4DUMMY_VARIABLE:=$(shell [ ! -d $(G4BIN) ] && mkdir -p $(G4BIN) )
+
+# If G4DEBUG or G4NO_OPTIMISE are not specified,
+# the default compilation is optimised ...
+#
+ifdef G4DEBUG
+  CPPFLAGS += -DG4DEBUG
+  G4DEBUG := 1
+else
+  ifndef G4NO_OPTIMISE
+    CPPFLAGS += -DG4OPTIMISE
+    G4OPTIMISE := 1
+  endif
+endif
+
+# CLHEP path, etc.
+#
+ifndef CLHEP_BASE_DIR
+  CLHEP_BASE_DIR    := $(shell ls CLHEP_BASE_DIR--UNDEFINED)
+endif
+ifndef CLHEP_INCLUDE_DIR
+  CLHEP_INCLUDE_DIR := $(CLHEP_BASE_DIR)/include
+endif
+ifndef CLHEP_LIB_DIR
+  CLHEP_LIB_DIR     := $(CLHEP_BASE_DIR)/lib
+endif
+ifndef CLHEP_LIB
+  ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
+    CLHEP_LIB := CLHEP.lib
+  else
+    CLHEP_LIB := CLHEP
+#
+# If using the "granular" libraries of CLHEP, uncomment below
+#
+#   CLHEP_LIB := CLHEP-HepMC -l CLHEP-Geometry -l CLHEP-Random -l CLHEP-Vector
+  endif
+endif
+
+# Paths for G4 data
+#
+ifndef G4DATA
+  G4DATA := $(G4INSTALL)/data
+endif
+
+# Photon evaporation data
+#
+ifndef G4LEVELGAMMADATA
+  G4LEVELGAMMADATA := $(G4DATA)/PhotonEvaporation
+endif
+
+# Toggle variables (positional qualifiers) between WIN32-VC and UNIX...
+#
+ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
+  OUT_OBJ := -TP '-Fo'
+  FOR_OBJ := '-Fo'
+  OUT_LIB := '-out:'
+  OUT_EXE := '-Fe'
+  LIB_PATH := '-libpath:'
+  CERNLIB_PATH := "c:\cern\pro\lib"
+  PATH_DEL := \\
+  #
+  # pattern for next substitution
+  #
+  LIB_PATT  := lib(LibName).a
+  FLIB_PATT := (LibName).lib
+else
+  OUT_OBJ := -o 
+  FOR_OBJ := -o 
+  OUT_LIB := 
+  OUT_EXE := -o 
+  LIB_PATH := -L
+  CERNLIB_PATH := /cern/pro/lib
+  PATH_DEL := /
+  #
+  # pattern for next substitution
+  #
+  LIB_PATT  := -l(LibName)
+  FLIB_PATT := $(LIB_PATT)
+endif
+
+# Variables for implicit rules, etc., as suggested in GNU Make manual...
+#
+CPPFLAGS  += -Iinclude 
+CPPFLAGS  += -I$(CLHEP_INCLUDE_DIR)
+
+# Positional qualifiers in action...
+#
+ifndef LDFLAGS
+  LDFLAGS :=
+endif
+ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
+  LDFLAGS   += -link $(LIB_PATH)$(CLHEP_LIB_DIR)
+  LOADLIBS  := $(CLHEP_LIB)
+else
+  LDFLAGS   += -L$(CLHEP_LIB_DIR)
+  LOADLIBS  := -l$(CLHEP_LIB)
+  LOADLIBS  += -lm
+  ifdef G4LIB_USE_ZLIB
+    ifndef G4LIB_BUILD_ZLIB
+      LOADLIBS += -lz
+    endif
+  endif
+endif
+
+# Graphic variables...
+#
+ifndef VISLIBS
+  VISLIBS :=
+endif
+#
+# ---------------- OpenGL --------------------
+# The user can define his own values of OGLFLAGS and OGLLIBS.
+# OGLFLAGS gives the directory containing include files.
+#   E.g.: OGLFLAGS  := -I$(OGLHOME)/include
+# OGLLIBS gives the libraries.
+#   E.g.: OGLLIBS   := -L$(OGLHOME)/lib -lGLU -lGL
+#   Or  : OGLLIBS   := -L$(OGLHOME)/lib -lMesaGLU -lMesaGL
+# OGLHOME is often /usr or /usr/local.  In such case, it is not necessary
+# to specify the path in OGLFLAGS, since added already by default by the
+# compiler.  OGLHOME can also point to a special installation.
+# If the user does not set his/her own values, system-dependent values
+# are set below.  Most system-dependent code assumes OGLHOME is set.
+#
+# ------------- OpenInventor -----------------
+# The path to the installation of OpenInventor must be specified
+# if the package is installed in a location different
+# than default system directories (like... /usr or /usr/local).
+#
+ifndef OIVHOME
+  OIVHOME  := /usr/local/Inventor
+endif
+ifndef OIVFLAGS
+  OIVFLAGS  := -I$(OIVHOME)/include 
+endif
+ifndef OIVLIBS
+  OIVLIBS   := -L$(OIVHOME)/lib -lInventorXt -lInventor
+endif
+
+# For cfront compilers the repository location is set to
+# $G4TMP/$G4SYSTEM/g4.ptrepository.
+#
+G4TEMPLATE_REPOSITORY := $(G4SYSTEM)/g4.ptrepository
+G4TEMPEXEC_REPOSITORY := $(G4TEMPLATE_REPOSITORY)/exec
+G4TREP := $(G4TMP)/$(G4TEMPLATE_REPOSITORY)
+
+# Default archive call. Changed for: SUN-CC.
+#
+AR := ar r
+
+# Default echo used with makedepend. Changed for SUN-CC, Linux-g++.
+#
+ECHO:= echo
+
+# Default grep used with source/GNUmakfile.  Changed for SUN-CC.
+#
+GREP := grep
+
+# Include architecture dependent setups...
+#
+include $(G4INSTALL)/config/sys/$(G4SYSTEM).gmk
+
+#  make certain that OGLFLAGS does NOT contain -I/usr/include
+#   caused by OGLHOME being /usr, as e.g. on Linux
+#
+ifdef OGLFLAGS
+  OGLFLAGS:= $(filter-out -I/usr/include,$(OGLFLAGS))
+  OGLFLAGS:= $(filter-out -I/usr//include,$(OGLFLAGS))
+endif
+	
+	
+# If there is no cbrt() function...
+#
+ifdef G4_NO_CBRT
+  CPPFLAGS += -DG4_NO_CBRT
+endif
+
+# Verbosity code can be left out (for better performance)
+# by defining G4_NO_VERBOSE.
+#
+ifndef G4_NO_VERBOSE
+  CPPFLAGS += -DG4VERBOSE
+endif
+
+# Trajectory related classes can be left out (for better performance)
+# by defining G4_NO_STORE_TRAJECTORY.
+#
+ifndef G4_NO_STORE_TRAJECTORY
+  CPPFLAGS += -DG4_STORE_TRAJECTORY
+endif
+
+# Template setup - repositories, special options etc
+#
+ifdef CFRONT_G4TEMPLATE_REPOSITORY
+  ifeq ($(findstring DEC,$(G4SYSTEM)),DEC)
+      ifdef G4EXEC_BUILD
+        CXXTEMPLATE_FLAGS := -ptr $(G4TREP)/exec -ptr $(G4TREP)
+      else
+        CXXTEMPLATE_FLAGS := -ptr $(G4TREP)
+      endif
+  else
+      ifdef G4EXEC_BUILD
+        CXXTEMPLATE_FLAGS := -ptr$(G4TREP)/exec -ptr$(G4TREP)
+      else
+        CXXTEMPLATE_FLAGS := -ptr$(G4TREP)
+      endif
+  endif
+  CXXFLAGS += $(CXXTEMPLATE_FLAGS)
+  CFRONT := true
+endif
+ifdef CFRONT
+  G4TEMPLATE_REPOSITORY_PARENT := $(shell echo $(G4TREP) | sed 's!/[^/][^/]*/*$$!!' )
+  G4DUMMY_VARIABLE:=$(shell [ ! -d $(G4TEMPLATE_REPOSITORY_PARENT) ] && mkdir -p $(G4TEMPLATE_REPOSITORY_PARENT) )
+  G4DUMMY_VARIABLE:=$(shell [ ! -d $(G4TREP) ] && mkdir -p $(G4TREP) )
+  G4DUMMY_VARIABLE:=$(shell [ ! -d $(G4TREP)/exec ] &&mkdir -p $(G4TREP)/exec )
+endif
+
+# If G4SYSTEM is not specified or not valid, issue an ERROR !
+#
+#$(G4INSTALL)/config/sys/$(G4SYSTEM).gmk:
+#	@echo "ERROR - G4SYSTEM is not defined in the environment"
+#	@echo "        or $(G4SYSTEM) architecture is not a valid one !"
+#	exit 1
Index: trunk/geant4/config/binmake.gmk
===================================================================
--- trunk/geant4/config/binmake.gmk	(revision 472)
+++ trunk/geant4/config/binmake.gmk	(revision 472)
@@ -0,0 +1,411 @@
+# $Id: binmake.gmk,v 1.112 2006/04/24 10:54:18 gcosmo Exp $
+# ----------------------------------------------------------
+# Script defining rules and paths for making binaries.
+#    First implementation: Gabriele Cosmo, 25/06/1998.
+# ----------------------------------------------------------
+
+ifndef LDFLAGS
+  include $(G4INSTALL)/config/architecture.gmk
+endif
+
+G4LIBDIR := $(G4LIB)/$(G4SYSTEM)
+
+# Define variable checking for existence of centrally installed headers.
+# If check will be true, avoid explicit definition of paths to INCFLAGS.
+#
+G4INCLUDE_EXEC := $(shell [ -r $(G4INCLUDE)/globals.hh ] && echo 1)
+
+include $(G4INSTALL)/config/G4UI_USE.gmk
+include $(G4INSTALL)/config/G4VIS_USE.gmk
+include $(G4INSTALL)/config/interactivity.gmk
+include $(G4INSTALL)/config/analysis.gmk
+
+# Verify the existance of the global static libraries first.
+# if not verify the existance of global shared libraries (Unix only).
+#
+ifndef G4LIB_USE_GRANULAR
+    GLOBALLIBS := $(shell test -f $(G4LIB)/$(G4SYSTEM)/libG4global.a && echo yes)
+  ifndef GLOBALLIBS
+    GLOBALLIBS := $(shell test -f $(G4LIB)/$(G4SYSTEM)/libG4global.$(SHEXT) && echo yes)
+    SHAREDLIBS := $(shell test -f $(G4LIB)/$(G4SYSTEM)/libG4global.$(SHEXT) && echo yes)
+  endif
+endif
+
+# Verify the existance of granular shared libraries (Unix) or global DLLs (Windows)
+#
+ifndef SHAREDLIBS
+  SHAREDLIBS := $(shell test -f $(G4LIB)/$(G4SYSTEM)/libG4globman.$(SHEXT) && echo yes)
+endif
+ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
+  SHAREDLIBS := $(shell test -f $(G4LIB)/$(G4SYSTEM)/G4global.$(SHEXT) && echo yes)
+endif  
+
+ifndef INCFLAGS
+ ifeq ($(G4INCLUDE_EXEC),1)
+  INCFLAGS := -I$(G4INCLUDE)
+ else
+  INCFLAGS := \
+              -I$(G4BASE)/global/management/include \
+              -I$(G4BASE)/global/HEPRandom/include \
+              -I$(G4BASE)/global/HEPGeometry/include \
+              -I$(G4BASE)/global/HEPNumerics/include \
+              -I$(G4BASE)/run/include \
+              -I$(G4BASE)/materials/include \
+              -I$(G4BASE)/parameterisations/trd_clusters/include \
+              -I$(G4BASE)/parameterisations/gflash/include \
+              -I$(G4BASE)/particles/management/include \
+              -I$(G4BASE)/particles/bosons/include \
+              -I$(G4BASE)/particles/leptons/include \
+              -I$(G4BASE)/particles/hadrons/barions/include \
+              -I$(G4BASE)/particles/hadrons/ions/include \
+              -I$(G4BASE)/particles/hadrons/mesons/include \
+              -I$(G4BASE)/particles/shortlived/include \
+              -I$(G4BASE)/processes/management/include \
+              -I$(G4BASE)/processes/cuts/include \
+              -I$(G4BASE)/processes/decay/include \
+              -I$(G4BASE)/processes/optical/include \
+              -I$(G4BASE)/processes/transportation/include \
+              -I$(G4BASE)/processes/parameterisation/include \
+              -I$(G4BASE)/processes/electromagnetic/standard/include \
+              -I$(G4BASE)/processes/electromagnetic/muons/include \
+              -I$(G4BASE)/processes/electromagnetic/utils/include \
+              -I$(G4BASE)/processes/electromagnetic/xrays/include \
+              -I$(G4BASE)/processes/electromagnetic/lowenergy/include \
+              -I$(G4BASE)/processes/electromagnetic/highenergy/include \
+              -I$(G4BASE)/processes/hadronic/cross_sections/include \
+	      -I$(G4BASE)/processes/hadronic/management/include \
+	      -I$(G4BASE)/processes/hadronic/models/abrasion/include \
+              -I$(G4BASE)/processes/hadronic/models/binary_cascade/include \
+	      -I$(G4BASE)/processes/hadronic/models/cascade/cascade/include \
+	      -I$(G4BASE)/processes/hadronic/models/cascade/evaporation/include \
+	      -I$(G4BASE)/processes/hadronic/models/cascade/utils/include \
+              -I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/body/include \
+              -I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/interface/include \
+              -I$(G4BASE)/processes/hadronic/models/coherent_elastic/include \
+	      -I$(G4BASE)/processes/hadronic/models/de_excitation/ablation/include \
+              -I$(G4BASE)/processes/hadronic/models/de_excitation/evaporation/include \
+              -I$(G4BASE)/processes/hadronic/models/de_excitation/fermi_breakup/include \
+	      -I$(G4BASE)/processes/hadronic/models/de_excitation/fission/include \
+              -I$(G4BASE)/processes/hadronic/models/de_excitation/gem_evaporation/include \
+              -I$(G4BASE)/processes/hadronic/models/de_excitation/handler/include \
+              -I$(G4BASE)/processes/hadronic/models/de_excitation/management/include \
+              -I$(G4BASE)/processes/hadronic/models/de_excitation/multifragmentation/include \
+              -I$(G4BASE)/processes/hadronic/models/de_excitation/photon_evaporation/include \
+              -I$(G4BASE)/processes/hadronic/models/de_excitation/util/include \
+              -I$(G4BASE)/processes/hadronic/models/em_dissociation/include \
+              -I$(G4BASE)/processes/hadronic/models/general_finalstate/include \
+              -I$(G4BASE)/processes/hadronic/models/high_energy/include \
+              -I$(G4BASE)/processes/hadronic/models/im_r_matrix/include \
+              -I$(G4BASE)/processes/hadronic/models/inucl/include \
+              -I$(G4BASE)/processes/hadronic/models/isotope_production/include \
+              -I$(G4BASE)/processes/hadronic/models/leading_particle/include \
+              -I$(G4BASE)/processes/hadronic/models/low_energy/include \
+              -I$(G4BASE)/processes/hadronic/models/management/include \
+              -I$(G4BASE)/processes/hadronic/models/neutron_hp/include \
+              -I$(G4BASE)/processes/hadronic/models/parton_string/diffraction/include \
+              -I$(G4BASE)/processes/hadronic/models/parton_string/hadronization/include \
+              -I$(G4BASE)/processes/hadronic/models/parton_string/management/include \
+              -I$(G4BASE)/processes/hadronic/models/parton_string/qgsm/include \
+              -I$(G4BASE)/processes/hadronic/models/photolepton_hadron/muon_nuclear/include \
+              -I$(G4BASE)/processes/hadronic/models/pre_equilibrium/exciton_model/include \
+              -I$(G4BASE)/processes/hadronic/models/quark_molecular_dynamics/body/include \
+              -I$(G4BASE)/processes/hadronic/models/quark_molecular_dynamics/util/include \
+              -I$(G4BASE)/processes/hadronic/models/radioactive_decay/include \
+              -I$(G4BASE)/processes/hadronic/models/relativistic_qmd/include \
+              -I$(G4BASE)/processes/hadronic/models/relativistic_qmd/uplusplus/include \
+              -I$(G4BASE)/processes/hadronic/models/theo_high_energy/include \
+              -I$(G4BASE)/processes/hadronic/models/util/include \
+              -I$(G4BASE)/processes/hadronic/processes/include \
+              -I$(G4BASE)/processes/hadronic/stopping/include \
+              -I$(G4BASE)/processes/hadronic/util/include \
+              -I$(G4BASE)/geometry/management/include \
+              -I$(G4BASE)/geometry/solids/CSG/include \
+              -I$(G4BASE)/geometry/solids/specific/include \
+              -I$(G4BASE)/geometry/solids/BREPS/include \
+              -I$(G4BASE)/geometry/solids/Boolean/include \
+              -I$(G4BASE)/geometry/divisions/include \
+              -I$(G4BASE)/geometry/volumes/include \
+              -I$(G4BASE)/geometry/navigation/include \
+              -I$(G4BASE)/geometry/magneticfield/include \
+              -I$(G4BASE)/geometry/biasing/include \
+              -I$(G4BASE)/track/include \
+              -I$(G4BASE)/tracking/include \
+              -I$(G4BASE)/digits_hits/detector/include \
+              -I$(G4BASE)/digits_hits/hits/include \
+              -I$(G4BASE)/digits_hits/digits/include \
+              -I$(G4BASE)/digits_hits/utils/include \
+              -I$(G4BASE)/persistency/include \
+              -I$(G4BASE)/readout/include \
+              -I$(G4BASE)/event/include \
+              -I$(G4BASE)/graphics_reps/include \
+              -I$(G4BASE)/intercoms/include
+  ifdef G4LIB_USE_G3TOG4
+    INCFLAGS += -I$(G4BASE)/g3tog4/include
+  endif
+ endif
+endif
+
+CPPFLAGS += $(INCFLAGS)
+LDFLAGS += -L$(G4LIBDIR)
+
+G4TMPDIR := $(G4TMP)/$(G4SYSTEM)/$(G4TARGET)
+G4BINDIR := $(G4BIN)/$(G4SYSTEM)
+
+ifdef G4EXLIB
+  G4LIBDIR := $(G4TMPDIR)
+  LDFLAGS += -L$(G4LIBDIR)
+  ifdef SHAREDLIBS
+    ifdef G4RUNPATHOPTION
+#         For the example dependent directory, keep the 
+#         path to the shared lib in the executable.
+      LDFLAGS += $(G4RUNPATHOPTION)$(G4LIBDIR)
+    endif
+  endif
+  include $(G4INSTALL)/config/common.gmk
+endif
+
+ifdef LDLIBS
+  USER_DEFINED_LDLIBS := 1
+endif
+
+# Because of the script for granular libraries which replaces part of LDLIBS
+# and because of the way user defined LDLIBS was augmented historically I
+# have split LDLIBS into 4 parts...
+#
+ifndef USER_DEFINED_LDLIBS
+
+# TARGETLIB is the library generated for the final user application;
+# TARGOBJEXT defines the target object extension
+#
+ifdef G4EXLIB
+  ifeq (,$(findstring WIN32-VC,$(G4SYSTEM)))
+  # Unix
+    TARGETLIB  := -l$(G4TARGET)
+    TARGOBJEXT := o
+  else
+  # Windows
+    TARGETLIB  := lib$(G4TARGET).a   
+    TARGOBJEXT := OBJ   
+  endif
+endif
+
+# LDLIBS1 contains the very high level libraries...
+#
+LDLIBS1 := $(EXTRALIBS)
+
+# VISLIBS (and UILIBS?) is handled by the granular library script...
+#
+ifdef GLOBALLIBS
+  LDLIBS2 := $(VISLIBS) -lG4interfaces -lG4persistency
+
+  ifdef G4LIB_USE_G3TOG4
+    LDLIBS2 += -lG3toG4
+  endif
+
+  LDLIBS2 += -lG4readout \
+             -lG4run \
+             -lG4event \
+             -lG4tracking \
+	     -lG4parmodels \
+             -lG4processes \
+             -lG4digits_hits \
+             -lG4track \
+             -lG4particles \
+             -lG4geometry \
+             -lG4materials \
+             -lG4graphics_reps \
+             -lG4intercoms \
+             -lG4global
+else
+# The next lines specifically should read LDLIBS2 = , not LDLIBS2 :=, so
+# that it is not expanded until the directory G4TMPDIR is created.
+  ifeq ($(G4INCLUDE_EXEC),1)
+    LDLIBS2 = $(shell \
+        G4TMP=$(G4TMP); export G4TMP; \
+	if [ \( -f $(G4LIB)/$(G4SYSTEM)/liblist \
+	  -a -f $(G4LIB)/$(G4SYSTEM)/libname.map \) ]; then \
+	$(G4LIB)/$(G4SYSTEM)/liblist \
+	  -m $(G4LIB)/$(G4SYSTEM) \
+	  < $(G4LIB)/$(G4SYSTEM)/libname.map; fi)
+  else
+    LDLIBS2 = $(shell \
+        G4TMP=$(G4TMP); export G4TMP; \
+	if [ \( -f $(G4LIB)/$(G4SYSTEM)/liblist \
+	  -a -f $(G4LIB)/$(G4SYSTEM)/libname.map \) ]; then \
+	$(G4LIB)/$(G4SYSTEM)/liblist \
+	  -d $(G4TMPDIR) \
+	  < $(G4LIB)/$(G4SYSTEM)/libname.map; fi)
+# Warning: do not add to LDLIBS2 with += because this causes it to be
+# expanded too soon.  Hence extra libraries must have a different name...
+# Extra libraries to resolve remaining circular dependencies...
+#  LDLIBS2EXTRA = 
+  endif
+endif
+
+ifdef G4LIB_BUILD_ZLIB
+  LDLIBS2 += -lG4zlib
+endif
+
+# LDLIBS3 contains the first set of low level libraries...
+#
+LDLIBS3 += $(INTYLIBS)
+LDLIBS3 += $(ANALYSISLIBS)
+
+endif # ifndef USER_DEFINED_LDLIBS
+
+# LDLIBS4 contains the next set of low level libraries which historically
+# (why?) the user is not supposed to be able to define...
+#
+LDLIBS4 += $(LOADLIBS)
+
+# Finally assemble libraries...
+#
+ifdef USER_DEFINED_LDLIBS
+  LDLIBS_PREFINAL := $(LDLIBS)
+  LDLIBS_KERNEL   := $(LDLIBS)
+else
+# Again, do not use := or +=.  See note on LDLIBS2 above.
+  LDLIBS_PREFINAL = $(LDLIBS1) $(LDLIBS2) $(LDLIBS2EXTRA) $(LDLIBS3)
+# Version leaving out EXTRALIBS 
+  LDLIBS_KERNEL   = $(LDLIBS2) $(LDLIBS2EXTRA) $(LDLIBS3)
+endif
+LDLIBS_PREFINAL += $(LDLIBS4)
+LDLIBS_KERNEL   += $(LDLIBS4)
+
+ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
+  WIN32TMP := $(patsubst -L%,$(LIB_PATH)%,$(LDFLAGS))
+  LDFLAGS  = $(patsubst /,$(PATH_DEL),$(WIN32TMP))
+  WIN32TMP2 := $(patsubst -L%,$(LIB_PATH)%,$(LDLIBS_PREFINAL))
+  WIN32TMP3 := $(patsubst -L%,$(LIB_PATH)%,$(LDLIBS1))
+  WIN32TMP4 := $(patsubst -L%,$(LIB_PATH)%,$(LDLIBS_KERNEL))
+  ifdef SHAREDLIBS
+    ifdef G4LIB_USE_DLL
+        LDLIBS = $(TARGETLIB) $(patsubst -l%,lib%.a,$(WIN32TMP3)) $(patsubst -l%,lib%.lib,$(WIN32TMP4))
+    else
+	LDLIBS = $(TARGETLIB) $(patsubst -l%,lib%.lib,$(WIN32TMP2))
+    endif
+  else
+  	LDLIBS = $(TARGETLIB) $(patsubst -l%,lib%.a,$(WIN32TMP2))
+  endif
+else
+  LDLIBS = $(TARGETLIB) $(LDLIBS_PREFINAL)
+endif
+
+ifdef transform-RPath
+# Invoke system specific transformation of 
+include $(G4INSTALL)/config/sys/$(G4SYSTEM)-runpath.gmk
+endif
+	
+sources := $(wildcard $(G4TARGET).cc)
+objects := $(patsubst %.cc,$(G4TMPDIR)/exe/%.$(TARGOBJEXT),$(sources))
+dependencies := $(patsubst %.cc,$(G4TMPDIR)/exe/%.d,$(sources))
+
+LINK_DEPENDENCIES := $(G4TMPDIR)/exe/obj.last $(EXTRA_LINK_DEPENDENCIES)
+
+.PHONY: bin clean clean_bin debug
+
+# Make $(G4TARGET) executable.
+
+bin: $(G4BINDIR)/$(G4TARGET)
+
+$(G4BINDIR)/$(G4TARGET): $(LINK_DEPENDENCIES)
+ifndef USER_DEFINED_LDLIBS
+  ifndef GLOBALLIBS
+	@echo "Using granular libraries ..."
+	@if [ ! \( -f $(G4LIB)/$(G4SYSTEM)/liblist \
+	  -a -f $(G4LIB)/$(G4SYSTEM)/libname.map \) ]; then \
+	  echo "ERROR: No liblist program or library map file."; \
+	  echo "       These are needed for building with granular"; \
+	  echo "       libraries."; \
+	  echo '         cd $$G4INSTALL/source'; \
+	  echo "         gmake"; \
+	  echo "       or if you are sure you have already made all the"; \
+	  echo "       granular libraries:"; \
+	  echo "         gmake libmap"; \
+	  exit 1; fi
+  else
+	@echo "Using global libraries ..."
+  endif
+endif
+	@if [ ! -d $(G4BINDIR) ] ; then mkdir $(G4BINDIR) ;fi
+ifdef CPPVERBOSE
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) \
+	  -o $(G4BINDIR)/$(G4TARGET) $(objects) $(LDFLAGS) \
+	  $(LDLIBS)
+else
+	@echo Linking $(G4TARGET) ...
+	@$(CXX) $(CXXFLAGS) $(CPPFLAGS) \
+	  -o $(G4BINDIR)/$(G4TARGET) $(objects) $(LDFLAGS) \
+	  $(LDLIBS)
+	@if [ \( -f $(G4BINDIR)/$(G4TARGET) \) ]; then \
+	  echo "... Done!"; fi
+endif
+
+# Touch the versioning file
+ifdef G4EXLIB
+$(G4TMPDIR)/exe/obj.last: lib $(objects)
+else
+$(G4TMPDIR)/exe/obj.last: $(objects)
+endif
+	@touch $@
+
+# Make the $(G4TARGET).$(TARGOBJEXT) file.
+$(G4TMPDIR)/exe/$(G4TARGET).$(TARGOBJEXT) : $(G4TARGET).cc
+ifdef CPPVERBOSE
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(APPFLAGS) \
+	 -c $(OUT_OBJ)$(G4TMPDIR)/exe/$(G4TARGET).$(TARGOBJEXT) $(G4TARGET).cc
+else
+	@echo Compiling $(G4TARGET).cc ...
+	@$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(APPFLAGS) \
+	 -c $(OUT_OBJ)$(G4TMPDIR)/exe/$(G4TARGET).$(TARGOBJEXT) $(G4TARGET).cc
+endif
+
+GPPFLAGS := "-M"
+
+# Make the $(G4TARGET).d file and include it.
+
+# The ideas for this come from the GNU Make Manual, Section 4.12,
+# Generating Prerequisites Automatically.  The g++ compiler has an
+# option -M or -MM to write to standard output a list of dependencies
+# based on the #include statements.  The "sed" adds the dependency
+# file itself as a second target.  The result is a mini-makefile which
+# specifies the .o and .d files as targets which depend on all the
+# files found through the #include statements.  This file is then
+# included, causing GNU Make to honour these dependencies.
+
+# The "set -e" causes the shell to exit with an error when the "g++"
+# fails (otherwise it would only notice the last command in the
+# pipeline, namely "sed").  GNU Make notices the error and exits
+# sooner than it otherwise would (still not as soon as I expect,
+# though!).  Even then, an empty file is made, so "[ -s $@ ] || rm -f
+# $@" removes it ([ -s filename ] gives zero exit code only if file
+# exists and has a size greater than zero).  This avoids making
+# corrupt .d files which would play havoc with your next build.
+
+$(G4TMPDIR)/exe/$(G4TARGET).d: $(G4TARGET).cc
+	@if [ ! -d $(G4TMP)/$(G4SYSTEM) ] ; then mkdir $(G4TMP)/$(G4SYSTEM) ;fi
+	@if [ ! -d $(G4TMPDIR) ] ; then mkdir $(G4TMPDIR) ;fi
+	@if [ ! -d $(G4TMPDIR)/exe ] ; then mkdir $(G4TMPDIR)/exe ;fi
+	@echo Making dependency for file $< ...
+	@set -e;\
+	g++ $(GPPFLAGS) $(CPPFLAGS) -w $< |\
+	sed 's!$(G4TARGET)\.$(TARGOBJEXT)!$(G4TMPDIR)/exe/& $@!' >$@;\
+	[ -s $@ ] || rm -f $@
+ifneq ($(dependencies),)
+-include $(dependencies)
+endif
+
+clean::
+	@echo Cleaning up ...
+	@rm -f ./core
+	@rm -rf $(G4TMPDIR)
+	@rm -f $(G4LIBDIR)/lib$(G4TARGET).a
+	@rm -f $(G4BINDIR)/$(G4TARGET)
+ifdef CFRONT
+	@rm -rf $(G4TREP)/exec
+endif
+
+clean_bin::
+	@echo Removing application $(G4TARGET) ...
+	@rm -f ./core
+	@rm -f $(G4BINDIR)/$(G4TARGET)
Index: trunk/geant4/config/common.gmk
===================================================================
--- trunk/geant4/config/common.gmk	(revision 472)
+++ trunk/geant4/config/common.gmk	(revision 472)
@@ -0,0 +1,151 @@
+# $Id: common.gmk,v 1.41 2005/12/07 09:41:54 gcosmo Exp $
+# ----------------------------------------------------------------
+# Common part of GNUmakefile for libraries.  John Allison, 5/7/95.
+# ----------------------------------------------------------------
+# Libraries are created according to G4SYSTEM. G.Cosmo, 11/6/96.
+# Introduced G4LIBDIR and G4TMPDIR. G.Cosmo, 23/6/98.
+
+ifndef G4LIBDIR
+  G4LIBDIR := $(G4LIB)/$(G4SYSTEM)
+endif
+G4TMPDIR := $(G4TMP)/$(G4SYSTEM)/$(name)
+
+sources := $(wildcard src/*.cc)
+objects := $(patsubst src/%.cc,$(G4TMPDIR)/%.o,$(sources))
+dependencies := $(patsubst src/%.cc,$(G4TMPDIR)/%.d,$(sources))
+
+   g4libraries_to_build :=
+ifeq ($(G4LIB_NO_SHARED),)
+ifneq ($(G4LIB_BUILD_SHARED),)
+   g4libraries_to_build += $(G4LIBDIR)/lib$(name).$(SHEXT)
+endif
+endif
+ifneq ($(G4LIB_BUILD_STATIC),)
+   g4libraries_to_build += $(G4LIBDIR)/lib$(name).a
+endif
+
+# GPPFLAGS is defined here to make the .d file(s) and include it(them).
+
+GPPFLAGS := "-M"
+
+###############################################################################
+#
+# Actual gmake targets.
+#
+
+lib: $(g4libraries_to_build)
+
+ifeq ($(G4LIB_NO_SHARED),)
+ifneq ($(G4LIB_BUILD_SHARED),)
+# Make shared library.
+$(G4LIBDIR)/lib$(name).$(SHEXT): $(G4TMPDIR)/obj.last
+	@if [ ! -d $(G4LIBDIR) ] ; then mkdir $(G4LIBDIR) ;fi
+	@echo Creating shared library $@ ...
+	@$(RM) $@
+#      use architecture specific macro defined in sys/$(G4SYSTEM).gmk
+	$(build-granular-shared-lib)
+endif
+endif
+
+ifneq ($(G4LIB_BUILD_STATIC),)
+# Make static (archive) library.
+$(G4LIBDIR)/lib$(name).a: $(G4TMPDIR)/obj.last
+	@if [ ! -d $(G4LIBDIR) ] ; then mkdir $(G4LIBDIR) ;fi
+	@echo Creating/replacing object files in $(G4LIBDIR)/lib$(name).a ...
+	@rm -f $(G4LIBDIR)/lib$(name).a
+	@$(AR) $(OUT_LIB)$(G4LIBDIR)/lib$(name).a $(G4TMPDIR)/*.o
+	@if [ X$(G4SYSTEM) != XWIN32-VC ] ; then  \
+	if [ -f /usr/bin/ranlib -o -f /bin/ranlib ] ; then \
+	ranlib $(G4LIBDIR)/lib$(name).a ; fi ; fi
+endif
+
+###############################################################################
+#
+# Actual targets for .o, .d files
+#
+
+$(G4TMPDIR)/%.o: src/%.cc
+ifdef CPPVERBOSE
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(OUT_OBJ)$(G4TMPDIR)/$(*F).o src/$*.cc
+else
+	@echo Compiling $*.cc ...
+	@$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(OUT_OBJ)$(G4TMPDIR)/$(*F).o src/$*.cc
+endif
+
+# .PHONY targets are executed regardless of time-stamp of any file of
+# same name.
+.PHONY: all obj lib clean clean_libs includes
+
+obj: $(G4TMPDIR)/obj.last
+
+# Touch the versioning file
+$(G4TMPDIR)/obj.last: $(objects)
+	@touch $@
+
+# Make the .d file(s) and include it(them).
+
+# The ideas for this come from the GNU Make Manual, Section 4.12,
+# Generating Prerequisites Automatically.  The g++ compiler has an
+# option -M or -MM to write to standard output a list of dependencies
+# based on the #include statements.  The "sed" adds the dependency
+# file itself as a second target.  The result is a mini-makefile which
+# specifies the .o and .d files as targets which depend on all the
+# files found through the #include statements.  This file is then
+# included, causing GNU Make to honour these dependencies.
+
+# The "set -e" causes the shell to exit with an error when the "g++"
+# fails (otherwise it would only notice the last command in the
+# pipeline, namely "sed").  GNU Make notices the error and exits
+# sooner than it otherwise would (still not as soon as I expect,
+# though!).  Even then, an empty file is made, so "[ -s $@ ] || rm -f
+# $@" removes it ([ -s filename ] gives zero exit code only if file
+# exists and has a size greater than zero).  This avoids making
+# corrupt .d files which would play havoc with your next build.
+
+$(G4TMPDIR)/%.d: src/%.cc
+	@echo Making dependency for file $< ...
+	@if [ ! -d $(G4TMPDIR) ] ; then mkdir -p $(G4TMPDIR)  ;fi
+	@set -e;\
+	g++ $(GPPFLAGS) $(CPPFLAGS) -w $< |\
+	sed 's!$*\.o!$(G4TMPDIR)/& $@!' >$@;\
+	[ -s $@ ] || rm -f $@
+ifneq ($(dependencies),)
+-include $(dependencies)
+endif
+
+#
+# Installation of include files
+#
+installed_includes:=$(foreach file,$(wildcard include/*),$(shell test -f $(file) && echo $(file)))
+installed_includes:=$(patsubst include/%,$(G4INCLUDE)/%,$(installed_includes))
+
+# NOTE: the double colon rule allows to add other rules for the same target
+#
+includes::	$(installed_includes)
+
+# Static Pattern rules, see GNU make manual for details.
+#           target(s): target-pattern : dep-pattern	
+#
+$(installed_includes): $(G4INCLUDE)/% : include/%
+	@cp -p $< $@
+
+#
+# Clean up libraries
+#
+ifndef G4EXLIB
+clean::
+	@echo Cleaning up ...
+	@rm -f $(G4LIBDIR)/lib$(name).a
+	@rm -f $(G4LIBDIR)/*$(name).lib
+	@rm -f $(G4LIBDIR)/*$(name).exp
+	@rm -f $(G4LIBDIR)/lib$(name).$(SHEXT)
+	@rm -rf $(G4TMPDIR)
+endif
+
+clean_libs::
+	@echo Removing library lib$(name).a ...
+	@rm -f $(G4LIBDIR)/*$(name).a
+	@echo Removing library lib$(name).$(SHEXT) ...
+	@rm -f $(G4LIBDIR)/*$(name).lib
+	@rm -f $(G4LIBDIR)/*$(name).exp
+	@rm -f $(G4LIBDIR)/*$(name).$(SHEXT)
Index: trunk/geant4/config/globlib.gmk
===================================================================
--- trunk/geant4/config/globlib.gmk	(revision 472)
+++ trunk/geant4/config/globlib.gmk	(revision 472)
@@ -0,0 +1,134 @@
+# $Id: globlib.gmk,v 1.28 2005/12/07 09:53:46 gcosmo Exp $
+# --------------------------------------------------------------
+# Script for compound libraries.  Gabriele Cosmo, 25/6/98.
+# --------------------------------------------------------------
+
+ifndef G4INSTALL
+  G4INSTALL = ..
+endif
+
+include $(G4INSTALL)/config/architecture.gmk
+
+G4LIBDIR = $(G4LIB)/$(G4SYSTEM)
+
+.PHONY : all glob global objs includes clean clean_libs wipe_libs
+
+all: makesub
+
+makesub:
+	@for dir in $(SUBDIRS); do (cd $$dir && $(MAKE)); done
+
+g4libraries_to_build:=
+
+ifeq ($(G4LIB_NO_SHARED),)
+ifneq ($(G4LIB_BUILD_SHARED),)
+  SHARED_LIB=$(G4LIBDIR)/lib$(name).$(SHEXT)
+  g4libraries_to_build += $(SHARED_LIB)
+else
+  SHARED_LIB=
+endif
+endif
+
+ifneq ($(G4LIB_BUILD_STATIC),)
+  g4libraries_to_build += $(G4LIBDIR)/lib$(name).a
+endif
+
+glob global: objs wipe_libs $(g4libraries_to_build)
+
+##
+## make static libraries
+##
+ifneq ($(G4LIB_BUILD_STATIC),)
+$(G4LIBDIR)/lib$(name).a: \
+  $(foreach dir,$(SUBLIBS),$(G4TMP)/$(G4SYSTEM)/$(dir)/obj.last)
+	@if [ ! -d $(G4LIBDIR) ] ; then mkdir $(G4LIBDIR) ; fi
+	@echo Merging object files in $(G4LIBDIR)/lib$(name).a ...
+	@$(RM) $(G4LIBDIR)/lib$(name).a
+#
+#
+#
+	@if [ X$(G4SYSTEM) = XWIN32-VC ] ; \
+	then  \
+	i=NO; \
+	(( for lib in $(SUBLIBS); \
+	do ( if [ $$i = NO ]; \
+	then \
+	$(AR) $(OUT_LIB)$(G4LIBDIR)/lib$(name).lib \
+		$(G4TMP)/$(G4SYSTEM)/$$lib/*.o ; \
+	else \
+	$(AR) $(G4LIBDIR)/lib$(name).lib $(G4TMP)/$(G4SYSTEM)/$$lib/*.o; \
+	fi ); \
+	i=YES; \
+	done ) ; \
+	mv $(G4LIBDIR)/lib$(name).lib $(G4LIBDIR)/lib$(name).a); \
+	else \
+	(for lib in $(SUBLIBS); \
+	do ($(AR) $(OUT_LIB)$(G4LIBDIR)/lib$(name).a \
+	$(G4TMP)/$(G4SYSTEM)/$$lib/*.o); \
+	done);\
+	fi	
+#
+#
+#
+	@if [ X$(G4SYSTEM) != XWIN32-VC ] ; then  \
+	if [ -f /usr/bin/ranlib -o -f /bin/ranlib ] ; then \
+	ranlib $(G4LIBDIR)/lib$(name).a ; fi ; fi
+endif
+
+
+##
+## make shared libraries
+##
+ifeq ($(G4LIB_NO_SHARED),)
+ifneq ($(G4LIB_BUILD_SHARED),)
+$(SHARED_LIB):	$(foreach dir,$(SUBLIBS),$(G4TMP)/$(G4SYSTEM)/$(dir)/obj.last)
+	@if [ ! -d $(G4LIBDIR) ] ; then mkdir $(G4LIBDIR) ; fi
+	@echo Creating global shared library $@ ...
+	@$(RM) $@
+#	use system specific commands to build the library
+	$(build-global-shared-lib)
+endif
+endif
+
+objs:
+	@for dir in $(SUBDIRS); \
+	  do (cd $$dir; $(MAKE) -q obj && ok=yes; \
+	    if [ $$ok ]; \
+	    then echo Nothing to be done for lib$(name) in $$dir/.; \
+	    else $(MAKE) clean_libs; $(MAKE) obj; \
+	    fi; ) \
+	  done
+
+includes::
+	@for dir in $(SUBDIRS); do (cd $$dir && $(MAKE) $@ ); done
+	
+wipe_libs:
+	@for lib in $(SUBLIBS); do (rm -f $(G4LIBDIR)/lib$$lib.a); done
+	@for lib in $(SUBLIBS); do (rm -f $(G4LIBDIR)/lib$$lib.$(SHEXT)); done
+
+clean::
+	@echo Cleaning up ...
+	@for lib in $(SUBLIBS); do ( \
+				 rm -rf $(G4TMP)/$(G4SYSTEM)/$$lib;\
+				 rm -f $(G4LIBDIR)/*$$lib.a;\
+				 rm -f $(G4LIBDIR)/*$$lib.lib;\
+				 rm -f $(G4LIBDIR)/*$$lib.exp;\
+				 rm -f $(G4LIBDIR)/*$$lib.$(SHEXT) );\
+				done
+	@rm -f $(G4LIBDIR)/*$(name).a
+	@rm -f $(G4LIBDIR)/*$(name).lib
+	@rm -f $(G4LIBDIR)/*$(name).exp
+	@rm -f $(G4LIBDIR)/*$(name).$(SHEXT)
+
+clean_libs::
+	@echo Removing lib$(name).a/.$(SHEXT) and sub-libraries ...
+	@for lib in $(SUBLIBS); do ( \
+				  rm -f $(G4LIBDIR)/*$$lib.a;\
+				  rm -f $(G4LIBDIR)/*$$lib.lib;\
+				  rm -f $(G4LIBDIR)/*$$lib.exp;\
+				  rm -f $(G4LIBDIR)/*$$lib.$(SHEXT) );\
+				done
+	@rm -f $(G4LIBDIR)/*$(name).a
+	@rm -f $(G4LIBDIR)/*$(name).lib
+	@rm -f $(G4LIBDIR)/*$(name).exp
+	@rm -f $(G4LIBDIR)/*$(name).$(SHEXT)
Index: trunk/geant4/config/interactivity.gmk
===================================================================
--- trunk/geant4/config/interactivity.gmk	(revision 472)
+++ trunk/geant4/config/interactivity.gmk	(revision 472)
@@ -0,0 +1,83 @@
+#  GNUmakefile for CPPFLAGS, LDFLAGS for interactivy, 
+# ie interfaces and visualization.
+#
+#  Here we really set the CCPFLAGS, LDFLAGS for X11, Motif,...
+# according various INC_xxx, LOAD_xxx flags setted in
+# G4[UI, VIS]_[USE, BUILD].gmk. With this logic the 
+# flags for one product (X11, Motif,...) will appear once 
+# in the compilation/load command line.
+#
+#   Guy Barrand, 7th July 1998.
+
+# Other libraries
+
+########################### Inventor ############
+
+# Should be before OpenGL.
+ifdef INC_IV
+  INC_GL    = 1
+  CPPFLAGS += $(OIVFLAGS)
+endif
+ifdef LOAD_IV
+  LOAD_GL  = 1
+  INTYLIBS += $(OIVLIBS)
+endif
+
+########################### OpenGL ###############################
+
+ifdef INC_GL
+  CPPFLAGS += $(OGLFLAGS)
+endif
+ifdef LOAD_GL
+  INTYLIBS += $(OGLLIBS)
+endif
+
+########################### Motif, Athena, X11 ###################
+# Motif raise X11 flags.
+
+# Should be before X11.
+ifdef INC_XM
+  INC_X11   = 1
+  CPPFLAGS += $(XMFLAGS)
+endif
+ifdef LOAD_XM
+  LOAD_X11           = 1
+  INTYLIBS += $(XMLIBS)
+endif
+
+# Should be before X11.
+ifdef INC_XAW
+  INC_X11   = 1
+  CPPFLAGS += $(XAWFLAGS)
+endif
+ifdef LOAD_XAW
+  LOAD_X11           = 1
+  INTYLIBS += $(XAWLIBS)
+endif
+
+ifdef INC_X11
+  CPPFLAGS += $(X11FLAGS)
+endif
+ifdef LOAD_X11
+  INTYLIBS += $(X11LIBS)
+endif
+
+########################### and finally... #######################
+
+ifdef G4INTY_BUILD_XT
+  CPPFLAGS += -DG4INTY_BUILD_XT
+endif
+
+ifdef G4INTY_USE_XT
+  CPPFLAGS += -DG4INTY_USE_XT
+endif
+
+ifdef G4INTY_BUILD_WIN32
+  CPPFLAGS += -DG4INTY_BUILD_WIN32
+endif
+
+ifdef G4INTY_USE_WIN32
+  CPPFLAGS += -DG4INTY_USE_WIN32
+  INTYLIBS += $(UI32LIBS)
+endif
+
Index: trunk/geant4/config/liblist.c
===================================================================
--- trunk/geant4/config/liblist.c	(revision 472)
+++ trunk/geant4/config/liblist.c	(revision 472)
@@ -0,0 +1,592 @@
+/* $Id: liblist.c,v 1.17 2002/11/22 11:53:10 gcosmo Exp $ */
+
+/*
+Given a "libname.map" file on standard input and a list or directory
+of .d dependency files liblist produces:
+  a) without -l option, a library list ordered according to the libname.map,
+     giving a warning if conflicting dependencies are found in the .d files.
+  b) with -l option, another libname.map, ordered according firstly to the
+     original libname.map file, then reordered according to the dependencies
+     found in the .d files.  This option is used for compiling the file
+     libname.map from all the dependencies.
+  c) with -m <lpath> option, the whole existing libraries list ordered
+     according to the libname.map, where libraries are placed in <lpath>.
+The .d files are specified in the argument(s).
+The libname.map is on standard input.
+
+Usage:
+  liblist *.d < libname.map
+  liblist -d <ddir> < libname.map
+  liblist -l *.d < libname.map
+  liblist -ld <ddir> < libname.map
+  liblist -l -d <ddir> < libname.map
+  liblist -m <lpath> < libname.map
+where:
+  <ddir>  is a directory name of a directory which is recursively
+          searched for dependency files
+  <lpath> is the path where libraries are located
+
+Frank Behner, John Allison 13th February 1999.
+*/
+
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <dirent.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <errno.h>
+#include <stdlib.h>
+
+#define BUFSIZE 1000000
+#define TRIGSIZE 1000
+#define NLIBMAX 200
+
+extern char *optarg;
+extern int optind, opterr, optopt;
+
+char** parsedir(char *directory,int *argc)
+{
+  DIR *actualdir;
+  FILE *actualfile;
+  struct dirent *entry; 
+  char *buffer=0;
+  struct stat status;
+  char **targv=0,**ptr,**phelp;
+  int len,targc,s;
+
+  /*Open the actual directory*/
+  actualdir=opendir(directory);
+
+  if(!actualdir) return targv;
+
+  /*Loop over all entries */
+  for(entry=readdir(actualdir);entry!=NULL;entry=readdir(actualdir))
+    {
+      /* Throw away . and .. */
+      if(strcmp(entry->d_name,".")==0 ||
+	 strcmp(entry->d_name,"..")==0) continue;
+      /* Obtain the status information of that entry */
+      if(buffer) free(buffer);
+      buffer=(char*) malloc((strlen(directory)+
+			     strlen(entry->d_name)+2)*sizeof(char));
+      strcpy(buffer,directory);
+      strcat(buffer,"/");
+      strcat(buffer,entry->d_name);
+      s=stat(buffer,&status);
+      if(s==0)
+	{
+	  if(S_ISDIR(status.st_mode))
+	    {
+	      /* a directory, so we are going recursive*/
+	      targc=0;
+	      ptr=parsedir(buffer,&targc);
+	      if(targc)
+		{
+		  phelp=targv;
+		  targv=(char**) malloc((*argc+targc)*sizeof(char*));
+		  memcpy(targv,phelp,*argc*sizeof(char*));
+		  memcpy(&targv[*argc],ptr,targc*sizeof(char*));
+		  *argc+=targc;
+		  free(phelp);
+		  free(ptr);
+		}
+	    }
+	  else if(S_ISREG(status.st_mode))
+	    {
+	      /* a regular file is it .d? */
+	      len=strlen(entry->d_name);
+	      if(entry->d_name[len-2]=='.' && entry->d_name[len-1]=='d')
+		{
+		  phelp=targv;
+		  targv=(char**) malloc((*argc+1)*sizeof(char*));
+		  memcpy(targv,phelp,*argc*sizeof(char*));
+		  targv[*argc]=strdup(buffer);
+		  (*argc)++;
+		  free(phelp);
+		}
+	    }
+	}
+      else
+	{
+	  fprintf
+	    (stderr,
+	     "  No status - perhaps file %s does not exist.\n",
+	     directory);
+	  exit(1);
+	}
+    }
+
+  if(buffer) free(buffer);
+  closedir(actualdir);
+
+  return targv;
+}
+		
+ 
+int main (int argc, char** argv) {
+
+  char static buffer[BUFSIZE],*bufferPtr,workbuf[256];
+  char *ptr,*p,**pp,**pp1,**pp2,*directory=0,*libpath=0;
+  char **rargv;
+  char libname[128];
+  int i,optl=0,optm=0,swapping,c,rargc;
+  FILE *fp;
+
+#if defined ( _WIN32 ) || defined ( __CYGWIN__ ) || defined ( __CYGWIN32__ )
+  char *ntg4tmp=0,*ntg4tmp1=0;
+  int nti; 
+#endif
+
+  struct libmap_
+    {
+      char *lib;      /* Library name, e.g., G4run. */
+      char *trigger;  /* Source directory, e.g., source/run/.  */
+      int used;       /* True if used by these dependency files.  */
+      char **uses;    /* List of library names which this library uses.  */
+      struct libmap_ *next;
+  };
+
+  struct libmap_ *libmap=0,*libmapPtr=0,*libmapPtr1=0,*libmapPtr2=0,
+    *prevPtr1,*prevPtr2,*tmpp,*userLibmapPtr;
+
+  while((c=getopt(argc,argv,"ld: m:"))!=EOF)
+    {
+      switch(c)
+	{
+	case 'l':
+	  optl=1;
+	  break;
+	case 'd':
+	  directory=strdup(optarg);
+	  break;
+        case 'm':
+          optm=1;
+	  libpath=strdup(optarg);
+          break;
+	}
+    }
+	  
+  /*Adjust parameters after parsing options */
+
+  if(optind<argc)
+    {
+      rargv=&argv[optind];
+      rargc=argc-optind;
+    }
+  else
+    {
+      rargv=0;
+      rargc=0;
+    }
+
+  if(directory)
+    {
+      if(rargc==0)
+	{
+	  rargv=parsedir(directory,&rargc);
+	}
+      else
+	{
+	  fprintf
+	    (stderr,
+	     "  ERROR: If you specify a directory don't also specify files\n");
+	  exit(1);
+	}
+    }
+
+  if(optl)fprintf(stderr,"  Reading library name map file...\n");
+  while (!feof(stdin))
+    {
+      /* Get library name... */
+      gets(buffer);
+      if(feof(stdin)) break;
+      ptr=strtok(buffer,":\n");
+
+      /* Check for duplicate names... */
+      for(libmapPtr1=libmap;libmapPtr1;libmapPtr1=libmapPtr1->next)
+	{
+	  if(strcmp(libmapPtr1->lib,ptr)==0)
+	    {
+	      fprintf(stderr,"  ERROR: Duplicate library name: %s\n",ptr);
+	      fprintf(stderr,
+		      "  Perhaps a duplicate subdirectory with"
+		      " a GNUmakefile with the same library name.\n"
+		      );
+	      exit(1);
+	    }
+	}
+
+      if(libmap)
+	{
+	  libmapPtr->next=(struct libmap_*) malloc(sizeof(struct libmap_));
+	  libmapPtr=libmapPtr->next;
+	}
+      else /* First time through anchor libmapPtr to libmap. */
+	{
+	  libmap=(struct libmap_*) malloc(sizeof(struct libmap_));
+	  libmapPtr=libmap;
+	}
+      libmapPtr->next=0;      
+      libmapPtr->lib=strdup(ptr);
+      libmapPtr->used=0;
+      libmapPtr->uses=(char**)calloc(NLIBMAX,sizeof(char*));
+
+      /* If option -l not specified, fill uses list... */
+      if(!optl && !optm)
+	{
+	  pp=libmapPtr->uses;
+	  if(ptr)
+	    {
+	      ptr=strtok(NULL," \n");
+	      while (ptr)
+		{
+		  *pp=strdup(ptr);
+		  pp++;
+		  ptr=strtok(NULL," \n");
+		}
+	    }
+	}
+
+      if(!optm)
+        {
+          /* Get directory name... */
+          gets(buffer);
+          ptr=strtok(buffer,"/");
+          if(!ptr)
+	    {
+	      fprintf(stderr,"  ERROR: \"/\" before \"source\" expected.\n");
+	      exit(1);
+	    }
+          while(ptr&&strcmp (ptr,"source"))ptr=strtok(NULL,"/");
+          ptr=strtok(NULL,"/");
+          if(!ptr)
+	    {
+	      fprintf(stderr,"  ERROR: \"source\" expected.\n");
+	      exit(1);
+	    }
+          libmapPtr->trigger=(char*)malloc(TRIGSIZE);
+          strcpy(libmapPtr->trigger,ptr);
+          ptr=strtok(NULL,"/");
+          while(ptr&&strcmp(ptr,"GNUmakefile"))
+	    {
+	      strcat(libmapPtr->trigger,"/");
+	      strcat(libmapPtr->trigger,ptr);
+	      ptr=strtok(NULL,"/");
+	    }
+          if(!ptr)
+	    {
+	      fprintf
+	        (stderr,
+	         "  ERROR: \"source/<unique-sub-path>/GNUmakefile\" expected.\n");
+	      exit(1);
+	    }
+	}
+    }
+
+  if(optl)fprintf(stderr,"  Reading dependency files...\n");
+
+#if defined ( _WIN32 ) || defined ( __CYGWIN__ ) || defined ( __CYGWIN32__ )
+      ntg4tmp=getenv("G4TMP");
+      if ( ! ntg4tmp ) 
+        {
+           fprintf(stderr,"  ERROR: Cannot find environment variable G4TMP\n");
+           exit(1);
+        }
+      ntg4tmp1=strdup(ntg4tmp);
+#endif
+
+  for(i=0;i<rargc;i++)
+    {
+      fp=fopen(rargv[i],"r");
+      fgets(buffer,BUFSIZE,fp);
+
+#if defined ( _WIN32 ) || defined ( __CYGWIN__ ) || defined ( __CYGWIN32__ )
+      ptr=strchr(ntg4tmp1,':');
+      if ( ptr ) *(ptr+1)='\0';
+
+      while ( ptr=strchr(buffer,'\\') ) *ptr='/';
+ 
+      while (ntg4tmp1!=NULL &&  (ptr=strstr(buffer,ntg4tmp1))!=NULL )
+        {
+          for(nti=0;nti<strlen(ntg4tmp1);nti++) ptr[nti]=' ';
+        }
+#endif
+     
+      /* Clip target out of dependency file... */
+      ptr=strtok(buffer,":");
+      
+      /* Look for a "user" library... */
+      for(libmapPtr=libmap;libmapPtr;libmapPtr=libmapPtr->next)
+	{
+	  strcpy(workbuf,libmapPtr->lib);
+	  /* Add trailing "/" to distinguish track/ and tracking/, etc. */
+	  strcat(workbuf,"/");
+	  if(strstr(ptr,workbuf)) break;
+	}
+      if(libmapPtr)
+	{
+	  userLibmapPtr=libmapPtr;
+	}
+      else
+	{
+	  userLibmapPtr=0;
+	}
+
+      if(!optm)
+	{
+	  /* Look for a "used" library and add it to the "user" uses list... */
+	  bufferPtr=strtok(NULL,"\n");  /* Start *after* ":". */
+	  if (!bufferPtr) 
+	    {
+	      fprintf(stderr,"  WARNING: It seems there is nothing after \':\' in dependency file %s.\n", rargv[i]);
+	    }
+	  else {
+	  do
+	    {
+	      for(libmapPtr=libmap;libmapPtr;libmapPtr=libmapPtr->next)
+	        {
+		  /* Look for trigger string. */
+		  strcpy(workbuf,libmapPtr->trigger);
+		  strcat(workbuf,"/include");
+		  ptr=strstr(bufferPtr,workbuf);
+		  if(ptr && (userLibmapPtr != libmapPtr))
+		    {
+		      libmapPtr->used=1;
+		      if(userLibmapPtr)
+		        {
+			  for(pp=userLibmapPtr->uses;*pp;pp++)
+			    {
+			      if(strcmp(*pp,libmapPtr->lib)==0)break;
+			    }
+			  if(!*pp)*pp=libmapPtr->lib;
+		        }
+		    }
+		  /* Also look for library name in case header files are
+		     placed in temporary directories under a subdirectory
+		     with the same name as the library name.  This can
+		     happen with Objectivity which makes header files
+		     from .ddl files and places them in a temporary
+		     directory. */
+		  strcpy(workbuf,libmapPtr->lib);
+		  strcat(workbuf,"/");
+		  ptr=strstr(bufferPtr,workbuf);
+		  if(ptr && (userLibmapPtr != libmapPtr))
+		    {
+		      libmapPtr->used=1;
+		      if(userLibmapPtr)
+		        {
+			  for(pp=userLibmapPtr->uses;*pp;pp++)
+			    {
+			      if(strcmp(*pp,libmapPtr->lib)==0)break;
+			    }
+			  if(!*pp)*pp=libmapPtr->lib;
+		        }
+		    }
+	        }
+	      fgets(buffer,BUFSIZE,fp);
+	      bufferPtr=buffer;
+
+#if defined ( _WIN32 ) || defined ( __CYGWIN__ ) || defined ( __CYGWIN32__ )
+	      while ( ptr=strchr(buffer,'\\') ) *ptr='/';
+
+	      while (ntg4tmp1 &&  (ptr=strstr(buffer,ntg4tmp1)) )
+	        {
+		  for(nti=0;nti<strlen(ntg4tmp1);nti++) ptr[nti]=' ';
+	        }
+#endif
+
+	    } while(!feof(fp));
+	  fclose(fp);
+        }
+      }
+    }
+
+#if defined ( _WIN32 ) || defined ( __CYGWIN__ ) || defined ( __CYGWIN32__ )
+      free(ntg4tmp1);
+#endif
+
+  if(optl) /* This option is used for compiling the file libname.map
+	      from all the dependencies. */
+    {
+      fprintf(stderr,"  Checking for circular dependencies...\n");
+      for(libmapPtr=libmap;libmapPtr;libmapPtr=libmapPtr->next)
+	{
+	  for(pp=libmapPtr->uses;*pp;pp++)
+	    {
+	      for(libmapPtr1=libmap;libmapPtr1!=libmapPtr;
+		  libmapPtr1=libmapPtr1->next)
+		{
+		  if(strcmp(libmapPtr1->lib,*pp)==0)
+		    {
+		      for(pp1=libmapPtr1->uses;*pp1;pp1++)
+			{
+			  if(strcmp(*pp1,libmapPtr->lib)==0)break;
+			}
+		      if(*pp1)
+			{
+			  fprintf
+			    (stderr,
+			     "  WARNING: %s and %s use each other.\n",
+			     libmapPtr->lib,
+			     libmapPtr1->lib);
+			}
+		    }
+		  else 
+		    {
+		      /* Not right yet...
+		      for(pp1=libmapPtr1->uses;*pp1;pp1++)
+			{
+			  for(libmapPtr0=libmap;libmapPtr0!=libmapPtr1;
+			      libmapPtr0=libmapPtr0->next)
+			    {
+			      if(libmapPtr0==*pp)
+				{
+				  fprintf
+				    (stderr,
+				     "  WARNING: triangular dependecy:\n"
+				     "  %s uses %s uses %s uses %s.\n",
+				     libmapPtr->lib,
+				     libmapPtr1->lib,
+				     libmapPtr0->lib,
+				     libmapPtr->lib);
+				}
+			    }
+			}
+		      */
+		    }
+		}
+	    }
+	}
+
+      fprintf(stderr,"  Reordering according to dependencies...\n");
+      do
+	{
+	  swapping=0;
+	  prevPtr2=0;
+	  for(libmapPtr=libmap;libmapPtr;libmapPtr=libmapPtr->next)
+	    {
+	      for(pp=libmapPtr->uses;*pp;pp++)
+		{
+		  prevPtr1=0;
+		  for(libmapPtr1=libmap;libmapPtr1!=libmapPtr;
+		      libmapPtr1=libmapPtr1->next)
+		    {
+		      if(strcmp(libmapPtr1->lib,*pp)==0)
+			{
+			  /* Check that 1st doesn't use 2nd... */
+			  for(pp1=libmapPtr1->uses;*pp1;pp1++)
+			    {
+			      if(strcmp(*pp1,libmapPtr->lib)==0)break;
+			    }
+			  if(!*pp1) /* If not... */
+			    {
+			      swapping=1;
+			      /* Make previous of 1st now point to 2nd... */
+			      if(prevPtr1)
+				{
+				  prevPtr1->next=libmapPtr;
+				}
+			      else
+				{
+				  libmap=libmapPtr;
+				}
+			      /* Make 2nd now point to what 1st did, unless
+				 it's adjacent, in which case make it point
+				 to 1st itself... */
+			      tmpp=libmapPtr->next;
+			      if(libmapPtr1->next==libmapPtr)
+				{
+				  libmapPtr->next=libmapPtr1;
+				}
+			      else
+				{
+				  libmapPtr->next=libmapPtr1->next;
+				}
+			      /* Make previous of 2nd point to 1st, unless
+				 it's adjacent, in which case leave it... */
+			      if(libmapPtr1->next!=libmapPtr)
+				{
+				  prevPtr2->next=libmapPtr1;
+				}
+			      /* Make 1st now point to what 2nd did... */
+			      libmapPtr1->next=tmpp;
+			      break;
+			    }
+			}
+		      prevPtr1=libmapPtr1;
+		    }
+		  if(swapping)break;
+		}
+	      prevPtr2=libmapPtr;
+	      if(swapping)break;
+	    }
+	}while(swapping);
+
+      fprintf(stderr,"  Writing new library map file...\n");
+      for(libmapPtr=libmap;libmapPtr;libmapPtr=libmapPtr->next)
+	{
+	  printf("%s:",libmapPtr->lib);
+	  for(pp=libmapPtr->uses;*pp;pp++)
+	    {
+	      printf(" %s",*pp);
+	    }
+	  printf("\n");
+	  printf("source/%s/GNUmakefile\n",libmapPtr->trigger);
+	}
+    }
+  else if (optm)
+    {
+      /* Write out full library list... */
+      for(libmapPtr=libmap;libmapPtr;libmapPtr=libmapPtr->next)
+      {
+        /* Check existance of libraries and print out only installed ones */
+	sprintf(libname, "%s/lib%s.a", libpath, libmapPtr->lib);
+        if (access(libname,R_OK))
+	{
+	  sprintf(libname, "%s/lib%s.so", libpath, libmapPtr->lib);
+          if (!access(libname,R_OK))
+	  {
+            printf("-l%s ",libmapPtr->lib);
+	  }
+	}
+        else
+	{
+          printf("-l%s ",libmapPtr->lib);
+	}
+	libmapPtr=libmapPtr->next;
+      }
+    }
+  else
+    {
+      /* Add dependent libraries... */
+      for(libmapPtr=libmap;libmapPtr;libmapPtr=libmapPtr->next)
+	{
+	  if(libmapPtr->used)
+	    {
+	      for(pp=libmapPtr->uses;*pp;pp++)
+		{
+		  for(libmapPtr1=libmap;libmapPtr1;libmapPtr1=libmapPtr1->next)
+		    {
+		      if(strcmp(libmapPtr1->lib,*pp)==0)
+			{
+			  libmapPtr1->used=1;
+			}
+		    }
+		}	      
+	    }
+	}
+
+      /* Write out library list... */
+      for(libmapPtr=libmap;libmapPtr;libmapPtr=libmapPtr->next)
+	{
+	  if(libmapPtr->used)
+	    {
+	      printf("-l%s ",libmapPtr->lib);
+	    }
+	}
+    }
+      
+  exit(0);
+  
+}
Index: trunk/geant4/config/scripts/GNUmakefile
===================================================================
--- trunk/geant4/config/scripts/GNUmakefile	(revision 472)
+++ trunk/geant4/config/scripts/GNUmakefile	(revision 472)
@@ -0,0 +1,25 @@
+# $Id: GNUmakefile,v 1.8 2003/10/02 17:57:10 stesting Exp $
+# --------------------------------------------------------------
+# GNUmakefile for tests module.  Gabriele Cosmo, 27/06/98.
+# --------------------------------------------------------------
+
+name := Marker
+G4TARGET := $(name)
+G4EXLIB := true
+
+ifndef G4INSTALL
+  G4INSTALL = ../..
+endif
+
+.PHONY: all
+
+all: lib bin
+
+include $(G4INSTALL)/config/scripts/binmake.gmk
+
+CXXFLAGS_FINAL := $(CXXFLAGS) 
+INCFLAGS_FINAL := $(INCFLAGS)
+LDLIBS_FINAL := $(LDLIBS)
+LDLIB3_FINAL := $(LDLIBS3)
+LDLIB4_FINAL := $(LDLIBS4)
+#LDFLAGS_FINAL := $(LDFLAGS)
Index: trunk/geant4/config/scripts/binmake.gmk
===================================================================
--- trunk/geant4/config/scripts/binmake.gmk	(revision 472)
+++ trunk/geant4/config/scripts/binmake.gmk	(revision 472)
@@ -0,0 +1,368 @@
+# $Id: binmake.gmk,v 1.11 2003/12/12 10:07:56 stesting Exp $
+# ----------------------------------------------------------
+# Script defining rules and paths for making binaries.
+#    First implementation: Gabriele Cosmo, 25/06/1998.
+# ----------------------------------------------------------
+
+ifndef LDFLAGS
+  include $(G4INSTALL)/config/architecture.gmk
+endif
+
+G4LIBDIR := $(G4LIB)/$(G4SYSTEM)
+
+# Define variable checking for existence of centrally installed headers.
+# If check will be true, avoid explicit definition of paths to INCFLAGS.
+#
+G4INCLUDE_EXEC := $(shell [ -r $(G4INCLUDE)/globals.hh ] && echo 1)
+
+include $(G4INSTALL)/config/G4UI_USE.gmk
+include $(G4INSTALL)/config/G4VIS_USE.gmk
+include $(G4INSTALL)/config/interactivity.gmk
+include $(G4INSTALL)/config/analysis.gmk
+
+ifndef G4LIB_USE_GRANULAR
+    GLOBALLIBS := $(shell test -f $(G4LIB)/$(G4SYSTEM)/libG4global.a && echo yes)
+  ifndef GLOBALLIBS
+    GLOBALLIBS := $(shell test -f $(G4LIB)/$(G4SYSTEM)/libG4global.$(SHEXT) && echo yes)
+    SHAREDLIBS := $(shell test -f $(G4LIB)/$(G4SYSTEM)/libG4global.$(SHEXT) && echo yes)
+  endif
+endif
+
+ifndef SHAREDLIBS
+  SHAREDLIBS := $(shell test -f $(G4LIB)/$(G4SYSTEM)/libG4globman.$(SHEXT) && echo yes)
+endif
+  
+ifndef INCFLAGS
+ ifeq ($(G4INCLUDE_EXEC),1)
+  INCFLAGS := -I$(G4INCLUDE)
+ else
+  INCFLAGS := \
+              -I$(G4BASE)/global/management/include \
+              -I$(G4BASE)/global/HEPRandom/include \
+              -I$(G4BASE)/global/HEPGeometry/include \
+              -I$(G4BASE)/global/HEPNumerics/include \
+              -I$(G4BASE)/run/include \
+              -I$(G4BASE)/materials/include \
+              -I$(G4BASE)/parameterisations/include \
+              -I$(G4BASE)/particles/management/include \
+              -I$(G4BASE)/particles/bosons/include \
+              -I$(G4BASE)/particles/leptons/include \
+              -I$(G4BASE)/particles/hadrons/barions/include \
+              -I$(G4BASE)/particles/hadrons/ions/include \
+              -I$(G4BASE)/particles/hadrons/mesons/include \
+              -I$(G4BASE)/particles/shortlived/include \
+              -I$(G4BASE)/processes/management/include \
+              -I$(G4BASE)/processes/cuts/include \
+              -I$(G4BASE)/processes/decay/include \
+              -I$(G4BASE)/processes/optical/include \
+              -I$(G4BASE)/processes/transportation/include \
+              -I$(G4BASE)/processes/parameterisation/include \
+              -I$(G4BASE)/processes/electromagnetic/standard/include \
+              -I$(G4BASE)/processes/electromagnetic/muons/include \
+              -I$(G4BASE)/processes/electromagnetic/utils/include \
+              -I$(G4BASE)/processes/electromagnetic/xrays/include \
+              -I$(G4BASE)/processes/electromagnetic/lowenergy/include \
+              -I$(G4BASE)/processes/hadronic/cross_sections/include \
+	      -I$(G4BASE)/processes/hadronic/management/include \
+	      -I$(G4BASE)/processes/hadronic/models/cascade/cascade/include \
+	      -I$(G4BASE)/processes/hadronic/models/cascade/evaporation/include \
+	      -I$(G4BASE)/processes/hadronic/models/cascade/utils/include \
+              -I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/body/include \
+              -I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/interface/include \
+              -I$(G4BASE)/processes/hadronic/models/coherent_elastic/include \
+              -I$(G4BASE)/processes/hadronic/models/high_energy/include \
+              -I$(G4BASE)/processes/hadronic/models/isotope_production/include \
+              -I$(G4BASE)/processes/hadronic/models/leading_particle/include \
+              -I$(G4BASE)/processes/hadronic/models/low_energy/include \
+              -I$(G4BASE)/processes/hadronic/models/neutron_hp/include \
+              -I$(G4BASE)/processes/hadronic/models/binary_cascade/include \
+              -I$(G4BASE)/processes/hadronic/models/de_excitation/evaporation/include \
+              -I$(G4BASE)/processes/hadronic/models/de_excitation/fermi_breakup/include \
+              -I$(G4BASE)/processes/hadronic/models/de_excitation/fission/include \
+              -I$(G4BASE)/processes/hadronic/models/de_excitation/gem_evaporation/include \
+              -I$(G4BASE)/processes/hadronic/models/de_excitation/handler/include \
+              -I$(G4BASE)/processes/hadronic/models/de_excitation/management/include \
+              -I$(G4BASE)/processes/hadronic/models/de_excitation/multifragmentation/include \
+              -I$(G4BASE)/processes/hadronic/models/de_excitation/photon_evaporation/include \
+              -I$(G4BASE)/processes/hadronic/models/de_excitation/util/include \
+              -I$(G4BASE)/processes/hadronic/models/inucl/include \
+              -I$(G4BASE)/processes/hadronic/models/photolepton_hadron/muon_nuclear/include \
+              -I$(G4BASE)/processes/hadronic/models/pre_equilibrium/exciton_model/include \
+              -I$(G4BASE)/processes/hadronic/models/quark_molecular_dynamics/body/include \
+              -I$(G4BASE)/processes/hadronic/models/quark_molecular_dynamics/util/include \
+              -I$(G4BASE)/processes/hadronic/models/relativistic_qmd/include \
+              -I$(G4BASE)/processes/hadronic/models/relativistic_qmd/uplusplus/include \
+              -I$(G4BASE)/processes/hadronic/models/im_r_matrix/include \
+              -I$(G4BASE)/processes/hadronic/models/management/include \
+              -I$(G4BASE)/processes/hadronic/models/parton_string/diffraction/include \
+              -I$(G4BASE)/processes/hadronic/models/parton_string/hadronization/include \
+              -I$(G4BASE)/processes/hadronic/models/parton_string/management/include \
+              -I$(G4BASE)/processes/hadronic/models/parton_string/qgsm/include \
+              -I$(G4BASE)/processes/hadronic/models/theo_high_energy/include \
+              -I$(G4BASE)/processes/hadronic/models/util/include \
+              -I$(G4BASE)/processes/hadronic/models/general_finalstate/include \
+              -I$(G4BASE)/processes/hadronic/models/radioactive_decay/include \
+              -I$(G4BASE)/processes/hadronic/processes/include \
+              -I$(G4BASE)/processes/hadronic/stopping/include \
+              -I$(G4BASE)/processes/hadronic/util/include \
+              -I$(G4BASE)/geometry/management/include \
+              -I$(G4BASE)/geometry/solids/CSG/include \
+              -I$(G4BASE)/geometry/solids/specific/include \
+              -I$(G4BASE)/geometry/solids/BREPS/include \
+              -I$(G4BASE)/geometry/solids/Boolean/include \
+              -I$(G4BASE)/geometry/divisions/include \
+              -I$(G4BASE)/geometry/volumes/include \
+              -I$(G4BASE)/geometry/navigation/include \
+              -I$(G4BASE)/geometry/magneticfield/include \
+              -I$(G4BASE)/geometry/biasing/include \
+              -I$(G4BASE)/track/include \
+              -I$(G4BASE)/tracking/include \
+              -I$(G4BASE)/digits_hits/detector/include \
+              -I$(G4BASE)/digits_hits/hits/include \
+              -I$(G4BASE)/digits_hits/digits/include \
+              -I$(G4BASE)/persistency/include \
+              -I$(G4BASE)/readout/include \
+              -I$(G4BASE)/event/include \
+              -I$(G4BASE)/graphics_reps/include \
+              -I$(G4BASE)/intercoms/include
+  ifdef G4USE_G3TOG4
+    INCFLAGS += -I$(G4BASE)/g3tog4/include
+  endif
+ endif
+endif
+
+CPPFLAGS_FINAL := $(CPPFLAGS)
+
+CPPFLAGS += $(INCFLAGS)
+LDFLAGS += -L$(G4LIBDIR)
+
+G4TMPDIR := $(G4TMP)/$(G4SYSTEM)/$(G4TARGET)
+G4BINDIR := $(G4BIN)/$(G4SYSTEM)
+
+LDFLAGS_FINAL := $(LDFLAGS)
+
+ifdef G4EXLIB
+  G4LIBDIR := $(G4TMPDIR)
+  LDFLAGS += -L$(G4LIBDIR)
+  ifdef SHAREDLIBS
+    ifdef G4RUNPATHOPTION
+#         For the example dependent directory, keep the 
+#         path to the shared lib in the executable.
+      LDFLAGS += $(G4RUNPATHOPTION)$(G4LIBDIR)
+    endif
+  endif
+  include $(G4INSTALL)/config/common.gmk
+endif
+
+ifdef LDLIBS
+  USER_DEFINED_LDLIBS := 1
+endif
+
+# Because of the script for granular libraries which replaces part of LDLIBS
+# and because of the way user defined LDLIBS was augmented historically I
+# have split LDLIBS into 4 parts...
+#
+ifndef USER_DEFINED_LDLIBS
+
+# LDLIBS1 contains the very high level libraries...
+#
+ifdef G4EXLIB
+  LDLIBS1 := -l$(G4TARGET)
+endif
+LDLIBS1 += $(EXTRALIBS)
+
+# VISLIBS and UILIBS are now handled by the granular library script...
+#
+ifdef GLOBALLIBS
+  LDLIBS1 += $(VISLIBS) $(UILIBS) -lG4persistency
+
+  ifdef G4USE_G3TOG4
+    LDLIBS1 += -lG3toG4
+  endif
+
+  LDLIBS2 := -lG4readout \
+             -lG4run \
+             -lG4event \
+             -lG4tracking \
+	     -lG4parmodels \
+             -lG4processes \
+             -lG4digits_hits \
+             -lG4track \
+             -lG4particles \
+             -lG4geometry \
+             -lG4materials \
+             -lG4graphics_reps \
+             -lG4intercoms \
+             -lG4global
+else
+# The next lines specifically should read LDLIBS2 = , not LDLIBS2 :=, so
+# that it is not expanded until the directory G4TMPDIR is created.
+  ifeq ($(G4INCLUDE_EXEC),1)
+    LDLIBS2 = $(shell \
+        G4TMP=$(G4TMP); export G4TMP; \
+	if [ \( -f $(G4LIB)/$(G4SYSTEM)/liblist \
+	  -a -f $(G4LIB)/$(G4SYSTEM)/libname.map \) ]; then \
+	$(G4LIB)/$(G4SYSTEM)/liblist \
+	  -m $(G4LIB)/$(G4SYSTEM) \
+	  < $(G4LIB)/$(G4SYSTEM)/libname.map; fi)
+  else
+    LDLIBS2 = $(shell \
+        G4TMP=$(G4TMP); export G4TMP; \
+	if [ \( -f $(G4LIB)/$(G4SYSTEM)/liblist \
+	  -a -f $(G4LIB)/$(G4SYSTEM)/libname.map \) ]; then \
+	$(G4LIB)/$(G4SYSTEM)/liblist \
+	  -d $(G4TMPDIR) \
+	  < $(G4LIB)/$(G4SYSTEM)/libname.map; fi)
+# Warning: do not add to LDLIBS2 with += because this causes it to be
+# expanded too soon.  Hence extra libraries must have a different name...
+# Extra libraries to resolve remaining circular dependencies...
+#  LDLIBS2EXTRA = 
+  endif
+endif
+
+# LDLIBS3 contains the first set of low level libraries...
+#
+LDLIBS3 += $(INTYLIBS)
+LDLIBS3 += $(ANALYSISLIBS)
+
+endif # ifndef USER_DEFINED_LDLIBS
+
+# LDLIBS4 contains the next set of low level libraries which historically
+# (why?) the user is not supposed to be able to define...
+#
+LDLIBS4 += $(LOADLIBS)
+
+# Finally assemble libraries...
+#
+ifdef USER_DEFINED_LDLIBS
+  LDLIBS_PREFINAL := $(LDLIBS)
+else
+# Again, do not use := or +=.  See note on LDLIBS2 above.
+  LDLIBS_PREFINAL = $(LDLIBS1) $(LDLIBS2) $(LDLIBS2EXTRA) $(LDLIBS3)
+endif
+LDLIBS_PREFINAL += $(LDLIBS4)
+
+ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
+  WIN32TMP := $(patsubst -L%,$(LIB_PATH)%,$(LDFLAGS))
+  LDFLAGS  = $(patsubst /,$(PATH_DEL),$(WIN32TMP))
+  LDLIBS = $(patsubst -l%,lib%.a,$(LDLIBS_PREFINAL))
+else
+  LDLIBS = $(LDLIBS_PREFINAL)
+endif
+
+ifdef transform-RPath
+#invoke system specific transformation of 
+include $(G4INSTALL)/config/sys/$(G4SYSTEM)-runpath.gmk
+endif
+	
+sources := $(wildcard $(G4TARGET).cc)
+objects := $(patsubst %.cc,$(G4TMPDIR)/exe/%.o,$(sources))
+dependencies := $(patsubst %.cc,$(G4TMPDIR)/exe/%.d,$(sources))
+
+LINK_DEPENDENCIES := $(G4TMPDIR)/exe/obj.last $(EXTRA_LINK_DEPENDENCIES)
+
+.PHONY: bin clean clean_bin debug
+
+# Make $(G4TARGET) executable.
+
+bin: $(G4BINDIR)/$(G4TARGET)
+
+$(G4BINDIR)/$(G4TARGET): $(LINK_DEPENDENCIES)
+ifndef USER_DEFINED_LDLIBS
+  ifndef GLOBALLIBS
+	@echo "Using granular libraries ..."
+	@if [ ! \( -f $(G4LIB)/$(G4SYSTEM)/liblist \
+	  -a -f $(G4LIB)/$(G4SYSTEM)/libname.map \) ]; then \
+	  echo "ERROR: No liblist program or library map file."; \
+	  echo "       These are needed for building with granular"; \
+	  echo "       libraries."; \
+	  echo '         cd $$G4INSTALL/source'; \
+	  echo "         gmake"; \
+	  echo "       or if you are sure you have already made all the"; \
+	  echo "       granular libraries:"; \
+	  echo "         gmake libmap"; \
+	  exit 1; fi
+  else
+	@echo "Using global libraries."
+  endif
+endif
+	@if [ ! -d $(G4BINDIR) ] ; then mkdir $(G4BINDIR) ;fi
+ifdef CPPVERBOSE
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) \
+	  -o $(G4BINDIR)/$(G4TARGET) $(objects) $(LDFLAGS) \
+	  $(LDLIBS)
+else
+	@echo Linking $(G4TARGET) ...
+	@$(CXX) $(CXXFLAGS) $(CPPFLAGS) \
+	  -o $(G4BINDIR)/$(G4TARGET) $(objects) $(LDFLAGS) \
+	  $(LDLIBS)
+endif
+
+# Touch the versioning file
+ifdef G4EXLIB
+$(G4TMPDIR)/exe/obj.last: lib $(objects)
+else
+$(G4TMPDIR)/exe/obj.last: $(objects)
+endif
+	@touch $@
+
+# Make the $(G4TARGET).o file.
+$(G4TMPDIR)/exe/$(G4TARGET).o : $(G4TARGET).cc
+ifdef CPPVERBOSE
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(APPFLAGS) \
+	 -c $(OUT_OBJ)$(G4TMPDIR)/exe/$(G4TARGET).o $(G4TARGET).cc
+else
+	@echo Compiling $(G4TARGET).cc ...
+	@$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(APPFLAGS) \
+	 -c $(OUT_OBJ)$(G4TMPDIR)/exe/$(G4TARGET).o $(G4TARGET).cc
+endif
+
+GPPFLAGS := "-M"
+
+# Make the $(G4TARGET).d file and include it.
+
+# The ideas for this come from the GNU Make Manual, Section 4.12,
+# Generating Prerequisites Automatically.  The g++ compiler has an
+# option -M or -MM to write to standard output a list of dependencies
+# based on the #include statements.  The "sed" adds the dependency
+# file itself as a second target.  The result is a mini-makefile which
+# specifies the .o and .d files as targets which depend on all the
+# files found through the #include statements.  This file is then
+# included, causing GNU Make to honour these dependencies.
+
+# The "set -e" causes the shell to exit with an error when the "g++"
+# fails (otherwise it would only notice the last command in the
+# pipeline, namely "sed").  GNU Make notices the error and exits
+# sooner than it otherwise would (still not as soon as I expect,
+# though!).  Even then, an empty file is made, so "[ -s $@ ] || rm -f
+# $@" removes it ([ -s filename ] gives zero exit code only if file
+# exists and has a size greater than zero).  This avoids making
+# corrupt .d files which would play havoc with your next build.
+
+$(G4TMPDIR)/exe/$(G4TARGET).d: $(G4TARGET).cc
+	@if [ ! -d $(G4TMP)/$(G4SYSTEM) ] ; then mkdir $(G4TMP)/$(G4SYSTEM) ;fi
+	@if [ ! -d $(G4TMPDIR) ] ; then mkdir $(G4TMPDIR) ;fi
+	@if [ ! -d $(G4TMPDIR)/exe ] ; then mkdir $(G4TMPDIR)/exe ;fi
+	@echo Making dependency for file $<...
+	@set -e;\
+	g++ $(GPPFLAGS) $(CPPFLAGS) -w $< |\
+	sed 's!$(G4TARGET)\.o!$(G4TMPDIR)/exe/& $@!' >$@;\
+	[ -s $@ ] || rm -f $@
+ifneq ($(dependencies),)
+-include $(dependencies)
+endif
+
+clean:
+	@echo Cleaning up ...
+	@rm -f ./core
+	@rm -rf $(G4TMPDIR)
+	@rm -f $(G4LIBDIR)/lib$(G4TARGET).a
+	@rm -f $(G4BINDIR)/$(G4TARGET)
+ifdef CFRONT
+	@rm -rf $(G4TREP)/exec
+endif
+
+clean_bin:
+	@echo Removing application $(G4TARGET) ...
+	@rm -f ./core
+	@rm -f $(G4BINDIR)/$(G4TARGET)
Index: trunk/geant4/config/scripts/env.csh.SH
===================================================================
--- trunk/geant4/config/scripts/env.csh.SH	(revision 472)
+++ trunk/geant4/config/scripts/env.csh.SH	(revision 472)
@@ -0,0 +1,433 @@
+case $CONFIG in
+'')
+	if test -f config.sh; then TOP=.;
+	elif test -f ../config.sh; then TOP=..;
+	elif test -f ../../config.sh; then TOP=../..;
+	elif test -f ../../../config.sh; then TOP=../../..;
+	elif test -f ../../../../config.sh; then TOP=../../../..;
+	else
+		echo "Can't find config.sh."; exit 1
+	fi
+	. $TOP/config.sh
+	;;
+esac
+: This forces SH files to create target in same directory as SH file.
+: This is so that make depend always knows where to find SH derivatives.
+case "$0" in
+*/*) cd `expr X$0 : 'X\(.*\)/'` ;;
+esac
+#echo "Extracting env.csh (with variable substitutions)"
+: This section of the file will have variable substitutions done on it.
+: Move anything that needs config subs from !NO!SUBS! section to !GROK!THIS!.
+: Protect any dollar signs and backticks that you do not want interpreted
+: by putting a backslash in front.  You may delete these comments.
+$spitshell >env.csh <<!GROK!THIS!
+######################################
+#
+# g4system.U
+#
+#+
+setenv G4SYSTEM "$g4system"
+echo "On this machine the G4SYSTEM=\$G4SYSTEM"
+
+#
+# g4dirs.U
+#
+#+
+if ( X$g4install != X$g4final_install ) then
+setenv G4INSTALL "$g4final_install/src/geant4"
+echo "On this machine the G4INSTALL=\$G4INSTALL"
+else
+setenv G4INSTALL "$g4install"
+echo "On this machine the G4INSTALL=\$G4INSTALL"
+endif
+
+#+
+if ( X$g4includes_flag != Xn ) then
+if ( X$g4install != X$g4final_install ) then
+setenv G4INCLUDE "$g4final_install/include/geant4"
+else
+setenv G4INCLUDE "$g4final_install/include"
+endif
+echo "On this machine the G4INCLUDE=\$G4INCLUDE"
+#else
+#setenv G4BASE "$g4final_install/include/geant4/source"
+#echo "On this machine the G4BASE=\$G4BASE"
+endif
+
+#+
+if ( X$g4lib != X ) then
+if ( X$g4install != X$g4final_install ) then
+setenv G4LIB "$g4final_install/lib/geant4"
+else
+setenv G4LIB "$g4final_install/lib"
+endif
+echo "On this machine the G4LIB=\$G4LIB"
+endif
+
+#+
+if ( X$g4levelgammadata != X ) then
+setenv G4LEVELGAMMADATA "$g4levelgammadata"
+echo "On this machine the G4LEVELGAMMADATA=\$G4LEVELGAMMADATA"
+endif
+
+#+
+if ( X$g4radioactivedata != X ) then
+setenv G4RADIOACTIVEDATA "$g4radioactivedata"
+echo "On this machine the G4RADIOACTIVEDATA=\$G4RADIOACTIVEDATA"
+endif
+
+#+
+if ( X$g4ledata != X ) then
+setenv G4LEDATA "$g4ledata"
+echo "On this machine the G4LEDATA=\$G4LEDATA"
+endif
+
+#+
+if ( X$g4neutronhpcrosssections != X ) then
+setenv NeutronHPCrossSections "$g4neutronhpcrosssections"
+echo "On this machine the NeutronHPCrossSections=\$NeutronHPCrossSections"
+endif
+
+#+
+if ( X$g4elasticdata != X ) then
+setenv G4ELASTICDATA "$g4elasticdata"
+echo "On this machine the G4ELASTICDATA=\$G4ELASTICDATA"
+endif
+
+#
+# g4clhep.U
+#
+if ( X$g4clhep_base_dir != X ) then
+setenv CLHEP_BASE_DIR "$g4clhep_base_dir"
+echo "On this machine the CLHEP_BASE_DIR=\$CLHEP_BASE_DIR"
+endif
+
+#+
+if ( X$g4clhep_include_dir != X ) then
+setenv CLHEP_INCLUDE_DIR "$g4clhep_include_dir"
+echo "On this machine the CLHEP_INCLUDE_DIR=\$CLHEP_INCLUDE_DIR"
+endif
+
+#+
+if ( X$g4clhep_lib_dir != X ) then
+setenv CLHEP_LIB_DIR "$g4clhep_lib_dir"
+echo "On this machine the CLHEP_LIB_DIR=\$CLHEP_LIB_DIR"
+endif
+
+#+
+if ( X$g4clhep_lib != X ) then
+setenv CLHEP_LIB "$g4clhep_lib"
+echo "On this machine the CLHEP_LIB=\$CLHEP_LIB"
+endif
+
+#+
+#
+# g4debug
+#
+if ( X$g4debug != X ) then
+setenv G4DEBUG "$g4debug"
+echo "On this machine the G4DEBUG=\$G4DEBUG"
+endif
+
+#
+# g4analysis
+#
+#+
+if ( X$g4wanalysis_use == Xy ) then
+setenv G4ANALYSIS_USE 1
+echo "On this machine the G4ANALYSIS_USE=\$G4ANALYSIS_USE"
+endif
+
+#
+# g4ui
+#
+#+
+if ( X$g4ui_build_xaw_session == Xy ) then
+setenv G4UI_BUILD_XAW_SESSION 1
+echo "On this machine the G4UI_BUILD_XAW_SESSION=\$G4UI_BUILD_XAW_SESSION"
+endif
+
+#+
+if ( X$g4ui_use_xaw == Xy ) then
+setenv G4UI_USE_XAW 1
+echo "On this machine the G4UI_USE_XAW=\$G4UI_USE_XAW"
+endif
+
+#+
+if ( X$g4ui_build_xm_session == Xy ) then
+setenv G4UI_BUILD_XM_SESSION 1
+echo "On this machine the G4UI_BUILD_XM_SESSION=\$G4UI_BUILD_XM_SESSION"
+endif
+
+#+
+if ( X$g4ui_use_xm == Xy ) then
+setenv G4UI_USE_XM 1
+echo "On this machine the G4UI_USE_XM=\$G4UI_USE_XM"
+endif
+
+#+
+if ( X$g4ui_build_win32_session == Xy ) then
+setenv G4UI_BUILD_WIN32_SESSION 1
+echo "On this machine the G4UI_BUILD_WIN32_SESSION=\$G4UI_BUILD_WIN32_SESSION"
+endif
+
+#+
+if ( X$g4ui_use_win32 == Xy ) then
+setenv G4UI_USE_WIN32 1
+echo "On this machine the G4UI_USE_WIN32=\$G4UI_USE_WIN32"
+endif
+
+#
+# g4vis
+#
+#+
+if ( X$g4vis_build_dawn_driver == Xy ) then
+setenv G4VIS_BUILD_DAWN_DRIVER 1
+echo "On this machine the G4VIS_BUILD_DAWN_DRIVER=\$G4VIS_BUILD_DAWN_DRIVER"
+endif
+
+#+
+if ( X$g4vis_build_openglx_driver == Xy ) then
+setenv G4VIS_BUILD_OPENGLX_DRIVER 1
+echo "On this machine the G4VIS_BUILD_OPENGLX_DRIVER=\$G4VIS_BUILD_OPENGLX_DRIVER"
+endif
+
+#+
+if ( X$g4vis_build_openglxm_driver == Xy ) then
+setenv G4VIS_BUILD_OPENGLXM_DRIVER 1
+echo "On this machine the G4VIS_BUILD_OPENGLXM_DRIVER=\$G4VIS_BUILD_OPENGLXM_DRIVER"
+endif
+
+#+
+if ( X$g4vis_build_openglwin32_driver == Xy ) then
+setenv G4VIS_BUILD_OPENGLWIN32_DRIVER 1
+echo "On this machine the G4VIS_BUILD_OPENGLWIN32_DRIVER=\$G4VIS_BUILD_OPENGLWIN32_DRIVER"
+endif
+
+#+
+if ( X$g4vis_build_oix_driver == Xy ) then
+setenv G4VIS_BUILD_OIX_DRIVER 1
+echo "On this machine the G4VIS_BUILD_OIX_DRIVER=\$G4VIS_BUILD_OIX_DRIVER"
+endif
+
+#+
+if ( X$g4vis_build_raytracerx_driver == Xy ) then
+setenv G4VIS_BUILD_RAYTRACERX_DRIVER 1
+echo "On this machine the G4VIS_BUILD_RAYTRACERX_DRIVER=\$G4VIS_BUILD_RAYTRACERX_DRIVER"
+endif
+
+#+
+if ( X$g4vis_build_oiwin32_driver == Xy ) then
+setenv G4VIS_BUILD_OIWIN32_DRIVER 1
+echo "On this machine the G4VIS_BUILD_OIWIN32_DRIVER=\$G4VIS_BUILD_OIWIN32_DRIVER"
+endif
+
+#+
+if ( X$g4vis_build_vrml_driver == Xy ) then
+setenv G4VIS_BUILD_VRML_DRIVER 1
+echo "On this machine the G4VIS_BUILD_VRML_DRIVER=\$G4VIS_BUILD_VRML_DRIVER"
+endif
+
+#+
+if ( X$g4vis_use_dawn == Xy ) then
+setenv G4VIS_USE_DAWN 1
+echo "On this machine the G4VIS_USE_DAWN=\$G4VIS_USE_DAWN"
+endif
+
+#+
+if ( X$g4vis_use_openglx == Xy ) then
+setenv G4VIS_USE_OPENGLX 1
+echo "On this machine the G4VIS_USE_OPENGLX=\$G4VIS_USE_OPENGLX"
+endif
+
+#+
+if ( X$g4vis_use_openglxm == Xy ) then
+setenv G4VIS_USE_OPENGLXM 1
+echo "On this machine the G4VIS_USE_OPENGLXM=\$G4VIS_USE_OPENGLXM"
+endif
+
+#+
+if ( X$g4vis_use_openglwin32 == Xy ) then
+setenv G4VIS_USE_OPENGLWIN32 1
+echo "On this machine the G4VIS_USE_OPENGLWIN32=\$G4VIS_USE_OPENGLWIN32"
+endif
+
+#+
+if ( X$g4vis_use_oix == Xy ) then
+setenv G4VIS_USE_OIX 1
+echo "On this machine the G4VIS_USE_OIX=\$G4VIS_USE_OIX"
+endif
+
+#+
+if ( X$g4vis_use_raytracerx == Xy ) then
+setenv G4VIS_USE_RAYTRACERX 1
+echo "On this machine the G4VIS_USE_RAYTRACERX=\$G4VIS_USE_RAYTRACERX"
+endif
+
+#+
+if ( X$g4vis_use_oiwin32 == Xy ) then
+setenv G4VIS_USE_OIWIN32 1
+echo "On this machine the G4VIS_USE_OIWIN32=\$G4VIS_USE_OIWIN32"
+endif
+
+#+
+if ( X$g4vis_use_vrml == Xy ) then
+setenv G4VIS_USE_VRML 1
+echo "On this machine the G4VIS_USE_VRML=\$G4VIS_USE_VRML"
+endif
+
+#+
+if ( X$g4vis_oglhome != X )  then
+setenv OGLHOME "$g4vis_oglhome"
+echo "On this machine the OGLHOME=\$OGLHOME"
+endif 
+
+#+
+if ( X$g4vis_oivhome != X )  then
+setenv OIVHOME "$g4vis_oivhome"
+echo "On this machine the OIVHOME=\$OIVHOME"
+endif 
+
+#+
+if ( X$g4vis_build_openglxm_driver != X )  then
+setenv XMFLAGS "$g4vis_xmflags"
+echo "On this machine the XMFLAGS=\$XMFLAGS"
+endif 
+
+#+
+if ( X$g4vis_build_openglxm_driver != X )  then
+setenv XMLIBS "$g4vis_xmlibs"
+echo "On this machine the XMLIBS=\$XMLIBS"
+endif 
+
+#+
+if ( X$g4ui_build_xm_session != X )  then
+setenv XMFLAGS "$g4vis_xmflags"
+echo "On this machine the XMFLAGS=\$XMFLAGS"
+endif 
+
+#+
+if ( X$g4ui_build_xm_session != X )  then
+setenv XMLIBS "$g4vis_xmlibs"
+echo "On this machine the XMLIBS=\$XMLIBS"
+endif 
+
+#+
+if ( X$g4ui_build_xaw_session != X )  then
+setenv XAWFLAGS "$g4ui_xawflags"
+echo "On this machine the XAWFLAGS=\$XAWFLAGS"
+endif 
+
+#+
+if ( X$g4ui_build_xaw_session != X )  then
+setenv XAWLIBS "$g4ui_xawlibs"
+echo "On this machine the XAWLIBS=\$XAWLIBS"
+endif 
+
+#
+# Use G3TOG4 module
+#
+#+
+if ( X$g4wlib_build_g3tog4 == Xy )  then
+setenv G4LIB_BUILD_G3TOG4 1
+echo "On this machine the G4LIB_BUILD_G3TOG4=\$G4LIB_BUILD_G3TOG4"
+endif 
+
+if ( X$g4w_use_g3tog4 == Xy )  then
+setenv G4LIB_USE_G3TOG4 1
+echo "On this machine the G4LIB_USE_G3TOG4=\$G4LIB_USE_G3TOG4"
+endif 
+
+
+#
+# Use ZLIB module
+#
+#+
+if ( X$g4wlib_build_zlib == Xy )  then
+setenv G4LIB_BUILD_ZLIB 1
+echo "On this machine the G4LIB_BUILD_ZLIB=\$G4LIB_BUILD_ZLIB"
+endif 
+
+if ( X$g4w_use_ZLIB == Xy )  then
+setenv G4LIB_USE_ZLIB 1
+echo "On this machine the G4LIB_USE_ZLIB=\$G4LIB_USE_ZLIB"
+endif 
+
+#+
+#
+# g4shared
+#
+if ( X$g4lib_build_shared == Xy ) then
+setenv G4LIB_BUILD_SHARED 1
+echo "On this machine the G4LIB_BUILD_SHARED=\$G4LIB_BUILD_SHARED"
+endif
+
+if ( X$g4lib_build_static == Xy ) then
+setenv G4LIB_BUILD_STATIC 1
+echo "On this machine the G4LIB_BUILD_STATIC=\$G4LIB_BUILD_STATIC"
+endif
+
+#+
+#
+# g4granular
+#
+if ( X$g4lib_use_granular == Xy ) then
+setenv G4LIB_USE_GRANULAR 1
+echo "On this machine the G4LIB_USE_GRANULAR=\$G4LIB_USE_GRANULAR"
+endif
+
+# Check for Windows!
+if ( "X\$G4SYSTEM" != "XWIN32-VC" && "X\$G4SYSTEM" != "XWIN32-VC7" ) then
+setenv G4UI_USE_TCSH 1
+echo "On this machine the G4UI_USE_TCSH=\$G4UI_USE_TCSH"
+endif
+
+#####################################################################
+
+!GROK!THIS!
+
+: In the following dollars and backticks do not need the extra backslash.
+$spitshell >>env.csh <<'!NO!SUBS!'
+
+
+#+
+#
+# G4WORKDIR
+#
+if ( ${?G4WORKDIR} ) then
+echo "In your environment you have the G4WORKDIR=$G4WORKDIR"
+else
+# Check for Windows!
+if ( "X$G4SYSTEM" == "XWIN32-VC" || "X$G4SYSTEM" == "XWIN32-VC7" ) then
+
+echo "G4WORKDIR will be set to c:/geant4 (in "native" Windows syntax)."
+setenv G4WORKDIR "c:/geant4"
+
+else # if Unix
+
+echo "G4WORKDIR will be set to HOME/geant4=$HOME/geant4"
+setenv G4WORKDIR $HOME/geant4
+
+endif
+endif
+
+#
+# Shared libraries
+#
+if ( ${?G4LIB_BUILD_SHARED} ) then
+if ( ${?LD_LIBRARY_PATH} )  then
+setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}
+else
+setenv LD_LIBRARY_PATH ${G4LIB}/${G4SYSTEM}
+endif
+endif
+
+#
+# For BIN
+#
+setenv PATH ${PATH}:${G4WORKDIR}/bin/${G4SYSTEM}
+
+!NO!SUBS!
+chmod 755 env.csh
+$eunicefix env.csh
Index: trunk/geant4/config/scripts/env.sh.SH
===================================================================
--- trunk/geant4/config/scripts/env.sh.SH	(revision 472)
+++ trunk/geant4/config/scripts/env.sh.SH	(revision 472)
@@ -0,0 +1,608 @@
+case $CONFIG in
+'')
+	if test -f config.sh; then TOP=.;
+	elif test -f ../config.sh; then TOP=..;
+	elif test -f ../../config.sh; then TOP=../..;
+	elif test -f ../../../config.sh; then TOP=../../..;
+	elif test -f ../../../../config.sh; then TOP=../../../..;
+	else
+		echo "Can't find config.sh."; exit 1
+	fi
+	. $TOP/config.sh
+	;;
+esac
+: This forces SH files to create target in same directory as SH file.
+: This is so that make depend always knows where to find SH derivatives.
+case "$0" in
+*/*) cd `expr X$0 : 'X\(.*\)/'` ;;
+esac
+#echo "Extracting env.sh (with variable substitutions)"
+: This section of the file will have variable substitutions done on it.
+: Move anything that needs config subs from !NO!SUBS! section to !GROK!THIS!.
+: Protect any dollar signs and backticks that you do not want interpreted
+: by putting a backslash in front.  You may delete these comments.
+$spitshell >env.sh <<!GROK!THIS!
+######################################
+#
+# g4system.U
+#
+#+
+G4SYSTEM="$g4system"
+export G4SYSTEM
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the G4SYSTEM=\$G4SYSTEM"
+fi
+
+#
+# g4dirs.U
+#
+#+
+if [ X$g4install != X$g4final_install ] ; then
+G4INSTALL="$g4final_install/src/geant4"
+else
+G4INSTALL="$g4install"
+fi
+export G4INSTALL
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the G4INSTALL=\$G4INSTALL"
+fi
+
+#+
+if [ X$g4includes_flag != Xn ] ; then 
+if [ X$g4install != X$g4final_install ] ; then
+G4INCLUDE="$g4final_install/include/geant4"
+else
+G4INCLUDE="$g4install/include/"
+fi
+export G4INCLUDE
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the G4INCLUDE=\$G4INCLUDE"
+fi
+#else
+#G4BASE="$g4final_install/include/geant4/source"
+#export G4BASE
+#if [ X\$g4non_display = X ] ; then
+#echo "On this machine the G4BASE=\$G4BASE"
+#fi
+fi
+
+#+
+if [ X$g4lib != X ] ; then 
+if [ X$g4install != X$g4final_install ] ; then
+G4LIB="$g4final_install/lib/geant4"
+else
+G4LIB="$g4install/lib"
+fi
+export G4LIB
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the G4LIB=\$G4LIB"
+fi
+fi
+
+#+
+if [ X$g4levelgammadata != X ] ; then 
+G4LEVELGAMMADATA="$g4levelgammadata"
+export G4LEVELGAMMADATA
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the G4LEVELGAMMADATA=\$G4LEVELGAMMADATA"
+fi
+fi
+
+#+
+if [ X$g4radioactivedata != X ] ; then 
+G4RADIOACTIVEDATA="$g4radioactivedata"
+export G4RADIOACTIVEDATA
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the G4RADIOACTIVEDATA=\$G4RADIOACTIVEDATA"
+fi
+fi
+
+#+
+if [ X$g4ledata != X ] ; then 
+G4LEDATA="$g4ledata"
+export G4LEDATA
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the G4LEDATA=\$G4LEDATA"
+fi
+fi
+
+#+
+if [ X$g4neutronhpcrosssections != X ] ; then 
+NeutronHPCrossSections="$g4neutronhpcrosssections"
+export NeutronHPCrossSections
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the NeutronHPCrossSections=\$NeutronHPCrossSections"
+fi
+fi
+
+#+
+if [ X$g4elasticdata != X ] ; then 
+G4ELASTICDATA="$g4elasticdata"
+export G4ELASTICDATA
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the G4ELASTICDATA=\$G4ELASTICDATA"
+fi
+fi
+
+#
+# g4clhep.U
+#
+if [ X$g4clhep_base_dir != X ] ; then 
+CLHEP_BASE_DIR="$g4clhep_base_dir"
+export CLHEP_BASE_DIR
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the CLHEP_BASE_DIR=\$CLHEP_BASE_DIR"
+fi
+fi
+
+#+
+if [ X$g4clhep_include_dir != X ] ; then 
+CLHEP_INCLUDE_DIR="$g4clhep_include_dir"
+export CLHEP_INCLUDE_DIR
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the CLHEP_INCLUDE_DIR=\$CLHEP_INCLUDE_DIR"
+fi
+fi
+
+#+
+if [ X$g4clhep_lib_dir != X ] ; then 
+CLHEP_LIB_DIR="$g4clhep_lib_dir"
+export CLHEP_LIB_DIR
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the CLHEP_LIB_DIR=\$CLHEP_LIB_DIR"
+fi
+fi
+
+#+
+if [ X$g4clhep_lib != X ] ; then 
+CLHEP_LIB="$g4clhep_lib"
+export CLHEP_LIB
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the CLHEP_LIB=\$CLHEP_LIB"
+fi
+fi
+
+#+
+#
+# g4debug
+#
+if [ X$g4debug != X ] ; then 
+G4DEBUG="$g4debug"
+export G4DEBUG
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the G4DEBUG=\$G4DEBUG"
+fi
+fi
+
+#
+# g4analysis
+#
+#+
+if [ X$g4wanalysis_use = Xy ] ; then
+G4ANALYSIS_USE=1
+export G4ANALYSIS_USE
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the G4ANALYSIS_USE=\$G4ANALYSIS_USE"
+fi
+fi 
+
+#
+# g4ui
+#
+#+
+if [ X$g4ui_build_xaw_session = Xy ] ; then
+G4UI_BUILD_XAW_SESSION=1
+export G4UI_BUILD_XAW_SESSION
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the G4UI_BUILD_XAW_SESSION=\$G4UI_BUILD_XAW_SESSION"
+fi
+fi 
+
+#+
+if [ X$g4ui_use_xaw = Xy ] ; then
+G4UI_USE_XAW=1
+export G4UI_USE_XAW
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the G4UI_USE_XAW=\$G4UI_USE_XAW"
+fi
+fi 
+
+#+
+if [ X$g4ui_build_xm_session = Xy ] ; then
+G4UI_BUILD_XM_SESSION=1
+export G4UI_BUILD_XM_SESSION
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the G4UI_BUILD_XM_SESSION=\$G4UI_BUILD_XM_SESSION"
+fi
+fi 
+
+#+
+if [ X$g4ui_use_xm = Xy ] ; then
+G4UI_USE_XM=1
+export G4UI_USE_XM
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the G4UI_USE_XM=\$G4UI_USE_XM"
+fi
+fi 
+
+#+
+if [ X$g4ui_build_win32_session = Xy ] ; then
+G4UI_BUILD_WIN32_SESSION=1
+export G4UI_BUILD_WIN32_SESSION
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the G4UI_BUILD_WIN32_SESSION=\$G4UI_BUILD_WIN32_SESSION"
+fi
+fi 
+
+#+
+if [ X$g4ui_use_win32 = Xy ] ; then
+G4UI_USE_WIN32=1
+export G4UI_USE_WIN32
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the G4UI_USE_WIN32=\$G4UI_USE_WIN32"
+fi
+fi 
+
+#
+# g4vis
+#
+#+
+if [ X$g4vis_build_dawn_driver = Xy ] ; then
+G4VIS_BUILD_DAWN_DRIVER=1
+export G4VIS_BUILD_DAWN_DRIVER
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the G4VIS_BUILD_DAWN_DRIVER=\$G4VIS_BUILD_DAWN_DRIVER"
+fi
+fi 
+
+#+
+if [ X$g4vis_build_openglx_driver = Xy ] ; then
+G4VIS_BUILD_OPENGLX_DRIVER=1
+export G4VIS_BUILD_OPENGLX_DRIVER
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the G4VIS_BUILD_OPENGLX_DRIVER=\$G4VIS_BUILD_OPENGLX_DRIVER"
+fi
+fi 
+
+#+
+if [ X$g4vis_build_openglxm_driver = Xy ] ; then
+G4VIS_BUILD_OPENGLXM_DRIVER=1
+export G4VIS_BUILD_OPENGLXM_DRIVER
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the G4VIS_BUILD_OPENGLXM_DRIVER=\$G4VIS_BUILD_OPENGLXM_DRIVER"
+fi
+fi 
+
+#+
+if [ X$g4vis_build_openglwin32_driver = Xy ] ; then
+G4VIS_BUILD_OPENGLWIN32_DRIVER=1
+export G4VIS_BUILD_OPENGLWIN32_DRIVER
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the G4VIS_BUILD_OPENGLWIN32_DRIVER=\$G4VIS_BUILD_OPENGLWIN32_DRIVER"
+fi
+fi 
+
+#+
+if [ X$g4vis_build_oix_driver = Xy ] ; then
+G4VIS_BUILD_OIX_DRIVER=1
+export G4VIS_BUILD_OIX_DRIVER
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the G4VIS_BUILD_OIX_DRIVER=\$G4VIS_BUILD_OIX_DRIVER"
+fi
+fi 
+
+#+
+if [ X$g4vis_build_raytracerx_driver = Xy ] ; then
+G4VIS_BUILD_RAYTRACERX_DRIVER=1
+export G4VIS_BUILD_RAYTRACERX_DRIVER
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the G4VIS_BUILD_RAYTRACERX_DRIVER=\$G4VIS_BUILD_RAYTRACERX_DRIVER"
+fi
+fi 
+
+#+
+if [ X$g4vis_build_oiwin32_driver = Xy ] ; then
+G4VIS_BUILD_OIWIN32_DRIVER=1
+export G4VIS_BUILD_OIWIN32_DRIVER
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the G4VIS_BUILD_OIWIN32_DRIVER=\$G4VIS_BUILD_OIWIN32_DRIVER"
+fi
+fi 
+
+#+
+if [ X$g4vis_build_vrml_driver = Xy ] ; then
+G4VIS_BUILD_VRML_DRIVER=1
+export G4VIS_BUILD_VRML_DRIVER
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the G4VIS_BUILD_VRML_DRIVER=\$G4VIS_BUILD_VRML_DRIVER"
+fi
+fi 
+
+#+
+if [ X$g4vis_use_dawn = Xy ] ; then
+G4VIS_USE_DAWN=1
+export G4VIS_USE_DAWN
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the G4VIS_USE_DAWN=\$G4VIS_USE_DAWN"
+fi
+fi 
+
+#+
+if [ X$g4vis_use_openglx = Xy ] ; then
+G4VIS_USE_OPENGLX=1
+export G4VIS_USE_OPENGLX
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the G4VIS_USE_OPENGLX=\$G4VIS_USE_OPENGLX"
+fi
+fi 
+
+#+
+if [ X$g4vis_use_openglxm = Xy ] ; then
+G4VIS_USE_OPENGLXM=1
+export G4VIS_USE_OPENGLXM
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the G4VIS_USE_OPENGLXM=\$G4VIS_USE_OPENGLXM"
+fi
+fi 
+
+#+
+if [ X$g4vis_use_openglwin32 = Xy ] ; then
+G4VIS_USE_OPENGLWIN32=1
+export G4VIS_USE_OPENGLWIN32
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the G4VIS_USE_OPENGLWIN32=\$G4VIS_USE_OPENGLWIN32"
+fi
+fi 
+
+#+
+if [ X$g4vis_use_oix = Xy ] ; then
+G4VIS_USE_OIX=1
+export G4VIS_USE_OIX
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the G4VIS_USE_OIX=\$G4VIS_USE_OIX"
+fi
+fi 
+
+#+
+if [ X$g4vis_use_raytracerx = Xy ] ; then
+G4VIS_USE_RAYTRACERX=1
+export G4VIS_USE_RAYTRACERX
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the G4VIS_USE_RAYTRACERX=\$G4VIS_USE_RAYTRACERX"
+fi
+fi 
+
+#+
+if [ X$g4vis_use_oiwin32 = Xy ] ; then
+G4VIS_USE_OIWIN32=1
+export G4VIS_USE_OIWIN32
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the G4VIS_USE_OIWIN32=\$G4VIS_USE_OIWIN32"
+fi
+fi 
+
+#+
+if [ X$g4vis_use_vrml = Xy ] ; then
+G4VIS_USE_VRML=1
+export G4VIS_USE_VRML
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the G4VIS_USE_VRML=\$G4VIS_USE_VRML"
+fi
+fi 
+
+#+
+if [ X$g4vis_oglhome != X ] ; then
+OGLHOME="$g4vis_oglhome"
+export OGLHOME
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the OGLHOME=\$OGLHOME"
+fi
+fi 
+
+#+
+if [ X$g4vis_oivhome != X ] ; then
+OIVHOME="$g4vis_oivhome"
+export OIVHOME
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the OIVHOME=\$OIVHOME"
+fi
+fi 
+
+#+
+if [ X$g4vis_build_openglxm_driver != X ] ; then
+XMFLAGS="$g4vis_xmflags"
+export XMFLAGS
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the XMFLAGS=\$XMFLAGS"
+fi
+fi 
+
+#+
+if [ X$g4vis_build_openglxm_driver != X ] ; then
+XMLIBS="$g4vis_xmlibs"
+export XMLIBS
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the XMLIBS=\$XMLIBS"
+fi
+fi 
+
+#+
+if [ X$g4ui_build_xm_session != X ] ; then
+XMFLAGS="$g4vis_xmflags"
+export XMFLAGS
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the XMFLAGS=\$XMFLAGS"
+fi
+fi 
+
+#+
+if [ X$g4vis_build_xm_session != X ] ; then
+XMLIBS="$g4vis_xmlibs"
+export XMLIBS
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the XMLIBS=\$XMLIBS"
+fi
+fi 
+
+#+
+if [ X$g4ui_build_xaw_session != X ] ; then
+XAWFLAGS="$g4ui_xawflags"
+export XAWFLAGS
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the XAWFLAGS=\$XAWFLAGS"
+fi
+fi 
+
+#+
+if [ X$g4ui_build_xaw_session != X ] ; then
+XAWLIBS="$g4ui_xawlibs"
+export XAWLIBS
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the XAWLIBS=\$XAWLIBS"
+fi
+fi 
+
+#
+# Use G3TOG4 module
+#
+#+
+if [ X$g4wlib_build_g3tog4 = Xy ] ; then
+G4LIB_BUILD_G3TOG4=1
+export G4LIB_BUILD_G3TOG4
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the G4LIB_BUILD_G3TOG4=\$G4LIB_BUILD_G3TOG4"
+fi
+fi 
+
+if [ X$g4w_use_g3tog4 = Xy ] ; then
+G4LIB_USE_G3TOG4=1
+export G4LIB_USE_G3TOG4
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the G4LIB_USE_G3TOG4=\$G4LIB_USE_G3TOG4"
+fi
+fi 
+
+#
+# Use ZLIB module
+#
+#+
+if [ X$g4wlib_build_zlib = Xy ] ; then
+G4LIB_BUILD_ZLIB=1
+export G4LIB_BUILD_ZLIB
+echo "On this machine the G4LIB_BUILD_ZLIB=\$G4LIB_BUILD_ZLIB"
+fi 
+
+if [ X$g4w_use_zlib = Xy ] ; then
+G4LIB_USE_ZLIB=1
+export G4LIB_USE_ZLIB
+echo "On this machine the G4LIB_USE_ZLIB=\$G4LIB_USE_ZLIB"
+fi 
+
+
+#+
+#
+# g4shared
+#
+if [ X$g4lib_build_shared = Xy ] ; then
+G4LIB_BUILD_SHARED=1
+export G4LIB_BUILD_SHARED
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the G4LIB_BUILD_SHARED=\$G4LIB_BUILD_SHARED"
+fi
+fi 
+
+if [ X$g4lib_build_static = Xy ] ; then
+G4LIB_BUILD_STATIC=1
+export G4LIB_BUILD_STATIC
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the G4LIB_BUILD_STATIC=\$G4LIB_BUILD_STATIC"
+fi
+fi 
+
+#+
+#
+# g4granular
+#
+if [ X$g4lib_use_granular = Xy ] ; then
+G4LIB_USE_GRANULAR=1
+export G4LIB_USE_GRANULAR
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the G4LIB_USE_GRANULAR=\$G4LIB_USE_GRANULAR"
+fi
+fi 
+
+# Check for Windows!
+if test "X\$G4SYSTEM" != "XWIN32-VC" -a "X\$G4SYSTEM" != "XWIN32-VC7"; then
+#+
+#
+# UI_USE_TCSH for Unix
+#
+G4UI_USE_TCSH=1
+export G4UI_USE_TCSH
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the G4UI_USE_TCSH=\$G4UI_USE_TCSH"
+fi 
+fi
+
+#####################################################################
+
+!GROK!THIS!
+
+: In the following dollars and backticks do not need the extra backslash.
+$spitshell >>env.sh <<'!NO!SUBS!'
+
+
+#+
+#
+# G4WORKDIR
+#
+if [ $G4WORKDIR ] ; then
+
+if [ X$g4non_display = X ] ; then
+echo "In your environment you have the G4WORKDIR=$G4WORKDIR"
+fi # if non_display
+
+else
+
+if [ X$g4non_display = X ] ; then
+
+# Check for Windows!
+if test "X$G4SYSTEM" = "XWIN32-VC" -o "X$G4SYSTEM" = "XWIN32-VC7"; then
+
+echo "G4WORKDIR will be set to c:/geant4 (in "native" Windows syntax)"
+G4WORKDIR="c:/geant4"
+export G4WORKDIR
+
+else # if Unix
+
+echo "G4WORKDIR will be set to HOME/geant4=$HOME/geant4"
+export G4WORKDIR=$HOME/geant4
+
+fi # if platforms
+
+fi
+
+fi
+
+#
+# Shared libraries
+#
+if [ $G4LIB_BUILD_SHARED ] ; then
+if [ $LD_LIBRARY_PATH ] ; then
+LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}
+export LD_LIBRARY_PATH
+else
+LD_LIBRARY_PATH=${G4LIB}/${G4SYSTEM}
+export LD_LIBRARY_PATH
+fi
+fi
+
+#
+# For BIN
+#
+PATH=${PATH}:${G4WORKDIR}/bin/${G4SYSTEM}
+export PATH
+
+!NO!SUBS!
+chmod 755 env.sh
+$eunicefix env.sh
Index: trunk/geant4/config/scripts/install.sh.SH
===================================================================
--- trunk/geant4/config/scripts/install.sh.SH	(revision 472)
+++ trunk/geant4/config/scripts/install.sh.SH	(revision 472)
@@ -0,0 +1,547 @@
+case $CONFIG in
+'')
+	if test -f config.sh; then TOP=.;
+	elif test -f ../config.sh; then TOP=..;
+	elif test -f ../../config.sh; then TOP=../..;
+	elif test -f ../../../config.sh; then TOP=../../..;
+	elif test -f ../../../../config.sh; then TOP=../../../..;
+	else
+		echo "Can't find config.sh."; exit 1
+	fi
+	. $TOP/config.sh
+	;;
+esac
+: This forces SH files to create target in same directory as SH file.
+: This is so that make depend always knows where to find SH derivatives.
+case "$0" in
+*/*) cd `expr X$0 : 'X\(.*\)/'` ;;
+esac
+#echo "Extracting install.sh (with variable substitutions)"
+: This section of the file will have variable substitutions done on it.
+: Move anything that needs config subs from !NO!SUBS! section to !GROK!THIS!.
+: Protect any dollar signs and backticks that you do not want interpreted
+: by putting a backslash in front.  You may delete these comments.
+$spitshell >install.sh <<!GROK!THIS!
+######################################
+#
+# g4system.U
+#
+#+
+G4SYSTEM="$g4system"
+export G4SYSTEM
+echo "On this machine the G4SYSTEM=\$G4SYSTEM"
+
+#
+# g4dirs.U
+#
+#+
+G4INSTALL="$g4install"
+export G4INSTALL
+echo "On this machine the G4INSTALL=\$G4INSTALL"
+
+#+
+if [ X$g4include != X -a X$g4include != Xn ] ; then
+G4INCLUDE="$g4include"
+export G4INCLUDE
+echo "On this machine the G4INCLUDE=\$G4INCLUDE"
+fi
+
+#+
+if [ X$g4tmp != X ] ; then
+G4TMP="$g4tmp"
+export G4TMP
+echo "On this machine the G4TMP=\$G4TMP"
+fi
+
+#+
+if [ X$g4lib != X ] ; then 
+G4LIB="$g4lib"
+export G4LIB
+echo "On this machine the G4LIB=\$G4LIB"
+fi
+
+#+
+if [ X$g4lib != X ] ; then 
+G4BIN="$g4lib/../bin"
+export G4BIN
+fi
+
+#+
+if [ X$g4levelgammadata != X ] ; then 
+G4LEVELGAMMADATA="$g4levelgammadata"
+export G4LEVELGAMMADATA
+echo "On this machine the G4LEVELGAMMADATA=\$G4LEVELGAMMADATA"
+fi
+
+#+
+if [ X$g4radioactivedata != X ] ; then 
+G4RADIOACTIVEDATA="$g4radioactivedata"
+export G4RADIOACTIVEDATA
+echo "On this machine the G4RADIOACTIVEDATA=\$G4RADIOACTIVEDATA"
+fi
+
+#+
+if [ X$g4ledata != X ] ; then 
+G4LEDATA="$g4ledata"
+export G4LEDATA
+echo "On this machine the G4LEDATA=\$G4LEDATA"
+fi
+
+#+
+if [ X$g4neutronhpcrosssections != X ] ; then 
+NeutronHPCrossSections="$g4neutronhpcrosssections"
+export NeutronHPCrossSections
+echo "On this machine the NeutronHPCrossSections=\$NeutronHPCrossSections"
+fi
+
+#+
+if [ X$g4elasticdata != X ] ; then 
+G4ELASTICDATA="$g4elasticdata"
+export G4ELASTICDATA
+echo "On this machine the G4ELASTICDATA=\$g4elasticdata"
+fi
+
+#
+# g4clhep.U
+#
+if [ X$g4clhep_base_dir != X ] ; then 
+CLHEP_BASE_DIR="$g4clhep_base_dir"
+export CLHEP_BASE_DIR
+echo "On this machine the CLHEP_BASE_DIR=\$CLHEP_BASE_DIR"
+fi
+
+#if [ X$g4clhep_base_dir != X/usr -o X$g4clhep_base_dir != X/usr/local ] ; then 
+#CLHEP_BASE_DIR="$g4clhep_base_dir"
+#export CLHEP_BASE_DIR
+#echo "On this machine the CLHEP_BASE_DIR=\$CLHEP_BASE_DIR"
+#fi
+
+#+
+if [ X$g4clhep_include_dir != X ] ; then 
+CLHEP_INCLUDE_DIR="$g4clhep_include_dir"
+export CLHEP_INCLUDE_DIR
+echo "On this machine the CLHEP_INCLUDE_DIR=\$CLHEP_INCLUDE_DIR"
+fi
+
+#+
+if [ X$g4clhep_lib_dir != X ] ; then 
+CLHEP_LIB_DIR="$g4clhep_lib_dir"
+export CLHEP_LIB_DIR
+echo "On this machine the CLHEP_LIB_DIR=\$CLHEP_LIB_DIR"
+fi
+
+#+
+if [ X$g4clhep_lib != X ] ; then 
+CLHEP_LIB="$g4clhep_lib"
+export CLHEP_LIB
+echo "On this machine the CLHEP_LIB=\$CLHEP_LIB"
+fi
+
+#+
+#
+# g4debug
+#
+if [ X$g4debug != X ] ; then 
+G4DEBUG="$g4debug"
+export G4DEBUG
+echo "On this machine the G4DEBUG=\$G4DEBUG"
+fi
+
+#
+# g4analysis
+#
+#+
+if [ X$g4wanalysis_use = Xy ] ; then
+G4ANALYSIS_USE=1
+export G4ANALYSIS_USE
+echo "On this machine the G4ANALYSIS_USE=\$G4ANALYSIS_USE"
+fi 
+
+#
+# g4ui
+#
+#+
+if [ X$g4ui_build_xaw_session = Xy ] ; then
+G4UI_BUILD_XAW_SESSION=1
+export G4UI_BUILD_XAW_SESSION
+echo "On this machine the G4UI_BUILD_XAW_SESSION=\$G4UI_BUILD_XAW_SESSION"
+fi 
+
+#+
+if [ X$g4ui_use_xaw = Xy ] ; then
+G4UI_USE_XAW=1
+export G4UI_USE_XAW
+echo "On this machine the G4UI_USE_XAW=\$G4UI_USE_XAW"
+fi 
+
+#+
+if [ X$g4ui_build_xm_session = Xy ] ; then
+G4UI_BUILD_XM_SESSION=1
+export G4UI_BUILD_XM_SESSION
+echo "On this machine the G4UI_BUILD_XM_SESSION=\$G4UI_BUILD_XM_SESSION"
+fi 
+
+#+
+if [ X$g4ui_use_xm = Xy ] ; then
+G4UI_USE_XM=1
+export G4UI_USE_XM
+echo "On this machine the G4UI_USE_XM=\$G4UI_USE_XM"
+fi 
+
+#+
+if [ X$g4ui_build_win32_session = Xy ] ; then
+G4UI_BUILD_WIN32_SESSION=1
+export G4UI_BUILD_WIN32_SESSION
+echo "On this machine the G4UI_BUILD_WIN32_SESSION=\$G4UI_BUILD_WIN32_SESSION"
+fi 
+
+#+
+if [ X$g4ui_use_win32 = Xy ] ; then
+G4UI_USE_WIN32=1
+export G4UI_USE_WIN32
+echo "On this machine the G4UI_USE_WIN32=\$G4UI_USE_WIN32"
+fi 
+
+#
+# g4vis
+#
+#+
+if [ X$g4vis_build_dawn_driver = Xy ] ; then
+G4VIS_BUILD_DAWN_DRIVER=1
+export G4VIS_BUILD_DAWN_DRIVER
+echo "On this machine the G4VIS_BUILD_DAWN_DRIVER=\$G4VIS_BUILD_DAWN_DRIVER"
+fi 
+
+#+
+if [ X$g4vis_build_openglx_driver = Xy ] ; then
+G4VIS_BUILD_OPENGLX_DRIVER=1
+export G4VIS_BUILD_OPENGLX_DRIVER
+echo "On this machine the G4VIS_BUILD_OPENGLX_DRIVER=\$G4VIS_BUILD_OPENGLX_DRIVER"
+fi 
+
+#+
+if [ X$g4vis_build_openglxm_driver = Xy ] ; then
+G4VIS_BUILD_OPENGLXM_DRIVER=1
+export G4VIS_BUILD_OPENGLXM_DRIVER
+echo "On this machine the G4VIS_BUILD_OPENGLXM_DRIVER=\$G4VIS_BUILD_OPENGLXM_DRIVER"
+fi 
+
+#+
+if [ X$g4vis_build_openglwin32_driver = Xy ] ; then
+G4VIS_BUILD_OPENGLWIN32_DRIVER=1
+export G4VIS_BUILD_OPENGLWIN32_DRIVER
+echo "On this machine the G4VIS_BUILD_OPENGLWIN32_DRIVER=\$G4VIS_BUILD_OPENGLWIN32_DRIVER"
+fi 
+
+#+
+if [ X$g4vis_build_oix_driver = Xy ] ; then
+G4VIS_BUILD_OIX_DRIVER=1
+export G4VIS_BUILD_OIX_DRIVER
+echo "On this machine the G4VIS_BUILD_OIX_DRIVER=\$G4VIS_BUILD_OIX_DRIVER"
+fi 
+
+#+
+if [ X$g4vis_build_raytracerx_driver = Xy ] ; then
+G4VIS_BUILD_RAYTRACERX_DRIVER=1
+export G4VIS_BUILD_RAYTRACERX_DRIVER
+echo "On this machine the G4VIS_BUILD_RAYTRACERX_DRIVER=\$G4VIS_BUILD_RAYTRACERX_DRIVER"
+fi 
+
+#+
+if [ X$g4vis_build_oiwin32_driver = Xy ] ; then
+G4VIS_BUILD_OIWIN32_DRIVER=1
+export G4VIS_BUILD_OIWIN32_DRIVER
+echo "On this machine the G4VIS_BUILD_OIWIN32_DRIVER=\$G4VIS_BUILD_OIWIN32_DRIVER"
+fi 
+
+#+
+if [ X$g4vis_build_vrml_driver = Xy ] ; then
+G4VIS_BUILD_VRML_DRIVER=1
+export G4VIS_BUILD_VRML_DRIVER
+echo "On this machine the G4VIS_BUILD_VRML_DRIVER=\$G4VIS_BUILD_VRML_DRIVER"
+fi 
+
+#+
+if [ X$g4vis_use_dawn = Xy ] ; then
+G4VIS_USE_DAWN=1
+export G4VIS_USE_DAWN
+echo "On this machine the G4VIS_USE_DAWN=\$G4VIS_USE_DAWN"
+fi 
+
+#+
+if [ X$g4vis_use_openglx = Xy ] ; then
+G4VIS_USE_OPENGLX=1
+export G4VIS_USE_OPENGLX
+echo "On this machine the G4VIS_USE_OPENGLX=\$G4VIS_USE_OPENGLX"
+fi 
+
+#+
+if [ X$g4vis_use_openglxm = Xy ] ; then
+G4VIS_USE_OPENGLXM=1
+export G4VIS_USE_OPENGLXM
+echo "On this machine the G4VIS_USE_OPENGLXM=\$G4VIS_USE_OPENGLXM"
+fi 
+
+#+
+if [ X$g4vis_use_openglwin32 = Xy ] ; then
+G4VIS_USE_OPENGLWIN32=1
+export G4VIS_USE_OPENGLWIN32
+echo "On this machine the G4VIS_USE_OPENGLWIN32=\$G4VIS_USE_OPENGLWIN32"
+fi 
+
+#+
+if [ X$g4vis_use_oix = Xy ] ; then
+G4VIS_USE_OIX=1
+export G4VIS_USE_OIX
+echo "On this machine the G4VIS_USE_OIX=\$G4VIS_USE_OIX"
+fi 
+
+#+
+if [ X$g4vis_use_raytracerx = Xy ] ; then
+G4VIS_USE_RAYTRACERX=1
+export G4VIS_USE_RAYTRACERX
+echo "On this machine the G4VIS_USE_RAYTRACERX=\$G4VIS_USE_RAYTRACERX"
+fi 
+
+#+
+if [ X$g4vis_use_oiwin32 = Xy ] ; then
+G4VIS_USE_OIWIN32=1
+export G4VIS_USE_OIWIN32
+echo "On this machine the G4VIS_USE_OIWIN32=\$G4VIS_USE_OIWIN32"
+fi 
+
+#+
+if [ X$g4vis_use_vrml = Xy ] ; then
+G4VIS_USE_VRML=1
+export G4VIS_USE_VRML
+echo "On this machine the G4VIS_USE_VRML=\$G4VIS_USE_VRML"
+fi 
+
+#+
+if [ X$g4vis_oglhome != X ] ; then
+OGLHOME="$g4vis_oglhome"
+export OGLHOME
+echo "On this machine the OGLHOME=\$OGLHOME"
+fi 
+
+#+
+if [ X$g4vis_oivhome != X ] ; then
+OIVHOME="$g4vis_oivhome"
+export OIVHOME
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the OIVHOME=\$OIVHOME"
+fi
+fi 
+
+#+
+if [ X$g4vis_build_openglxm_driver != X ] ; then
+XMFLAGS="$g4vis_xmflags"
+export XMFLAGS
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the XMFLAGS=\$XMFLAGS"
+fi
+fi 
+
+#+
+if [ X$g4vis_build_openglxm_driver != X ] ; then
+XMLIBS="$g4vis_xmlibs"
+export XMLIBS
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the XMLIBS=\$XMLIBS"
+fi
+fi 
+
+#+
+if [ X$g4ui_build_xm_session != X ] ; then
+XMFLAGS="$g4vis_xmflags"
+export XMFLAGS
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the XMFLAGS=\$XMFLAGS"
+fi
+fi 
+
+#+
+if [ X$g4vis_build_xm_session != X ] ; then
+XMLIBS="$g4vis_xmlibs"
+export XMLIBS
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the XMLIBS=\$XMLIBS"
+fi
+fi 
+
+#+
+if [ X$g4ui_build_xaw_session != X ] ; then
+XAWFLAGS="$g4ui_xawflags"
+export XAWFLAGS
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the XAWFLAGS=\$XAWFLAGS"
+fi
+fi 
+
+#+
+if [ X$g4ui_build_xaw_session != X ] ; then
+XAWLIBS="$g4ui_xawlibs"
+export XAWLIBS
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the XAWLIBS=\$XAWLIBS"
+fi
+fi 
+
+#
+# Use G3TOG4 module
+#
+#+
+if [ X$g4wlib_build_g3tog4 = Xy ] ; then
+G4LIB_BUILD_G3TOG4=1
+export G4LIB_BUILD_G3TOG4
+echo "On this machine the G4LIB_BUILD_G3TOG4=\$G4LIB_BUILD_G3TOG4"
+fi 
+
+if [ X$g4w_use_g3tog4 = Xy ] ; then
+G4LIB_USE_G3TOG4=1
+export G4LIB_USE_G3TOG4
+echo "On this machine the G4LIB_USE_G3TOG4=\$G4LIB_USE_G3TOG4"
+fi 
+
+#
+# Use ZLIB module
+#
+#+
+if [ X$g4wlib_build_zlib = Xy ] ; then
+G4LIB_BUILD_ZLIB=1
+export G4LIB_BUILD_ZLIB
+echo "On this machine the G4LIB_BUILD_ZLIB=\$G4LIB_BUILD_ZLIB"
+fi 
+
+if [ X$g4w_use_zlib = Xy ] ; then
+G4LIB_USE_ZLIB=1
+export G4LIB_USE_ZLIB
+echo "On this machine the G4LIB_USE_ZLIB=\$G4LIB_USE_ZLIB"
+fi 
+
+#+
+#
+# g4shared
+#
+if [ X$g4lib_build_shared = Xy ] ; then
+G4LIB_BUILD_SHARED=1
+export G4LIB_BUILD_SHARED
+echo "On this machine the G4LIB_BUILD_SHARED=\$G4LIB_BUILD_SHARED"
+fi 
+
+if [ X$g4lib_build_static = Xy ] ; then
+G4LIB_BUILD_STATIC=1
+export G4LIB_BUILD_STATIC
+echo "On this machine the G4LIB_BUILD_STATIC=\$G4LIB_BUILD_STATIC"
+fi 
+
+#+
+#
+# g4granular
+#
+if [ X$g4lib_use_granular = Xy ] ; then
+G4LIB_USE_GRANULAR=1
+export G4LIB_USE_GRANULAR
+echo "On this machine the G4LIB_USE_GRANULAR=\$G4LIB_USE_GRANULAR"
+fi 
+
+#####################################################################
+
+#####################################################################
+# Create GNUmakefile.db to keep ALL GNUmakefile DB :)
+
+if test -f \$G4INSTALL/config/scripts/GNUmakefile.db ; then
+mv \$G4INSTALL/config/scripts/GNUmakefile.db \$G4LIB/\$G4SYSTEM/GNUmakefile.db.bac
+fi
+
+# Be careful: first time there is no $G4LIB!
+
+mkdir -p \$G4LIB/\$G4SYSTEM
+
+$g4make -n -p -f \$G4INSTALL/config/scripts/GNUmakefile > \$G4LIB/\$G4SYSTEM/GNUmakefile.db
+
+echo ""
+echo "Starting build..."
+echo ""
+cd $g4install/source
+#echo `pwd`
+
+# There is no env!
+if [ X$g4global = Xy ] ; then
+echo ""
+rm -rf $g4conf/g4make.log
+$g4make global 2>&1 | tee $g4conf/g4make.log
+fi
+
+# There is env for binaries - for User: should be set in env.[c]sh!
+if [ X$g4granular = Xy ] ; then
+G4LIB_USE_GRANULAR=1
+export G4LIB_USE_GRANULAR
+rm -rf $g4conf/g4make.log
+$g4make 2>&1 | tee $g4conf/g4make.log
+fi
+
+if [ X$g4lib_build_dll = Xy ] ; then
+echo ""
+rm -rf $g4conf/g4make.log
+$g4make dll 2>&1 | tee $g4conf/g4make.log
+fi
+
+if [ X$g4lib_build_dyn = Xy ] ; then
+echo ""
+rm -rf $g4conf/g4make.log
+$g4make global G4LIB_BUILD_SHARED=1 2>&1 | tee $g4conf/g4make.log
+fi
+
+# Check for errors in log file
+if test -f \$g4conf/g4make.log ; then
+
+# There are two (at least) shells 'sh' and 'bash' with
+# different arithmetic expansion...So we are doing it by 'text'
+# in two steps...
+ 
+err=\`grep " Error " $g4conf/g4make.log | wc -w\` 
+int=\`grep " Interrupt " $g4conf/g4make.log | wc -w\` 
+stp=\`grep Stop\. $g4conf/g4make.log | wc -w\` 
+
+err2=\`echo \$err\`
+int2=\`echo \$int\`
+stp2=\`echo \$stp\`
+
+if [ X\$err2 = X0 -a X\$int2 = X0 ] ; then
+echo ""
+echo "####################################################"
+echo "# Your Geant4 installation seems to be successful!  "
+echo "# To be sure please have a look into the log file:  "
+echo "# $g4conf/g4make.log				  "
+echo "####################################################"
+echo ""
+else
+echo ""
+echo "############################################################"
+echo "# It looks like you had errors during Geant4 installation   "
+echo "# (or interrupted installation)!				  "
+echo "# Please check log file:				      	  "
+echo "# $g4conf/g4make.log					  "
+echo "############################################################"
+echo ""
+fi 
+else
+echo ""
+echo "############################################################"
+echo "# It looks like you had errors during Geant4 installation   "
+echo "# (or interrupted installation)!				  "
+echo "# You have no log file:				      	  "
+echo "# $g4conf/g4make.log					  "
+echo "############################################################"
+echo ""
+fi
+
+!GROK!THIS!
+
+: In the following dollars and backticks do not need the extra backslash.
+$spitshell >>install.sh <<'!NO!SUBS!'
+!NO!SUBS!
+chmod 755 install.sh
+$eunicefix install.sh
+
Index: trunk/geant4/config/scripts/move.sh.SH
===================================================================
--- trunk/geant4/config/scripts/move.sh.SH	(revision 472)
+++ trunk/geant4/config/scripts/move.sh.SH	(revision 472)
@@ -0,0 +1,434 @@
+case $CONFIG in
+'')
+	if test -f config.sh; then TOP=.;
+	elif test -f ../config.sh; then TOP=..;
+	elif test -f ../../config.sh; then TOP=../..;
+	elif test -f ../../../config.sh; then TOP=../../..;
+	elif test -f ../../../../config.sh; then TOP=../../../..;
+	else
+		echo "Can't find config.sh."; exit 1
+	fi
+	. $TOP/config.sh
+	;;
+esac
+: This forces SH files to create target in same directory as SH file.
+: This is so that make depend always knows where to find SH derivatives.
+case "$0" in
+*/*) cd `expr X$0 : 'X\(.*\)/'` ;;
+esac
+#echo "Extracting move.sh (with variable substitutions)"
+: This section of the file will have variable substitutions done on it.
+: Move anything that needs config subs from !NO!SUBS! section to !GROK!THIS!.
+: Protect any dollar signs and backticks that you do not want interpreted
+: by putting a backslash in front.  You may delete these comments.
+$spitshell >move.sh <<!GROK!THIS!
+######################################
+#
+# g4system.U
+#
+#+
+G4SYSTEM="$g4system"
+export G4SYSTEM
+echo "On this machine the G4SYSTEM=\$G4SYSTEM"
+
+#
+# g4dirs.U
+#
+#+
+G4INSTALL="$g4install"
+export G4INSTALL
+echo "On this machine the G4INSTALL=\$G4INSTALL"
+
+#+
+if [ X$g4include != X -a X$g4include != Xn ] ; then
+G4INCLUDE="$g4include"
+export G4INCLUDE
+echo "On this machine the G4INCLUDE=\$G4INCLUDE"
+fi
+
+#+
+if [ X$g4tmp != X ] ; then
+G4TMP="$g4tmp"
+export G4TMP
+echo "On this machine the G4TMP=\$G4TMP"
+fi
+
+#+
+if [ X$g4lib != X ] ; then 
+G4LIB="$g4lib"
+export G4LIB
+echo "On this machine the G4LIB=\$G4LIB"
+fi
+
+#+
+if [ X$g4lib != X ] ; then 
+G4BIN="$g4lib/../bin"
+export G4BIN
+fi
+
+#+
+if [ X$g4levelgammadata != X ] ; then 
+G4LEVELGAMMADATA="$g4levelgammadata"
+export G4LEVELGAMMADATA
+echo "On this machine the G4LEVELGAMMADATA=\$G4LEVELGAMMADATA"
+fi
+
+#+
+if [ X$g4radioactivedata != X ] ; then 
+G4RADIOACTIVEDATA="$g4radioactivedata"
+export G4RADIOACTIVEDATA
+echo "On this machine the G4RADIOACTIVEDATA=\$G4RADIOACTIVEDATA"
+fi
+
+#+
+if [ X$g4ledata != X ] ; then 
+G4LEDATA="$g4ledata"
+export G4LEDATA
+echo "On this machine the G4LEDATA=\$G4LEDATA"
+fi
+
+#+
+if [ X$g4neutronhpcrosssections != X ] ; then 
+NeutronHPCrossSections="$g4neutronhpcrosssections"
+export NeutronHPCrossSections
+echo "On this machine the NeutronHPCrossSections=\$NeutronHPCrossSections"
+fi
+
+#+
+if [ X$g4elasticdata != X ] ; then 
+G4ELASTICDATA="$g4elasticdata"
+export G4ELASTICDATA
+echo "On this machine the G4ELASTICDATA=\$G4ELASTICDATA"
+fi
+
+#
+# g4clhep.U
+#
+if [ X$g4clhep_base_dir != X/usr -o X$g4clhep_base_dir != X/usr/local ] ; then 
+CLHEP_BASE_DIR="$g4clhep_base_dir"
+export CLHEP_BASE_DIR
+echo "On this machine the CLHEP_BASE_DIR=\$CLHEP_BASE_DIR"
+fi
+
+#+
+if [ X$g4clhep_include_dir != X ] ; then 
+CLHEP_INCLUDE_DIR="$g4clhep_include_dir"
+export CLHEP_INCLUDE_DIR
+echo "On this machine the CLHEP_INCLUDE_DIR=\$CLHEP_INCLUDE_DIR"
+fi
+
+#+
+if [ X$g4clhep_lib_dir != X ] ; then 
+CLHEP_LIB_DIR="$g4clhep_lib_dir"
+export CLHEP_LIB_DIR
+echo "On this machine the CLHEP_LIB_DIR=\$CLHEP_LIB_DIR"
+fi
+
+#+
+if [ X$g4clhep_lib != X ] ; then 
+CLHEP_LIB="$g4clhep_lib"
+export CLHEP_LIB
+echo "On this machine the CLHEP_LIB=\$CLHEP_LIB"
+fi
+
+#+
+#
+# g4debug
+#
+if [ X$g4debug != X ] ; then 
+G4DEBUG="$g4debug"
+export G4DEBUG
+echo "On this machine the G4DEBUG=\$G4DEBUG"
+fi
+
+#
+# g4analysis
+#
+#+
+if [ X$g4wanalysis_use = Xy ] ; then
+G4ANALYSIS_USE=1
+export G4ANALYSIS_USE
+echo "On this machine the G4ANALYSIS_USE=\$G4ANALYSIS_USE"
+fi 
+
+#
+# g4ui
+#
+#+
+if [ X$g4ui_build_xaw_session = Xy ] ; then
+G4UI_BUILD_XAW_SESSION=1
+export G4UI_BUILD_XAW_SESSION
+echo "On this machine the G4UI_BUILD_XAW_SESSION=\$G4UI_BUILD_XAW_SESSION"
+fi 
+
+#+
+if [ X$g4ui_use_xaw = Xy ] ; then
+G4UI_USE_XAW=1
+export G4UI_USE_XAW
+echo "On this machine the G4UI_USE_XAW=\$G4UI_USE_XAW"
+fi 
+
+#+
+if [ X$g4ui_build_xm_session = Xy ] ; then
+G4UI_BUILD_XM_SESSION=1
+export G4UI_BUILD_XM_SESSION
+echo "On this machine the G4UI_BUILD_XM_SESSION=\$G4UI_BUILD_XM_SESSION"
+fi 
+
+#+
+if [ X$g4ui_use_xm = Xy ] ; then
+G4UI_USE_XM=1
+export G4UI_USE_XM
+echo "On this machine the G4UI_USE_XM=\$G4UI_USE_XM"
+fi 
+
+#+
+if [ X$g4ui_build_win32_session = Xy ] ; then
+G4UI_BUILD_WIN32_SESSION=1
+export G4UI_BUILD_WIN32_SESSION
+echo "On this machine the G4UI_BUILD_WIN32_SESSION=\$G4UI_BUILD_WIN32_SESSION"
+fi 
+
+#+
+if [ X$g4ui_use_win32 = Xy ] ; then
+G4UI_USE_WIN32=1
+export G4UI_USE_WIN32
+echo "On this machine the G4UI_USE_WIN32=\$G4UI_USE_WIN32"
+fi 
+
+#
+# g4vis
+#
+#+
+if [ X$g4vis_build_dawn_driver = Xy ] ; then
+G4VIS_BUILD_DAWN_DRIVER=1
+export G4VIS_BUILD_DAWN_DRIVER
+echo "On this machine the G4VIS_BUILD_DAWN_DRIVER=\$G4VIS_BUILD_DAWN_DRIVER"
+fi 
+
+#+
+if [ X$g4vis_build_openglx_driver = Xy ] ; then
+G4VIS_BUILD_OPENGLX_DRIVER=1
+export G4VIS_BUILD_OPENGLX_DRIVER
+echo "On this machine the G4VIS_BUILD_OPENGLX_DRIVER=\$G4VIS_BUILD_OPENGLX_DRIVER"
+fi 
+
+#+
+if [ X$g4vis_build_openglxm_driver = Xy ] ; then
+G4VIS_BUILD_OPENGLXM_DRIVER=1
+export G4VIS_BUILD_OPENGLXM_DRIVER
+echo "On this machine the G4VIS_BUILD_OPENGLXM_DRIVER=\$G4VIS_BUILD_OPENGLXM_DRIVER"
+fi 
+
+#+
+if [ X$g4vis_build_openglwin32_driver = Xy ] ; then
+G4VIS_BUILD_OPENGLWIN32_DRIVER=1
+export G4VIS_BUILD_OPENGLWIN32_DRIVER
+echo "On this machine the G4VIS_BUILD_OPENGLWIN32_DRIVER=\$G4VIS_BUILD_OPENGLWIN32_DRIVER"
+fi 
+
+#+
+if [ X$g4vis_build_oix_driver = Xy ] ; then
+G4VIS_BUILD_OIX_DRIVER=1
+export G4VIS_BUILD_OIX_DRIVER
+echo "On this machine the G4VIS_BUILD_OIX_DRIVER=\$G4VIS_BUILD_OIX_DRIVER"
+fi 
+
+#+
+if [ X$g4vis_build_oiwin32_driver = Xy ] ; then
+G4VIS_BUILD_OIWIN32_DRIVER=1
+export G4VIS_BUILD_OIWIN32_DRIVER
+echo "On this machine the G4VIS_BUILD_OIWIN32_DRIVER=\$G4VIS_BUILD_OIWIN32_DRIVER"
+fi 
+
+#+
+if [ X$g4vis_build_vrml_driver = Xy ] ; then
+G4VIS_BUILD_VRML_DRIVER=1
+export G4VIS_BUILD_VRML_DRIVER
+echo "On this machine the G4VIS_BUILD_VRML_DRIVER=\$G4VIS_BUILD_VRML_DRIVER"
+fi 
+
+#+
+if [ X$g4vis_use_dawn = Xy ] ; then
+G4VIS_USE_DAWN=1
+export G4VIS_USE_DAWN
+echo "On this machine the G4VIS_USE_DAWN=\$G4VIS_USE_DAWN"
+fi 
+
+#+
+if [ X$g4vis_use_openglx = Xy ] ; then
+G4VIS_USE_OPENGLX=1
+export G4VIS_USE_OPENGLX
+echo "On this machine the G4VIS_USE_OPENGLX=\$G4VIS_USE_OPENGLX"
+fi 
+
+#+
+if [ X$g4vis_use_openglxm = Xy ] ; then
+G4VIS_USE_OPENGLXM=1
+export G4VIS_USE_OPENGLXM
+echo "On this machine the G4VIS_USE_OPENGLXM=\$G4VIS_USE_OPENGLXM"
+fi 
+
+#+
+if [ X$g4vis_use_openglwin32 = Xy ] ; then
+G4VIS_USE_OPENGLWIN32=1
+export G4VIS_USE_OPENGLWIN32
+echo "On this machine the G4VIS_USE_OPENGLWIN32=\$G4VIS_USE_OPENGLWIN32"
+fi 
+
+#+
+if [ X$g4vis_use_oix = Xy ] ; then
+G4VIS_USE_OIX=1
+export G4VIS_USE_OIX
+echo "On this machine the G4VIS_USE_OIX=\$G4VIS_USE_OIX"
+fi 
+
+#+
+if [ X$g4vis_use_oiwin32 = Xy ] ; then
+G4VIS_USE_OIWIN32=1
+export G4VIS_USE_OIWIN32
+echo "On this machine the G4VIS_USE_OIWIN32=\$G4VIS_USE_OIWIN32"
+fi 
+
+#+
+if [ X$g4vis_use_vrml = Xy ] ; then
+G4VIS_USE_VRML=1
+export G4VIS_USE_VRML
+echo "On this machine the G4VIS_USE_VRML=\$G4VIS_USE_VRML"
+fi 
+
+#+
+if [ X$g4vis_oglhome != X ] ; then
+OGLHOME="$g4vis_oglhome"
+export OGLHOME
+echo "On this machine the OGLHOME=\$OGLHOME"
+fi 
+
+#
+# Use G3TOG4 module
+#
+#+
+if [ X$g4wlib_build_g3tog4 = Xy ] ; then
+G4LIB_BUILD_G3TOG4=1
+export G4LIB_BUILD_G3TOG4
+echo "On this machine the G4LIB_BUILD_G3TOG4=\$G4LIB_BUILD_G3TOG4"
+fi 
+
+if [ X$g4w_use_g3tog4 = Xy ] ; then
+G4LIB_USE_G3TOG4=1
+export G4LIB_USE_G3TOG4
+echo "On this machine the G4LIB_USE_G3TOG4=\$G4LIB_USE_G3TOG4"
+fi 
+
+#
+# Use ZLIB module
+#
+#+
+if [ X$g4wlib_build_zlib = Xy ] ; then
+G4LIB_BUILD_ZLIB=1
+export G4LIB_BUILD_ZLIB
+echo "On this machine the G4LIB_BUILD_ZLIB=\$G4LIB_BUILD_ZLIB"
+fi 
+
+if [ X$g4w_use_zlib = Xy ] ; then
+G4LIB_USE_ZLIB=1
+export G4LIB_USE_ZLIB
+echo "On this machine the G4LIB_USE_ZLIB=\$G4LIB_USE_ZLIB"
+fi 
+
+
+#+
+#
+# g4shared
+#
+if [ X$g4lib_build_shared = Xy ] ; then
+G4LIB_BUILD_SHARED=1
+export G4LIB_BUILD_SHARED
+echo "On this machine the G4LIB_BUILD_SHARED=\$G4LIB_BUILD_SHARED"
+fi 
+
+if [ X$g4lib_build_static = Xy ] ; then
+G4LIB_BUILD_STATIC=1
+export G4LIB_BUILD_STATIC
+echo "On this machine the G4LIB_BUILD_STATIC=\$G4LIB_BUILD_STATIC"
+fi 
+
+#+
+#
+# g4granular
+#
+if [ X$g4lib_use_granular = Xy ] ; then
+G4LIB_USE_GRANULAR=1
+export G4LIB_USE_GRANULAR
+echo "On this machine the G4LIB_USE_GRANULAR=\$G4LIB_USE_GRANULAR"
+fi 
+
+#####################################################################
+
+#####################################################################
+
+echo ""
+echo "Starting installation..."
+echo ""
+
+cd $g4install
+#echo `pwd`
+
+
+# Remove 'verbosity' in 'tar' command
+# If not INCLUDE then install full tree in 'src' directory!
+#
+if [ X$g4includes_flag = Xn ] ; then
+if [ X$g4install != X$g4final_install ] ; then
+echo ""
+echo "Installing sources and headers..."
+echo ""
+mkdir -p $g4final_install/src/geant4/
+tar cf - Configure config/ source/ environments/ physics_lists/ examples/ |(cd $g4final_install/src/geant4/; tar xf -)
+fi
+fi
+
+########################################
+# There is no env!
+if [ X$g4includes_flag = Xy ] ; then
+
+if [ X$g4install != X$g4final_install ] ; then
+echo ""
+echo "Installing sources..."
+echo ""
+
+mkdir -p $g4final_install/src/geant4/
+tar cf - Configure config/ source/ environments/ physics_lists/ examples/ |(cd $g4final_install/src/geant4/; tar xf -)
+fi
+
+echo ""
+echo "Installing headers..."
+echo ""
+cd $g4install/source
+$g4make includes dependencies=""
+fi
+
+# Move libraries
+if [ X$g4install != X$g4final_install ] ; then
+echo ""
+echo "Installing libraries..."
+echo ""
+mkdir -p $g4final_install/lib/geant4
+cd $g4install/lib
+tar cf - $g4system |(cd $g4final_install/lib/geant4; tar xf -)
+fi
+
+# For the reason of strange behaivior for DOTted directory...
+mkdir -p $g4final_install/src/geant4/.config
+cd $g4install/.config
+tar cf - . |(cd $g4final_install/src/geant4/.config; tar xf -)
+
+
+!GROK!THIS!
+
+: In the following dollars and backticks do not need the extra backslash.
+$spitshell >>move.sh <<'!NO!SUBS!'
+!NO!SUBS!
+chmod 755 move.sh
+$eunicefix move.sh
+
Index: trunk/geant4/config/sys/AIX-xlC.gmk
===================================================================
--- trunk/geant4/config/sys/AIX-xlC.gmk	(revision 472)
+++ trunk/geant4/config/sys/AIX-xlC.gmk	(revision 472)
@@ -0,0 +1,51 @@
+#
+# -------- AIX ----------     !!! not supported !!!
+#                               AIX-4.3.2 xlC 6.0
+
+ifeq ($(G4SYSTEM),AIX-xlC)
+  CXX       := xlC
+  ifdef G4OPTIMISE
+    CXXFLAGS  := -O3 -qtwolink -+
+  else
+    ifdef G4DEBUG
+      CXXFLAGS  := -g -qdbxextra -qcheck=all -qfullpath -qtwolink -+
+      FCFLAGS := -g
+      CCFLAGS := -g
+    endif
+  endif
+  FC := xlf
+  FCFLAGS += -qextname
+  FCLIBS := -lxlf90 -lxlf
+  ifndef X11FLAGS
+    X11FLAGS  := -I/usr/include/X11/extensions -I/usr/include/X11
+  endif
+  ifndef X11LIBS
+    X11LIBS   := -L/usr/lib -lXmu -lX11 -lXext
+  endif
+  ifndef XMFLAGS
+    XMFLAGS   := -I/usr/include/Motif1.2
+  endif
+  ifndef XMLIBS
+    XMLIBS    := -L/usr/lib -lXm -lXt -lX11
+  endif
+  ifndef XAWFLAGS
+    XAWFLAGS  := -I/usr/include/X11
+  endif
+  ifndef XAWLIBS
+    XAWLIBS   := -L/usr/lib -lXaw -lXmu -lXt -lX11 -lXext
+  endif
+  ifndef OGLFLAGS
+    OGLFLAGS  := -I$(OGLHOME)/include 
+  endif
+  ifndef OGLLIBS
+    OGLLIBS   := -L$(OGLHOME)/lib -lGLU -lGL
+  endif
+
+  define build-granular-shared-lib
+    @echo "Shared Libraries not supported on $(G4SYSTEM)
+  endef
+  define build-global-shared-lib
+    @echo "Shared Libraries not supported on $(G4SYSTEM)
+  endef
+
+endif
Index: trunk/geant4/config/sys/DEC-cxx.gmk
===================================================================
--- trunk/geant4/config/sys/DEC-cxx.gmk	(revision 472)
+++ trunk/geant4/config/sys/DEC-cxx.gmk	(revision 472)
@@ -0,0 +1,57 @@
+#
+# -------- DEC ---------    !!! not supported !!!
+#                         OSF V4.0, cxx C++ V6.1-027
+ifeq ($(G4SYSTEM),DEC-cxx)
+  CXX		:= cxx
+  ifdef G4OPTIMISE
+    CXXFLAGS	:= -O
+  else
+    ifdef G4DEBUG
+      CXXFLAGS	:= -gall
+      FCFLAGS	:= -g
+      CCFLAGS   := -g
+    endif
+  endif
+  CXXFLAGS	+= -ieee -timplicit_local
+  CXXFLAGS      += -std strict_ansi
+  SHEXT         := so
+  G4RUNPATHOPTION := -rpath
+  FC		:= f77
+  FCLIBS	:= -lUfor -lfor -lFutil -lots
+  ifndef X11FLAGS
+    X11FLAGS  := -I/usr/include/X11/extensions -I/usr/include/X11
+  endif
+  ifndef X11LIBS
+    X11LIBS   := -lXmu -lXt -lXext -lX11
+  endif
+  ifndef XMFLAGS
+    XMFLAGS   :=
+  endif
+  ifndef XMLIBS
+    XMLIBS    := -lXm
+  endif
+  ifndef XAWFLAGS
+    XAWFLAGS   :=
+  endif
+  ifndef XAWLIBS
+    XAWLIBS    := -lXaw
+  endif
+  ifndef OGLFLAGS
+    OGLFLAGS  := -I$(OGLHOME)/include 
+#   OGLFLAGS  := -I/usr/include -I/usr/local/include
+  endif
+  ifndef OGLLIBS
+    OGLLIBS   := -L$(OGLHOME)/lib -lGLU -lGL
+#   OGLLIBS   := -lMesaGLU -lMesaGL
+  endif
+
+  define build-granular-shared-lib
+    @libdir=`(cd $(@D);/bin/pwd)`; \
+     cd $(G4TMPDIR); \
+     $(CXX) -shared -o $$libdir/$(@F) *.o
+  endef
+#  transform-RPath = 1
+  define build-global-shared-lib
+    @echo "Global shared Libraries not supported on $(G4SYSTEM)
+  endef
+endif
Index: trunk/geant4/config/sys/Darwin-g++.gmk
===================================================================
--- trunk/geant4/config/sys/Darwin-g++.gmk	(revision 472)
+++ trunk/geant4/config/sys/Darwin-g++.gmk	(revision 472)
@@ -0,0 +1,81 @@
+#
+# ------ MacOS-X ------
+#                                 MacOS 10.3 gcc-3.3
+#                                 MacOS 10.4 gcc-4.0
+#
+# Original author: Helmut Burkhardt - CERN
+#       Revisions: Guy Barrand - LAL
+#                  Gabriele Cosmo - CERN
+#
+ifeq ($(G4SYSTEM),Darwin-g++)
+  CXX       := g++
+  CXXFLAGS  := -Wall -ansi -pedantic -Wno-non-virtual-dtor -Wno-long-long
+  CXXFLAGS  += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual -pipe
+  ifdef G4OPTIMISE
+    CXXFLAGS  += -O2
+    FCFLAGS   := -O2
+    CCFLAGS   := -O2
+  else
+    ifdef G4DEBUG
+      CXXFLAGS  += -g
+      FCFLAGS   := -g
+      CCFLAGS   := -g
+    endif
+  endif
+  ifdef G4PROFILE
+    CXXFLAGS  += -pg
+    FCFLAGS   += -pg
+    CCFLAGS   += -pg
+  endif
+  FC := g77
+  FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
+  LDFLAGS += -bind_at_load
+  FCLIBS := -lg2c -lnsl
+  ECHO    := /bin/echo -n
+  SHEXT   := dylib
+  ifndef X11FLAGS
+    X11FLAGS  := -I/usr/include/X11/extensions -I/usr/include/X11
+  endif
+  ifndef X11LIBS
+    X11LIBS   := -L/usr/X11R6/lib  -lXmu -lXt -lXext -lX11 -lXi -lSM -lICE
+  endif
+  ifndef XMFLAGS
+    XMFLAGS   := -I/sw/include
+#   XMFLAGS   := -I/usr/X11R6/include          ##### some installations.
+  endif
+  ifndef XMLIBS
+    XMLIBS    := -L/sw/lib -lXm -lXpm
+#   XMLIBS    := -L/usr/X11R6/lib -lXm -lXpm   ##### some installations.
+  endif
+  ifndef XAWFLAGS
+    XAWFLAGS   := -I/sw/include
+#   XAWFLAGS   := -I/usr/X11R6/include         ##### some installations.
+  endif
+  ifndef XAWLIBS
+    XAWLIBS    := -lXaw
+  endif
+  DLDLIBS   := -ldl
+  ifndef OGLHOME
+    OGLHOME  := /usr/X11R6
+  endif
+  ifndef OGLFLAGS
+    OGLFLAGS  := -I$(OGLHOME)/include 
+  endif
+  ifndef OGLLIBS
+    OGLLIBS   := -L$(OGLHOME)/lib -lGLU -lGL
+  endif
+
+  define build-granular-shared-lib
+    @libdir=`(cd $(@D);/bin/pwd)`; \
+     cd $(G4TMPDIR); \
+     g++ -dynamiclib -single_module -undefined dynamic_lookup \
+         -o $$libdir/$(@F) $(INTYLIBS) *.o
+  endef
+  define build-global-shared-lib
+    @libdir=`(cd $(@D);/bin/pwd)`; \
+     cd $(G4TMP)/$(G4SYSTEM); \
+     g++ -dynamiclib -single_module -undefined dynamic_lookup \
+         -o $$libdir/$(@F) $(INTYLIBS) $(foreach dir,$(SUBLIBS),$(dir)/*.o);
+  endef
+
+endif
Index: trunk/geant4/config/sys/HP-aCC.gmk
===================================================================
--- trunk/geant4/config/sys/HP-aCC.gmk	(revision 472)
+++ trunk/geant4/config/sys/HP-aCC.gmk	(revision 472)
@@ -0,0 +1,65 @@
+#
+# -------- HP ---------      !!! not supported !!!
+#                          HP-UX B.10.20 - aCC A.01.23
+ifeq ($(G4SYSTEM),HP-aCC)
+  CXX       := aCC
+  ifdef G4OPTIMISE
+    CXXFLAGS  := +O2 +Onolimit
+  else
+    ifdef G4DEBUG
+      CXXFLAGS := -g
+      FCFLAGS  := -g
+      CCFLAGS  := -g
+    endif
+  endif
+  CXXFLAGS += +DAportable +W823
+  CPPFLAGS += -I/usr
+  CPPFLAGS += -DG4NOT_ISO_DELETES -DG4NO_ISO_VECDIST
+  ifdef G4LIB_BUILD_SHARED
+    CXXFLAGS += +Z
+    FCFLAGS  += +Z
+    CCFLAGS  += +Z
+  endif
+  FC      := f77
+  SHEXT   := sl
+  FCFLAGS += +E6 +ppu
+  CCFLAGS += -Ae +DAportable
+  ifndef X11FLAGS
+    X11FLAGS  := -I/usr/include/X11/extensions -I/usr/contrib/X11R6/include
+    X11FLAGS  += -I/usr/contrib/X11R6/include/X11
+  endif
+  ifndef X11LIBS
+    X11LIBS   := -L/usr/contrib/X11R6/lib -lXmu -L/usr/lib -lXt -lXext -lX11
+  endif
+  ifndef XMFLAGS
+    XMFLAGS   := -I/usr/include/Motif1.2
+  endif
+  ifndef XMLIBS
+    XMLIBS    := -L/usr/lib/Motif1.2_R6 -lXm
+  endif
+  ifndef XAWFLAGS
+    XAWFLAGS  := -I/usr/contrib/X11R6/include -I/usr/contrib/X11R6/include/X11
+  endif
+  ifndef XAWLIBS
+    XAWLIBS   := -L/usr/contrib/X11R6/lib -lXaw
+  endif
+  ifndef OGLFLAGS
+    OGLFLAGS  := -I$(OGLHOME)/include 
+  endif
+  ifndef OGLLIBS
+    OGLLIBS   := -L$(OGLHOME)/lib -lGLU -lGL
+    OGLLIBS   += -L/opt/graphics/common/lib -lXwindow -lhpgfx -lXhp11 -ldld
+  endif
+
+  define build-granular-shared-lib
+    @libdir=`(cd $(@D);/bin/pwd)`; \
+     cd $(G4TMPDIR); \
+     $(CXX) -b -o $$libdir/$(@F) *.o
+  endef
+  define build-global-shared-lib
+    @libdir=`(cd $(@D);/bin/pwd)`; \
+     cd $(G4TMP)/$(G4SYSTEM); \
+     $(CXX) -b -o $$libdir/$(@F) $(foreach dir,$(SUBLIBS),$(dir)/*.o);
+  endef
+
+endif
Index: trunk/geant4/config/sys/Linux-egcs.gmk
===================================================================
--- trunk/geant4/config/sys/Linux-egcs.gmk	(revision 472)
+++ trunk/geant4/config/sys/Linux-egcs.gmk	(revision 472)
@@ -0,0 +1,71 @@
+#
+# ------ GNU/LINUX ------    !!! not supported !!!
+#                    Red-Hat 6.1, egcs-1.1.2 (gcc-2.91.66)
+ifeq ($(G4SYSTEM),Linux-egcs)
+  CXX       := g++
+  CXXFLAGS  := -pipe
+  ifdef G4OPTIMISE
+    CXXFLAGS  += -O
+    FCFLAGS   := -O
+    CCFLAGS   := -O
+  else
+    ifdef G4DEBUG
+      CXXFLAGS  += -g
+      FCFLAGS   := -g
+      CCFLAGS   := -g
+    endif
+  endif
+  ifdef G4PROFILE
+    CXXFLAGS  += -pg
+    FCFLAGS   += -pg
+    CCFLAGS   += -pg
+  endif
+  ifdef G4LIB_BUILD_SHARED
+    CXXFLAGS  += -fPIC
+    FCFLAGS   += -fPIC
+    CCFLAGS   += -fPIC
+  endif
+  G4RUNPATHOPTION := -Wl,-rpath 
+  FC := g77
+  FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
+  FCLIBS := -lg2c -lnsl
+  ECHO    := /bin/echo -e
+  SHEXT   := so
+  ifndef X11FLAGS
+    X11FLAGS  := -I/usr/include/X11/extensions -I/usr/include/X11
+  endif
+  ifndef X11LIBS
+    X11LIBS   := -L/usr/X11R6/lib  -lXmu -lXt -lXext -lX11 -lSM -lICE
+  endif
+  ifndef XMFLAGS
+    XMFLAGS   := -I/usr/X11R6/include
+  endif
+  ifndef XMLIBS
+    XMLIBS    := -lXm -lXpm
+  endif
+  ifndef XAWFLAGS
+    XAWFLAGS   := -I/usr/X11R6/include
+  endif
+  ifndef XAWLIBS
+    XAWLIBS    := -lXaw
+  endif
+  DLDLIBS   := -ldl
+  ifndef OGLFLAGS
+    OGLFLAGS  := -I$(OGLHOME)/include 
+  endif
+  ifndef OGLLIBS
+    OGLLIBS   := -L$(OGLHOME)/lib -lGLU -lGL
+  endif
+  define build-granular-shared-lib
+    @libdir=`(cd $(@D);/bin/pwd)`; \
+     cd $(G4TMPDIR); \
+     $(CXX) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) *.o
+  endef
+  define build-global-shared-lib
+    @libdir=`(cd $(@D);/bin/pwd)`; \
+     cd $(G4TMP)/$(G4SYSTEM); \
+     $(CXX) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) \
+                    $(foreach dir,$(SUBLIBS),$(dir)/*.o);
+  endef
+
+endif
Index: trunk/geant4/config/sys/Linux-g++.gmk
===================================================================
--- trunk/geant4/config/sys/Linux-g++.gmk	(revision 472)
+++ trunk/geant4/config/sys/Linux-g++.gmk	(revision 472)
@@ -0,0 +1,82 @@
+#
+# ------ GNU/LINUX ------ gcc 3.2 and higher
+#
+ifeq ($(G4SYSTEM),Linux-g++)
+  CXX       := g++
+  CXXFLAGS  := -W -Wall -ansi -pedantic -Wno-non-virtual-dtor -Wno-long-long
+  CXXFLAGS  += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual -pipe
+#
+# Uncomment the following options to activate Pentium4 chip specific
+# floating-point operations on the SSE unit. It will allow for more stable
+# results (no output differences between debug/optimised runs) and little
+# performance improvement (in the order of 2%).
+# NOTE: binaries built using these options will NOT be portable cross
+#       platforms. Will only run on Pentium4-based architectures !
+#
+# CXXFLAGS  += -march=pentium4 -mfpmath=sse
+  ifdef G4OPTIMISE
+    CXXFLAGS  += -O2
+    FCFLAGS   := -O2
+    CCFLAGS   := -O2
+  else
+    ifdef G4DEBUG
+      CXXFLAGS  += -g
+      FCFLAGS   := -g
+      CCFLAGS   := -g
+    endif
+  endif
+  ifdef G4PROFILE
+    CXXFLAGS  += -pg
+    FCFLAGS   += -pg
+    CCFLAGS   += -pg
+  endif
+  ifdef G4LIB_BUILD_SHARED
+    CXXFLAGS  += -fPIC
+    FCFLAGS   += -fPIC
+    CCFLAGS   += -fPIC
+  endif
+  G4RUNPATHOPTION := -Wl,-rpath 
+  CC := gcc
+  FC := g77
+  FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
+  FCLIBS := -lg2c -lnsl
+  ECHO    := /bin/echo -e
+  SHEXT   := so
+  ifndef X11FLAGS
+    X11FLAGS  := -I/usr/include/X11/extensions -I/usr/include/X11
+  endif
+  ifndef X11LIBS
+    X11LIBS   := -L/usr/X11R6/lib  -lXmu -lXt -lXext -lX11 -lSM -lICE
+  endif
+  ifndef XMFLAGS
+    XMFLAGS   := -I/usr/X11R6/include
+  endif
+  ifndef XMLIBS
+    XMLIBS    := -lXm -lXpm
+  endif
+  ifndef XAWFLAGS
+    XAWFLAGS   := -I/usr/X11R6/include
+  endif
+  ifndef XAWLIBS
+    XAWLIBS    := -lXaw
+  endif
+  DLDLIBS   := -ldl
+  ifndef OGLFLAGS
+    OGLFLAGS  := -I$(OGLHOME)/include 
+  endif
+  ifndef OGLLIBS
+    OGLLIBS   := -L$(OGLHOME)/lib -lGLU -lGL
+  endif
+  define build-granular-shared-lib
+    @libdir=`(cd $(@D);/bin/pwd)`; \
+     cd $(G4TMPDIR); \
+     $(CXX) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) $(INTYLIBS) *.o
+  endef
+  define build-global-shared-lib
+    @libdir=`(cd $(@D);/bin/pwd)`; \
+     cd $(G4TMP)/$(G4SYSTEM); \
+     $(CXX) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) $(INTYLIBS) \
+                    $(foreach dir,$(SUBLIBS),$(dir)/*.o);
+  endef
+
+endif
Index: trunk/geant4/config/sys/Linux-icc.gmk
===================================================================
--- trunk/geant4/config/sys/Linux-icc.gmk	(revision 472)
+++ trunk/geant4/config/sys/Linux-icc.gmk	(revision 472)
@@ -0,0 +1,73 @@
+#
+# ------ GNU/LINUX ------     !!! not supported !!!
+#                                 Intel icc 8.0
+ifeq ($(G4SYSTEM),Linux-icc)
+  CXX       := icc
+  CXXFLAGS  := -ansi -mp -no-gcc -w1
+  ifdef G4OPTIMISE
+    CXXFLAGS  += -O
+    FCFLAGS   := -O
+    CCFLAGS   := -O
+  else
+    ifdef G4DEBUG
+      CXXFLAGS  += -g
+      FCFLAGS   := -g
+      CCFLAGS   := -g
+    endif
+  endif
+  ifdef G4PROFILE
+    CXXFLAGS  += -qp
+    FCFLAGS   += -qp
+    CCFLAGS   += -pg
+  endif
+  ifdef G4LIB_BUILD_SHARED
+    CXXFLAGS  += -fPIC
+    FCFLAGS   += -fPIC
+    CCFLAGS   += -fPIC
+  endif
+  G4RUNPATHOPTION := -Xlinker -rpath 
+  CC := gcc
+  FC := g77
+  FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
+  FCLIBS := -lg2c -lnsl
+  AR := xiar r
+  ECHO    := /bin/echo -e
+  SHEXT   := so
+  ifndef X11FLAGS
+    X11FLAGS  := -I/usr/include/X11/extensions -I/usr/include/X11
+  endif
+  ifndef X11LIBS
+    X11LIBS   := -L/usr/X11R6/lib  -lXmu -lXt -lXext -lX11 -lSM -lICE
+  endif
+  ifndef XMFLAGS
+    XMFLAGS   := -I/usr/X11R6/include
+  endif
+  ifndef XMLIBS
+    XMLIBS    := -lXm -lXpm
+  endif
+  ifndef XAWFLAGS
+    XAWFLAGS   := -I/usr/X11R6/include
+  endif
+  ifndef XAWLIBS
+    XAWLIBS    := -lXaw
+  endif
+  DLDLIBS   := -ldl
+  ifndef OGLFLAGS
+    OGLFLAGS  := -I$(OGLHOME)/include 
+  endif
+  ifndef OGLLIBS
+    OGLLIBS   := -L$(OGLHOME)/lib -lGLU -lGL
+  endif
+  define build-granular-shared-lib
+    @libdir=`(cd $(@D);/bin/pwd)`; \
+     cd $(G4TMPDIR); \
+     $(CXX) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) $(INTYLIBS) *.o
+  endef
+  define build-global-shared-lib
+    @libdir=`(cd $(@D);/bin/pwd)`; \
+     cd $(G4TMP)/$(G4SYSTEM); \
+     $(CXX) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) $(INTYLIBS) \
+                    $(foreach dir,$(SUBLIBS),$(dir)/*.o);
+  endef
+
+endif
Index: trunk/geant4/config/sys/SGI-CC.gmk
===================================================================
--- trunk/geant4/config/sys/SGI-CC.gmk	(revision 472)
+++ trunk/geant4/config/sys/SGI-CC.gmk	(revision 472)
@@ -0,0 +1,52 @@
+#
+# -------- SGI ---------   !!! not supported !!!
+#                             Irix-6.5.5 CC-8
+ifeq ($(G4SYSTEM),SGI-CC)
+  CXX       := CC
+  ifdef G4OPTIMISE
+    CXXFLAGS  := -O -OPT:Olimit=5000
+  else
+    ifdef G4DEBUG
+      CXXFLAGS  := -g 
+      FCFLAGS   := -g
+      CCFLAGS   := -g
+    endif
+  endif
+  CXXFLAGS  += -ptused
+  CPPFLAGS  += -DSOCKET_IRIX_SOLARIS
+  FC        := f77
+  FCLIBS    := -lftn
+  SHEXT     := so
+  ifndef X11FLAGS
+    X11FLAGS  := -I/usr/include/X11/extensions -I/usr/include/X11
+  endif
+  ifndef X11LIBS
+    X11LIBS   := -L/usr/lib -lXmu -lXt -lXext -lX11
+  endif
+  ifndef XMFLAGS
+    XMFLAGS   :=
+  endif
+  ifndef XMLIBS
+    XMLIBS    := -L/usr/lib -lXm
+  endif
+  ifndef XAWFLAGS
+    XAWFLAGS   :=
+  endif
+  ifndef XAWLIBS
+    XAWLIBS    := -lXaw
+  endif
+  ifndef OGLFLAGS
+    OGLFLAGS  :=
+  endif
+  ifndef OGLLIBS
+    OGLLIBS   := -L/usr/lib -lGLU -lGL
+  endif
+
+  define build-granular-shared-lib
+    @echo "Shared Libraries not supported on $(G4SYSTEM)
+  endef
+  define build-global-shared-lib
+    @echo "Shared Libraries not supported on $(G4SYSTEM)
+  endef
+
+endif
Index: trunk/geant4/config/sys/SUN-CC.gmk
===================================================================
--- trunk/geant4/config/sys/SUN-CC.gmk	(revision 472)
+++ trunk/geant4/config/sys/SUN-CC.gmk	(revision 472)
@@ -0,0 +1,67 @@
+#
+# -------- SUN ---------
+#
+ifeq ($(G4SYSTEM),SUN-CC)
+  CXX       := CC
+  ifdef G4OPTIMISE
+    CXXFLAGS  := -O
+  else
+    ifdef G4DEBUG
+      CXXFLAGS  := -g
+      FCFLAGS := -g
+      CCFLAGS := -g
+    endif
+  endif
+  ifdef G4LIB_BUILD_SHARED
+    CXXFLAGS += -KPIC
+    FCFLAGS  += -KPIC
+    CCFLAGS  += -KPIC
+  endif
+  CPPFLAGS += -DSOCKET_IRIX_SOLARIS
+  CPPFLAGS += -DG4NOT_ISO_DELETES -DG4NO_ISO_VECDIST
+  G4RUNPATHOPTION := -R
+  FC     := f77
+  SHEXT  := so
+  AR     := $(CXX) -xar -o
+  ECHO   := /bin/echo
+  GREP   := /usr/xpg4/bin/grep
+  FCLIBS := -lM77 -lF77 -lsunmath
+  ifndef X11FLAGS
+    X11FLAGS  := -I/usr/openwin/include/X11/extensions -I/usr/openwin/include/X11
+    X11FLAGS  += -I/usr/openwin/include
+  endif
+  ifndef X11LIBS
+    X11LIBS   := -L/usr/openwin/lib -L/usr/dt/lib -L/usr/ucblib
+    X11LIBS   += -R/usr/openwin/lib -lXmu -lX11 -lXext
+  endif
+  ifndef XMLIBS
+    XMLIBS    := -L/usr/openwin/lib -L/usr/dt/lib -L/usr/ucblib
+    XMLIBS    += -R/usr/openwin/lib -lXt -lXm -lX11
+  endif
+  ifndef XAWFLAGS
+    XAWFLAGS  := -I/usr/openwin/include/X11
+  endif
+  ifndef XAWLIBS
+    XAWLIBS   := -L/usr/openwin/lib -L/usr/dt/lib -L/usr/ucblib
+    XAWLIBS   += -R/usr/openwin/lib -lXaw -lXmu -lXt -lX11 -lXext
+  endif
+  ifndef OGLFLAGS
+    OGLFLAGS  := -I$(OGLHOME)/include 
+  endif
+  ifndef OGLLIBS
+    OGLLIBS   := -L$(OGLHOME)/lib -lGLU -lGL
+  endif
+  LOADLIBS += -lsunmath -lsocket -lnsl
+
+  define build-granular-shared-lib
+    @libdir=`(cd $(@D);/bin/pwd)`; \
+    cd $(G4TMPDIR); \
+     $(CXX) -G $(CXXTEMPLATE_FLAGS) -o $$libdir/$(@F) -h $(@F) $(INTYLIBS) *.o
+  endef
+  define build-global-shared-lib
+    @libdir=`(cd $(@D);/bin/pwd)`; \
+    cd $(G4TMP)/$(G4SYSTEM); \
+     $(CXX) -G $(CXXTEMPLATE_FLAGS) -o $$libdir/$(@F) -h $(@F) $(INTYLIBS) \
+               $(foreach dir,$(SUBLIBS),$(dir)/*.o);
+  endef
+endif
Index: trunk/geant4/config/sys/WIN32-VC.gmk
===================================================================
--- trunk/geant4/config/sys/WIN32-VC.gmk	(revision 472)
+++ trunk/geant4/config/sys/WIN32-VC.gmk	(revision 472)
@@ -0,0 +1,103 @@
+#
+# ------ WIN32/VC ------    Visual-C++ 7 .NET
+#
+ifeq ($(G4SYSTEM),WIN32-VC)
+  CXX       := CL
+  ifdef G4OPTIMISE
+    CXXFLAGS  += -Ox
+  else
+    ifdef G4DEBUG
+      CXXFLAGS  += -Od -Zi -Fd$(G4LIBDIR)/lib$(name)
+    endif
+  endif
+  CXXFLAGS += -MD -GR -EHsc -Zm200 -nologo
+  CXXFLAGS += -D_CONSOLE -D_WIN32 -DOS
+  CPPFLAGS += -DWIN32 -DXPNET -D_CRT_SECURE_NO_DEPRECATE
+  LDFLAGS  += -FORCE /NODEFAULTLIB:MSVCRT.dll
+
+  SHEXT := dll
+  AR := LIB
+  ECHO := echo -e
+  FC := g77
+#  FCLIBS := -lf2c
+  ifndef OGLFLAGS
+    OGLFLAGS  :=
+  endif
+  ifndef OGLLIBS
+    OGLLIBS   := glu32.lib opengl32.lib
+  endif
+  ifndef UI32LIBS
+    UI32LIBS  := gdi32.lib user32.lib
+  endif
+
+#
+# Building DLLs (G.Barrand)
+# -------------
+#  The commands below allow to build DLLs from the archive libraries.
+#  From a libG4xxx.a, it will extract the symbols with :
+#    DOS> dumpbin /symbols libG4xxx.a > G4xxx.dumpbin
+#  After that it will produce a G4xxx.def using the 'win32def' program.
+#  The G4xxx.def file will contain the list of symbols that are "exported"
+#  or made public for using the DLLs.
+#  The source win32def.c is in the geant4/config directory. The binary is
+#  built during the library installation process, and will be placed in
+#  $G4LIB/G4SYSTEM. 
+#  If can also be built as follows :
+#    DOS> cl.exe /Fowin32def.exe win32def.c 
+#  Then, to use it :
+#    DOS> win32def G4xxx < G4xxx.dumpbin > G4xxx.def
+#  Libraries libG4xxx.lib can also be built with :
+#    DOS> lib /def:G4xxx.def /out:libG4xxx.lib
+#  It also produces a libG4xxx.exp used to build the DLL.
+#  The DLL can be built with :
+#    DOS> link /dll /out:G4xxx.dll libG4xxx.exp libG4xxx.a <dependencies>
+#  Note that a DLL must be fully linked. You should NOT have undefined 
+#  symbols as output of the link command.
+#
+  define build-granular-shared-lib
+    @libdir=`(cd $(@D);/bin/pwd)`;\
+    cd $(G4TMP)/$(G4SYSTEM);\
+    echo "Building $(name).dumpbin file ...";\
+    $(RM) $(name).dumpbin;\
+    dumpbin /symbols $(G4LIBDIR)/lib$(name).a > $(name).dumpbin;\
+    echo "Building $(name).def file ...";\
+    $(RM) $(name).def;\
+    $(G4LIB)/$(G4SYSTEM)/win32def.exe $(name) < $(name).dumpbin > $(name).def;\
+    $(RM) $(name).dumpbin;\
+    echo "Building lib$(name).exp and lib$(name).lib file ...";\
+    $(RM) $(G4LIBDIR)/lib$(name).exp;\
+    $(RM) $(G4LIBDIR)/lib$(name).lib;\
+    lib.exe /nologo /machine:ix86 /def:$(name).def \
+            /out:$(G4LIBDIR)/lib$(name).lib;\
+    $(RM) $(G4LIBDIR)/$(name).dll;\
+    echo "Building $(name).dll file ...";\
+    link.exe /nologo /dll /out:$(G4LIBDIR)/$(name).dll \
+             $(G4LIBDIR)/lib$(name).exp $(G4LIBDIR)/lib$(name).a \
+             /libpath:$(G4LIBDIR) $(GLOBLIBS) \
+             $(LIB_PATH)$(CLHEP_LIB_DIR) $(CLHEP_LIB) \
+             $(INTYLIBS) $(ANALYSISLIBS) $(UI32LIBS)
+  endef
+  define build-global-shared-lib
+    @libdir=`(cd $(@D);/bin/pwd)`;\
+    cd $(G4TMP)/$(G4SYSTEM);\
+    echo "Building $(name).dumpbin file ...";\
+    $(RM) $(name).dumpbin;\
+    dumpbin /symbols $(G4LIBDIR)/lib$(name).a > $(name).dumpbin;\
+    echo "Building $(name).def file ...";\
+    $(RM) $(name).def;\
+    $(G4LIB)/$(G4SYSTEM)/win32def.exe $(name) < $(name).dumpbin > $(name).def;\
+    $(RM) $(name).dumpbin;\
+    echo "Building lib$(name).exp and lib$(name).lib ...";\
+    $(RM) $(G4LIBDIR)/lib$(name).exp;\
+    $(RM) $(G4LIBDIR)/lib$(name).lib;\
+    lib.exe /nologo /machine:ix86 /def:$(name).def \
+            /out:$(G4LIBDIR)/lib$(name).lib;\
+    $(RM) $(G4LIBDIR)/$(name).dll;\
+    echo "Building $(name).dll ...";\
+    link.exe /nologo /dll /out:$(G4LIBDIR)/$(name).dll \
+             $(G4LIBDIR)/lib$(name).exp $(G4LIBDIR)/lib$(name).a \
+             /libpath:$(G4LIBDIR) $(GLOBLIBS) \
+             $(LIB_PATH)$(CLHEP_LIB_DIR) $(CLHEP_LIB) \
+             $(INTYLIBS) $(ANALYSISLIBS) $(UI32LIBS)
+  endef
+endif
Index: trunk/geant4/config/sys/WIN32-g++.gmk
===================================================================
--- trunk/geant4/config/sys/WIN32-g++.gmk	(revision 472)
+++ trunk/geant4/config/sys/WIN32-g++.gmk	(revision 472)
@@ -0,0 +1,71 @@
+#
+# ------ GNU/WIN32 CYGNUS ------   !!! not supported !!!
+#                             Cygnus CygWin - gcc-3.2 and higher
+#                                     Windows 2000/XP
+#
+# Stefano Agostinelli (agos001@pn.itnet.it) - IST Group, Genova
+#
+ifeq ($(G4SYSTEM),WIN32-g++)
+  CXX       := g++
+  CXXFLAGS  := -W -Wall -ansi -pedantic -Wno-non-virtual-dtor -Wno-long-long
+  CXXFLAGS  += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual -pipe
+  ifdef G4OPTIMISE
+    CXXFLAGS  += -O
+    FCFLAGS   := -O
+    CCFLAGS   := -O
+  else
+    ifdef G4DEBUG
+      CXXFLAGS  += -g
+      FCFLAGS   := -g
+      CCFLAGS   := -g
+    endif
+  endif
+  ifdef G4LIB_BUILD_SHARED
+    CXXFLAGS  += -fPIC
+    FCFLAGS   += -fPIC
+    CCFLAGS   += -fPIC
+  endif
+  G4RUNPATHOPTION := -Wl,-rpath 
+  FC := g77
+  FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
+  FCLIBS := -lg2c -lnsl
+  ECHO    := echo -e
+  SHEXT   := so
+  ifndef X11FLAGS
+    X11FLAGS  := -I/usr/include/X11/extensions -I/usr/include/X11
+  endif
+  ifndef X11LIBS
+    X11LIBS   := -L/usr/X11R6/lib  -lXmu -lXt -lXext -lX11 -lSM -lICE
+  endif
+  ifndef XMFLAGS
+    XMFLAGS   := -I/usr/X11R6/include
+  endif
+  ifndef XMLIBS
+    XMLIBS    := -lXm -lXpm
+  endif
+  ifndef XAWFLAGS
+    XAWFLAGS  := -I/usr/X11R6/include
+  endif
+  ifndef XAWLIBS
+    XAWLIBS   := -lXaw
+  endif
+  ifndef OGLFLAGS
+    OGLFLAGS  := -I$(OGLHOME)/include 
+  endif
+  ifndef OGLLIBS
+    OGLLIBS   := -L$(OGLHOME)/lib -lGLU -lGL
+  endif
+  define build-granular-shared-lib
+    @libdir=`(cd $(@D);/bin/pwd)`; \
+     cd $(G4TMPDIR); \
+     $(CXX) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) $(INTYLIBS) *.o
+  endef
+  define build-global-shared-lib
+    @libdir=`(cd $(@D);/bin/pwd)`; \
+     cd $(G4TMP)/$(G4SYSTEM); \
+     $(CXX) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) $(INTYLIBS) \
+                    $(foreach dir,$(SUBLIBS),$(dir)/*.o);
+  endef
+
+endif
+
Index: trunk/geant4/config/win32def.c
===================================================================
--- trunk/geant4/config/win32def.c	(revision 472)
+++ trunk/geant4/config/win32def.c	(revision 472)
@@ -0,0 +1,174 @@
+/* $Id: win32def.c,v 1.3 2004/06/18 16:10:06 gcosmo Exp $ */
+/* +---------------------- Copyright notice -------------------------------+ */
+/* | Copyright (C) 1995, Guy Barrand, LAL Orsay, (barrand@lal.in2p3.fr)    | */
+/* |   Permission to use, copy, modify, and distribute this software       | */
+/* |   and its documentation for any purpose and without fee is hereby     | */
+/* |   granted, provided that the above copyright notice appear in all     | */
+/* |   copies and that both that copyright notice and this permission      | */
+/* |   notice appear in supporting documentation.  This software is        | */
+/* |   provided "as is" without express or implied warranty.               | */
+/* +---------------------- Copyright notice -------------------------------+ */
+
+/*
+  This program is a tool to build .def file
+ used by lib.exe to build the DLL on Windows.
+  It takes the output of a "dumpbin" over an
+ archive library and produces the .def file for
+ this library. For example :
+   DOS> dumpbin /out:tmp /symbols MyLib.arc
+   DOS> win32def.exe MyLib < tmp > MyLib.def
+ Note that win32def is a standalone program that 
+ can be easily reconstructed with :
+   DOS> cl /Fowin32def.exe win32def.c
+*/
+
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+char** GetWords (char*,char*,int*);
+/*****************************************************************************/
+int main (
+ int aArgn 
+,char** aArgs
+)
+/*****************************************************************************/
+{
+#define MAX_STRING 2048
+  char buffer[MAX_STRING+1];
+  int length;
+
+
+  /*EXETYPE WINDOWS\n\ */
+  printf("\
+LIBRARY %s\n\
+EXPORTS\n",aArgs[1]);
+
+  while(1){
+    if(fgets(buffer,MAX_STRING,stdin)==NULL) return EXIT_FAILURE;
+    /*
+      On some system (NT) editors when saving binary files 
+      put \r\n at place of \n ; we then look for \r\n.
+    */
+    length = strlen(buffer);
+    if( (length>=2) && (buffer[length-2]=='\r') && (buffer[length-1]=='\n') ) {
+      buffer[length-2] = '\0';
+      length--;
+      length--;
+    } else if((length>=1) && (buffer[length-1]=='\n')) {
+      buffer[length-1] = '\0';
+      length--;
+    }
+    if(strstr(buffer,"SECT")==NULL) continue;
+    if(strstr(buffer,"External")==NULL) continue;
+    if(strstr(buffer,"??_")!=NULL) {
+      if(strstr(buffer,"operator/=")==NULL) continue;
+      /* Keep operator /= */
+    }
+
+    {    
+      char** words;
+      int    wordn;
+      words  = GetWords (buffer," ",&wordn);
+      if(wordn>=8) {
+	int iword = 7;
+        int offset = 0;
+	if(strcmp(words[4],"()")==0) {
+	  iword = 7;
+	} else if(strcmp(words[4],"External")==0) {
+	  iword = 6;
+	}
+	if(words[iword][0]=='_') offset = 1;
+
+        if( (iword==6) && (strstr(buffer,"static class")!=NULL) ){
+          /* static class objects are not DATA */
+	  printf(" %s\n",words[iword]+offset);
+	} else if(iword==6) {
+          /* DATA */
+	  printf(" %s\tDATA\n",words[iword]+offset);
+	} else {
+          /* code */
+	  printf(" %s\n",words[iword]+offset);
+	}
+
+      }
+      {int count;
+      for(count=0;count<wordn;count++) if(words[count]) free(words[count]);
+      if(words) free(words);}
+    }
+    /*printf("%s\n",buffer);*/
+  }
+  return EXIT_SUCCESS;
+}
+/*****************************************************************************/
+char** GetWords (
+ char* a_string 
+,char* a_limiter 
+,int* a_number
+)
+/***************************************************************************/
+/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
+{
+#define STRDUP(str)  ((str) != NULL ? (strcpy((char*)malloc((unsigned)strlen(str) + 1), str)) : (char*)NULL)
+#define STRDEL(str) {if((str)!=NULL) {free(str);str=NULL;}}
+  int count;
+  char*  string;
+  char*  token;
+  int    iline;
+  char** list  = NULL;
+  int    nline = 0;
+/*.........................................................................*/
+  if(a_number!=NULL) *a_number      = 0;
+  if( (a_string==NULL) || (*a_string=='\0') )  return NULL;
+  if(a_limiter==NULL) return NULL;
+
+  string = STRDUP(a_string);
+  if(string==NULL) return NULL;
+
+  nline = 16;
+  list = (char**)malloc(nline*sizeof(char*));
+  if(list==NULL) return NULL;
+  iline = 0;
+
+  token = string;
+  while(1) { 
+    char* pos;
+    pos = strstr (token,a_limiter);
+    if(pos!=NULL) {
+      *pos = '\0';
+      if(*token!='\0') {
+	if(iline>=nline) { 
+	  nline    +=16;
+	  list      = (char**)realloc(list,nline*sizeof(char*));
+	  if(list==NULL) return NULL;
+	}
+	list[iline]      = token;
+	iline++;
+      }
+      token = pos + strlen(a_limiter);          
+    } else { /*last word*/
+      if(*token!='\0') {
+	if(iline>=nline) {
+	  nline    += 16;
+	  list      = (char**)realloc(list,nline*sizeof(char*));
+	  if(list==NULL) return NULL;
+	}
+	list[iline]      = token;
+	iline++;
+      }
+      break;
+    }
+  }
+  
+  for(count=0;count<iline;count++) list[count] = STRDUP(list[count]);
+  STRDEL(string);
+
+  if(iline==0)  {
+    if(list) free(list);
+    if(a_number!=NULL) *a_number = 0;
+    return             NULL;
+  } else {
+    if(a_number!=NULL) *a_number = iline;
+    return             list;
+  }
+}
