SimDist/build

diff -u -r1.7 -r1.8
--- geant4.m4	17 Aug 2007 20:51:03 -0000	1.7
+++ geant4.m4	15 Dec 2007 01:30:56 -0000	1.8
@@ -12,10 +12,10 @@

 
   if test -e "$G4INSTALL/source/global/management/include/G4Version.hh"
   then

-    GEANT4_VERSION=$(grep G4Version $G4INSTALL/source/global/management/include/G4Version.hh | grep -o "geant4[[0-9\-]]*" | sed 's/geant4-//g' | sed 's/-/./g')

+    GEANT4_FULL_VERSION=$(grep G4Version $G4INSTALL/source/global/management/include/G4Version.hh | grep -o "geant4[[0-9\-]]*" | sed 's/geant4-//g' | sed 's/-/./g')

   elif test -e "$G4INSTALL/source/run/src/G4RunManagerKernel.cc"
   then

-    GEANT4_VERSION=$(grep "[$]Name" $G4INSTALL/source/run/src/G4RunManagerKernel.cc | grep GEANT4 | grep -o "geant4[[0-9a-z\-]]*" | sed -e 's/geant4-//g' -e 's/patch-//g'| sed 's/-/./g')

+    GEANT4_FULL_VERSION=$(grep "[$]Name" $G4INSTALL/source/run/src/G4RunManagerKernel.cc | grep GEANT4 | grep -o "geant4[[0-9a-z\-]]*" | sed -e 's/geant4-//g' -e 's/patch-//g'| sed 's/-/./g')

   else
     AC_MSG_ERROR(could not determine Geant4 version because G4Version.hh or G4RunManagerKernel.hh was not found in Geant4 source)
   fi

@@ -23,37 +23,37 @@

   AC_MSG_ERROR(G4INSTALL is not set)
 fi
 

-GEANT4_MAJOR=$(echo "$GEANT4_VERSION" | awk 'BEGIN{ FS="." } { print [$]1 }' | sed 's/0*//')
-GEANT4_MINOR=$(echo "$GEANT4_VERSION" | awk 'BEGIN{ FS="." } { print [$]2 }' | sed 's/0*//')
-GEANT4_PATCH=$(echo "$GEANT4_VERSION" | awk 'BEGIN{ FS="." } { print [$]3 }' | sed 's/0*//')

+GEANT4_MAJOR_VERSION=$(echo "$GEANT4_FULL_VERSION" | awk 'BEGIN{ FS="." } { print [$]1 }' | sed 's/0*//')
+GEANT4_MINOR_VERSION=$(echo "$GEANT4_FULL_VERSION" | awk 'BEGIN{ FS="." } { print [$]2 }' | sed 's/0*//')
+GEANT4_PATCH_VERSION=$(echo "$GEANT4_FULL_VERSION" | awk 'BEGIN{ FS="." } { print [$]3 }' | sed 's/0*//')

-if test -z "$GEANT4_MINOR";

+if test -z "$GEANT4_MINOR_VERSION";

 then

-  GEANT4_MINOR=0

+  GEANT4_MINOR_VERSION=0

 fi
 

-if test -z "$GEANT4_PATCH";

+if test -z "$GEANT4_PATCH_VERSION";

 then

-  GEANT4_PATCH=0

+  GEANT4_PATCH_VERSION=0

 fi
 

-GEANT4_VERSION=$GEANT4_MAJOR"."$GEANT4_MINOR"."$GEANT4_PATCH

+GEANT4_FULL_VERSION=$GEANT4_MAJOR_VERSION"."$GEANT4_MINOR_VERSION"."$GEANT4_PATCH_VERSION

-AC_MSG_RESULT($GEANT4_VERSION)

+AC_MSG_RESULT($GEANT4_FULL_VERSION)

 
 AC_MSG_CHECKING(for Geant4 major version level)

-AC_MSG_RESULT($GEANT4_MAJOR)

+AC_MSG_RESULT($GEANT4_MAJOR_VERSION)

 
 AC_MSG_CHECKING(for Geant4 minor version level)

-AC_MSG_RESULT($GEANT4_MINOR)

+AC_MSG_RESULT($GEANT4_MINOR_VERSION)

 
 AC_MSG_CHECKING(for Geant4 patch level)

-AC_MSG_RESULT($GEANT4_PATCH)

+AC_MSG_RESULT($GEANT4_PATCH_VERSION)

-AC_SUBST(GEANT4_VERSION)
-AC_SUBST(GEANT4_MAJOR)
-AC_SUBST(GEANT4_MINOR)
-AC_SUBST(GEANT4_PATCH)

+AC_SUBST(GEANT4_FULL_VERSION)
+AC_SUBST(GEANT4_MAJOR_VERSION)
+AC_SUBST(GEANT4_MINOR_VERSION)
+AC_SUBST(GEANT4_PATCH_VERSION)

 
 ])
 

@@ -132,7 +132,7 @@

   G4VIS_USE_DAWN=1
   G4VIS_USE_VRML=1
   G4VIS_USE_RAYTRACERX=1

-  G4LIB_USE_ZLIB=1

+dnl  G4LIB_USE_ZLIB=1

 fi
 
 # Variable substitutions.