diff -u -r1.96 -r1.97
--- configure	3 Jun 2011 21:30:13 -0000	1.96
+++ configure	9 Jun 2011 01:53:00 -0000	1.97
@@ -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 QTHOME clhep_version_dot CLHEP_BASEDIR CLHEP_BUILDDIR CLHEP_CONFIG_OPTS CLHEP_DIR_ORIG CLHEP_DOWNLOAD GDML_BASEDIR GDML_BUILDDIR GDML_CONFIG_OPTS GDML_!
 CVSMODULE GEANT4_VERSION_DOWNLOAD GEANT4_VERSION GEANT4_BUILDDIR GEANT4_DIR_ORIG GEANT4_DOWNLOAD G4NEUTRONHP_NEGLECT_DOPPLER 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_USE_OPENGLQT G4LIB_BUILD_GDML LCD!
 D_BASEDI
R LCDD_VERSION LCIO_BASEDIR LCIO_BUILDDIR 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_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 PACKAGE_NJOBS 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 GDM!
 L_BASEDIR GDML_BUILDDIR GDML_CONFIG_OPTS GDML_CVSMODULE GEANT4_VERSION_DOWNLOAD GEANT4_VERSION GEANT4_BUILDDIR GEANT4_DIR_ORIG GEANT4_DOWNLOAD G4NEUTRONHP_NEGLECT_DOPPLER 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 G4V!
 ERBOSE G4UI_BUILD_QT_SESSION G4UI_USE_QT G4VIS_BUILD_OPENGLQT_!
 DRIVER G
4VIS_USE_OPENGLQT G4LIB_BUILD_GDML LCDD_BASEDIR LCDD_VERSION LCIO_BASEDIR LCIO_BUILDDIR 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_dir LIBOBJS LTLIBOBJS'

 ac_subst_files=''
 
 # Initialize some variables set by options.

@@ -827,6 +827,7 @@

   --with-prefix=<path>    binary installation base area
   --with-cvsuser=<username>
                           SLAC CVS user name. (Default is anonymous)

+  --with-njobs=<njobs>    number of simultaneous make jobs

   --with-opengl=<path>    OpenGL installation directory
   --with-qthome=<path>    Qt installation directory
   --with-distdir=<path>   Set distribution directory with format:

@@ -2302,6 +2303,34 @@

+echo "$as_me:$LINENO: checking for number of make jobs" >&5
+echo $ECHO_N "checking for number of make jobs... $ECHO_C" >&6
+
+
+# Check whether --with-njobs or --without-njobs was given.
+if test "${with_njobs+set}" = set; then
+  withval="$with_njobs"
+  njobs="$with_njobs"
+else
+  njobs="1"
+fi;
+
+echo "$as_me:$LINENO: result: $njobs" >&5
+echo "${ECHO_T}$njobs" >&6
+
+if [[ ${njobs} = *[^0-9]* ]] ; then
+    { { echo "$as_me:$LINENO: error: ${njobs} has a non-digit somewhere in it." >&5
+echo "$as_me: error: ${njobs} has a non-digit somewhere in it." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+PACKAGE_NJOBS=$njobs
+
+
+
+
+
+

 sim_dist_dir_basename=$(basename `pwd`)
 
 

@@ -2843,8 +2872,6 @@

 if test "${enable_opengl}" != "no"; then
   G4VIS_USE_OPENGLX=1
   G4VIS_BUILD_OPENGLX_DRIVER=1

-  G4VIS_USE_OPENGL=1
-  G4VIS_BUILD_OPENGL=1

 fi
 
 G4UI_USE_TCSH=

@@ -2960,8 +2987,6 @@

-G4LIB_USE_ZLIB=1
-

@@ -3920,6 +3945,7 @@

 s,@CMAKE@,$CMAKE,;t t
 s,@SLACCVSROOT@,$SLACCVSROOT,;t t
 s,@SLACCVSUSER@,$SLACCVSUSER,;t t

+s,@PACKAGE_NJOBS@,$PACKAGE_NJOBS,;t t

 s,@sim_dist_dir_basename@,$sim_dist_dir_basename,;t t
 s,@packages_dep_order@,$packages_dep_order,;t t
 s,@packages_reverse_dep_order@,$packages_reverse_dep_order,;t t