SimDist
diff -u -r1.65 -r1.66
--- configure 18 Dec 2007 00:30:17 -0000 1.65
+++ configure 4 Aug 2008 21:09:53 -0000 1.66
@@ -272,7 +272,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 have_wget WGET have_scp SCP 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 GDML_CONFIG_OPTS GEANT4_VERSION_DOWNL!
OAD 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 LCDD_BASEDIR LCIO_BASEDIR LCIO_BUILDDIR LCPHYS_CVSMODULE LCPHYS_BASEDIR SLIC_BINNAME SLIC_VERSION SLIC_BASE!
DIR MOKKA_VERSION MOKKA_BASEDIR MOKKA_BUILDDIR MOKKA_DOWNLOAD !
MOKKA_DI
R_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 BDSIM_BASEDIR BDSIM_DIR_ORIG BDSIM_DOWNLOAD BDSIM_BUILDDIR BDSIM_VERSION ROOTSYS USE_ROOT MYSQL_BASEDIR MYSQL_INCLUDEDIR MYSQL_LIBDIR 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_ant ANT 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 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 LCDD_BASEDIR LCIO_BASEDIR LCIO_BUILDDIR LCPHYS_CVSMODULE LCP!
HYS_BASEDIR SLIC_BINNAME SLIC_VERSION SLIC_BASEDIR MOKKA_VERSI!
ON MOKKA
_BASEDIR MOKKA_BUILDDIR 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 BDSIM_BASEDIR BDSIM_DIR_ORIG BDSIM_DOWNLOAD BDSIM_BUILDDIR BDSIM_VERSION ROOTSYS USE_ROOT HEPPDT_CONFIG_OPTS HEPPDT_BASEDIR HEPPDT_BUILDDIR HEPPDT_DOWNLOAD HEPPDT_VERSION HEPPDT_DIR_ORIG MYSQL_BASEDIR MYSQL_INCLUDEDIR MYSQL_LIBDIR 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.
@@ -2016,6 +2016,75 @@
fi
+echo "$as_me:$LINENO: checking for JAVA_HOME" >&5
+echo $ECHO_N "checking for JAVA_HOME... $ECHO_C" >&6
+if test -z "$JAVA_HOME"
+then
+ JAVA_HOME=$(dirname `which java`)/..
+fi
+echo "$as_me:$LINENO: result: $JAVA_HOME" >&5
+echo "${ECHO_T}$JAVA_HOME" >&6
+
+
+echo "$as_me:$LINENO: checking for JDK_HOME" >&5
+echo $ECHO_N "checking for JDK_HOME... $ECHO_C" >&6
+if test -z "$JDK_HOME"
+then
+ JDK_HOME=$JAVA_HOME
+fi
+echo "$as_me:$LINENO: result: $JDK_HOME" >&5
+echo "${ECHO_T}$JDK_HOME" >&6
+
+
+
+
+
+# Extract the first word of "ant", so it can be a program name with args.
+set dummy ant; 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_ant+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$have_ant"; then
+ ac_cv_prog_have_ant="$have_ant" # 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_ant="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_ant" && ac_cv_prog_have_ant="no"
+fi
+fi
+have_ant=$ac_cv_prog_have_ant
+if test -n "$have_ant"; then
+ echo "$as_me:$LINENO: result: $have_ant" >&5
+echo "${ECHO_T}$have_ant" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+
+if test $have_ant == "no"
+then
+ { { echo "$as_me:$LINENO: error: ant not found" >&5
+echo "$as_me: error: ant not found" >&2;}
+ { (exit 1); exit 1; }; }
+else
+ ANT=ant
+
+fi
# Extract the first word of "wget", so it can be a program name with args.
@@ -2118,6 +2187,52 @@
+# Extract the first word of "cmake", so it can be a program name with args.
+set dummy cmake; 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_cmake+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$have_cmake"; then
+ ac_cv_prog_have_cmake="$have_cmake" # 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_cmake="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_cmake" && ac_cv_prog_have_cmake="no"
+fi
+fi
+have_cmake=$ac_cv_prog_have_cmake
+if test -n "$have_cmake"; then
+ echo "$as_me:$LINENO: result: $have_cmake" >&5
+echo "${ECHO_T}$have_cmake" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+
+if test $have_cmake == "yes"
+then
+ CMAKE=cmake
+
+fi
+
+
+
+
echo "$as_me:$LINENO: checking for SLAC CVS user" >&5
echo $ECHO_N "checking for SLAC CVS user... $ECHO_C" >&6
@@ -2180,7 +2295,7 @@
sim_dist_dir_basename=$(basename `pwd`)
-packages_dep_order="clhep geant4 lcphys xerces gdml lcio lcdd slic mokka bdsim"
+packages_dep_order="clhep geant4 lcphys xerces gdml lcio lcdd heppdt slic mokka bdsim"
packages_reverse_dep_order=""
@@ -2874,6 +2989,29 @@
;;
+heppdt )
+
+
+
+heppdt_url=http://lcgapp.cern.ch/project/simu/HepPDT/download/HepPDT-3.02.03.tar.gz
+
+HEPPDT_CONFIG_OPTS="--prefix=\$(PACKAGE_BASEDIR) --disable-shared"
+HEPPDT_BASEDIR=$package_base_dir
+HEPPDT_BUILDDIR=$package_base_dir
+HEPPDT_DOWNLOAD=$heppdt_url
+HEPPDT_VERSION=3.02.03
+HEPPDT_DIR_ORIG=HepPDT-3.02.03
+
+
+
+
+
+
+
+
+
+ ;;
+
* )
{ { echo "$as_me:$LINENO: error: package $package_name is unknown" >&5
echo "$as_me: error: package $package_name is unknown" >&2;}
@@ -3777,10 +3915,16 @@
s,@CVS@,$CVS,;t t
s,@have_java@,$have_java,;t t
s,@JAVA@,$JAVA,;t t
+s,@JAVA_HOME@,$JAVA_HOME,;t t
+s,@JDK_HOME@,$JDK_HOME,;t t
+s,@have_ant@,$have_ant,;t t
+s,@ANT@,$ANT,;t t
s,@have_wget@,$have_wget,;t t
s,@WGET@,$WGET,;t t
s,@have_scp@,$have_scp,;t t
s,@SCP@,$SCP,;t t
+s,@have_cmake@,$have_cmake,;t t
+s,@CMAKE@,$CMAKE,;t t
s,@SLACCVSROOT@,$SLACCVSROOT,;t t
s,@SLACCVSUSER@,$SLACCVSUSER,;t t
s,@sim_dist_dir_basename@,$sim_dist_dir_basename,;t t
@@ -3890,6 +4034,12 @@
s,@BDSIM_VERSION@,$BDSIM_VERSION,;t t
s,@ROOTSYS@,$ROOTSYS,;t t
s,@USE_ROOT@,$USE_ROOT,;t t
+s,@HEPPDT_CONFIG_OPTS@,$HEPPDT_CONFIG_OPTS,;t t
+s,@HEPPDT_BASEDIR@,$HEPPDT_BASEDIR,;t t
+s,@HEPPDT_BUILDDIR@,$HEPPDT_BUILDDIR,;t t
+s,@HEPPDT_DOWNLOAD@,$HEPPDT_DOWNLOAD,;t t
+s,@HEPPDT_VERSION@,$HEPPDT_VERSION,;t t
+s,@HEPPDT_DIR_ORIG@,$HEPPDT_DIR_ORIG,;t t
s,@MYSQL_BASEDIR@,$MYSQL_BASEDIR,;t t
s,@MYSQL_INCLUDEDIR@,$MYSQL_INCLUDEDIR,;t t
s,@MYSQL_LIBDIR@,$MYSQL_LIBDIR,;t t