SimDist
diff -u -r1.4 -r1.5
--- configure.in 17 Aug 2007 18:16:31 -0000 1.4
+++ configure.in 23 May 2008 21:01:25 -0000 1.5
@@ -1,4 +1,4 @@
-dnl $Header: /cvs/lcd/SimDist/configure.in,v 1.4 2007/08/17 18:16:31 jeremy Exp $
+dnl $Header: /cvs/lcd/SimDist/configure.in,v 1.5 2008/05/23 21:01:25 jeremy Exp $
dnl
dnl Process this file with autoconf to produce the configure script for SimDist.
dnl
@@ -21,8 +21,10 @@
AC_PROG_CXX
AC_PROG_CVS
AC_PROG_JAVA
+AC_PROG_ANT
AC_PROG_WGET
AC_PROG_SCP
+AC_PROG_CMAKE
dnl Set the SLAC CVS username.
AC_WITH_CVSUSER
SimDist/build
diff -u -r1.10 -r1.11
--- util.m4 27 Jun 2007 17:27:59 -0000 1.10
+++ util.m4 23 May 2008 21:01:25 -0000 1.11
@@ -11,7 +11,7 @@
AC_SUBST($1, $v)
echo $v
])
-\
+
dnl
AC_DEFUN(VERSION_GEANT4, [
v=$(echo $2 | sed 's/[[vr]]/\./g' | sed 's/p/\.p/g')
@@ -102,6 +102,20 @@
])
+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)
@@ -131,6 +145,19 @@
])
+dnl cmake
+AC_DEFUN(AC_PROG_CMAKE, [
+
+AC_CHECK_PROG(have_cmake, cmake, yes, no)
+
+if test $have_cmake == "yes"
+then
+ CMAKE=cmake
+ AC_SUBST(CMAKE)
+fi
+
+])
+
AC_DEFUN(AC_WITH_CVSUSER, [
AC_MSG_CHECKING(for SLAC CVS user)
@@ -236,7 +263,7 @@
sim_dist_dir_basename=$(basename `pwd`)
AC_SUBST(sim_dist_dir_basename)
-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"
AC_SUBST(packages_dep_order)
packages_reverse_dep_order=""