SimDist/build

diff -u -r1.7 -r1.8
--- packages.m4	21 Feb 2006 22:40:24 -0000	1.7
+++ packages.m4	31 Mar 2006 21:37:29 -0000	1.8
@@ -181,10 +181,6 @@

   CONFIG_PACKAGE_BASE($p)
 done
 

-dnl extras for these packages
-#CONFIG_XERCES
-#CONFIG_GEANT4
-

 ])
 
 dnl macro to setup Geant4

@@ -194,6 +190,26 @@

 
 AC_SUBST(g4system)
 

+dnl setup the Geant4 terminal type according to platform
+SET_GEANT4_TERMINAL
+
+])
+
+dnl macro to setup a Geant4 terminal type
+AC_DEFUN(SET_GEANT4_TERMINAL, [
+
+AC_MSG_CHECKING(for type of Geant4 UI terminal to use)
+
+if test $host_os == "Linux" || test $host_os == "Darwin"; then
+  ac_geant4_terminal="TCSH"
+else
+  ac_geant4_terminal="CSH"
+fi
+
+AC_MSG_RESULT(${ac_geant4_terminal})
+
+AC_SUBST(ac_geant4_terminal)
+

 ])
 
 dnl macro to setup Xerces

SimDist/packages/geant4

diff -u -r1.4 -r1.5
--- env.gmk.in	30 Jan 2006 20:48:14 -0000	1.4
+++ env.gmk.in	31 Mar 2006 21:37:29 -0000	1.5
@@ -7,6 +7,15 @@

 USE_OGL=@USE_OGL@
 ifeq ($(USE_OGL),yes)
   export OGLHOME=@OGLHOME@

-  export G4VIS_BUILD_OPENGLX_DRIVER=1 

+  export G4VIS_BUILD_OPENGLX_DRIVER=1

   export G4VIS_USE_OPENGLX=1
 endif

+
+# built-in visualization
+export G4VIS_BUILD_DAWN_DRIVER=1
+export G4VIS_BUILD_RAYTRACERX_DRIVER=1
+export G4VIS_BUILD_VRML_DRIVER=1
+export G4LIB_BUILD_ZLIB=1
+
+# G4 terminal determined by configure
+export G4UI_USE_@ac_geant4_terminal@=1