SimDist
diff -u -r1.28 -r1.29
--- configure 17 May 2006 19:06:37 -0000 1.28
+++ configure 17 May 2006 19:09:26 -0000 1.29
@@ -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 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 slic_binname 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_di!
r_orig gdml_download gdml_config_opts g4system ac_geant4_terminal 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 mokka mokka_version mokka_package_dir mokka_base_dir mokka_build_dir mokka_download mokka_dir_orig mokka_tgz_local 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 CLHEP_BASEDIR CLHEP_CONFIG CLHEP_INCLUDEDIR CLHEP_LIBDIR CLHEP_LIBNAME dist_tarball dist_tarbal!
l_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 slic_binname 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_download gdml_config_opts g4system ac_geant4_terminal 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 mokka mokka_version mokka_package_dir mokka_base_dir mokka_build_dir mokka_download mokka_dir_orig mokka_tgz_local 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.
@@ -729,22 +729,6 @@
ac_env_CPPFLAGS_value=$CPPFLAGS
ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
ac_cv_env_CPPFLAGS_value=$CPPFLAGS
-ac_env_CLHEP_BASEDIR_set=${CLHEP_BASEDIR+set}
-ac_env_CLHEP_BASEDIR_value=$CLHEP_BASEDIR
-ac_cv_env_CLHEP_BASEDIR_set=${CLHEP_BASEDIR+set}
-ac_cv_env_CLHEP_BASEDIR_value=$CLHEP_BASEDIR
-ac_env_CLHEP_INCLUDEDIR_set=${CLHEP_INCLUDEDIR+set}
-ac_env_CLHEP_INCLUDEDIR_value=$CLHEP_INCLUDEDIR
-ac_cv_env_CLHEP_INCLUDEDIR_set=${CLHEP_INCLUDEDIR+set}
-ac_cv_env_CLHEP_INCLUDEDIR_value=$CLHEP_INCLUDEDIR
-ac_env_CLHEP_LIBDIR_set=${CLHEP_LIBDIR+set}
-ac_env_CLHEP_LIBDIR_value=$CLHEP_LIBDIR
-ac_cv_env_CLHEP_LIBDIR_set=${CLHEP_LIBDIR+set}
-ac_cv_env_CLHEP_LIBDIR_value=$CLHEP_LIBDIR
-ac_env_CLHEP_LIBNAME_set=${CLHEP_LIBNAME+set}
-ac_env_CLHEP_LIBNAME_value=$CLHEP_LIBNAME
-ac_cv_env_CLHEP_LIBNAME_set=${CLHEP_LIBNAME+set}
-ac_cv_env_CLHEP_LIBNAME_value=$CLHEP_LIBNAME
#
# Report the --help message.
@@ -819,15 +803,6 @@
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-cvsuser=<path> SLAC CVS user name. (Default is anonymous)
--with-prefix=<path> binary installation base area
- --with-clhep-basedir=<path>
- absolute path to CLHEP base install directory
- --with-clhep-includedir=<path>
- absolute path to CLHEP include directory
- --with-clhep-libdir=<path>
- absolute path to CLHEP lib directory
- --with-clhep-libname=<path>
- name of CLHEP library with (NO prefix or file
- extension)
--with-distdir=<path> Set SCP-style dist directory in form
username@host:dir
@@ -838,17 +813,6 @@
nonstandard directory <lib dir>
CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
headers in a nonstandard directory <include dir>
- CLHEP_BASEDIR
- base installation directory of CLHEP package, containing
- directories bin, lib, include, etc.
- CLHEP_INCLUDEDIR
- directory containing the CLHEP headers, which should itself
- contain a directory called CLHEP
- CLHEP_LIBDIR
- directory containing the CLHEP library
- CLHEP_LIBNAME
- name of the CLHEP library, without library prefix or static,
- shared extension
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -3717,404 +3681,7 @@
-
-
-
- echo "$as_me:$LINENO: checking for CLHEP_BASEDIR" >&5
-echo $ECHO_N "checking for CLHEP_BASEDIR... $ECHO_C" >&6
-
- if test -z "$CLHEP_BASEDIR"
- then
-
-# Check whether --with-clhep-basedir or --without-clhep-basedir was given.
-if test "${with_clhep_basedir+set}" = set; then
- withval="$with_clhep_basedir"
-
- if test "$withval" != "yes"
- then
- CLHEP_BASEDIR="$withval"
- fi
-
-
-fi;
- fi
-
- if test -n "$CLHEP_BASE_DIR"
- then
- CLHEP_BASEDIR=$CLHEP_BASE_DIR
- fi
-
- if test -z "$CLHEP_BASEDIR"
- then
- { { echo "$as_me:$LINENO: error: CLHEP_BASEDIR could not be set from args or environment" >&5
-echo "$as_me: error: CLHEP_BASEDIR could not be set from args or environment" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
- if ! test -d "$CLHEP_BASEDIR"
- then
- { { echo "$as_me:$LINENO: error: $CLHEP_BASEDIR does not exist or is not a directory" >&5
-echo "$as_me: error: $CLHEP_BASEDIR does not exist or is not a directory" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
- echo "$as_me:$LINENO: result: $CLHEP_BASEDIR" >&5
-echo "${ECHO_T}$CLHEP_BASEDIR" >&6
-
-
-
-
- # Extract the first word of "clhep-config", so it can be a program name with args.
-set dummy clhep-config; 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_CLHEP_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$CLHEP_CONFIG"; then
- ac_cv_prog_CLHEP_CONFIG="$CLHEP_CONFIG" # 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_CLHEP_CONFIG=""
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-
-fi
-fi
-CLHEP_CONFIG=$ac_cv_prog_CLHEP_CONFIG
-if test -n "$CLHEP_CONFIG"; then
- echo "$as_me:$LINENO: result: $CLHEP_CONFIG" >&5
-echo "${ECHO_T}$CLHEP_CONFIG" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-
- if test -z "$CLHEP_CONFIG"
- then
- if test -n "$CLHEP_BASEDIR"
- then
- as_ac_File=`echo "ac_cv_file_$CLHEP_BASEDIR/bin/clhep-config" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $CLHEP_BASEDIR/bin/clhep-config" >&5
-echo $ECHO_N "checking for $CLHEP_BASEDIR/bin/clhep-config... $ECHO_C" >&6
-if eval "test \"\${$as_ac_File+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- test "$cross_compiling" = yes &&
- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
- { (exit 1); exit 1; }; }
-if test -r "$CLHEP_BASEDIR/bin/clhep-config"; then
- eval "$as_ac_File=yes"
-else
- eval "$as_ac_File=no"
-fi
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
-if test `eval echo '${'$as_ac_File'}'` = yes; then
-
- CLHEP_CONFIG=$CLHEP_BASEDIR/bin/clhep-config
-
-
-
-fi
-
- fi
- fi
-
- if test -n "$CLHEP_CONFIG"
- then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_CLHEP_CONFIG 1
-_ACEOF
-
- fi
-
-
-
-
-
-
-
- echo "$as_me:$LINENO: checking for CLHEP_INCLUDEDIR" >&5
-echo $ECHO_N "checking for CLHEP_INCLUDEDIR... $ECHO_C" >&6
-
- if test -z "$CLHEP_INCLUDEDIR"
- then
-
-# Check whether --with-clhep-includedir or --without-clhep-includedir was given.
-if test "${with_clhep_includedir+set}" = set; then
- withval="$with_clhep_includedir"
- if test "$withval" != "yes"
- then
- CLHEP_INCLUDEDIR="$withval"
- fi
-
-
-fi;
- fi
-
- if test -n "$CLHEP_INCLUDE_DIR"
- then
- CLHEP_INCLUDEDIR=$CLHEP_INCLUDE_DIR
- fi
-
- if test -z "$CLHEP_INCLUDEDIR"
- then
- if test -n "$CLHEP_CONFIG"
- then
- CLHEP_INCLUDEDIR=$(${CLHEP_CONFIG} --include | sed 's/-I//g')
- fi
- fi
-
- if test -z "$CLHEP_INCLUDEDIR"
- then
- if test -z "$CLHEP_INCLUDEDIR"
- then
- CLHEP_INCLUDEDIR=$CLHEP_BASEDIR/include
- fi
- fi
-
- if test -z "$CLHEP_INCLUDEDIR"
- then
- { { echo "$as_me:$LINENO: error: CLHEP_INCLUDEDIR could not be set" >&5
-echo "$as_me: error: CLHEP_INCLUDEDIR could not be set" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
- if ! test -d "$CLHEP_INCLUDEDIR"
- then
- { { echo "$as_me:$LINENO: error: $CLHEP_INCLUDEDIR does not exist" >&5
-echo "$as_me: error: $CLHEP_INCLUDEDIR does not exist" >&2;}
- { (exit or it is not a directory); exit or it is not a directory; }; }
- fi
-
- echo "$as_me:$LINENO: result: $CLHEP_INCLUDEDIR" >&5
-echo "${ECHO_T}$CLHEP_INCLUDEDIR" >&6
-
- as_ac_File=`echo "ac_cv_file_${CLHEP_INCLUDEDIR}/CLHEP/config/CLHEP.h" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for ${CLHEP_INCLUDEDIR}/CLHEP/config/CLHEP.h" >&5
-echo $ECHO_N "checking for ${CLHEP_INCLUDEDIR}/CLHEP/config/CLHEP.h... $ECHO_C" >&6
-if eval "test \"\${$as_ac_File+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- test "$cross_compiling" = yes &&
- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
- { (exit 1); exit 1; }; }
-if test -r "${CLHEP_INCLUDEDIR}/CLHEP/config/CLHEP.h"; then
- eval "$as_ac_File=yes"
-else
- eval "$as_ac_File=no"
-fi
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
-if test `eval echo '${'$as_ac_File'}'` = yes; then
- :
-else
- { { echo "$as_me:$LINENO: error: CLHEP include directory does not contain CLHEP/config/CLHEP.h" >&5
-echo "$as_me: error: CLHEP include directory does not contain CLHEP/config/CLHEP.h" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
-
-
-
-
-
-
-
-
- echo "$as_me:$LINENO: checking for CLHEP_LIBDIR directory" >&5
-echo $ECHO_N "checking for CLHEP_LIBDIR directory... $ECHO_C" >&6
-
- if test -z "$CLHEP_LIBDIR"
- then
-
-# Check whether --with-clhep-libdir or --without-clhep-libdir was given.
-if test "${with_clhep_libdir+set}" = set; then
- withval="$with_clhep_libdir"
- if test "$withval" != "yes"
- then
- CLHEP_LIBDIR="$withval"
- fi
-
-
-fi;
- fi
-
- if test -z "$CLHEP_LIBDIR"
- then
- if test -n "$CLHEP_LIB_DIR"
- then
- CLHEP_LIBDIR=$CLHEP_LIB_DIR
- fi
- fi
-
- if test -z "$CLHEP_LIBDIR"
- then
- if test -n "$CLHEP_CONFIG"
- then
- CLHEP_LIBDIR=$(${CLHEP_CONFIG} --libs | grep -o "\-L[a-zA-Z0-9/-]*" | sed 's/-L//g')
- fi
- fi
-
- if test -z "$CLHEP_LIBDIR"
- then
- if test -n "$CLHEP_LIBDIR"
- then
- CLHEP_LIBDIR=$CLHEP_BASEDIR/lib
- fi
- fi
-
- echo "$as_me:$LINENO: result: $CLHEP_LIBDIR" >&5
-echo "${ECHO_T}$CLHEP_LIBDIR" >&6
-
-
-
-
-
-
-
- echo "$as_me:$LINENO: checking for CLHEP_LIBNAME" >&5
-echo $ECHO_N "checking for CLHEP_LIBNAME... $ECHO_C" >&6
-
- if test -z "$CLHEP_LIBNAME"
- then
-
-# Check whether --with-clhep-libname or --without-clhep-libname was given.
-if test "${with_clhep_libname+set}" = set; then
- withval="$with_clhep_libname"
-
- if test "$withval" != "yes"
- then
- CLHEP_LIBNAME="$withval"
- fi
-
-
-fi;
- fi
-
- if test -z "$CLHEP_LIBNAME"
- then
- if test -n "$CLHEP_CONFIG"
- then
- CLHEP_LIBNAME=$(${CLHEP_CONFIG} --libs | grep -o "\-l[a-zA-Z0-9-].*" | sed 's/-l//g')
- fi
- fi
-
- if test -z "$CLHEP_LIBNAME"
- then
- { { echo "$as_me:$LINENO: error: CLHEP_LIBNAME could not be set" >&5
-echo "$as_me: error: CLHEP_LIBNAME could not be set" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
- echo "$as_me:$LINENO: result: $CLHEP_LIBNAME" >&5
-echo "${ECHO_T}$CLHEP_LIBNAME" >&6
-
-
-
-
-
- echo "$as_me:$LINENO: checking whether CLHEP test compile works" >&5
-echo $ECHO_N "checking whether CLHEP test compile works... $ECHO_C" >&6
-
- ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
- # Store current CPPFLAGS settings.
- OLDCPPFLAGS=$CPPFLAGS
- CPPFLAGS="$OLDCPPFLAGS -I${CLHEP_INCLUDEDIR} -L${CLHEP_LIBDIR} -l${CLHEP_LIBNAME}"
-
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
- #include <CLHEP/Random/Random.h>
-
-int
-main ()
-{
-
- class _clhepcheck
- {
- _clhepcheck()
- {
- HepRandom* r = new HepRandom();
- }
- };
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- { { echo "$as_me:$LINENO: error: CLHEP test compile failed" >&5
-echo "$as_me: error: CLHEP test compile failed" >&2;}
- { (exit 1); exit 1; }; }
-
-
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-
- # Restore CPPFLAGS.
- CPPFLAGS=$OLDCPPFLAGS
-
-
-
-
-
-
-
-
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_CLHEP 1
-_ACEOF
-
-
+#AC_CLHEP
# setup name of tarball
@@ -4981,11 +4548,6 @@
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,@CLHEP_BASEDIR@,$CLHEP_BASEDIR,;t t
-s,@CLHEP_CONFIG@,$CLHEP_CONFIG,;t t
-s,@CLHEP_INCLUDEDIR@,$CLHEP_INCLUDEDIR,;t t
-s,@CLHEP_LIBDIR@,$CLHEP_LIBDIR,;t t
-s,@CLHEP_LIBNAME@,$CLHEP_LIBNAME,;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
