5 modified files
SimDist
diff -u -r1.66 -r1.67
--- configure 4 Aug 2008 21:09:53 -0000 1.66
+++ configure 5 Aug 2008 18:49:21 -0000 1.67
@@ -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 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 GD!
ML_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 LCPHYS_BASEDIR SLIC_BI!
NNAME SL
IC_VERSION SLIC_BASEDIR MOKKA_VERSION 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_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 GDM!
L_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 LCPHYS_BASEDIR S!
LIC_BINNAME SLIC_VERSION SLIC_BASEDIR MOKKA_VERSION MOKKA_BASE!
DIR MOKK
A_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.
@@ -2038,55 +2038,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.
set dummy wget; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -3917,8 +3868,6 @@
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
SimDist
diff -u -r1.5 -r1.6
--- configure.in 23 May 2008 21:01:25 -0000 1.5
+++ configure.in 5 Aug 2008 18:49:21 -0000 1.6
@@ -1,4 +1,4 @@
-dnl $Header: /cvs/lcd/SimDist/configure.in,v 1.5 2008/05/23 21:01:25 jeremy Exp $
+dnl $Header: /cvs/lcd/SimDist/configure.in,v 1.6 2008/08/05 18:49:21 jeremy Exp $
dnl
dnl Process this file with autoconf to produce the configure script for SimDist.
dnl
@@ -21,7 +21,7 @@
AC_PROG_CXX
AC_PROG_CVS
AC_PROG_JAVA
-AC_PROG_ANT
+dnl AC_PROG_ANT
AC_PROG_WGET
AC_PROG_SCP
AC_PROG_CMAKE
SimDist/build
diff -u -r1.18 -r1.19
--- common.gmk.in 23 May 2008 21:31:22 -0000 1.18
+++ common.gmk.in 5 Aug 2008 18:49:21 -0000 1.19
@@ -1,4 +1,4 @@
-# $Id: common.gmk.in,v 1.18 2008/05/23 21:31:22 jeremy Exp $
+# $Id: common.gmk.in,v 1.19 2008/08/05 18:49:21 jeremy Exp $
#
# Common Make variables for SimDist
@@ -25,7 +25,6 @@
JAVA=@JAVA@
JAVA_HOME=@JAVA_HOME@
JDK_HOME=@JDK_HOME@
-ANT=@ANT@
WGET=@WGET@
SCP=@SCP@
CMAKE=@CMAKE@
SimDist/build
diff -u -r1.12 -r1.13
--- util.m4 23 May 2008 21:31:22 -0000 1.12
+++ util.m4 5 Aug 2008 18:49:21 -0000 1.13
@@ -119,20 +119,6 @@
])
-dnl ant
-AC_DEFUN(AC_PROG_ANT, [
-
-AC_CHECK_PROG(have_ant, ant, yes, no)
-
-if test $have_ant == "no"
-then
- AC_MSG_ERROR(ant not found)
-else
- ANT=ant
- AC_SUBST(ANT)
-fi
-])
-
dnl wget
AC_DEFUN(AC_PROG_WGET, [
AC_CHECK_PROG(have_wget, wget, yes, no)
SimDist/packages/lcio
diff -u -r1.12 -r1.13
--- Makefile.in 23 May 2008 22:16:01 -0000 1.12
+++ Makefile.in 5 Aug 2008 18:49:21 -0000 1.13
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/SimDist/packages/lcio/Makefile.in,v 1.12 2008/05/23 22:16:01 jeremy Exp $
+# $Header: /cvs/lcd/SimDist/packages/lcio/Makefile.in,v 1.13 2008/08/05 18:49:21 jeremy Exp $
# default
targets := cvs config
@@ -13,7 +13,7 @@
# ant compile
.PHONY: compile_ant
compile_ant:
- PATH="$(LCIO)/tools:$(LCIO)/bin:$(PATH)" ; cd $(PACKAGE_BUILDDIR) ; $(ANT) aid.generate cpp;:
+ PATH="$(LCIO)/tools:$(LCIO)/bin:$(PATH)" ; cd $(PACKAGE_BUILDDIR) ; ant aid.generate cpp;:
compile_cmake:
cd $(PACKAGE_BUILDDIR); \
CVSspam 0.2.8