diff -u -r1.31 -r1.32
--- aclocal.m4	10 Apr 2008 20:33:28 -0000	1.31
+++ aclocal.m4	4 Nov 2009 23:20:30 -0000	1.32
@@ -1,4 +1,4 @@

-dnl $Header: /cvs/lcd/slic/aclocal.m4,v 1.31 2008/04/10 20:33:28 jeremy Exp $

+dnl $Header: /cvs/lcd/slic/aclocal.m4,v 1.32 2009/11/04 23:20:30 jeremy Exp $

 
 dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
 dnl Autoconf macros for SLIC and its dependencies friends.

@@ -329,15 +329,12 @@

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

-    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_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')

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

   else

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

+    AC_MSG_ERROR(FATAL ERROR: Could not determine Geant4 version because G4Version.hh was not found in Geant4 source code.  You are probably using an old Geant4 version.)

   fi
 else

-  AC_MSG_ERROR(G4INSTALL is not set)

+  AC_MSG_ERROR(G4INSTALL is not set.)

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

diff -u -r1.122 -r1.123
--- configure	3 Nov 2009 22:15:06 -0000	1.122
+++ configure	4 Nov 2009 23:20:30 -0000	1.123
@@ -3445,18 +3445,15 @@

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

-    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_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')

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

   else

-    { { echo "$as_me:$LINENO: error: could not determine Geant4 version because G4Version.hh or G4RunManagerKernel.hh was not found in Geant4 source" >&5
-echo "$as_me: error: could not determine Geant4 version because G4Version.hh or G4RunManagerKernel.hh was not found in Geant4 source" >&2;}

+    { { echo "$as_me:$LINENO: error: FATAL ERROR: Could not determine Geant4 version because G4Version.hh was not found in Geant4 source code.  You are probably using an old Geant4 version." >&5
+echo "$as_me: error: FATAL ERROR: Could not determine Geant4 version because G4Version.hh was not found in Geant4 source code.  You are probably using an old Geant4 version." >&2;}

    { (exit 1); exit 1; }; }
   fi
 else

-  { { echo "$as_me:$LINENO: error: G4INSTALL is not set" >&5
-echo "$as_me: error: G4INSTALL is not set" >&2;}

+  { { echo "$as_me:$LINENO: error: G4INSTALL is not set." >&5
+echo "$as_me: error: G4INSTALL is not set." >&2;}

    { (exit 1); exit 1; }; }
 fi