diff -u -r1.101 -r1.102
--- configure	12 Jul 2011 21:46:38 -0000	1.101
+++ configure	23 Aug 2011 22:38:23 -0000	1.102
@@ -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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os SET_MAKE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT have_cvs CVS have_java JAVA JAVA_HOME JDK_HOME have_wget WGET have_scp SCP have_cmake CMAKE clhep_version gdml_version geant4_version heppdt_version lcdd_version lcio_version lcdetectors_version slic_version xerces_version OS_SHARED_LIBS_VAR SIMDIST_ENABLE_SHARED SLACCVSROOT SLACCVSUSER PACKAGE_NJOBS 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_scri!
 pts_dir SIMDIST_DISABLE_MALLOC_CHECK OGLHOME QTHOME clhep_version_dot CLHEP_BASEDIR CLHEP_BUILDDIR CLHEP_CONFIG_OPTS CLHEP_DIR_ORIG CLHEP_DOWNLOAD CLHEP_LIB_DIR CLHEP_VERSION GDML_BASEDIR GDML_BUILDDIR GDML_CONFIG_OPTS GDML_CVSMODULE GDML_VERSION GEANT4_VERSION_DOWNLOAD GEANT4_VERSION GEANT4_BUILDDIR GEANT4_DIR_ORIG GEANT4_DOWNLOAD G4NEUTRONHP_NEGLECT_DOPPLER G4SYSTEM G4INSTALL G4INCLUDE G4LIB G4LEVELGAMMADATA G4RADIOACTIVEDATA G4LEDATA G4ELASTICDATA G4DEBUG G4ANALYSIS_USE G4UI_BUILD_XAW_SESSION G4UI_USE_XAW G4UI_BUILD_XM_SESSION G4UI_USE_XM G4UI_BUILD_WIN32_SESSION G4UI_USE_WIN32 G4VIS_BUILD_DAWN_DRIVER G4VIS_BUILD_OPENGLX_DRIVER G4VIS_BUILD_OPENGLXM_DRIVER G4VIS_BUILD_OPENGLWIN32_DRIVER G4VIS_BUILD_OIX_DRIVER G4VIS_BUILD_RAYTRACERX_DRIVER G4VIS_BUILD_OIWIN32_DRIVER G4VIS_BUILD_VRML_DRIVER G4VIS_USE_DAWN G4VIS_USE_OPENGLX G4VIS_USE_OPENGLXM G4VIS_USE_OPENGLWIN32 G4VIS_USE_OIX G4VIS_USE_RAYTRACERX G4VIS_USE_OIWIN32 G4VIS_USE_VRML G4LIB_BUILD_G3TOG4 G4LIB_USE_G3TOG4 G4LIB_BU!
 ILD_ZLIB G4LIB_USE_ZLIB G4LIB_BUILD_SHARED G4LIB_BUILD_STATIC !
 G4LIB_US
E_GRANULAR G4UI_USE_TCSH G4WORKDIR G4UI_NONE G4VIS_NONE G4VIS_BUILD_OPENGL_DRVIER G4VIS_USE_OPENGL G4VIS_BUILD_OPENGL G4VERBOSE G4UI_BUILD_QT_SESSION G4UI_USE_QT G4VIS_BUILD_OPENGLQT_DRIVER G4VIS_USE_OPENGLQT G4LIB_BUILD_GDML LCDD_BASEDIR LCDD_VERSION LCDD_CONFIG_OPTS LCIO_BASEDIR LCIO_BUILDDIR LCIO_VERSION LCIO_CMAKE_BUILD_SHARED SLIC_BINNAME SLIC_VERSION SLIC_BASEDIR SLIC_CONFIG_OPTS xerces_version_dot XERCES_VERSION XERCES_BASEDIR XERCES_BUILDDIR XERCES_DIR_ORIG XERCES_DOWNLOAD XERCES_CONFIG XERCES_CONFIG_OPTS HEPPDT_CONFIG_OPTS HEPPDT_BASEDIR HEPPDT_BUILDDIR HEPPDT_DOWNLOAD HEPPDT_VERSION HEPPDT_DIR_ORIG LCDETECTORS_BASEDIR LCDETECTORS_VERSION dist_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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os SET_MAKE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT have_cvs CVS have_java JAVA JAVA_HOME JDK_HOME have_wget WGET have_scp SCP have_cmake CMAKE have_svn SVN clhep_version gdml_version geant4_version heppdt_version lcdd_version lcio_version lcdetectors_version slic_version xerces_version OS_SHARED_LIBS_VAR SIMDIST_ENABLE_SHARED SLACCVSROOT SLACCVSUSER PACKAGE_NJOBS 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_d!
 ir sim_scripts_dir SIMDIST_DISABLE_MALLOC_CHECK OGLHOME QTHOME clhep_version_dot CLHEP_BASEDIR CLHEP_BUILDDIR CLHEP_CONFIG_OPTS CLHEP_DIR_ORIG CLHEP_DOWNLOAD CLHEP_LIB_DIR CLHEP_VERSION GDML_BASEDIR GDML_BUILDDIR GDML_CONFIG_OPTS GDML_CVSMODULE GDML_VERSION GEANT4_VERSION_DOWNLOAD GEANT4_VERSION GEANT4_BUILDDIR GEANT4_DIR_ORIG GEANT4_DOWNLOAD G4NEUTRONHP_NEGLECT_DOPPLER G4SYSTEM G4INSTALL G4INCLUDE G4LIB G4LEVELGAMMADATA G4RADIOACTIVEDATA G4LEDATA G4ELASTICDATA G4DEBUG G4ANALYSIS_USE G4UI_BUILD_XAW_SESSION G4UI_USE_XAW G4UI_BUILD_XM_SESSION G4UI_USE_XM G4UI_BUILD_WIN32_SESSION G4UI_USE_WIN32 G4VIS_BUILD_DAWN_DRIVER G4VIS_BUILD_OPENGLX_DRIVER G4VIS_BUILD_OPENGLXM_DRIVER G4VIS_BUILD_OPENGLWIN32_DRIVER G4VIS_BUILD_OIX_DRIVER G4VIS_BUILD_RAYTRACERX_DRIVER G4VIS_BUILD_OIWIN32_DRIVER G4VIS_BUILD_VRML_DRIVER G4VIS_USE_DAWN G4VIS_USE_OPENGLX G4VIS_USE_OPENGLXM G4VIS_USE_OPENGLWIN32 G4VIS_USE_OIX G4VIS_USE_RAYTRACERX G4VIS_USE_OIWIN32 G4VIS_USE_VRML G4LIB_BUILD_G3TOG4 G4LIB_USE_G3TO!
 G4 G4LIB_BUILD_ZLIB G4LIB_USE_ZLIB G4LIB_BUILD_SHARED G4LIB_BU!
 ILD_STAT
IC G4LIB_USE_GRANULAR G4UI_USE_TCSH G4WORKDIR G4UI_NONE G4VIS_NONE G4VIS_BUILD_OPENGL_DRVIER G4VIS_USE_OPENGL G4VIS_BUILD_OPENGL G4VERBOSE G4UI_BUILD_QT_SESSION G4UI_USE_QT G4VIS_BUILD_OPENGLQT_DRIVER G4VIS_USE_OPENGLQT G4LIB_BUILD_GDML LCDD_BASEDIR LCDD_VERSION LCDD_CONFIG_OPTS LCIO_BASEDIR LCIO_BUILDDIR LCIO_VERSION LCIO_CMAKE_BUILD_SHARED LCIO_SVN_URL SLIC_BINNAME SLIC_VERSION SLIC_BASEDIR SLIC_CONFIG_OPTS xerces_version_dot XERCES_VERSION XERCES_BASEDIR XERCES_BUILDDIR XERCES_DIR_ORIG XERCES_DOWNLOAD XERCES_CONFIG XERCES_CONFIG_OPTS HEPPDT_CONFIG_OPTS HEPPDT_BASEDIR HEPPDT_BUILDDIR HEPPDT_DOWNLOAD HEPPDT_VERSION HEPPDT_DIR_ORIG LCDETECTORS_BASEDIR LCDETECTORS_VERSION dist_tarball dist_dir LIBOBJS LTLIBOBJS'

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

@@ -1312,6 +1312,18 @@

+clhep_version="v2r1p0_1"
+gdml_version="HEAD"
+geant4_version="v9r4p02"
+heppdt_version="3.03.02"
+lcdd_version="HEAD"
+lcdetectors_version="HEAD"
+#lcio_version="HEAD"
+# NOTE: The LCIO version conforms to tag conventions in the svn.
+lcio_version="v01-60"
+slic_version="v2r10p7"
+xerces_version="v3r1p1"
+

 ac_aux_dir=
 for ac_dir in ${srcdir}/build $srcdir/${srcdir}/build; do
   if test -f $ac_dir/install-sh; then

@@ -2244,16 +2256,55 @@

+  # Extract the first word of "svn", so it can be a program name with args.
+set dummy svn; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_have_svn+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$have_svn"; then
+  ac_cv_prog_have_svn="$have_svn" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_have_svn="yes"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_prog_have_svn" && ac_cv_prog_have_svn="no"
+fi
+fi
+have_svn=$ac_cv_prog_have_svn
+if test -n "$have_svn"; then
+  echo "$as_me:$LINENO: result: $have_svn" >&5
+echo "${ECHO_T}$have_svn" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+
+  if test $have_svn == "no"
+  then
+    { { echo "$as_me:$LINENO: error: svn not found" >&5
+echo "$as_me: error: svn not found" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    SVN=svn
+
+  fi
+
+

-clhep_version="v2r1p0_1"
-gdml_version="HEAD"
-geant4_version="v9r4p02"
-heppdt_version="3.03.02"
-lcdd_version="HEAD"
-lcdetectors_version="HEAD"
-lcio_version="HEAD"
-slic_version="v2r10p7"
-xerces_version="v3r1p1"

@@ -2865,6 +2916,7 @@

 
 package_version=$(eval echo \${${package_name}_version})
 

+

 if test -z $package_version
 then
   { { echo "$as_me:$LINENO: error: $package_name version was not set." >&5

@@ -3245,9 +3297,19 @@

 
 
 LCIO_VERSION=${package_version}

+
+

 LCIO_BASEDIR=$package_base_dir
 LCIO_BUILDDIR=${package_base_dir}/src/cpp
 

+lcio_svn_base=svn://svn.freehep.org/lcio/
+
+if test "${LCIO_VERSION}" == "HEAD"; then
+  LCIO_SVN_URL=${lcio_svn_base}/trunk
+else
+  LCIO_SVN_URL=${lcio_svn_base}/tags/${LCIO_VERSION}
+fi
+

 if test "${SIMDIST_ENABLE_SHARED}" == "1"; then
   LCIO_CMAKE_BUILD_SHARED="ON"
 else

@@ -4182,6 +4244,8 @@

 s,@SCP@,$SCP,;t t
 s,@have_cmake@,$have_cmake,;t t
 s,@CMAKE@,$CMAKE,;t t

+s,@have_svn@,$have_svn,;t t
+s,@SVN@,$SVN,;t t

 s,@clhep_version@,$clhep_version,;t t
 s,@gdml_version@,$gdml_version,;t t
 s,@geant4_version@,$geant4_version,;t t

@@ -4288,6 +4352,7 @@

 s,@LCIO_BUILDDIR@,$LCIO_BUILDDIR,;t t
 s,@LCIO_VERSION@,$LCIO_VERSION,;t t
 s,@LCIO_CMAKE_BUILD_SHARED@,$LCIO_CMAKE_BUILD_SHARED,;t t

+s,@LCIO_SVN_URL@,$LCIO_SVN_URL,;t t

 s,@SLIC_BINNAME@,$SLIC_BINNAME,;t t
 s,@SLIC_VERSION@,$SLIC_VERSION,;t t
 s,@SLIC_BASEDIR@,$SLIC_BASEDIR,;t t

diff -u -r1.20 -r1.21
--- configure.in	12 Jul 2011 21:46:38 -0000	1.20
+++ configure.in	23 Aug 2011 22:38:23 -0000	1.21
@@ -1,4 +1,4 @@

-dnl $Header: /cvs/lcd/SimDist/configure.in,v 1.20 2011/07/12 21:46:38 jeremy Exp $

+dnl $Header: /cvs/lcd/SimDist/configure.in,v 1.21 2011/08/23 22:38:23 jeremy Exp $

 dnl
 dnl Process this file with autoconf to produce the configure script for SimDist.
 dnl

@@ -11,6 +11,23 @@

 	v1r0p0,
 	[log in to unmask])
 

+dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
+dnl Default package version tags in 'v#r#p#' format (mostly) or 'HEAD' for CVS head.
+dnl These may all be overridden by user settings from configure arguments.
+dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
+clhep_version="v2r1p0_1"
+gdml_version="HEAD"
+geant4_version="v9r4p02"
+dnl TODO: change heppdt to vrp format
+heppdt_version="3.03.02"
+lcdd_version="HEAD"
+lcdetectors_version="HEAD"
+#lcio_version="HEAD"
+# NOTE: The LCIO version conforms to tag conventions in the svn.
+lcio_version="v01-60"
+slic_version="v2r10p7"
+xerces_version="v3r1p1"
+

 dnl Autoconf's expected aux files are here.
 AC_CONFIG_AUX_DIR(${srcdir}/build)
 

@@ -25,23 +42,12 @@

 AC_PROG_WGET
 AC_PROG_SCP
 AC_PROG_CMAKE

+SIMDIST_PROG_SVN

 
 dnl echo "host_os=$host_os"
 dnl echo "host_cpu=$host_cpu"
 dnl echo "host_vendor=$host_vendor"
 

-dnl Default package version tags in 'v#r#p#' format (mostly) or 'HEAD' for CVS head.
-dnl These can be overridden by user settings from macros below.
-clhep_version="v2r1p0_1"
-gdml_version="HEAD"
-geant4_version="v9r4p02"
-dnl TODO: change heppdt to vrp format
-heppdt_version="3.03.02"
-lcdd_version="HEAD"
-lcdetectors_version="HEAD"
-lcio_version="HEAD"
-slic_version="v2r10p7"
-xerces_version="v3r1p1"

 
 dnl Make a list of packages from subdirs in packages dir.
 dnl AC_MSG_CHECKING(for packages)