slic
diff -u -r1.10 -r1.11
--- GNUmakefile.local.in 15 Nov 2006 09:41:50 -0000 1.10
+++ GNUmakefile.local.in 15 Dec 2007 01:31:59 -0000 1.11
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/slic/GNUmakefile.local.in,v 1.10 2006/11/15 09:41:50 jeremy Exp $
+# $Header: /cvs/lcd/slic/GNUmakefile.local.in,v 1.11 2007/12/15 01:31:59 jeremy Exp $
#
# Local build settings generated by configure
#
@@ -53,3 +53,10 @@
# Flag that CLHEP 2.x is being used.
CLHEP_MAJOR_VERSION=@CLHEP_MAJOR_VERSION@
+
+# Geant4 version
+GEANT4_FULL_VERSION=@GEANT4_FULL_VERSION@
+GEANT4_MAJOR_VERSION=@GEANT4_MAJOR_VERSION@
+GEANT4_MINOR_VERSION=@GEANT4_MINOR_VERSION@
+GEANT4_PATCH_VERSION=@GEANT4_PATCH_VERSION@
+
slic
diff -u -r1.26 -r1.27
--- aclocal.m4 15 Oct 2007 21:57:25 -0000 1.26
+++ aclocal.m4 15 Dec 2007 01:31:59 -0000 1.27
@@ -1,4 +1,4 @@
-dnl $Header: /cvs/lcd/slic/aclocal.m4,v 1.26 2007/10/15 21:57:25 jeremy Exp $
+dnl $Header: /cvs/lcd/slic/aclocal.m4,v 1.27 2007/12/15 01:31:59 jeremy Exp $
dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
dnl Autoconf macros for SLIC and its dependencies friends.
@@ -267,6 +267,65 @@
])
+dnl Macro to extract the Geant4 version from G4Version.hh or G4RunManagerKernel.hh, if the former file does not exist.
+AC_DEFUN(AC_GEANT4_VERSION, [
+
+AC_MSG_CHECKING(for Geant4 version)
+
+if test -n "$G4INSTALL"
+then
+
+ if ! test -d $G4INSTALL; then
+ AC_MSG_ERROR(G4INSTALL is not a valid directory)
+ fi
+
+ 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')
+ else
+ AC_MSG_ERROR(could not determine Geant4 version because G4Version.hh or G4RunManagerKernel.hh was not found in Geant4 source)
+ fi
+else
+ AC_MSG_ERROR(G4INSTALL is not set)
+fi
+
+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_VERSION";
+then
+ GEANT4_MINOR_VERSION=0
+fi
+
+if test -z "$GEANT4_PATCH_VERSION";
+then
+ GEANT4_PATCH_VERSION=0
+fi
+
+GEANT4_FULL_VERSION=$GEANT4_MAJOR_VERSION"."$GEANT4_MINOR_VERSION"."$GEANT4_PATCH_VERSION
+
+AC_MSG_RESULT($GEANT4_FULL_VERSION)
+
+AC_MSG_CHECKING(for Geant4 major version level)
+AC_MSG_RESULT($GEANT4_MAJOR_VERSION)
+
+AC_MSG_CHECKING(for Geant4 minor version level)
+AC_MSG_RESULT($GEANT4_MINOR_VERSION)
+
+AC_MSG_CHECKING(for Geant4 patch level)
+AC_MSG_RESULT($GEANT4_PATCH_VERSION)
+
+AC_SUBST(GEANT4_FULL_VERSION)
+AC_SUBST(GEANT4_MAJOR_VERSION)
+AC_SUBST(GEANT4_MINOR_VERSION)
+AC_SUBST(GEANT4_PATCH_VERSION)
+
+])
+
dnl /\/\/\ Geant4 /\/\/\
AC_DEFUN(SIM_SETUP_G4, [
@@ -324,6 +383,8 @@
AC_SUBST(G4SYSTEM)
+AC_GEANT4_VERSION
+
dnl libs and includes will be setup by Geant4 binmake.
])
slic
diff -u -r1.95 -r1.96
--- configure 12 Dec 2007 03:36:40 -0000 1.95
+++ configure 15 Dec 2007 01:31:59 -0000 1.96
@@ -311,7 +311,7 @@
#endif"
ac_default_prefix=$SLIC_BASE
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC SET_MAKE CPP EGREP G4_PREFIX G4WORKDIR G4SYSTEM CLHEP_PREFIX CLHEP_MAJOR_VERSION XERCES_PREFIX XERCES_LIBNAME GDML_PREFIX LCDD_PREFIX LCIO_PREFIX LCPHYS_PREFIX enable_lcphys SLIC_PREFIX DOXYGEN PACKAGE_AUTHORS PACKAGE_FULLNAME PACKAGE_INSTITUTION PACKAGE_DATE PACKAGE_WWW LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC SET_MAKE CPP EGREP G4_PREFIX G4WORKDIR G4SYSTEM GEANT4_FULL_VERSION GEANT4_MAJOR_VERSION GEANT4_MINOR_VERSION GEANT4_PATCH_VERSION CLHEP_PREFIX CLHEP_MAJOR_VERSION XERCES_PREFIX XERCES_LIBNAME GDML_PREFIX LCDD_PREFIX LCIO_PREFIX LCPHYS_PREFIX enable_lcphys SLIC_PREFIX DOXYGEN PACKAGE_AUTHORS PACKAGE_FULLNAME PACKAGE_INSTITUTION PACKAGE_DATE PACKAGE_WWW LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -3277,6 +3277,78 @@
+echo "$as_me:$LINENO: checking for Geant4 version" >&5
+echo $ECHO_N "checking for Geant4 version... $ECHO_C" >&6
+
+if test -n "$G4INSTALL"
+then
+
+ if ! test -d $G4INSTALL; then
+ { { echo "$as_me:$LINENO: error: G4INSTALL is not a valid directory" >&5
+echo "$as_me: error: G4INSTALL is not a valid directory" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ 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')
+ 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;}
+ { (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;}
+ { (exit 1); exit 1; }; }
+fi
+
+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_VERSION";
+then
+ GEANT4_MINOR_VERSION=0
+fi
+
+if test -z "$GEANT4_PATCH_VERSION";
+then
+ GEANT4_PATCH_VERSION=0
+fi
+
+GEANT4_FULL_VERSION=$GEANT4_MAJOR_VERSION"."$GEANT4_MINOR_VERSION"."$GEANT4_PATCH_VERSION
+
+echo "$as_me:$LINENO: result: $GEANT4_FULL_VERSION" >&5
+echo "${ECHO_T}$GEANT4_FULL_VERSION" >&6
+
+echo "$as_me:$LINENO: checking for Geant4 major version level" >&5
+echo $ECHO_N "checking for Geant4 major version level... $ECHO_C" >&6
+echo "$as_me:$LINENO: result: $GEANT4_MAJOR_VERSION" >&5
+echo "${ECHO_T}$GEANT4_MAJOR_VERSION" >&6
+
+echo "$as_me:$LINENO: checking for Geant4 minor version level" >&5
+echo $ECHO_N "checking for Geant4 minor version level... $ECHO_C" >&6
+echo "$as_me:$LINENO: result: $GEANT4_MINOR_VERSION" >&5
+echo "${ECHO_T}$GEANT4_MINOR_VERSION" >&6
+
+echo "$as_me:$LINENO: checking for Geant4 patch level" >&5
+echo $ECHO_N "checking for Geant4 patch level... $ECHO_C" >&6
+echo "$as_me:$LINENO: result: $GEANT4_PATCH_VERSION" >&5
+echo "${ECHO_T}$GEANT4_PATCH_VERSION" >&6
+
+
+
+
+
+
+
+
+
+
echo "$as_me:$LINENO: checking for G4Version.hh" >&5
echo $ECHO_N "checking for G4Version.hh... $ECHO_C" >&6
@@ -4669,6 +4741,10 @@
s,@G4_PREFIX@,$G4_PREFIX,;t t
s,@G4WORKDIR@,$G4WORKDIR,;t t
s,@G4SYSTEM@,$G4SYSTEM,;t t
+s,@GEANT4_FULL_VERSION@,$GEANT4_FULL_VERSION,;t t
+s,@GEANT4_MAJOR_VERSION@,$GEANT4_MAJOR_VERSION,;t t
+s,@GEANT4_MINOR_VERSION@,$GEANT4_MINOR_VERSION,;t t
+s,@GEANT4_PATCH_VERSION@,$GEANT4_PATCH_VERSION,;t t
s,@CLHEP_PREFIX@,$CLHEP_PREFIX,;t t
s,@CLHEP_MAJOR_VERSION@,$CLHEP_MAJOR_VERSION,;t t
s,@XERCES_PREFIX@,$XERCES_PREFIX,;t t