diff -u -r1.13 -r1.14
--- geant4.m4	28 Mar 2011 20:37:38 -0000	1.13
+++ geant4.m4	2 May 2011 20:57:57 -0000	1.14
@@ -78,6 +78,28 @@

 
 ])
 

+dnl
+dnl Check if G4's embedded GDML should be enabled.  
+dnl This has no effect on standalone GDML package used by LCDD.
+dnl
+AC_DEFUN(AC_ENABLE_G4GDML, [
+
+AC_MSG_CHECKING(whether to enable Geant4 embedded GDML lib)
+
+AC_ARG_ENABLE([g4gdml],
+              AC_HELP_STRING([--enable-g4gdml],
+                             [Enable or disable embedded Geant4 GDML lib.])
+             )
+
+if test "${enable_g4gdml}" != "no"; then
+  G4LIB_BUILD_GDML=1
+  AC_MSG_RESULT(yes)
+else
+  AC_MSG_RESULT(no)
+fi
+
+])
+

 dnl Setup Geant4.
 AC_DEFUN(AC_GEANT4, [
 

@@ -144,6 +166,9 @@

 dnl Config verbose setting.  No verbose means better performance.
 AC_ENABLE_G4VERBOSE
 

+dnl Config Geant4 embedded GDML lib.
+AC_ENABLE_G4GDML
+

 dnl Setting for G4 physics lists.
 AC_ENABLE_G4NEUTRONHP_NEGLECT_DOPPLER
 

@@ -199,6 +224,7 @@

 AC_SUBST(G4UI_USE_QT)
 AC_SUBST(G4VIS_BUILD_OPENGLQT_DRIVER)
 AC_SUBST(G4VIS_USE_OPENGLQT)

+AC_SUBST(G4LIB_BUILD_GDML)

 
 ])