Fixing problems with AliHLTGlobalTriggerComponent and failing test: testGlobalTrigger...

[u/mrichter/AliRoot.git] / HLT / acinclude.m4

diff --git a/HLT/acinclude.m4 b/HLT/acinclude.m4
index a62246086bac6f8e452ce554c3f1c8334e639ecc..b7c83568ce0cbc8a704833ac5bc3fd343b5227f3 100644 (file)
--- 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" ;;
@@ -223,13 +225,23 @@ AC_ARG_ENABLE([$1],
       [   compile the $1 library ])],
   [if test "x$enableval" = "xno";
      then enable_module=no
+   elif test "x$disable_all" = "xyes"; then
+     # do checks if library has been enabled after global disable
+     enable_module=yes
    else
      enable_module=force
   fi],
-  [enable_module=yes
+  [if test "x$disable_all" = "xyes"; then
+   enable_module=no...modules.disabled
+   else
+   enable_module=yes
+   fi # if test "x$disable_all" = "yes"
+  ])
+  if test "x$enable_module" = "xyes"; then
    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++)
@@ -263,6 +275,7 @@ AC_ARG_ENABLE([$1],
      ALIHLTMODULE_LIBS="$ALIHLTMODULE_LIBS"
      LDFLAGS="$save_LDFLAGS [$8]"
      for CHECKLIB in $CHECKLIBS ; do
+       CIRCULARS=`echo $CIRCULARS | sed -e "s|-l$CHECKLIB||"`
        LIBS="$save_LIBS [$9] $CIRCULARS $ALIHLTMODULE_LIBS"
        AC_CHECK_LIB([$CHECKLIB],[_init], [ALIHLTMODULE_LIBS="$ALIHLTMODULE_LIBS -l$CHECKLIB"])
      done
@@ -271,8 +284,8 @@ AC_ARG_ENABLE([$1],
      LIBS="$save_LIBS"  
      AC_LANG_POP(C++)
 
-   fi
-  ])
+   fi # if test "x$have_aliroot" = "xno"
+  fi  # if test "x$enable_module" = "xyes"
 ])