changed default to native STL, updated OGLHOME - both for HP-aCC

diff --git a/AliGeant4/config/setup.csh b/AliGeant4/config/setup.csh
index a34df96f90f220b17f764f6b4999084c7676265f..046e58a6727f9d7bb2b64ebd1a88c1ff46bb28ae 100755 (executable)
--- a/AliGeant4/config/setup.csh
+++ b/AliGeant4/config/setup.csh
@@ -295,7 +295,9 @@ setenv G4LEVELGAMMADATA ${G4INSTALL}/data/PhotonEvaporation
 set SYSTEM = `uname`
 if ( $SYSTEM == "HP-UX" ) then
   setenv G4SYSTEM "HP-aCC"
-  setenv G4USE_OSPACE 1
+  #setenv G4USE_OSPACE 1      # compiling with Object Space STL
+  setenv G4NO_STD_NAMESPACE 1 # required when compiling with native STL
+                              # (check if needed for geant4.2.0)
 endif 
 if ( $SYSTEM == "Linux" ) then
   setenv G4SYSTEM "Linux-g++"
@@ -438,12 +440,8 @@ if ( "$?AG4_VISUALIZE" == 1 ) then
   setenv G4VIS_BUILD_OPENGLXM_DRIVER 1
   setenv G4VIS_USE_OPENGLX           1
   setenv G4VIS_USE_OPENGLXM          1
-  if ( $SYSTEM == "Linux" ) then
-    setenv OGLHOME /usr/local
-    setenv OGLLIBS "-L$OGLHOME/lib -lMesaGLU -lMesaGL"
-  else
-    setenv OGLHOME $LHCXX_BASE/OpenGL/pro
-  endif
+  setenv OGLHOME /usr/local
+  setenv OGLLIBS "-L$OGLHOME/lib -lMesaGLU -lMesaGL"
 
   if ( "$VERBOSE" == "YES" ) then
     if ("$?G4VIS_USE_OPENGLX" == 1) then

diff --git a/AliGeant4/config/setup.sh b/AliGeant4/config/setup.sh
index 172e17fcd44a17f496543dabcf580cf97673812e..440120d11e027cb9325cbfe08e6d67a362bd1a43 100755 (executable)
--- a/AliGeant4/config/setup.sh
+++ b/AliGeant4/config/setup.sh
@@ -295,7 +295,9 @@ export G4LEVELGAMMADATA=$G4INSTALL/data/PhotonEvaporation
 SYSTEM=`uname`
 if [ "$SYSTEM" = "HP-UX" ]; then
   export G4SYSTEM="HP-aCC"
-  export G4USE_OSPACE=1
+  #export G4USE_OSPACE=1      # compiling with Object Space STL
+  export G4NO_STD_NAMESPACE=1 # required when compiling with native STL
+                              # (check if needed for geant4.2.0)
 fi  
 if [ "$SYSTEM" = "Linux" ]; then
   export G4SYSTEM="Linux-g++"
@@ -438,12 +440,8 @@ if [ $AG4_VISUALIZE ]; then
   export G4VIS_BUILD_OPENGLXM_DRIVER=1
   export G4VIS_USE_OPENGLX=1
   export G4VIS_USE_OPENGLXM=1
-  if [ "$SYSTEM" = "Linux" ]; then
-    export OGLHOME=/usr/local
-    export OGLLIBS="-L$OGLHOME/lib -lMesaGLU -lMesaGL"
-  else
-    export OGLHOME=$LHCXX_BASE/OpenGL/pro
-  fi
+  export OGLHOME=/usr/local
+  export OGLLIBS="-L$OGLHOME/lib -lMesaGLU -lMesaGL"
 
   if [ "$VERBOSE" = "YES" ]; then
     if [ $G4VIS_USE_OPENGLX ]; then