slic
diff -u -r1.73 -r1.74
--- configure 1 Mar 2007 23:08:11 -0000 1.73
+++ configure 27 Apr 2007 01:53:51 -0000 1.74
@@ -855,12 +855,14 @@
--enable-package-info Rewrite include/PackageInfo.hh
--enable-lcphys=<yes|no>
enable LCPhys library
- --enable-debug Enable debugging in code by setting SLIC_DEBUG,
- G4DEBUG and G4PROFILE
- --enable-verbose enable usage of verbose output using SLIC_VERBOSE
-
+ --enable-debug turn on debug code by defining SLIC_DEBUG; default =
+ no
+ --enable-gdb enable debugging with gdb; default = no
+ --enable-profiling enable profiling using gprof; default = no
+ --enable-log enable logging; disabling will turn off most console
+ output; default = yes
--enable-compile-verbose
- Use verbose compiler settings
+ use verbose compilation and linking flags
--enable-version=<yes|no>
Rewrite the VERSION file.
@@ -3625,8 +3627,8 @@
if test `eval echo '${'$as_ac_File'}'` = yes; then
:
else
- { { echo "$as_me:$LINENO: error: Please run configure from the SLIC checkout dir." >&5
-echo "$as_me: error: Please run configure from the SLIC checkout dir." >&2;}
+ { { echo "$as_me:$LINENO: error: please run configure from the SLIC checkout dir" >&5
+echo "$as_me: error: please run configure from the SLIC checkout dir" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -3634,8 +3636,8 @@
-echo "$as_me:$LINENO: checking whether SLIC code debugging should be enabled" >&5
-echo $ECHO_N "checking whether SLIC code debugging should be enabled... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking whether debug code should be enabled" >&5
+echo $ECHO_N "checking whether debug code should be enabled... $ECHO_C" >&6
# Check whether --enable-debug or --disable-debug was given.
if test "${enable_debug+set}" = set; then
@@ -3646,46 +3648,66 @@
if test -n "${enable_debug}" && test "${enable_debug}" = "yes"; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
-
- cat >>confdefs.h <<\_ACEOF
+ cat >>confdefs.h <<\_ACEOF
#define SLIC_DEBUG 1
_ACEOF
- cat >>confdefs.h <<\_ACEOF
-#define G4DEBUG 1
-_ACEOF
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
- cat >>confdefs.h <<\_ACEOF
-#define G4PROFILE 1
-_ACEOF
+echo "$as_me:$LINENO: checking whether gdb flags should be set" >&5
+echo $ECHO_N "checking whether gdb flags should be set... $ECHO_C" >&6
+
+# Check whether --enable-debug or --disable-debug was given.
+if test "${enable_debug+set}" = set; then
+ enableval="$enable_debug"
+
+fi;
+if test -n "${enable_gdb}" && test "${enable_gdb}" = "yes"; then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
- CXXFLAGS="${CXXFLAGS} -g -ggdb -pg"
+ CXXFLAGS="${CXXFLAGS} -g -ggdb"
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
fi
-echo "$as_me:$LINENO: checking whether SLIC verbose system should be enabled" >&5
-echo $ECHO_N "checking whether SLIC verbose system should be enabled... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking whether profiling flags should be set" >&5
+echo $ECHO_N "checking whether profiling flags should be set... $ECHO_C" >&6
-# Check whether --enable-verbose or --disable-verbose was given.
-if test "${enable_verbose+set}" = set; then
- enableval="$enable_verbose"
+# Check whether --enable-profiling or --disable-profiling was given.
+if test "${enable_profiling+set}" = set; then
+ enableval="$enable_profiling"
fi;
-if test "${enable_verbose}" = "yes" || test -z "${enable_verbose}"; then
+if test -n "${enable_profiling}" && test "${enable_profiling}" = "yes"; then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ CXXFLAGS="${CXXFLAGS} -pg"
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+echo "$as_me:$LINENO: checking whether to enable logging" >&5
+echo $ECHO_N "checking whether to enable logging... $ECHO_C" >&6
- cat >>confdefs.h <<\_ACEOF
-#define G4VERBOSE 1
-_ACEOF
+# Check whether --enable-log or --disable-log was given.
+if test "${enable_log+set}" = set; then
+ enableval="$enable_log"
+fi;
+
+if test "${enable_log}" = "yes" || test -z "${enable_log}"; then
cat >>confdefs.h <<\_ACEOF
-#define SLIC_VERBOSE 1
+#define SLIC_LOG 1
_ACEOF
-
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
@@ -3703,10 +3725,10 @@
# Check whether --enable-compile-verbose or --disable-compile-verbose was given.
if test "${enable_compile_verbose+set}" = set; then
enableval="$enable_compile_verbose"
- SLIC_COMPILE_VERBOSE_ENABLE="${enable_compile_verbose}"
+
fi;
-if test -n "${SLIC_COMPILE_VERBOSE_ENABLE}" && test "${SLIC_COMPILE_VERBOSE_ENABLE}" != "no"; then
+if test -n "${enable_compile_verbose}" && test "${enable_compile_verbose}" == "yes"; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
slic
diff -u -r1.22 -r1.23
--- aclocal.m4 15 Nov 2006 09:41:51 -0000 1.22
+++ aclocal.m4 27 Apr 2007 01:53:51 -0000 1.23
@@ -1,60 +1,89 @@
-dnl $Header: /cvs/lcd/slic/aclocal.m4,v 1.22 2006/11/15 09:41:51 jeremy Exp $
+dnl $Header: /cvs/lcd/slic/aclocal.m4,v 1.23 2007/04/27 01:53:51 jeremy Exp $
-dnl
-dnl m4 configuration macros for SLIC and friends
-dnl
-
-dnl /\/\/\ SLIC /\/\/\
+dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
+dnl Autoconf macros for SLIC and its dependencies friends.
+dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
+
+dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
+dnl Macro to configure SLIC.
+dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
AC_DEFUN(SIM_SETUP_SLIC, [
dnl make sure configure is running in SLIC_BASE
SLIC_PREFIX=$(pwd)
AC_CHECK_FILE([${SLIC_PREFIX}/slic.cc],
,
- AC_MSG_ERROR(Please run configure from the SLIC checkout dir.))
+ AC_MSG_ERROR(please run configure from the SLIC checkout dir))
AC_SUBST(SLIC_PREFIX)
dnl set as default install dir
AC_PREFIX_DEFAULT($SLIC_BASE)
-dnl enable debugging
-AC_MSG_CHECKING(whether SLIC code debugging should be enabled)
+dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
+dnl Macro to define SLIC_DEBUG.
+dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
+AC_MSG_CHECKING(whether debug code should be enabled)
AC_ARG_ENABLE(debug,
- AC_HELP_STRING([--enable-debug], [Enable debugging in code by setting SLIC_DEBUG, G4DEBUG and G4PROFILE]),
+ AC_HELP_STRING([--enable-debug], [turn on debug code by defining SLIC_DEBUG; default = no]),
,)
dnl default to no debug
if test -n "${enable_debug}" && test "${enable_debug}" = "yes"; then
AC_MSG_RESULT(yes)
-
- dnl compiler defines
AC_DEFINE(SLIC_DEBUG)
- AC_DEFINE(G4DEBUG)
- AC_DEFINE(G4PROFILE)
+else
+ AC_MSG_RESULT(no)
+fi
+
+dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
+dnl Macro to set gdb compiler flags.
+dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
+AC_MSG_CHECKING(whether gdb flags should be set)
+
+AC_ARG_ENABLE(debug,
+ AC_HELP_STRING([--enable-gdb], [enable debugging with gdb; default = no]),
+ ,)
+
+dnl default to no debug
+if test -n "${enable_gdb}" && test "${enable_gdb}" = "yes"; then
+ AC_MSG_RESULT(yes)
dnl debugging symbols
- CXXFLAGS="${CXXFLAGS} -g -ggdb -pg"
+ CXXFLAGS="${CXXFLAGS} -g -ggdb"
else
AC_MSG_RESULT(no)
fi
-dnl enable SLIC verbose system
-AC_MSG_CHECKING(whether SLIC verbose system should be enabled)
+dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
+dnl Macro to set profiling flags.
+dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
+AC_MSG_CHECKING(whether profiling flags should be set)
-AC_ARG_ENABLE(verbose,
- AC_HELP_STRING([--enable-verbose],
- [enable usage of verbose output using SLIC_VERBOSE])
- ,
- ,)
+AC_ARG_ENABLE(profiling,
+ AC_HELP_STRING([--enable-profiling], [enable profiling using gprof; default = no]),
+ ,)
-dnl turn verbosity on if enabled or no arg
-if test "${enable_verbose}" = "yes" || test -z "${enable_verbose}"; then
+dnl default to no profiling
+if test -n "${enable_profiling}" && test "${enable_profiling}" = "yes"; then
+ AC_MSG_RESULT(yes)
+ CXXFLAGS="${CXXFLAGS} -pg"
+else
+ AC_MSG_RESULT(no)
+fi
- dnl compiler defines
- AC_DEFINE(G4VERBOSE)
- AC_DEFINE(SLIC_VERBOSE)
+dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
+dnl Macro to enable logging.
+dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
+AC_MSG_CHECKING(whether to enable logging)
+
+AC_ARG_ENABLE(log,
+ AC_HELP_STRING([--enable-log],
+ [enable logging; disabling will turn off most console output; default = yes]),
+ ,)
+if test "${enable_log}" = "yes" || test -z "${enable_log}"; then
+ AC_DEFINE(SLIC_LOG)
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
@@ -62,16 +91,18 @@
])
-dnl enable verbose compiler output
+dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
+dnl Macro to enable verbose compiler output.
+dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
AC_DEFUN([SIM_SETUP_VERBOSE_COMPILE], [
AC_MSG_CHECKING(whether verbose compiler output should be enabled)
AC_ARG_ENABLE(compile-verbose,
- AC_HELP_STRING([--enable-compile-verbose], [Use verbose compiler settings]),
- [SLIC_COMPILE_VERBOSE_ENABLE="${enable_compile_verbose}"] )
+ AC_HELP_STRING([--enable-compile-verbose],
+ [use verbose compilation and linking flags]),
+ ,)
-dnl specified and not = no
-if test -n "${SLIC_COMPILE_VERBOSE_ENABLE}" && test "${SLIC_COMPILE_VERBOSE_ENABLE}" != "no"; then
+if test -n "${enable_compile_verbose}" && test "${enable_compile_verbose}" == "yes"; then
AC_MSG_RESULT(yes)
@@ -84,7 +115,9 @@
])
-dnl /\/\/\ LCIO /\/\/\
+dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
+dnl Setup LCIO.
+dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
AC_DEFUN(SIM_SETUP_LCIO, [
AC_MSG_CHECKING(for LCIO installation)