SimDist
diff -u -r1.88 -r1.89
--- configure 26 Aug 2010 21:00:30 -0000 1.88
+++ configure 8 Sep 2010 23:04:39 -0000 1.89
@@ -273,7 +273,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_CONFIG_OPTS GDML_CVSMODU!
LE 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 LCIO_BASEDIR LCIO_BUILDDIR SLIC_BINNAME SLIC_VER!
SION SLIC_BASEDIR xerces_version_dot XERCES_VERSION XERCES_BAS!
EDIR XER
CES_BUILDDIR XERCES_DIR_ORIG XERCES_DOWNLOAD XERCES_CONFIG XERCES_CONFIG_OPTS HEPPDT_CONFIG_OPTS HEPPDT_BASEDIR HEPPDT_BUILDDIR HEPPDT_DOWNLOAD HEPPDT_VERSION HEPPDT_DIR_ORIG LCDETECTORS_BASEDIR LCDETECTORS_VERSION 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 QTHOME clhep_version_dot CLHEP_BASEDIR CLHEP_BUILDDIR CLHEP_CONFIG_OPTS CLHEP_DIR_ORIG CLHEP_DOWNLOAD GDML_BASEDIR GDML_BUILDDIR GDML_CONFIG_OPTS GDML_CV!
SMODULE 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 G4UI_BUILD_QT_SESSION G4UI_USE_QT G4VIS_BUILD_OPENGLQT_DRIVER G4VIS_U!
SE_OPENGLQT LCDD_BASEDIR LCDD_VERSION LCIO_BASEDIR LCIO_BUILDD!
IR SLIC_
BINNAME SLIC_VERSION SLIC_BASEDIR xerces_version_dot XERCES_VERSION XERCES_BASEDIR XERCES_BUILDDIR XERCES_DIR_ORIG XERCES_DOWNLOAD XERCES_CONFIG XERCES_CONFIG_OPTS HEPPDT_CONFIG_OPTS HEPPDT_BASEDIR HEPPDT_BUILDDIR HEPPDT_DOWNLOAD HEPPDT_VERSION HEPPDT_DIR_ORIG LCDETECTORS_BASEDIR LCDETECTORS_VERSION 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.
@@ -808,6 +808,8 @@
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-opengl Enable or disable usage of OpenGL with Geant4.
+ --enable-qt Enable or disable usage of Qt with Geant4.
+
--enable-g4vis-none Set to yes to completely disable Geant4
visualization.
@@ -821,6 +823,7 @@
--with-cvsuser=<username>
SLAC CVS user name. (Default is anonymous)
--with-opengl=<path> OpenGL installation directory
+ --with-qthome=<path> Qt installation directory
--with-distdir=<path> Set distribution directory with format:
<username>@<host>:<dir>
@@ -2561,6 +2564,94 @@
+echo "$as_me:$LINENO: checking whether to use Qt" >&5
+echo $ECHO_N "checking whether to use Qt... $ECHO_C" >&6
+
+# Check whether --enable-qt or --disable-qt was given.
+if test "${enable_qt+set}" = set; then
+ enableval="$enable_qt"
+
+fi;
+
+if test "${enable_qt}" != "no"; then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ if test -z "${QTHOME}"; then
+ { { echo "$as_me:$LINENO: error: Qt enabled but QTHOME is not set" >&5
+echo "$as_me: error: Qt enabled but QTHOME is not set" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+else
+ DISABLE_QT=1
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+
+if test -z "$DISABLE_QT"
+then
+
+
+echo "$as_me:$LINENO: checking for QTHOME directory" >&5
+echo $ECHO_N "checking for QTHOME directory... $ECHO_C" >&6
+
+
+# Check whether --with-qthome or --without-qthome was given.
+if test "${with_qthome+set}" = set; then
+ withval="$with_qthome"
+ qthome=$with_qthome
+else
+ qthome=
+fi;
+
+if test -n "$qthome"
+then
+ QTHOME=$qthome
+fi
+
+echo "$as_me:$LINENO: result: $QTHOME" >&5
+echo "${ECHO_T}$QTHOME" >&6
+
+as_ac_File=`echo "ac_cv_file_$QTHOME/include/Qt/qconfig.h" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $QTHOME/include/Qt/qconfig.h" >&5
+echo $ECHO_N "checking for $QTHOME/include/Qt/qconfig.h... $ECHO_C" >&6
+if eval "test \"\${$as_ac_File+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ test "$cross_compiling" = yes &&
+ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+ { (exit 1); exit 1; }; }
+if test -r "$QTHOME/include/Qt/qconfig.h"; then
+ eval "$as_ac_File=yes"
+else
+ eval "$as_ac_File=no"
+fi
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+if test `eval echo '${'$as_ac_File'}'` = yes; then
+ :
+else
+ QTHOME=
+fi
+
+
+if test -z "$QTHOME"
+then
+ { { echo "$as_me:$LINENO: error: valid Qt installation not found" >&5
+echo "$as_me: error: valid Qt installation not found" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+HAVE_QT=1
+
+
+fi
+
+
+
for p in $(echo ${packages_list})
do
@@ -2770,6 +2861,26 @@
+echo "$as_me:$LINENO: checking whether Geant4 should enable Qt" >&5
+echo $ECHO_N "checking whether Geant4 should enable Qt... $ECHO_C" >&6
+
+if test -n "$HAVE_QT"
+then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ G4UI_BUILD_QT_SESSION=1
+ G4UI_USE_QT=1
+ G4VIS_BUILD_OPENGLQT_DRIVER=1
+ G4VIS_USE_OPENGLQT=1
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+
+
+
+
echo "$as_me:$LINENO: checking whether to set G4VERBOSE" >&5
echo $ECHO_N "checking whether to set G4VERBOSE... $ECHO_C" >&6
@@ -2841,6 +2952,10 @@
+
+
+
+
;;
lcdd )
@@ -3748,6 +3863,7 @@
s,@sim_build_dir@,$sim_build_dir,;t t
s,@sim_scripts_dir@,$sim_scripts_dir,;t t
s,@OGLHOME@,$OGLHOME,;t t
+s,@QTHOME@,$QTHOME,;t t
s,@clhep_version_dot@,$clhep_version_dot,;t t
s,@CLHEP_BASEDIR@,$CLHEP_BASEDIR,;t t
s,@CLHEP_BUILDDIR@,$CLHEP_BUILDDIR,;t t
@@ -3810,6 +3926,10 @@
s,@G4VIS_USE_OPENGL@,$G4VIS_USE_OPENGL,;t t
s,@G4VIS_BUILD_OPENGL@,$G4VIS_BUILD_OPENGL,;t t
s,@G4VERBOSE@,$G4VERBOSE,;t t
+s,@G4UI_BUILD_QT_SESSION@,$G4UI_BUILD_QT_SESSION,;t t
+s,@G4UI_USE_QT@,$G4UI_USE_QT,;t t
+s,@G4VIS_BUILD_OPENGLQT_DRIVER@,$G4VIS_BUILD_OPENGLQT_DRIVER,;t t
+s,@G4VIS_USE_OPENGLQT@,$G4VIS_USE_OPENGLQT,;t t
s,@LCDD_BASEDIR@,$LCDD_BASEDIR,;t t
s,@LCDD_VERSION@,$LCDD_VERSION,;t t
s,@LCIO_BASEDIR@,$LCIO_BASEDIR,;t t
