diff -u -r1.17 -r1.18
--- configure	30 Mar 2006 19:45:48 -0000	1.17
+++ configure	31 Mar 2006 01:09:18 -0000	1.18
@@ -273,7 +273,7 @@

 [log in to unmask]
 
 ac_unique_file="src/volumeExtendedSubscriber.cc"

-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 CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC SET_MAKE G4_PREFIX G4WORKDIR G4SYSTEM CLHEP_PREFIX XERCES_PREFIX XERCES_LIBNAME GDML_PREFIX GDML_PLATFORM GDML_SITE LCDD_PREFIX SCHEMA_INSTALL_DIR DOXYGEN 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 CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC SET_MAKE G4_PREFIX G4WORKDIR G4SYSTEM CLHEP_PREFIX XERCES_PREFIX XERCES_LIBNAME GDML_PREFIX GDML_PLATFORM LCDD_PREFIX SCHEMA_INSTALL_DIR DOXYGEN LIBOBJS LTLIBOBJS'

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

@@ -810,6 +810,7 @@

 Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]

+  --enable-verbose        set G4VERBOSE

   --enable-version=<yes|no>
                           Rewrite the VERSION file.
 

@@ -825,8 +826,6 @@

   --with-gdml-platform=<platform description>
                           description of platform for GDML, e.g.
                           Linux_gcc323.[PLATFORM]

-  --with-gdml-site=<site description>
-                          description of site, e.g. SLAC. [SITE]

   --with-schema-install-dir=<schema installation directory>
                           directory where schemas should be copied
 

@@ -2524,12 +2523,10 @@

-# set work dir

 G4WORKDIR=${LCDD_BASE}
 
 
 

-# try to derive G4SYSTEM if not set

 
 echo "$as_me:$LINENO: checking whether G4SYSTEM is set in your environment" >&5
 echo $ECHO_N "checking whether G4SYSTEM is set in your environment... $ECHO_C" >&6

@@ -2560,8 +2557,6 @@

-# libs/includes will be magically setup by Geant4 binmake.
-

 
 # CLHEP
 

@@ -2602,8 +2597,6 @@

-# libs/includes will be setup by Geant4 binmake.
-

 
 
 # Xerces

@@ -2673,7 +2666,6 @@

 echo "$as_me:$LINENO: checking for GDML installation" >&5
 echo $ECHO_N "checking for GDML installation... $ECHO_C" >&6
 

-# base dir

 
 # Check whether --with-gdml or --without-gdml was given.
 if test "${with_gdml+set}" = set; then

@@ -2707,7 +2699,6 @@

-# platform

 
 # Check whether --with-gdml-platform or --without-gdml-platform was given.
 if test "${with_gdml_platform+set}" = set; then

@@ -2723,24 +2714,11 @@

     comp_guess=$CXX
 
     GDML_PLATFORM=${host_guess}"-"${comp_guess}

-
-#    AC_MSG_RESULT(No)
-#    AC_MSG_ERROR(GDML's PLATFORM variable must be set with --with-gdml-platform or PLATFORM env var) # not found

   fi
 fi
 
 
 

-# site
-
-# Check whether --with-gdml-site or --without-gdml-site was given.
-if test "${with_gdml_site+set}" = set; then
-  withval="$with_gdml_site"
-  GDML_SITE=${with_gdml_site}
-fi;
-
-
-

 
 
 # LCDD

@@ -2774,6 +2752,32 @@

 echo "${ECHO_T}${SCHEMA_INSTALL_DIR}" >&6
 
 

+# verbose
+
+
+echo "$as_me:$LINENO: checking whether to set G4VERBOSE" >&5
+echo $ECHO_N "checking whether to set G4VERBOSE... $ECHO_C" >&6
+
+# Check whether --enable-verbose or --disable-verbose was given.
+if test "${enable_verbose+set}" = set; then
+  enableval="$enable_verbose"
+
+fi;
+
+if test "${enable_verbose}" != "no"; then
+  cat >>confdefs.h <<\_ACEOF
+#define G4VERBOSE 1
+_ACEOF
+
+  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
+
+
+

 # Doxygen
 
 

@@ -2832,12 +2836,14 @@

 
 fi;
 

-echo "$as_me:$LINENO: result: $enable_version" >&5
-echo "${ECHO_T}$enable_version" >&6
-

 if test "${enable_version}" = "yes"; then

+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

   rm VERSION &> /dev/null
   echo "${PACKAGE_NAME} ${PACKAGE_VERSION}" > VERSION

+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 fi
 
 

@@ -3506,7 +3512,6 @@

 s,@XERCES_LIBNAME@,$XERCES_LIBNAME,;t t
 s,@GDML_PREFIX@,$GDML_PREFIX,;t t
 s,@GDML_PLATFORM@,$GDML_PLATFORM,;t t

-s,@GDML_SITE@,$GDML_SITE,;t t

 s,@LCDD_PREFIX@,$LCDD_PREFIX,;t t
 s,@SCHEMA_INSTALL_DIR@,$SCHEMA_INSTALL_DIR,;t t
 s,@DOXYGEN@,$DOXYGEN,;t t