SimDist/build
diff -N mysql.m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ mysql.m4 26 May 2006 22:20:14 -0000 1.1
@@ -0,0 +1,104 @@
+AC_DEFUN([AC_MYSQL],
+[
+ AC_REQUIRE([AC_MYSQL_BASEDIR])
+ AC_REQUIRE([AC_MYSQL_INCLUDEDIR])
+ AC_REQUIRE([AC_MYSQL_LIBDIR])
+])
+
+AC_DEFUN([AC_MYSQL_BASEDIR],
+[
+
+ AC_ARG_VAR([MYSQL_BASEDIR],[base mysql directory])
+
+ AC_MSG_CHECKING(for MYSQL_BASEDIR)
+
+ if test -z "$MYSQL_BASEDIR"
+ then
+ AC_ARG_WITH(mysql-basedir,
+ AC_HELP_STRING([--with-mysql-basedir=<path>],
+ [absolute path to mysql base directory]),
+ [
+ if test "$withval" != "yes"
+ then
+ MYSQL_BASEDIR="$withval"
+ fi
+ ]
+ )
+ fi
+
+ AC_MSG_RESULT($MYSQL_BASEDIR)
+
+ AC_SUBST(MYSQL_BASEDIR)
+])
+
+
+AC_DEFUN([AC_MYSQL_LIBDIR],
+[
+ AC_ARG_VAR([MYSQL_LIBDIR],[directory containing mysql libraries])
+
+ AC_MSG_CHECKING(for MYSQL_LIBDIR)
+
+ if test -z "$MYSQL_LIBDIR"
+ then
+ AC_ARG_WITH(mysql-libdir,
+ AC_HELP_STRING([--with-mysql-libdir=<path>],
+ [absolute path to mysql library dir]),
+ [
+ if test "$withval" != "yes"
+ then
+ MYSQL_LIBDIR="$withval"
+ fi
+ ]
+ )
+ fi
+
+
+ if test -z "$MYSQL_LIBDIR"
+ then
+ if test -n "$MYSQL_BASEDIR"
+ then
+ MYSQL_LIBDIR="$MYSQL_BASEDIR/lib/mysql"
+ fi
+ fi
+
+
+ AC_MSG_RESULT($MYSQL_LIBDIR)
+
+ AC_SUBST(MYSQL_LIBDIR)
+])
+
+
+AC_DEFUN([AC_MYSQL_INCLUDEDIR],
+[
+ AC_ARG_VAR([MYSQL_INCLUDEDIR],[directory containing mysql headers directory])
+
+ AC_MSG_CHECKING(for MYSQL_INCLUDEDIR)
+
+ if test -z "$MYSQL_INCLUDEDIR"
+ then
+
+ AC_ARG_WITH(mysql-includedir,
+ AC_HELP_STRING([--with-mysql-includedir=<path>],
+ [absolute path to mysql headers dir]),
+ [
+ if test "$withval" != "yes"
+ then
+ MYSQL_INCLUDEDIR="$withval"
+ fi
+ ]
+ )
+ fi
+
+ if test -z "$MYSQL_INCLUDEDIR"
+ then
+ if test -n "$MYSQL_BASEDIR"
+ then
+ MYSQL_INCLUDEDIR="$MYSQL_BASEDIR"
+ fi
+ fi
+
+
+ AC_MSG_RESULT($MYSQL_INCLUDEDIR)
+
+ AC_SUBST(MYSQL_INCLUDEDIR)
+])
SimDist/build
diff -u -r1.1 -r1.2
--- clhep.m4 25 May 2006 00:30:45 -0000 1.1
+++ clhep.m4 26 May 2006 22:20:14 -0000 1.2
@@ -1,4 +1,4 @@
-dnl $Id: clhep.m4,v 1.1 2006/05/25 00:30:45 jeremy Exp $
+dnl $Id: clhep.m4,v 1.2 2006/05/26 22:20:14 jeremy Exp $
dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/
dnl
@@ -19,8 +19,8 @@
dnl
AC_DEFUN([AC_CLHEP],
[
- AC_REQUIRE([AC_CLHEP_BASEDIR])
AC_REQUIRE([AC_CLHEP_CONFIG])
+ AC_REQUIRE([AC_CLHEP_BASEDIR])
AC_REQUIRE([AC_CLHEP_INCLUDEDIR])
AC_REQUIRE([AC_CLHEP_LIBDIR])
AC_REQUIRE([AC_CLHEP_LIBNAME])
@@ -37,6 +37,7 @@
dnl 1) CLHEP_BASEDIR from environment.
dnl 2) --with-clhep-basedir argument.
dnl 3) CLHEP_BASE_DIR from environment (Geant4 setup).
+dnl 4) Use clhep-config --prefix.
dnl
AC_DEFUN([AC_CLHEP_BASEDIR],
[
@@ -65,17 +66,20 @@
CLHEP_BASEDIR=$CLHEP_BASE_DIR
fi
- dnl If still not found, then exit with error.
+ dnl Use clhep-config --prefix.
if test -z "$CLHEP_BASEDIR"
then
- AC_MSG_ERROR(CLHEP_BASEDIR could not be set from args or environment)
+ if test -n "$CLHEP_CONFIG"
+ then
+ CLHEP_BASEDIR=$(${CLHEP_CONFIG} --prefix)
+ fi
fi
dnl Is it a directory?
- if ! test -d "$CLHEP_BASEDIR"
- then
- AC_MSG_ERROR($CLHEP_BASEDIR does not exist or is not a directory)
- fi
+ dnl if ! test -d "$CLHEP_BASEDIR"
+ dnl then
+ dnl AC_MSG_ERROR($CLHEP_BASEDIR does not exist or is not a directory)
+ dnl fi
AC_MSG_RESULT($CLHEP_BASEDIR)
@@ -177,21 +181,21 @@
fi
dnl If not set by now then there is a problem.
- if test -z "$CLHEP_INCLUDEDIR"
- then
- AC_MSG_ERROR(CLHEP_INCLUDEDIR could not be set)
- fi
+ dnl if test -z "$CLHEP_INCLUDEDIR"
+ dnl then
+ dnl AC_MSG_ERROR(CLHEP_INCLUDEDIR could not be set)
+ dnl fi
dnl Test for directory.
- if ! test -d "$CLHEP_INCLUDEDIR"
- then
- AC_MSG_ERROR($CLHEP_INCLUDEDIR does not exist, or it is not a directory)
- fi
+ dnl if ! test -d "$CLHEP_INCLUDEDIR"
+ dnl then
+ dnl AC_MSG_ERROR($CLHEP_INCLUDEDIR does not exist, or it is not a directory)
+ dnl fi
- AC_MSG_RESULT($CLHEP_INCLUDEDIR)
+ dnl AC_MSG_RESULT($CLHEP_INCLUDEDIR)
dnl Test for header generated during build.
- AC_CHECK_FILE(${CLHEP_INCLUDEDIR}/CLHEP/config/CLHEP.h,,AC_MSG_ERROR([CLHEP include directory does not contain CLHEP/config/CLHEP.h]))
+ dnl AC_CHECK_FILE(${CLHEP_INCLUDEDIR}/CLHEP/config/CLHEP.h,,AC_MSG_ERROR([CLHEP include directory does not contain CLHEP/config/CLHEP.h]))
dnl Substitute to output.
AC_SUBST(CLHEP_INCLUDEDIR)
@@ -304,10 +308,10 @@
fi
dnl Problem setting lib name.
- if test -z "$CLHEP_LIBNAME"
- then
- AC_MSG_ERROR(CLHEP_LIBNAME could not be set)
- fi
+ dnl if test -z "$CLHEP_LIBNAME"
+ dnl then
+ dnl AC_MSG_ERROR(CLHEP_LIBNAME could not be set)
+ dnl fi
AC_MSG_RESULT($CLHEP_LIBNAME)
@@ -358,6 +362,28 @@
dnl
AC_DEFUN([AC_CLHEP_VERSION],
[
+ AC_ARG_VAR([CLHEP_VERSION],[dot-separated CLHEP version string])
-
+ AC_MSG_CHECKING([for CLHEP_VERSION])
+
+ if test -z "$CLHEP_VERSION"
+ then
+ AC_ARG_WITH(clhep-version,
+ AC_HELP_STRING([--with-clhep-version=<version>],
+ [dot-separated CLHEP version string]),
+ [ if test "$withval" != "yes"
+ then
+ CLHEP_VERSION="$withval"
+ fi
+ ]
+ )
+ fi
+
+ if test -z "$CLHEP_VERSION"
+ then
+ if test -n "$CLHEP_CONFIG"
+ then
+ CLHEP_VERSION=$(${CLHEP_CONFIG} --version | awk '{print $2}')
+ fi
+ fi
])
SimDist/build
diff -u -r1.10 -r1.11
--- common.gmk.in 19 May 2006 00:36:35 -0000 1.10
+++ common.gmk.in 26 May 2006 22:20:14 -0000 1.11
@@ -1,11 +1,11 @@
-# $Id: common.gmk.in,v 1.10 2006/05/19 00:36:35 jeremy Exp $
+# $Id: common.gmk.in,v 1.11 2006/05/26 22:20:14 jeremy Exp $
#
# Common Make variables for SimDist
#
# include package env vars
-include @sim_packages_dir@/*/env.gmk
+#include @sim_packages_dir@/*/env.gmk
# autoconf vars
prefix=@prefix@