lcdd
diff -u -r1.6 -r1.7
--- aclocal.m4 16 Jul 2005 00:53:05 -0000 1.6
+++ aclocal.m4 6 Sep 2005 17:59:16 -0000 1.7
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/lcdd/aclocal.m4,v 1.6 2005/07/16 00:53:05 jeremy Exp $
+# $Header: /cvs/lcd/lcdd/aclocal.m4,v 1.7 2005/09/06 17:59:16 jeremy Exp $
#
# local m4 macros for SLIC autoconf
#
@@ -26,7 +26,7 @@
# enable debugging
AC_MSG_CHECKING(whether SLIC code debugging should be enabled)
-AC_ARG_ENABLE(slic-debug,
+AC_ARG_ENABLE(slic-debug,
AC_HELP_STRING([--enable-slic-debug], [Enable debugging in code by setting SLIC_DEBUG, G4DEBUG and G4PROFILE]),
[SLIC_DEBUG_ENABLE="$enable_slic_debug"] )
@@ -35,7 +35,7 @@
AC_MSG_RESULT(Yes)
# GNUmakefile vars
- G4DEBUG_SET="G4DEBUG_SET=1"
+ G4DEBUG_SET="G4DEBUG_SET=1"
AC_SUBST(G4DEBUG_SET)
G4PROFILE_SET="G4PROFILE_SET=1"
@@ -43,8 +43,8 @@
# compiler defines
AC_DEFINE(SLIC_DEBUG)
- AC_DEFINE(G4DEBUG)
- AC_DEFINE(G4PROFILE)
+ AC_DEFINE(G4DEBUG)
+ AC_DEFINE(G4PROFILE)
# make sure to compile with debugging switches
CXXFLAGS="${CXXFLAGS} -g -ggdb -pg"
@@ -64,18 +64,18 @@
AC_MSG_RESULT(Yes)
# compiler defines
- AC_DEFINE(G4VERBOSE)
+ AC_DEFINE(G4VERBOSE)
AC_DEFINE(SLIC_VERBOSE)
-
+
# GNUmakefile vars
G4VERBOSE_SET="G4VERBOSE=1"
AC_SUBST(G4VERBOSE_SET)
SLIC_VERBOSE_SET="SLIC_VERBOSE=1"
- AC_SUBST(SLIC_VERBOSE_SET)
+ AC_SUBST(SLIC_VERBOSE_SET)
else
- AC_MSG_RESULT(No)
+ AC_MSG_RESULT(No)
fi
])
@@ -92,12 +92,32 @@
if test -n "${SLIC_COMPILE_VERBOSE_ENABLE}" && test "${SLIC_COMPILE_VERBOSE_ENABLE}" != "no"; then
AC_MSG_RESULT(Yes)
-
+
# verbose compiler commands into cpp flags
CXXFLAGS="${CXXFLAGS} -Wall -v -Wl,--verbose"
else
- AC_MSG_RESULT(No)
+ AC_MSG_RESULT(No)
+fi
+
+])
+
+AC_DEFUN(SIM_CREATE_VERSION_FILE, [
+
+AC_MSG_CHECKING(whether to rewrite VERSION file)
+
+AC_ARG_ENABLE([version-file],
+ AC_HELP_STRING([--enable-version-file=<yes|no>], [Rewrite the VERSION file.] ),
+ [rewrite_ver=$enable_version_file],
+ [rewrite_ver=no])
+
+AC_MSG_RESULT($rewrite_ver)
+
+#echo "rewrite_ver=${rewrite_ver}"
+
+if test "${rewrite_ver}" = "yes"; then
+ rm VERSION &> /dev/null
+ echo "${PACKAGE_NAME} ${PACKAGE_VERSION}" > VERSION
fi
])
@@ -112,9 +132,9 @@
[LCIO_PREFIX=$with_lcio])
if test -z "${with_lcio}"; then
- if test -n "$LCIO"; then
+ if test -n "$LCIO"; then
LCIO_PREFIX=${LCIO} # env
- else
+ else
AC_MSG_RESULT(No)
AC_MSG_ERROR(LCIO installation was not found) # not found
fi
@@ -179,12 +199,12 @@
AC_MSG_RESULT(No)
g4system_os=`uname`
- g4system_compiler=${CXX}
+ g4system_compiler=${CXX}
g4system=`echo "${g4system_os}-${g4system_compiler}"`
echo "guessing G4SYSTEM=${g4system}."
-
+
G4SYSTEM_TEST_FILE=${G4INSTALL}/.config/${g4system}/bin/env.sh
if test -z "${G4SYSTEM_TEST_FILE}"; then
@@ -214,7 +234,7 @@
CLHEP_PREFIX=${CLHEP_BASE_DIR} # env
else
AC_MSG_RESULT(No)
- AC_MSG_ERROR(CLHEP installation was not found) # not found
+ AC_MSG_ERROR(CLHEP installation was not found) # not found
fi
fi
@@ -241,13 +261,13 @@
#AC_MSG_CHECKING(for LCDD installation)
-#AC_ARG_WITH(lcdd,
+#AC_ARG_WITH(lcdd,
# AC_HELP_STRING([--with-lcdd=<path>],[LCDD installation base [[LCDD_BASE]] ]),
# [LCDD_PREFIX=$with_lcdd])
#if test -z "${with_lcdd}"; then
# if test -n "$LCDD_BASE"; then # env
-# ${LCDD_BASE}=`pwd`
+# ${LCDD_BASE}=`pwd`
# else
# AC_MSG_RESULT(No)
# AC_MSG_ERROR(LCDD installation was not found)
@@ -304,7 +324,7 @@
AC_MSG_CHECKING(for Xerces libname)
-AC_ARG_WITH(xerces-libname,
+AC_ARG_WITH(xerces-libname,
AC_HELP_STRING([--with-xerces-libname=<name>],[Xerces libname without lib or .a/.so]),
[XERCES_LIBNAME=$with_xerces_libname],
[XERCES_LIBNAME=xerces-c])
@@ -362,7 +382,7 @@
GDML_PREFIX=${GDML_BASE} # env
else
AC_MSG_RESULT(No)
- AC_MSG_ERROR(GDML installation was not found) # not found
+ AC_MSG_ERROR(GDML installation was not found) # not found
fi
fi
@@ -408,7 +428,7 @@
])
AC_DEFUN([SIM_SETUP_DOXYGEN], [
-
+
AC_CHECK_PROGS(DOXYGEN, doxygen)
AC_SUBST(DOXYGEN)
])