- fixing use of centrality class

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

diff --git a/HLT/acinclude.m4 b/HLT/acinclude.m4
index 0b779359495cde1ab723ec0264e5f9741568b004..3f8c4886fc8a9e1ee9ac8f0286e4f55948abedbc 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" ;;
@@ -44,6 +46,32 @@ AC_DEFUN([AC_DEBUG],
   AC_MSG_RESULT($enable_debug 'CFLAGS=$CFLAGS')
 ])
 
+dnl ------------------------------------------------------------------
+AC_DEFUN([AC_PROFILING],
+[
+  AC_REQUIRE([AC_PROG_CC])
+  AC_REQUIRE([AC_PROG_CXX])
+  AC_MSG_CHECKING(whether to add profiling info)
+  AC_ARG_ENABLE(profiling,
+    [AC_HELP_STRING([--enable-profiling],[Enable profiling info in objects])],
+    [],[enable_profiling=no])
+  if test "x$enable_profiling" = "xno" ; then
+    CFLAGS=`echo $CFLAGS | sed 's,-pg,,'`
+    CXXFLAGS=`echo $CXXFLAGS | sed 's,-pg,,'`
+  else
+    AC_DEFINE(PROFILING)
+    case $CXXFLAGS in
+    *-pg*) ;;
+    *)    CXXFLAGS="$CXXFLAGS -pg" ;;
+    esac
+    case $CFLAGS in
+    *-pg*) ;;
+    *)    CFLAGS="$CFLAGS -pg" ;;
+    esac
+  fi
+  AC_MSG_RESULT($enable_profiling 'CFLAGS=$CFLAGS')
+])
+
 dnl ------------------------------------------------------------------
 AC_DEFUN([AC_OPTIMIZATION],
 [
@@ -121,7 +149,8 @@ AC_DEFUN([ROOT_PATH],
   else 
    rootbin=$PATH
   fi
-  AC_PATH_PROG(ROOTCONF, root-config , no, $rootbin)
+  AC_PATH_PROG(ROOTCONF, root-config , no, $rootbin)   # used by HLT build system
+  AC_PATH_PROG(ROOTCONFIG, root-config , no, $rootbin) # used by AliRoot build system
   AC_PATH_PROG(ROOTEXEC, root , no, $rootbin)
   AC_PATH_PROG(ROOTCINT, rootcint , no, $rootbin)
        
@@ -239,6 +268,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++)
@@ -247,7 +277,9 @@ AC_ARG_ENABLE([$1],
      save_LIBS="$LIBS"
      CPPFLAGS="$save_CPPFLAGS [$3]"
 
-     AC_CHECK_HEADERS([$2], [], [enable_module="missheader"])
+     if test "x[$2]" != "x"; then
+        AC_CHECK_HEADERS([$2], [], [enable_module="missheader"])
+     fi
 
      dnl ==========================================================================
      dnl
@@ -272,6 +304,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