SimDist
diff -u -r1.78 -r1.79
--- configure 23 Nov 2009 23:22:25 -0000 1.78
+++ configure 14 Jul 2010 18:01:32 -0000 1.79
@@ -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 clhep_version_dot CLHEP_BASEDIR CLHEP_BUILDDIR CLHEP_CONFIG_OPTS CLHEP_DIR_ORIG CLHEP_DOWNLOAD GDML_BASEDIR GDML_BUILDDIR GDML_DIR_ORIG GDML_DOWNLOAD G!
DML_CONFIG_OPTS 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 LCDD_BASEDIR LCDD_VERSION LCIO_BASEDIR LCIO_BUILDDIR SLIC_BIN!
NAME SLIC_VERSION SLIC_BASEDIR MOKKA_VERSION MOKKA_BASEDIR MOK!
KA_BUILD
DIR MOKKA_DOWNLOAD MOKKA_DIR_ORIG XERCES_CONFIGURE_ARGS XERCES_OS XERCES_USE_SHARED_LIB XERCES_USE_STATIC_LIB xerces_version_underscore XERCES_VERSION XERCES_BASEDIR XERCES_BUILDDIR XERCES_CONFIG XERCES_CONFIG_OPTS XERCES_DOWNLOAD XERCES_DIR_ORIG XERCES_OBJDIR 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 clhep_version_dot CLHEP_BASEDIR CLHEP_BUILDDIR CLHEP_CONFIG_OPTS CLHEP_DIR_ORIG CLHEP_DOWNLOAD GDML_BASEDIR GDML_BUILDDIR GDML_CONFIG_OPTS 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 LCDD_BASEDIR LCDD_VERSION LCIO_BASEDIR LCIO_BUILDDIR SLIC_BINNAME SLIC_VERSION SLIC_BASEDIR!
MOKKA_VERSION MOKKA_BASEDIR MOKKA_BUILDDIR MOKKA_DOWNLOAD MOK!
KA_DIR_O
RIG xerces_version_dot XERCES_CONFIG_OPTS XERCES_VERSION XERCES_BASEDIR XERCES_BUILDDIR XERCES_CONFIG XERCES_DOWNLOAD XERCES_DIR_ORIG XERCES_OBJDIR 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_files=''
# Initialize some variables set by options.
@@ -2642,19 +2642,13 @@
gdml )
-gdml_url="http://simu.cvs.cern.ch/cgi-bin/simu.cgi/simu/GDML2.tar.gz?view=tar"
-if test "${package_version}" != "HEAD"; then
- gdml_url="${gdml_url}&pathrev=${package_version}"
-fi
GDML_BASEDIR=${package_base_dir}
GDML_BUILDDIR=${package_base_dir}/CPPGDML
GDML_DIR_ORIG=GDML2
-GDML_DOWNLOAD=\"${gdml_url}\"
GDML_CONFIG_OPTS="--enable-shared=no --enable-geant4-granular-libs --enable-examples=no --enable-nist=no"
-
-
+GDML_CVSMODULE=gdml2
@@ -2904,51 +2898,24 @@
-XERCES_OS=$(uname | tr [a-z] [A-Z])
-XERCES_USE_SHARED_LIB=
-XERCES_USE_STATIC_LIB=1
-
-case "$host_os" in
-
- linux* )
- XERCES_CONFIGURE_ARGS="-plinux -cgcc -xg++ -minmem -nsocket -tnative -rnone -P \$(PACKAGE_BASEDIR)"
- ;;
- cygwin* )
- XERCES_CONFIGURE_ARGS="-pcygwin -cgcc -xg++ -minmem -nsocket -tnative -rnone -P \$(PACKAGE_BASEDIR)"
- ;;
- darwin* )
- XERCES_CONFIGURE_ARGS="-pmacosx -nnative -tnative -rnone -P \$(PACKAGE_BASEDIR)"
- XERCES_OS=MACOSX
- XERCES_USE_SHARED_LIB=1
- XERCES_USE_STATIC_LIB=
- ;;
-
-esac
-
-
-
-
-
-
-
-
-xerces_version=${package_version}
-xerces_url=http://www.apache.org/dist/xerces/c/2/sources/
-xerces_version_underscore=$(
- v=$(echo ${xerces_version} | sed -e 's/[vrp]/_/g' -e 's/^_//g')
- xerces_version_underscore=$v
+XERCES_VERSION=${package_version}
+XERCES_BASEDIR=${package_base_dir}
+XERCES_BUILDDIR=${package_base_dir}
+XERCES_CONFIG=./configure
+
+XERCES_CONFIG_OPTS="--prefix=${XERCES_BASEDIR}"
+
+xerces_url=http://www.apache.org/dist/xerces/c/3/sources/
+xerces_version_dot=$(
+ v=$(echo ${XERCES_VERSION} | sed -e 's/[vrp]/\./g' -e 's/^\.//g' -e 's/_/./g')
+ xerces_version_dot=$v
echo $v
)
-xerces_tgz=xerces-c-src_${xerces_version_underscore}.tar.gz
+xerces_tgz=xerces-c-${xerces_version_dot}.tar.gz
-XERCES_VERSION=$package_version
-XERCES_BASEDIR=$package_base_dir
-XERCES_BUILDDIR=${package_base_dir}/src/xercesc
-XERCES_CONFIG=./runConfigure
-XERCES_CONFIG_OPTS=${XERCES_CONFIGURE_ARGS}
XERCES_DOWNLOAD=${xerces_url}/${xerces_tgz}
-XERCES_DIR_ORIG=xerces-c-src_${xerces_version_underscore}
+XERCES_DIR_ORIG=xerces-c-${xerces_version_dot}
@@ -3799,8 +3766,6 @@
s,@CLHEP_DOWNLOAD@,$CLHEP_DOWNLOAD,;t t
s,@GDML_BASEDIR@,$GDML_BASEDIR,;t t
s,@GDML_BUILDDIR@,$GDML_BUILDDIR,;t t
-s,@GDML_DIR_ORIG@,$GDML_DIR_ORIG,;t t
-s,@GDML_DOWNLOAD@,$GDML_DOWNLOAD,;t t
s,@GDML_CONFIG_OPTS@,$GDML_CONFIG_OPTS,;t t
s,@GEANT4_VERSION_DOWNLOAD@,$GEANT4_VERSION_DOWNLOAD,;t t
s,@GEANT4_VERSION@,$GEANT4_VERSION,;t t
@@ -3866,16 +3831,12 @@
s,@MOKKA_BUILDDIR@,$MOKKA_BUILDDIR,;t t
s,@MOKKA_DOWNLOAD@,$MOKKA_DOWNLOAD,;t t
s,@MOKKA_DIR_ORIG@,$MOKKA_DIR_ORIG,;t t
-s,@XERCES_CONFIGURE_ARGS@,$XERCES_CONFIGURE_ARGS,;t t
-s,@XERCES_OS@,$XERCES_OS,;t t
-s,@XERCES_USE_SHARED_LIB@,$XERCES_USE_SHARED_LIB,;t t
-s,@XERCES_USE_STATIC_LIB@,$XERCES_USE_STATIC_LIB,;t t
-s,@xerces_version_underscore@,$xerces_version_underscore,;t t
+s,@xerces_version_dot@,$xerces_version_dot,;t t
+s,@XERCES_CONFIG_OPTS@,$XERCES_CONFIG_OPTS,;t t
s,@XERCES_VERSION@,$XERCES_VERSION,;t t
s,@XERCES_BASEDIR@,$XERCES_BASEDIR,;t t
s,@XERCES_BUILDDIR@,$XERCES_BUILDDIR,;t t
s,@XERCES_CONFIG@,$XERCES_CONFIG,;t t
-s,@XERCES_CONFIG_OPTS@,$XERCES_CONFIG_OPTS,;t t
s,@XERCES_DOWNLOAD@,$XERCES_DOWNLOAD,;t t
s,@XERCES_DIR_ORIG@,$XERCES_DIR_ORIG,;t t
s,@XERCES_OBJDIR@,$XERCES_OBJDIR,;t t
