diff -u -r1.73 -r1.74
--- configure	25 Jun 2009 18:37:25 -0000	1.73
+++ configure	25 Jun 2009 18:55:40 -0000	1.74
@@ -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_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 G4VERBOSE LCDD_BASEDIR LCDD_VERSION LCIO_BASEDIR LCIO_BUILDDIR LCPHYS_C!
 VSMODULE LCPHYS_BASEDIR SLIC_BINNAME SLIC_VERSION SLIC_BASEDIR!
  MOKKA_V
ERSION 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 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 LCIO_BASEDIR LCIO_BUILDDIR LCPHYS_CVS!
 MODULE LCPHYS_BASEDIR SLIC_BINNAME SLIC_VERSION SLIC_BASEDIR M!
 OKKA_VER
SION 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 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.

@@ -730,18 +730,6 @@

 ac_env_CPPFLAGS_value=$CPPFLAGS
 ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
 ac_cv_env_CPPFLAGS_value=$CPPFLAGS

-ac_env_MYSQL_BASEDIR_set=${MYSQL_BASEDIR+set}
-ac_env_MYSQL_BASEDIR_value=$MYSQL_BASEDIR
-ac_cv_env_MYSQL_BASEDIR_set=${MYSQL_BASEDIR+set}
-ac_cv_env_MYSQL_BASEDIR_value=$MYSQL_BASEDIR
-ac_env_MYSQL_INCLUDEDIR_set=${MYSQL_INCLUDEDIR+set}
-ac_env_MYSQL_INCLUDEDIR_value=$MYSQL_INCLUDEDIR
-ac_cv_env_MYSQL_INCLUDEDIR_set=${MYSQL_INCLUDEDIR+set}
-ac_cv_env_MYSQL_INCLUDEDIR_value=$MYSQL_INCLUDEDIR
-ac_env_MYSQL_LIBDIR_set=${MYSQL_LIBDIR+set}
-ac_env_MYSQL_LIBDIR_value=$MYSQL_LIBDIR
-ac_cv_env_MYSQL_LIBDIR_set=${MYSQL_LIBDIR+set}
-ac_cv_env_MYSQL_LIBDIR_value=$MYSQL_LIBDIR

 
 #
 # Report the --help message.

@@ -829,12 +817,6 @@

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

-  --with-mysql-basedir=<path>
-                          absolute path to mysql base directory
-  --with-mysql-includedir=<path>
-                          absolute path to mysql headers dir
-  --with-mysql-libdir=<path>
-                          absolute path to mysql library dir

   --with-distdir=<path>   Set distribution directory with format:
                           <username>@<host>:<dir>
 

@@ -845,12 +827,6 @@

               nonstandard directory <lib dir>
   CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
               headers in a nonstandard directory <include dir>

-  MYSQL_BASEDIR
-              base mysql directory
-  MYSQL_INCLUDEDIR
-              directory containing mysql headers directory
-  MYSQL_LIBDIR
-              directory containing mysql libraries

 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.

@@ -3023,114 +2999,6 @@

-
-
-  echo "$as_me:$LINENO: checking for MYSQL_BASEDIR" >&5
-echo $ECHO_N "checking for MYSQL_BASEDIR... $ECHO_C" >&6
-
-  if test -z "$MYSQL_BASEDIR"
-  then
-
-# Check whether --with-mysql-basedir or --without-mysql-basedir was given.
-if test "${with_mysql_basedir+set}" = set; then
-  withval="$with_mysql_basedir"
-
-                  if test "$withval" != "yes"
-                  then
-                    MYSQL_BASEDIR="$withval"
-                  fi
-
-
-fi;
-  fi
-
-  echo "$as_me:$LINENO: result: $MYSQL_BASEDIR" >&5
-echo "${ECHO_T}$MYSQL_BASEDIR" >&6
-
-
-
-
-
-
-  echo "$as_me:$LINENO: checking for MYSQL_INCLUDEDIR" >&5
-echo $ECHO_N "checking for MYSQL_INCLUDEDIR... $ECHO_C" >&6
-
-  if test -z "$MYSQL_INCLUDEDIR"
-  then
-
-
-# Check whether --with-mysql-includedir or --without-mysql-includedir was given.
-if test "${with_mysql_includedir+set}" = set; then
-  withval="$with_mysql_includedir"
-
-                  if test "$withval" != "yes"
-                  then
-                    MYSQL_INCLUDEDIR="$withval"
-                  fi
-
-
-fi;
-  fi
-
-  if test -z "$MYSQL_INCLUDEDIR"
-  then
-    if test -n "$MYSQL_BASEDIR"
-    then
-      MYSQL_INCLUDEDIR="$MYSQL_BASEDIR"
-    fi
-  fi
-
-
-  echo "$as_me:$LINENO: result: $MYSQL_INCLUDEDIR" >&5
-echo "${ECHO_T}$MYSQL_INCLUDEDIR" >&6
-
-
-
-
-
-
-  echo "$as_me:$LINENO: checking for MYSQL_LIBDIR" >&5
-echo $ECHO_N "checking for MYSQL_LIBDIR... $ECHO_C" >&6
-
-  if test -z "$MYSQL_LIBDIR"
-  then
-
-# Check whether --with-mysql-libdir or --without-mysql-libdir was given.
-if test "${with_mysql_libdir+set}" = set; then
-  withval="$with_mysql_libdir"
-
-                  if test "$withval" != "yes"
-                  then
-                    MYSQL_LIBDIR="$withval"
-                  fi
-
-
-fi;
-  fi
-
-
-  if test -z "$MYSQL_LIBDIR"
-  then
-    if test -n "$MYSQL_BASEDIR"
-    then
-      MYSQL_LIBDIR="$MYSQL_BASEDIR/lib/mysql"
-    fi
-  fi
-
-
-  echo "$as_me:$LINENO: result: $MYSQL_LIBDIR" >&5
-echo "${ECHO_T}$MYSQL_LIBDIR" >&6
-
-
-
-
-
-
-
-
-
-
-

 dist_version=$(echo ${SLIC_VERSION} | sed -e 's/[a-z]/\_/g' -e 's/^_//g')
 
 dist_version=${dist_version}"-geant4-"$(echo ${GEANT4_VERSION} | sed -e 's/[a-z]/\_/g' -e 's/^_//g')

@@ -4009,9 +3877,6 @@

 s,@HEPPDT_DIR_ORIG@,$HEPPDT_DIR_ORIG,;t t
 s,@LCDETECTORS_BASEDIR@,$LCDETECTORS_BASEDIR,;t t
 s,@LCDETECTORS_VERSION@,$LCDETECTORS_VERSION,;t t

-s,@MYSQL_BASEDIR@,$MYSQL_BASEDIR,;t t
-s,@MYSQL_INCLUDEDIR@,$MYSQL_INCLUDEDIR,;t t
-s,@MYSQL_LIBDIR@,$MYSQL_LIBDIR,;t t

 s,@dist_tarball@,$dist_tarball,;t t
 s,@dist_tarball_current@,$dist_tarball_current,;t t
 s,@dist_version@,$dist_version,;t t