diff -u -r1.20 -r1.21
--- configure	21 Feb 2006 22:34:42 -0000	1.20
+++ configure	21 Feb 2006 22:40:23 -0000	1.21
@@ -273,7 +273,7 @@

 PACKAGE_STRING='SimDist v1r0p0'
 [log in to unmask]
 

-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 SET_MAKE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT have_cvs CVS have_java JAVA have_wget WGET have_scp SCP host_os platform compiler os_shared_libs_var sim_dist_dir_basename packages_dep_order packages_reverse_dep_order download_script cvs_script patch_script gen_files sim_dist_dir sim_packages_dir sim_build_dir sim_scripts_dir USE_OGL OGLHOME clhep_version_dot clhep clhep_version clhep_package_dir clhep_base_dir clep_build_dir clhep_tgz_local clhep_dir_orig clhep_download clhep_config_opts gdml_version_underscore gdml gdml_version gdml_package_dir gdml!
 _base_dir gdml_build_dir gdml_tgz_local gdml_dir_orig gdml_download gdml_config_opts g4system geant4_version_download geant4 geant4_version geant4_package_dir geant4_base_dir geant4_build_dir geant4_tgz_local geant4_dir_orig geant4_download lcdd lcdd_version lcdd_package_dir lcdd_base_dir lcdd_build_dir lcdd_cvsroot lcio lcio_version lcio_package_dir lcio_base_dir lcio_build_dir lcio_cvsroot lcphys lcphys_version lcphys_package_dir lcphys_base_dir lcphys_cvsmodule lcphys_cvsroot slic slic_version slic_package_dir slic_base_dir slic_cvsroot xerces_configure_args xerces_version_underscore xerces xerces_version xerces_package_dir xerces_base_dir xerces_build_dir xerces_config xerces_tgz_local xerces_config_opts xerces_download xerces_dir_orig dist_tarball dist_tarball_current dist_version bin_tarball dist_dir 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 SET_MAKE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT have_cvs CVS have_java JAVA have_wget WGET have_scp SCP host_os platform compiler os_shared_libs_var sim_dist_dir_basename packages_dep_order packages_reverse_dep_order download_script cvs_script patch_script gen_files sim_dist_dir sim_packages_dir sim_build_dir sim_scripts_dir USE_OGL OGLHOME clhep_version_dot clhep clhep_version clhep_package_dir clhep_base_dir clep_build_dir clhep_tgz_local clhep_dir_orig clhep_download clhep_config_opts gdml gdml_version gdml_package_dir gdml_base_dir gdml_build_dir gdml_tgz_local gdml_dir_orig gdml_dow!
 nload gdml_config_opts g4system geant4_version_download geant4 geant4_version geant4_package_dir geant4_base_dir geant4_build_dir geant4_tgz_local geant4_dir_orig geant4_download lcdd lcdd_version lcdd_package_dir lcdd_base_dir lcdd_build_dir lcdd_cvsroot lcio lcio_version lcio_package_dir lcio_base_dir lcio_build_dir lcio_cvsroot lcphys lcphys_version lcphys_package_dir lcphys_base_dir lcphys_cvsmodule lcphys_cvsroot slic slic_version slic_package_dir slic_base_dir slic_cvsroot xerces_configure_args xerces_version_underscore xerces xerces_version xerces_package_dir xerces_base_dir xerces_build_dir xerces_config xerces_tgz_local xerces_config_opts xerces_download xerces_dir_orig dist_tarball dist_tarball_current dist_version bin_tarball dist_dir LIBOBJS LTLIBOBJS'

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

@@ -2599,13 +2599,7 @@

 gdml )
 
   gdml_version=${package_version}

-  gdml_version_underscore=$(
-  v=$(echo ${gdml_version} | sed -e 's/[vrp]/_/g' -e 's/^_//g')
-  gdml_version_underscore=$v
-
-  echo $v
-)
-  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}

@@ -4362,7 +4356,6 @@

 s,@clhep_dir_orig@,$clhep_dir_orig,;t t
 s,@clhep_download@,$clhep_download,;t t
 s,@clhep_config_opts@,$clhep_config_opts,;t t

-s,@gdml_version_underscore@,$gdml_version_underscore,;t t

 s,@gdml@,$gdml,;t t
 s,@gdml_version@,$gdml_version,;t t
 s,@gdml_package_dir@,$gdml_package_dir,;t t