From adec4ad44c0af34c0ba27a1fe9969a1e42fe45e6 Mon Sep 17 00:00:00 2001 From: richterm Date: Wed, 11 Jun 2008 11:16:12 +0000 Subject: [PATCH] added NDEBUG and DEBUG flags; check for latest dependencies in TRD and ITS; minor bugfix in module status printout --- HLT/acinclude.m4 | 3 +++ HLT/configure.ac | 44 +++++++++++++++++++++++++++++++++++++++----- 2 files changed, 42 insertions(+), 5 deletions(-) diff --git a/HLT/acinclude.m4 b/HLT/acinclude.m4 index 0b779359495..34f6d3fb705 100644 --- a/HLT/acinclude.m4 +++ b/HLT/acinclude.m4 @@ -28,10 +28,12 @@ AC_DEFUN([AC_DEBUG], [AC_HELP_STRING([--enable-debug],[Enable debugging symbols in objects])], [],[enable_debug=no]) if test "x$enable_debug" = "xno" ; then + AC_DEFINE(NDEBUG) CFLAGS=`echo $CFLAGS | sed 's,-g,,'` CXXFLAGS=`echo $CXXFLAGS | sed 's,-g,,'` else AC_DEFINE(__DEBUG) + AC_DEFINE(DEBUG) case $CXXFLAGS in *-g*) ;; *) CXXFLAGS="$CXXFLAGS -g" ;; @@ -239,6 +241,7 @@ AC_ARG_ENABLE([$1], if test "x$have_aliroot" = "xno" ; then enable_module="no...requires.AliRoot" else + AC_MSG_NOTICE([-------------------------------------------------]) AC_MSG_NOTICE([checking dependencies for [$1] library]) AC_LANG_PUSH(C++) diff --git a/HLT/configure.ac b/HLT/configure.ac index 930229bae27..c38e45fd898 100644 --- a/HLT/configure.ac +++ b/HLT/configure.ac @@ -566,6 +566,8 @@ fi if test "x$enable_tpc" = "xyes" ; then AC_DEFINE(HLT_TPC) +else + enable_module=$enable_tpc fi AM_CONDITIONAL(EN_HLT_TPC, test x$enable_tpc = xyes) AC_MSG_CHECKING([whether to compile TPC library]) @@ -612,6 +614,8 @@ fi if test "x$enable_rcu" = "xyes" ; then AC_DEFINE(HLT_RCU) +else + enable_module=$enable_rcu fi AM_CONDITIONAL(EN_HLT_RCU, test x$enable_rcu = xyes) AC_MSG_CHECKING([whether to compile RCU library]) @@ -662,6 +666,8 @@ fi if test "x$enable_phos" = "xyes" ; then AC_DEFINE(HLT_PHOS) ALIPHOS_LIBS=$ALIHLTMODULE_LIBS +else + enable_module=$enable_phos fi AM_CONDITIONAL(EN_HLT_PHOS, test x$enable_phos = xyes) AC_MSG_CHECKING([whether to compile PHOS library]) @@ -689,12 +695,14 @@ else AC_LANG_PUSH(C++) save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$save_CPPFLAGS $ALIROOT_CPPFLAGS -I$ALICE_ROOT/TRD" - AC_MSG_CHECKING([for required functions in AliTRDclusterizer]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ], - [AliTRDclusterizer c; - c.SetRawVersion(0)])], + # AliTRDclusterizer::SetRawVersion() requires >v4-07-Release + # changed to AliTRDrecoParam::SetSeedingOn() due to revision 26327, Mon Jun 2 2008 + AC_MSG_CHECKING([for required functions in AliTRDrecoParam]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ], + [AliTRDrecoParam p; + p.SetSeedingOn()])], [], - [enable_trd="no...requires.AliRoot>v4-07-Release"]) + [enable_trd="no...requires.AliRoot>v4-13-Release"]) AC_MSG_RESULT([$enable_trd]) AC_LANG_POP(C++) CPPFLAGS="$save_CPPFLAGS" @@ -704,6 +712,8 @@ fi if test "x$enable_trd" = "xyes" ; then AC_DEFINE(HLT_TRD) ALITRD_LIBS=$ALIHLTMODULE_LIBS +else + enable_module=$enable_trd fi AM_CONDITIONAL(EN_HLT_TRD, test x$enable_trd = xyes) AC_MSG_CHECKING([whether to compile TRD library]) @@ -733,6 +743,8 @@ fi if test "x$enable_muon" = "xyes" ; then AC_DEFINE(HLT_MUON) ALIMUON_LIBS=$ALIHLTMODULE_LIBS +else + enable_module=$enable_muon fi AM_CONDITIONAL(EN_HLT_MUON, test x$enable_muon = xyes) AC_MSG_CHECKING([whether to compile MUON library]) @@ -761,6 +773,8 @@ fi if test "x$enable_trigger" = "xyes" ; then AC_DEFINE(HLT_TRIGGER) ALITRIGGER_LIBS=$ALIHLTMODULE_LIBS +else + enable_module=$enable_trigger fi AM_CONDITIONAL(EN_HLT_TRIGGER, test x$enable_trigger = xyes) AC_MSG_CHECKING([whether to compile Trigger library]) @@ -784,11 +798,29 @@ elif test "x$enable_module" = "xforce"; then enable_its="yes" else enable_its=$enable_module + if test "x$enable_its" = "xyes" ; then + AC_LANG_PUSH(C++) + save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$save_CPPFLAGS $ALIROOT_CPPFLAGS -I$ALICE_ROOT/ITS" + # changes in the AliVertexer base class revision 26414, Thu Jun 5 15:36:18 2008 + # require AliVertexer::GetNominalPos() + AC_MSG_CHECKING([for required functions in AliITSVertexer]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ], + [AliITSVertexerZ v; + v.GetNominalPos()])], + [], + [enable_its="no...requires.AliRoot>v4-13-Release"]) + AC_MSG_RESULT([$enable_its]) + AC_LANG_POP(C++) + CPPFLAGS="$save_CPPFLAGS" + fi fi if test "x$enable_its" = "xyes" ; then AC_DEFINE(HLT_ITS) ALIITS_LIBS=$ALIHLTMODULE_LIBS +else + enable_module=$enable_its fi AM_CONDITIONAL(EN_HLT_ITS, test x$enable_its = xyes) AC_MSG_CHECKING([whether to compile ITS library]) @@ -817,6 +849,8 @@ fi if test "x$enable_comp" = "xyes" ; then AC_DEFINE(HLT_COMP) ALICOMP_LIBS=$ALIHLTMODULE_LIBS +else + enable_module=$enable_comp fi AM_CONDITIONAL(EN_HLT_COMP, test x$enable_comp = xyes) AC_MSG_CHECKING([whether to compile comp library]) -- 2.43.0