5 modified files
SimDist
diff -u -r1.19 -r1.20
--- aclocal.m4 14 Jul 2010 18:01:32 -0000 1.19
+++ aclocal.m4 25 Aug 2010 21:08:03 -0000 1.20
@@ -1,9 +1,5 @@
-dnl include m4 macros from build area
builtin(include, build/util.m4)
-
builtin(include, build/packages.m4)
-
builtin(include, build/geant4.m4)
builtin(include, build/clhep.m4)
-dnl builtin(include, build/xerces.m4)
builtin(include, build/ogl.m4)
SimDist
diff -u -r1.86 -r1.87
--- configure 23 Aug 2010 18:12:08 -0000 1.86
+++ configure 25 Aug 2010 21:08:03 -0000 1.87
@@ -808,6 +808,9 @@
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-opengl Enable or disable usage of OpenGL with Geant4.
+ --enable-g4vis-none Set to yes to completely disable Geant4
+ visualization.
+
--enable-g4verbose Enable or disable setting G4VERBOSE.
@@ -2558,28 +2561,6 @@
-echo "$as_me:$LINENO: checking whether to set G4VERBOSE" >&5
-echo $ECHO_N "checking whether to set G4VERBOSE... $ECHO_C" >&6
-
-# Check whether --enable-g4verbose or --disable-g4verbose was given.
-if test "${enable_g4verbose+set}" = set; then
- enableval="$enable_g4verbose"
-
-fi;
-
-if test "${enable_g4verbose}" != "no"; then
- G4VERBOSE=1
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-
-
-
-
for p in $(echo ${packages_list})
do
@@ -2681,6 +2662,28 @@
geant4 )
+
+
+echo "$as_me:$LINENO: checking whether to set G4VIS_NONE" >&5
+echo $ECHO_N "checking whether to set G4VIS_NONE... $ECHO_C" >&6
+
+# Check whether --enable-g4vis-none or --disable-g4vis-none was given.
+if test "${enable_g4vis_none+set}" = set; then
+ enableval="$enable_g4vis_none"
+
+fi;
+
+if test "${enable_g4vis_none}" == "yes"; then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ G4VIS_NONE=1
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+
+
GEANT4_VERSION=${package_version}
GEANT4_URL=http://geant4.cern.ch/support/source/
GEANT4_VERSION_DOWNLOAD=$(
@@ -2738,18 +2741,15 @@
echo "$as_me:$LINENO: result: $G4SYSTEM" >&5
echo "${ECHO_T}$G4SYSTEM" >&6
-# OpenGL.
if test "${enable_opengl}" != "no"; then
G4VIS_USE_OPENGLX=1
G4VIS_BUILD_OPENGLX_DRIVER=1
fi
-# terminal
G4UI_USE_TCSH=
G4UI_USE_CSH=
case "$host_os" in
-
linux*|darwin* )
G4UI_USE_TCSH=1
;;
@@ -2758,7 +2758,6 @@
;;
esac
-# Built-in visualization.
if test -z "$G4VIS_NONE"
then
G4VIS_BUILD_DAWN_DRIVER=1
@@ -2769,7 +2768,6 @@
G4VIS_USE_RAYTRACERX=1
fi
-# Config verbose setting. No verbose means better performance.
echo "$as_me:$LINENO: checking whether to set G4VERBOSE" >&5
@@ -2792,7 +2790,6 @@
-# Variable substitutions.
@@ -3069,7 +3066,6 @@
-
config_files=${config_files%\ }
ac_config_files="$ac_config_files ${config_files}"
SimDist
diff -u -r1.12 -r1.13
--- configure.in 23 Aug 2010 17:45:58 -0000 1.12
+++ configure.in 25 Aug 2010 21:08:03 -0000 1.13
@@ -1,8 +1,9 @@
-dnl $Header: /cvs/lcd/SimDist/configure.in,v 1.12 2010/08/23 17:45:58 jeremy Exp $
+dnl $Header: /cvs/lcd/SimDist/configure.in,v 1.13 2010/08/25 21:08:03 jeremy Exp $
dnl
dnl Process this file with autoconf to produce the configure script for SimDist.
dnl
+dnl Autoconf min version.
AC_PREREQ(2.57)
dnl Package info.
@@ -19,12 +20,11 @@
dnl Set the installation prefix.
AC_WITH_PREFIX
-dnl Check for required build tools.
+dnl Check for build tools.
AC_PROG_MAKE_SET
AC_PROG_CXX
AC_PROG_CVS
AC_PROG_JAVA
-dnl AC_PROG_ANT
AC_PROG_WGET
AC_PROG_SCP
AC_PROG_CMAKE
@@ -43,9 +43,6 @@
AC_OPENGL
fi
-dnl Set G4VERBOSE mode.
-AC_ENABLE_G4VERBOSE
-
dnl Setup each dependency package.
AC_CONFIG_PACKAGES
@@ -61,9 +58,6 @@
AC_ADD_CONFIG_FILE(packages/Makefile)
AC_ADD_CONFIG_FILE(build/package.gmk)
-dnl AC_ADD_CONFIG_FILE(build/xerces.gmk)
-dnl AC_ADD_CONFIG_FILE(build/clhep.gmk)
-
dnl Remove trailing space from input file list.
config_files=${config_files%\ }
SimDist/build
diff -u -r1.10 -r1.11
--- geant4.m4 27 Oct 2009 19:45:17 -0000 1.10
+++ geant4.m4 25 Aug 2010 21:08:03 -0000 1.11
@@ -57,7 +57,7 @@
])
-dnl Macro to setup Geant4.
+dnl Setup Geant4.
AC_DEFUN(AC_GEANT4, [
AC_MSG_CHECKING(for G4SYSTEM setting)
@@ -87,18 +87,17 @@
AC_MSG_RESULT($G4SYSTEM)
-# OpenGL.
+dnl OpenGL setting, based on previous configuration argument.
if test "${enable_opengl}" != "no"; then
G4VIS_USE_OPENGLX=1
G4VIS_BUILD_OPENGLX_DRIVER=1
fi
-# terminal
+dnl Terminals.
G4UI_USE_TCSH=
G4UI_USE_CSH=
case "$host_os" in
-
linux*|darwin* )
G4UI_USE_TCSH=1
;;
@@ -107,7 +106,7 @@
;;
esac
-# Built-in visualization.
+dnl Built-in visualization.
if test -z "$G4VIS_NONE"
then
G4VIS_BUILD_DAWN_DRIVER=1
@@ -118,10 +117,10 @@
G4VIS_USE_RAYTRACERX=1
fi
-# Config verbose setting. No verbose means better performance.
+dnl Config verbose setting. No verbose means better performance.
AC_ENABLE_G4VERBOSE
-# Variable substitutions.
+dnl Variable substitutions for Geant4 environment.
AC_SUBST(G4SYSTEM)
AC_SUBST(G4INSTALL)
AC_SUBST(G4INCLUDE)
@@ -172,6 +171,7 @@
])
+dnl G4VERBOSE setting.
AC_DEFUN(AC_ENABLE_G4VERBOSE, [
AC_MSG_CHECKING(whether to set G4VERBOSE)
@@ -190,3 +190,21 @@
])
+dnl G4VIS_NONE setting, which should turn off compilation of all Geant4 visualization libraries.
+AC_DEFUN(AC_ENABLE_G4VIS_NONE, [
+
+AC_MSG_CHECKING(whether to set G4VIS_NONE)
+
+AC_ARG_ENABLE([g4vis-none],
+ AC_HELP_STRING([--enable-g4vis-none],
+ [Set to yes to completely disable Geant4 visualization.])
+ )
+
+if test "${enable_g4vis_none}" == "yes"; then
+ AC_MSG_RESULT(yes)
+ G4VIS_NONE=1
+else
+ AC_MSG_RESULT(no)
+fi
+
+])
SimDist/build
diff -u -r1.42 -r1.43
--- packages.m4 23 Aug 2010 18:12:08 -0000 1.42
+++ packages.m4 25 Aug 2010 21:08:03 -0000 1.43
@@ -158,6 +158,9 @@
dnl
AC_DEFUN(AC_GEANT4_PACKAGE, [
+dnl G4VIS_NONE setting.
+AC_ENABLE_G4VIS_NONE
+
GEANT4_VERSION=${package_version}
GEANT4_URL=http://geant4.cern.ch/support/source/
GEANT4_VERSION_DOWNLOAD=$(VERSION_GEANT4(GEANT4_VERSION_DOWNLOAD, ${GEANT4_VERSION}))
CVSspam 0.2.8
