SimDist
diff -u -r1.14 -r1.15
--- configure.in 8 Sep 2010 23:04:05 -0000 1.14
+++ configure.in 3 Jan 2011 18:16:11 -0000 1.15
@@ -1,4 +1,4 @@
-dnl $Header: /cvs/lcd/SimDist/configure.in,v 1.14 2010/09/08 23:04:05 jeremy Exp $
+dnl $Header: /cvs/lcd/SimDist/configure.in,v 1.15 2011/01/03 18:16:11 jeremy Exp $
dnl
dnl Process this file with autoconf to produce the configure script for SimDist.
dnl
@@ -14,6 +14,9 @@
dnl Set the Autoconf host variables.
AC_CANONICAL_HOST
+#echo "host_os=$host_os"
+#echo "host_cpu=$host_cpu"
+
dnl Set which variable to use for runtime location of shared libs.
AC_OS_SHARED_LIBS_VAR
SimDist
diff -u -r1.90 -r1.91
--- configure 12 Oct 2010 21:24:15 -0000 1.90
+++ configure 3 Jan 2011 18:16:11 -0000 1.91
@@ -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 OS_SHARED_LIBS_VAR 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 SLACCVSROOT SLACCVSUSER 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 OGLHOME QTHOME clhep_version_dot CLHEP_BASEDIR CLHEP_BUILDDIR CLHEP_CONFIG_OPTS CLHEP_DIR_ORIG CLHEP_DOWNLOAD GDML_BASEDIR GDML_BUILDDIR GDML_CONFIG_OPTS GDML_!
CVSMODULE GEANT4_VERSION_DOWNLOAD GEANT4_VERSION GEANT4_BUILDDIR GEANT4_DIR_ORIG GEANT4_DOWNLOAD 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_BUILD_ZLIB G4LIB_USE_ZLIB G4LIB_BUILD_SHARED G4LIB_BUILD_STATIC 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 LCDD_BASEDIR LCDD_VERSION LCIO_BASEDIR LCIO_BUIL!
DDIR SLI
C_BINNAME SLIC_VERSION SLIC_BASEDIR 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_tarball_current dist_version bin_tarball_current 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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os OS_SHARED_LIBS_VAR 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 SLACCVSROOT SLACCVSUSER 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 OGLHOME QTHOME clhep_version_dot CLHEP_BASEDIR CLHEP_BUILDDIR CLHEP_CONFIG_OPTS CLHEP_DIR_ORIG CLHEP_DOWNLOAD GDML_BASEDIR GDML_BUILDDIR GDML_CONFIG_OPTS GDML_CV!
SMODULE GEANT4_VERSION_DOWNLOAD GEANT4_VERSION GEANT4_BUILDDIR GEANT4_DIR_ORIG GEANT4_DOWNLOAD 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_BUILD_ZLIB G4LIB_USE_ZLIB G4LIB_BUILD_SHARED G4LIB_BUILD_STATIC 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_U!
SE_OPENGLQT LCDD_BASEDIR LCDD_VERSION LCIO_BASEDIR LCIO_BUILDD!
IR SLIC_
BINNAME SLIC_VERSION SLIC_BASEDIR 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.
@@ -1365,6 +1365,9 @@
+#echo "host_os=$host_os"
+#echo "host_cpu=$host_cpu"
+
case "$host_os" in
@@ -3084,28 +3087,23 @@
-dist_version=$(echo ${SLIC_VERSION} | sed -e 's/[a-z]/\_/g' -e 's/^_//g')
-
-dist_version=${dist_version}"-geant4-"$(echo ${GEANT4_VERSION} | sed -e 's/[a-z]/\_/g' -e 's/^_//g')
-
-dist_tarball="slic-"${dist_version}"-"${host_os}"-dist".tar.gz
-
-dist_tarball_current="slic-current-"${host_os}"-dist".tar.gz
-
-bin_tarball="slic-"${dist_version}"-"${host_os}"-bin".tar.gz
+echo "$as_me:$LINENO: checking for dist tarball name" >&5
+echo $ECHO_N "checking for dist tarball name... $ECHO_C" >&6
-bin_tarball_current="slic-current-"${host_os}"-bin".tar.gz
-#echo "bin_tarball_current=$bin_tarball_current"
+dist_full_version="slic-"${SLIC_VERSION}"_geant4-"${GEANT4_VERSION}
-#echo "bin_tarball=$bin_tarball"
+dist_host=${host_cpu}"-"${host_vendor}"-"${host_os}
+dist_tarball=${dist_full_version}"_"${dist_host}.tar.gz
+echo "$as_me:$LINENO: result: $dist_tarball" >&5
+echo "${ECHO_T}$dist_tarball" >&6
@@ -3954,10 +3952,6 @@
s,@LCDETECTORS_BASEDIR@,$LCDETECTORS_BASEDIR,;t t
s,@LCDETECTORS_VERSION@,$LCDETECTORS_VERSION,;t t
s,@dist_tarball@,$dist_tarball,;t t
-s,@dist_tarball_current@,$dist_tarball_current,;t t
-s,@dist_version@,$dist_version,;t t
-s,@bin_tarball_current@,$bin_tarball_current,;t t
-s,@bin_tarball@,$bin_tarball,;t t
s,@dist_dir@,$dist_dir,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t