Commit in SimDist on MAIN
configure+3-21.24 -> 1.25
build/packages.m4+2-31.8 -> 1.9
+5-5
2 modified files
JM: Make GDML use Geant4 granular libs

SimDist
configure 1.24 -> 1.25
diff -u -r1.24 -r1.25
--- configure	31 Mar 2006 21:36:45 -0000	1.24
+++ configure	6 Apr 2006 20:08:41 -0000	1.25
@@ -2680,17 +2680,18 @@
 
 
 
+  c="--enable-shared-libs=no --enable-geant4-granular-libs"
 
 
 f=$sim_packages_dir/gdml/package.gmk.in
 
 echo "export PACKAGE_CONFIG_OPTS = @gdml_config_opts@" >> $f ;
 
-if test -z "--enable-shared-libs=no"
+if test -z "${c}"
 then
   v=`eval echo $gdml_config_opts`
 else
-  v=--enable-shared-libs=no
+  v=${c}
 fi
 
 gdml_config_opts=$v

SimDist/build
packages.m4 1.8 -> 1.9
diff -u -r1.8 -r1.9
--- packages.m4	31 Mar 2006 21:37:29 -0000	1.8
+++ packages.m4	6 Apr 2006 20:08:41 -0000	1.9
@@ -61,8 +61,6 @@
 gdml )
 
   gdml_version=${package_version}
-dnl  gdml_version_underscore=$(VERSION_UNDERSCORE(gdml_version_underscore, ${gdml_version}))
-dnl  gdml_url="http://simu.cvs.cern.ch/cgi-bin/simu.cgi/simu/GDML2/GDML2.tar.gz?tarball=1&only_with_tag=GDML_"${gdml_version_underscore}
   gdml_url="http://simu.cvs.cern.ch/cgi-bin/simu.cgi/simu/GDML2/GDML2.tar.gz?tarball=1&only_with_tag="${package_version}
 
   PACKAGE_MAKEVAR(gdml, PACKAGE,             gdml,             [gdml])
@@ -73,7 +71,8 @@
   PACKAGE_MAKEVAR(gdml, PACKAGE_TGZ_LOCAL,   gdml_tgz_local,   [gdml.tar.gz])
   PACKAGE_MAKEVAR(gdml, PACKAGE_DIR_ORIG,    gdml_dir_orig,    GDML2)
   PACKAGE_MAKEVAR(gdml, PACKAGE_DOWNLOAD,    gdml_download,    [\"${gdml_url}\"])
-  PACKAGE_MAKEVAR(gdml, PACKAGE_CONFIG_OPTS, gdml_config_opts, [--enable-shared-libs=no])
+  _c="--enable-shared-libs=no --enable-geant4-granular-libs"
+  PACKAGE_MAKEVAR(gdml, PACKAGE_CONFIG_OPTS, gdml_config_opts, ${_c})
 
   ;;
 
CVSspam 0.2.8