lcdd

diff -u -r1.11 -r1.12
--- aclocal.m4	12 Jul 2007 18:09:00 -0000	1.11
+++ aclocal.m4	24 Sep 2007 18:36:04 -0000	1.12
@@ -1,4 +1,4 @@

-dnl $Header: /cvs/lcd/lcdd/aclocal.m4,v 1.11 2007/07/12 18:09:00 jeremy Exp $

+dnl $Header: /cvs/lcd/lcdd/aclocal.m4,v 1.12 2007/09/24 18:36:04 jeremy Exp $

 dnl
 dnl local m4 macros for SLIC autoconf
 dnl

@@ -49,9 +49,10 @@

 dnl Macro to check whether NIST is supported by the current Geant4 version
 AC_DEFUN(AC_HAVE_G4NIST, [
 

-AC_MSG_CHECKING(whether to enable Geant4 NIST service)

+AC_MSG_CHECKING(whether Geant4 NIST service is supported)

 
 if test -e $G4INSTALL/source/materials/include/G4NistManager.hh; then

+  HAVE_G4NIST=1

   AC_DEFINE(HAVE_G4NIST)
   AC_MSG_RESULT(yes)
 else

@@ -60,6 +61,25 @@

 
 ])
 

+dnl Macro to check whether to enable NIST.
+AC_DEFUN(AC_USE_G4NIST, [
+
+AC_MSG_CHECKING(whether to enable NIST)
+
+AC_ARG_ENABLE([nist],
+        AC_HELP_STRING([--enable-nist=<yes|no>], [Enable NIST material lookup in Geant4.]),
+        ,
+        )
+
+if test "${enable_nist}" = "yes" && test -n "${HAVE_NIST}"; then
+  AC_DEFINE(USE_G4NIST)
+  AC_MSG_RESULT(yes)
+else
+  AC_MSG_RESULT(no)
+fi
+
+])
+

 dnl Macro to check whether G4PVPlacement::CheckOverlaps is supported.
 AC_DEFUN(AC_HAVE_G4PVPLACEMENT_CHECKOVERLAPS, [
 

lcdd

diff -u -r1.42 -r1.43
--- configure	12 Jul 2007 18:09:27 -0000	1.42
+++ configure	24 Sep 2007 18:36:04 -0000	1.43
@@ -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-nist=<yes|no>  Enable NIST material lookup in Geant4.

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

@@ -2563,6 +2564,7 @@

 echo $ECHO_N "checking whether to enable Geant4 NIST service... $ECHO_C" >&6
 
 if test -e $G4INSTALL/source/materials/include/G4NistManager.hh; then

+  HAVE_G4NIST=1

   cat >>confdefs.h <<\_ACEOF
 #define HAVE_G4NIST 1
 _ACEOF

@@ -2577,6 +2579,30 @@

+echo "$as_me:$LINENO: checking whether to enable NIST" >&5
+echo $ECHO_N "checking whether to enable NIST... $ECHO_C" >&6
+
+# Check whether --enable-nist or --disable-nist was given.
+if test "${enable_nist+set}" = set; then
+  enableval="$enable_nist"
+
+fi;
+
+if test "${enable_nist}" = "yes" && test -n "${HAVE_NIST}"; then
+  cat >>confdefs.h <<\_ACEOF
+#define USE_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
 

lcdd

diff -u -r1.39 -r1.40
--- configure.ac	12 Jul 2007 18:09:27 -0000	1.39
+++ configure.ac	24 Sep 2007 18:36:04 -0000	1.40
@@ -1,4 +1,4 @@

-# $Header: /cvs/lcd/lcdd/configure.ac,v 1.39 2007/07/12 18:09:27 jeremy Exp $

+# $Header: /cvs/lcd/lcdd/configure.ac,v 1.40 2007/09/24 18:36:04 jeremy Exp $

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

@@ -34,6 +34,7 @@

 # G4
 SIM_SETUP_G4
 AC_HAVE_G4NIST

+AC_USE_G4NIST

 AC_HAVE_G4PVPLACEMENT_CHECKOVERLAPS
 AC_HAVE_G4LOGICALVOLUME_GETMASS
 AC_HAVE_G4REGION_SETUSERLIMITS

lcdd/include

diff -u -r1.2 -r1.3
--- NistWriter.hh	12 Jul 2007 18:09:00 -0000	1.2
+++ NistWriter.hh	24 Sep 2007 18:36:04 -0000	1.3
@@ -1,8 +1,8 @@

+#ifdef USE_G4NIST
+

 #ifndef NISTWRITER_HH
 #define NISTWRITER_HH 1
 

-#ifdef HAVE_G4NIST
-

 #include <string>
 
 class NistWriter

lcdd/include

diff -u -r1.2 -r1.3
--- NistWriterMessenger.hh	12 Jul 2007 18:09:00 -0000	1.2
+++ NistWriterMessenger.hh	24 Sep 2007 18:36:04 -0000	1.3
@@ -1,8 +1,8 @@

+#ifdef USE_G4NIST
+

 #ifndef NISTWRITERMESSENGER_HH
 #define NISTWRITERMESSENGER_HH 1
 

-#ifdef HAVE_G4NIST
-

 #include "G4UImessenger.hh"
 #include "G4UIcmdWithAString.hh"
 

lcdd/src

diff -u -r1.2 -r1.3
--- NistWriter.cc	12 Jul 2007 18:09:01 -0000	1.2
+++ NistWriter.cc	24 Sep 2007 18:36:04 -0000	1.3
@@ -1,6 +1,6 @@

-#include "NistWriter.hh"

+#ifdef USE_G4NIST

-#ifdef HAVE_G4NIST

+#include "NistWriter.hh"

 
 #include "G4NistManager.hh"
 #include "G4Material.hh"

lcdd/src

diff -u -r1.2 -r1.3
--- NistWriterMessenger.cc	12 Jul 2007 18:09:01 -0000	1.2
+++ NistWriterMessenger.cc	24 Sep 2007 18:36:04 -0000	1.3
@@ -1,6 +1,6 @@

-#include "NistWriterMessenger.hh"

+#ifdef USE_G4NIST

-#ifdef HAVE_G4NIST

+#include "NistWriterMessenger.hh"

 
 // lcdd
 #include "NistWriter.hh"