diff -u -r1.40 -r1.41
--- configure	19 Jun 2007 23:55:37 -0000	1.40
+++ configure	12 Jul 2007 18:08:25 -0000	1.41
@@ -1,6 +1,6 @@

 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.

-# Generated by GNU Autoconf 2.57 for LCDD v1r12p9.

+# Generated by GNU Autoconf 2.57 for LCDD v2r0p0.

 #
 # Report bugs to <[log in to unmask]>.
 #

@@ -268,8 +268,8 @@

 # Identity of this package.
 PACKAGE_NAME='LCDD'
 PACKAGE_TARNAME='lcdd'

-PACKAGE_VERSION='v1r12p9'
-PACKAGE_STRING='LCDD v1r12p9'

+PACKAGE_VERSION='v2r0p0'
+PACKAGE_STRING='LCDD v2r0p0'

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

@@ -746,7 +746,7 @@

   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF

-\`configure' configures LCDD v1r12p9 to adapt to many kinds of systems.

+\`configure' configures LCDD v2r0p0 to adapt to many kinds of systems.

 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 

@@ -803,7 +803,7 @@

 
 if test -n "$ac_init_help"; then
   case $ac_init_help in

-     short | recursive ) echo "Configuration of LCDD v1r12p9:";;

+     short | recursive ) echo "Configuration of LCDD v2r0p0:";;

    esac
   cat <<\_ACEOF
 

@@ -905,7 +905,7 @@

 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF

-LCDD configure v1r12p9

+LCDD configure v2r0p0

 generated by GNU Autoconf 2.57
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002

@@ -920,7 +920,7 @@

 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 

-It was created by LCDD $as_me v1r12p9, which was

+It was created by LCDD $as_me v2r0p0, which was

 generated by GNU Autoconf 2.57.  Invocation command line was
 
   $ $0 $@

@@ -2558,6 +2558,78 @@

+
+echo "$as_me:$LINENO: checking whether to enable Geant4 NIST service" >&5
+echo $ECHO_N "checking whether to enable Geant4 NIST service... $ECHO_C" >&6
+
+if test -e $G4INSTALL/source/materials/include/G4NistManager.hh; then
+  cat >>confdefs.h <<\_ACEOF
+#define HAVE_G4NIST 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
+
+
+
+
+echo "$as_me:$LINENO: checking whether G4PVPlacement::CheckOverlaps is supported" >&5
+echo $ECHO_N "checking whether G4PVPlacement::CheckOverlaps is supported... $ECHO_C" >&6
+
+if test "X$(grep CheckOverlaps $G4INSTALL/source/geometry/volumes/include/G4PVPlacement.hh)" != "X"; then
+  cat >>confdefs.h <<\_ACEOF
+#define HAVE_G4PVPLACEMENT_CHECKOVERLAPS 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
+
+
+
+
+echo "$as_me:$LINENO: checking whether G4LogicalVolume::GetMass is supported" >&5
+echo $ECHO_N "checking whether G4LogicalVolume::GetMass is supported... $ECHO_C" >&6
+
+if test "X$(grep GetMass $G4INSTALL/source/geometry/management/include/G4LogicalVolume.hh)" != "X"; then
+  cat >>confdefs.h <<\_ACEOF
+#define HAVE_G4LOGICALVOLUME_GETMASS 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
+
+
+
+
+echo "$as_me:$LINENO: checking whether G4Region::SetUserLimits is supported" >&5
+echo $ECHO_N "checking whether G4Region::SetUserLimits is supported... $ECHO_C" >&6
+
+if test "X$(grep SetUserLimits $G4INSTALL/source/geometry/management/include/G4Region.hh)" != "X"; then
+  cat >>confdefs.h <<\_ACEOF
+#define HAVE_G4REGION_SETUSERLIMITS 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
+
+
+

 # CLHEP
 
 

@@ -3251,7 +3323,7 @@

 } >&5
 cat >&5 <<_CSEOF
 

-This file was extended by LCDD $as_me v1r12p9, which was

+This file was extended by LCDD $as_me v2r0p0, which was

 generated by GNU Autoconf 2.57.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES

@@ -3306,7 +3378,7 @@

 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\

-LCDD config.status v1r12p9

+LCDD config.status v2r0p0

 configured by $0, generated by GNU Autoconf 2.57,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 

@@ -3760,6 +3832,4 @@

 echo
 echo "  gmake"
 echo

-echo "Once the build completes, the library should be found at $LCDD_BASE/lib/$G4SYSTEM/liblcdd.a."
-echo
-echo "Thank you for using the LCDD package."

+echo "The library should be found at $LCDD_BASE/lib/$G4SYSTEM/liblcdd.a when the build completes."

diff -u -r1.37 -r1.38
--- configure.ac	19 Jun 2007 23:55:37 -0000	1.37
+++ configure.ac	12 Jul 2007 18:08:25 -0000	1.38
@@ -1,4 +1,4 @@

-# $Header: /cvs/lcd/lcdd/configure.ac,v 1.37 2007/06/19 23:55:37 jeremy Exp $

+# $Header: /cvs/lcd/lcdd/configure.ac,v 1.38 2007/07/12 18:08:25 jeremy Exp $

 #
 # Process this file with autoconf to produce a configure script for LCDD.
 #

@@ -16,7 +16,7 @@

 
 # package info
 AC_PREREQ(2.57)

-AC_INIT(LCDD,v1r12p9, [log in to unmask])

+AC_INIT(LCDD,v2r0p0, [log in to unmask])

 AC_CONFIG_SRCDIR([src/volumeExtendedSubscriber.cc])
 
 # Checks for programs.

@@ -32,32 +32,36 @@

 # checks for required packages
 
 # G4

-SIM_SETUP_G4()

+SIM_SETUP_G4
+AC_HAVE_G4NIST
+AC_HAVE_G4PVPLACEMENT_CHECKOVERLAPS
+AC_HAVE_G4LOGICALVOLUME_GETMASS
+AC_HAVE_G4REGION_SETUSERLIMITS

 
 # CLHEP

-SIM_SETUP_CLHEP()

+SIM_SETUP_CLHEP

 
 # Xerces

-SIM_SETUP_XERCES()
-SIM_WITH_XERCES_LIBNAME()

+SIM_SETUP_XERCES
+SIM_WITH_XERCES_LIBNAME

 
 # GDML

-SIM_SETUP_GDML()

+SIM_SETUP_GDML

 
 # LCDD

-SIM_SETUP_LCDD()

+SIM_SETUP_LCDD

 
 # schema install

-LCDD_WITH_SCHEMA_INSTALL_DIR()

+LCDD_WITH_SCHEMA_INSTALL_DIR

 
 # verbose
 ENABLE_VERBOSE
 
 # Doxygen

-SIM_SETUP_DOXYGEN()

+SIM_SETUP_DOXYGEN

 
 # Set VERSION file

-SIM_CREATE_VERSION_FILE()

+SIM_CREATE_VERSION_FILE

 
 # substitute DEFS and CXXFLAGS
 AC_SUBST([CXXFLAGS])

@@ -70,7 +74,7 @@

 	"
 
 AC_CONFIG_FILES(${MAKEFILES})

-AC_OUTPUT()

+AC_OUTPUT

 
 # completion mesg
 echo "Done."

@@ -84,6 +88,4 @@

 echo
 echo "  gmake"
 echo

-echo "Once the build completes, the library should be found at $LCDD_BASE/lib/$G4SYSTEM/liblcdd.a."
-echo
-echo "Thank you for using the LCDD package."

+echo "The library should be found at $LCDD_BASE/lib/$G4SYSTEM/liblcdd.a when the build completes."