SimDist
diff -u -r1.70 -r1.71
--- configure 8 Oct 2008 23:03:30 -0000 1.70
+++ configure 11 Dec 2008 00:44:32 -0000 1.71
@@ -272,7 +272,7 @@
PACKAGE_STRING='SimDist v1r0p0'
[log in to unmask]
-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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os OS_SHARED_LIBS_VAR SET_MAKE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT have_cvs CVS have_java JAVA JAVA_HOME JDK_HOME have_wget WGET have_scp SCP have_cmake CMAKE SLACCVSROOT SLACCVSUSER sim_dist_dir_basename packages_dep_order packages_reverse_dep_order download_script cvs_script patch_script gen_files sim_dist_dir sim_packages_dir sim_build_dir sim_scripts_dir OGLHOME clhep_version_dot CLHEP_BASEDIR CLHEP_BUILDDIR CLHEP_CONFIG_OPTS CLHEP_DIR_ORIG CLHEP_DOWNLOAD GDML_BASEDIR GDML_BUILDDIR GDML_DIR_ORIG GDML_DOWNLOAD G!
DML_CONFIG_OPTS GEANT4_VERSION_DOWNLOAD GEANT4_VERSION GEANT4_BUILDDIR GEANT4_DIR_ORIG GEANT4_DOWNLOAD G4SYSTEM G4INSTALL G4INCLUDE G4LIB G4LEVELGAMMADATA G4RADIOACTIVEDATA G4LEDATA G4ELASTICDATA G4DEBUG G4ANALYSIS_USE G4UI_BUILD_XAW_SESSION G4UI_USE_XAW G4UI_BUILD_XM_SESSION G4UI_USE_XM G4UI_BUILD_WIN32_SESSION G4UI_USE_WIN32 G4VIS_BUILD_DAWN_DRIVER G4VIS_BUILD_OPENGLX_DRIVER G4VIS_BUILD_OPENGLXM_DRIVER G4VIS_BUILD_OPENGLWIN32_DRIVER G4VIS_BUILD_OIX_DRIVER G4VIS_BUILD_RAYTRACERX_DRIVER G4VIS_BUILD_OIWIN32_DRIVER G4VIS_BUILD_VRML_DRIVER G4VIS_USE_DAWN G4VIS_USE_OPENGLX G4VIS_USE_OPENGLXM G4VIS_USE_OPENGLWIN32 G4VIS_USE_OIX G4VIS_USE_RAYTRACERX G4VIS_USE_OIWIN32 G4VIS_USE_VRML G4LIB_BUILD_G3TOG4 G4LIB_USE_G3TOG4 G4LIB_BUILD_ZLIB G4LIB_USE_ZLIB G4LIB_BUILD_SHARED G4LIB_BUILD_STATIC G4LIB_USE_GRANULAR G4UI_USE_TCSH G4WORKDIR G4UI_NONE G4VIS_NONE G4VIS_BUILD_OPENGL_DRVIER G4VIS_USE_OPENGL G4VIS_BUILD_OPENGL LCDD_BASEDIR LCDD_VERSION LCIO_BASEDIR LCIO_BUILDDIR LCPHYS_CVSMODULE L!
CPHYS_BASEDIR SLIC_BINNAME SLIC_VERSION SLIC_BASEDIR MOKKA_VER!
SION MOK
KA_BASEDIR MOKKA_BUILDDIR MOKKA_DOWNLOAD MOKKA_DIR_ORIG XERCES_CONFIGURE_ARGS XERCES_OS XERCES_USE_SHARED_LIB XERCES_USE_STATIC_LIB xerces_version_underscore XERCES_VERSION XERCES_BASEDIR XERCES_BUILDDIR XERCES_CONFIG XERCES_CONFIG_OPTS XERCES_DOWNLOAD XERCES_DIR_ORIG XERCES_OBJDIR BDSIM_BASEDIR BDSIM_DIR_ORIG BDSIM_DOWNLOAD BDSIM_BUILDDIR BDSIM_VERSION ROOTSYS USE_ROOT HEPPDT_CONFIG_OPTS HEPPDT_BASEDIR HEPPDT_BUILDDIR HEPPDT_DOWNLOAD HEPPDT_VERSION HEPPDT_DIR_ORIG LCDETECTORS_BASEDIR LCDETECTORS_VERSION MYSQL_BASEDIR MYSQL_INCLUDEDIR MYSQL_LIBDIR dist_tarball dist_tarball_current dist_version bin_tarball_current bin_tarball dist_dir 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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os OS_SHARED_LIBS_VAR SET_MAKE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT have_cvs CVS have_java JAVA JAVA_HOME JDK_HOME have_wget WGET have_scp SCP have_cmake CMAKE SLACCVSROOT SLACCVSUSER sim_dist_dir_basename packages_dep_order packages_reverse_dep_order download_script cvs_script patch_script gen_files sim_dist_dir sim_packages_dir sim_build_dir sim_scripts_dir OGLHOME clhep_version_dot CLHEP_BASEDIR CLHEP_BUILDDIR CLHEP_CONFIG_OPTS CLHEP_DIR_ORIG CLHEP_DOWNLOAD GDML_BASEDIR GDML_BUILDDIR GDML_DIR_ORIG GDML_DOWNLOAD GDM!
L_CONFIG_OPTS GEANT4_VERSION_DOWNLOAD GEANT4_VERSION GEANT4_BUILDDIR GEANT4_DIR_ORIG GEANT4_DOWNLOAD G4SYSTEM G4INSTALL G4INCLUDE G4LIB G4LEVELGAMMADATA G4RADIOACTIVEDATA G4LEDATA G4ELASTICDATA G4DEBUG G4ANALYSIS_USE G4UI_BUILD_XAW_SESSION G4UI_USE_XAW G4UI_BUILD_XM_SESSION G4UI_USE_XM G4UI_BUILD_WIN32_SESSION G4UI_USE_WIN32 G4VIS_BUILD_DAWN_DRIVER G4VIS_BUILD_OPENGLX_DRIVER G4VIS_BUILD_OPENGLXM_DRIVER G4VIS_BUILD_OPENGLWIN32_DRIVER G4VIS_BUILD_OIX_DRIVER G4VIS_BUILD_RAYTRACERX_DRIVER G4VIS_BUILD_OIWIN32_DRIVER G4VIS_BUILD_VRML_DRIVER G4VIS_USE_DAWN G4VIS_USE_OPENGLX G4VIS_USE_OPENGLXM G4VIS_USE_OPENGLWIN32 G4VIS_USE_OIX G4VIS_USE_RAYTRACERX G4VIS_USE_OIWIN32 G4VIS_USE_VRML G4LIB_BUILD_G3TOG4 G4LIB_USE_G3TOG4 G4LIB_BUILD_ZLIB G4LIB_USE_ZLIB G4LIB_BUILD_SHARED G4LIB_BUILD_STATIC G4LIB_USE_GRANULAR G4UI_USE_TCSH G4WORKDIR G4UI_NONE G4VIS_NONE G4VIS_BUILD_OPENGL_DRVIER G4VIS_USE_OPENGL G4VIS_BUILD_OPENGL G4VERBOSE LCDD_BASEDIR LCDD_VERSION LCI!
O_BASEDIR LCIO_BUILDDIR LCPHYS_CVSMODULE LCPHYS_BASEDIR SLIC_B!
INNAME S
LIC_VERSION SLIC_BASEDIR MOKKA_VERSION MOKKA_BASEDIR MOKKA_BUILDDIR MOKKA_DOWNLOAD MOKKA_DIR_ORIG XERCES_CONFIGURE_ARGS XERCES_OS XERCES_USE_SHARED_LIB XERCES_USE_STATIC_LIB xerces_version_underscore XERCES_VERSION XERCES_BASEDIR XERCES_BUILDDIR XERCES_CONFIG XERCES_CONFIG_OPTS XERCES_DOWNLOAD XERCES_DIR_ORIG XERCES_OBJDIR BDSIM_BASEDIR BDSIM_DIR_ORIG BDSIM_DOWNLOAD BDSIM_BUILDDIR BDSIM_VERSION ROOTSYS USE_ROOT HEPPDT_CONFIG_OPTS HEPPDT_BASEDIR HEPPDT_BUILDDIR HEPPDT_DOWNLOAD HEPPDT_VERSION HEPPDT_DIR_ORIG LCDETECTORS_BASEDIR LCDETECTORS_VERSION MYSQL_BASEDIR MYSQL_INCLUDEDIR MYSQL_LIBDIR dist_tarball dist_tarball_current dist_version bin_tarball_current bin_tarball dist_dir LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -819,6 +819,8 @@
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-opengl Enable or disable usage of OpenGL with Geant4.
+ --enable-g4verbose Enable or disable setting G4VERBOSE.
+
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -2494,6 +2496,28 @@
+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
@@ -2626,7 +2650,6 @@
-
echo "$as_me:$LINENO: checking for G4SYSTEM setting" >&5
echo $ECHO_N "checking for G4SYSTEM setting... $ECHO_C" >&6
@@ -2664,9 +2687,6 @@
G4VIS_BUILD_OPENGLX_DRIVER=1
fi
-
-# Win32 OpenGL config.
-
# terminal
G4UI_USE_TCSH=
G4UI_USE_CSH=
@@ -2743,6 +2763,7 @@
+
;;
lcdd )
@@ -3962,6 +3983,7 @@
s,@G4VIS_BUILD_OPENGL_DRVIER@,$G4VIS_BUILD_OPENGL_DRVIER,;t t
s,@G4VIS_USE_OPENGL@,$G4VIS_USE_OPENGL,;t t
s,@G4VIS_BUILD_OPENGL@,$G4VIS_BUILD_OPENGL,;t t
+s,@G4VERBOSE@,$G4VERBOSE,;t t
s,@LCDD_BASEDIR@,$LCDD_BASEDIR,;t t
s,@LCDD_VERSION@,$LCDD_VERSION,;t t
s,@LCIO_BASEDIR@,$LCIO_BASEDIR,;t t
SimDist
diff -u -r1.6 -r1.7
--- configure.in 5 Aug 2008 18:49:21 -0000 1.6
+++ configure.in 11 Dec 2008 00:44:32 -0000 1.7
@@ -1,4 +1,4 @@
-dnl $Header: /cvs/lcd/SimDist/configure.in,v 1.6 2008/08/05 18:49:21 jeremy Exp $
+dnl $Header: /cvs/lcd/SimDist/configure.in,v 1.7 2008/12/11 00:44:32 jeremy Exp $
dnl
dnl Process this file with autoconf to produce the configure script for SimDist.
dnl
@@ -39,6 +39,9 @@
AC_OPENGL
AC_ENABLE_OPENGL
+dnl Set G4VERBOSE mode.
+AC_ENABLE_G4VERBOSE
+
dnl Setup each package.
AC_CONFIG_PACKAGES
SimDist/build
diff -u -r1.8 -r1.9
--- geant4.m4 15 Dec 2007 01:30:56 -0000 1.8
+++ geant4.m4 11 Dec 2008 00:44:32 -0000 1.9
@@ -60,8 +60,6 @@
dnl Macro to setup Geant4.
AC_DEFUN(AC_GEANT4, [
-dnl AC_GEANT4_VERSION
-
AC_MSG_CHECKING(for G4SYSTEM setting)
# G4SYSTEM
@@ -95,20 +93,6 @@
G4VIS_BUILD_OPENGLX_DRIVER=1
fi
-dnl if test -n "$OGLHOME"
-dnl then
-dnl G4VIS_USE_OPENGLX=1
-dnl G4VIS_BUILD_OPENGLX_DRIVER=1
-dnl fi
-
-# Win32 OpenGL config.
-dnl case "$host_os" in
-dnl cygwin* )
-dnl G4VIS_BUILD_OPENGLWIN32_DRIVER=1
-dnl G4VIS_USE_OPENGLWIN32=1
-dnl ;;
-dnl esac
-
# terminal
G4UI_USE_TCSH=
G4UI_USE_CSH=
@@ -132,7 +116,6 @@
G4VIS_USE_DAWN=1
G4VIS_USE_VRML=1
G4VIS_USE_RAYTRACERX=1
-dnl G4LIB_USE_ZLIB=1
fi
# Variable substitutions.
@@ -182,5 +165,25 @@
AC_SUBST(G4VIS_BUILD_OPENGL_DRVIER)
AC_SUBST(G4VIS_USE_OPENGL)
AC_SUBST(G4VIS_BUILD_OPENGL)
+AC_SUBST(G4VERBOSE)
])
+
+AC_DEFUN(AC_ENABLE_G4VERBOSE, [
+
+AC_MSG_CHECKING(whether to set G4VERBOSE)
+
+AC_ARG_ENABLE([g4verbose],
+ AC_HELP_STRING([--enable-g4verbose],
+ [Enable or disable setting G4VERBOSE.])
+ )
+
+if test "${enable_g4verbose}" != "no"; then
+ G4VERBOSE=1
+ AC_MSG_RESULT(yes)
+else
+ AC_MSG_RESULT(no)
+fi
+
+])
+
SimDist/packages/geant4
diff -u -r1.9 -r1.10
--- env.gmk.in 16 Feb 2007 20:03:27 -0000 1.9
+++ env.gmk.in 11 Dec 2008 00:44:32 -0000 1.10
@@ -1,4 +1,4 @@
-# $Id: env.gmk.in,v 1.9 2007/02/16 20:03:27 jeremy Exp $
+# $Id: env.gmk.in,v 1.10 2008/12/11 00:44:32 jeremy Exp $
# Environment variables for the Geant4 build system.
@@ -47,5 +47,6 @@
export G4VIS_NONE=@G4VIS_NONE@
export G4VIS_USE_OPENGL=@G4VIS_USE_OPENGL@
export G4VIS_BUILD_OPENGL=@G4VIS_BUILD_OPENGL@
+export G4VERBOSE=@G4VERBOSE@
export OGLHOME=@OGLHOME@