reverse logic of header checks in order to avoid unnecessary -D flags

diff --git a/HLT/BASE/AliHLTMessage.cxx b/HLT/BASE/AliHLTMessage.cxx
index b3d040471d04eada9b4c1878bae1414f8bae5a89..3d6c5c84cedf05c4053bf547f361e7760af80197 100644 (file)
--- a/HLT/BASE/AliHLTMessage.cxx
+++ b/HLT/BASE/AliHLTMessage.cxx
@@ -76,7 +76,7 @@ AliHLTMessage::AliHLTMessage(UInt_t what)
 //______________________________________________________________________________
 AliHLTMessage::AliHLTMessage(void *buf, Int_t bufsize)
   :
-# if defined(ROOT_TBufferFile) || defined(HAVE_TBUFFERFILE_H)
+# if defined(ROOT_TBufferFile)
   TBufferFile(kRead, bufsize, buf, 0),
 # else
   TBuffer(kRead, bufsize, buf, 0),

diff --git a/HLT/BASE/AliHLTMessage.h b/HLT/BASE/AliHLTMessage.h
index 90a89001a22c37348626777da214d4fa27d4c4ad..43e6d51726f2e03303d9b79bab2f771e0f8e9282 100644 (file)
--- a/HLT/BASE/AliHLTMessage.h
+++ b/HLT/BASE/AliHLTMessage.h
@@ -38,10 +38,6 @@
 // to differentiate between the usage of TBuffer or TBufferFile.
 #include "TMessage.h"
 
-#if defined(HAVE_TBUFFERFILE_H)
-#include "TBufferFile.h"
-#endif
-
 #ifndef ROOT_MessageTypes
 #include "MessageTypes.h"
 #endif
@@ -91,7 +87,7 @@
  */
 class AliHLTMessage 
 :
-# if defined(ROOT_TBufferFile) || defined(HAVE_TBUFFERFILE_H)
+# if defined(ROOT_TBufferFile)
 public TBufferFile,
 #else
 public TBuffer,

diff --git a/HLT/TPCLib/OnlineDisplay/AliHLTTPCDisplay.cxx b/HLT/TPCLib/OnlineDisplay/AliHLTTPCDisplay.cxx
index 951609ef30fa5509a943acef6ca21774ac0c09b9..c6cdf6ea4f25ba6d7a959494113026d7d9d4cc4f 100644 (file)
--- a/HLT/TPCLib/OnlineDisplay/AliHLTTPCDisplay.cxx
+++ b/HLT/TPCLib/OnlineDisplay/AliHLTTPCDisplay.cxx
@@ -34,7 +34,7 @@
 #define UNUSEDCLUSTERCOLOR
 
 #include "AliHLTStdIncludes.h"
-#if defined(HAVE_TVIEW3D_H)
+#ifndef HAVE_NOT_TVIEW3D
 #include <TView3D.h>
 #else
 #include <TView.h>
@@ -734,7 +734,7 @@ void AliHLTTPCDisplay::DrawHistCharge(){
 // #############################################################################
 void AliHLTTPCDisplay::Draw3D(){       
     
-#if defined(HAVE_TVIEW3D_H)
+#ifndef HAVE_NOT_TVIEW3D
     TView3D *v = new TView3D();
     if (v) v->SetSystem(1);
 #else

diff --git a/HLT/TPCLib/OnlineDisplay/AliHLTTPCDisplay3D.cxx b/HLT/TPCLib/OnlineDisplay/AliHLTTPCDisplay3D.cxx
index 512ab45161ffafbda9acfc0ca11e458a6198d26c..da4b98e65d75666534f7fa85e48a7a67dd40815d 100644 (file)
--- a/HLT/TPCLib/OnlineDisplay/AliHLTTPCDisplay3D.cxx
+++ b/HLT/TPCLib/OnlineDisplay/AliHLTTPCDisplay3D.cxx
@@ -32,7 +32,7 @@
 #include "AliHLTTPCDisplayPadRow.h"
 
 #include "AliHLTStdIncludes.h"
-#if defined(HAVE_TVIEW3D_H)
+#ifndef HAVE_NOT_TVIEW3D
 #include <TView3D.h>
 #else
 #include <TView.h>
@@ -114,7 +114,7 @@ void AliHLTTPCDisplay3D::Draw(){
     fDisplay->GetCanvas3D()->cd();
     fDisplay->GetCanvas3D()->Clear();
 
-#if defined(HAVE_TVIEW3D_H)
+#ifndef HAVE_NOT_TVIEW3D
     TView3D *v = new TView3D();
     if (v) v->SetSystem(1);
 #else

diff --git a/HLT/configure.ac b/HLT/configure.ac
index 3cc452281962393ddfef63d24d82828e9952a71d..d79e14e3dd21225e9183247ffb3a311ec4928340 100644 (file)
--- a/HLT/configure.ac
+++ b/HLT/configure.ac
@@ -83,11 +83,11 @@ if test "x$have_root" = "x1"; then
 
   # TBuffer.h has been made pure virtual in root v5-15-02 and one
   # has to derive from TBufferFile.h (needed for BASE/AliHLTMessage.h)
-  AC_CHECK_HEADERS([TBufferFile.h])
+  AC_CHECK_HEADER([TBufferFile.h], [], [HAVE_NOT_TBUFFERFILE])
 
   # TView.h has been made pure virtual right after root v5-15-02 and one
   # has to derive from TView3D.h (needed for TPCLib/OnlineDisplay/AliHLTTPCDisplay3D)
-  AC_CHECK_HEADERS([TView3D.h])
+  AC_CHECK_HEADER([TView3D.h], [], [HAVE_NOT_TVIEW3D])
 
   CPPFLAGS=$save_CPPFLAGS
   LDFLAGS=$save_LDFLAGS
@@ -313,8 +313,8 @@ if test ! "x$have_aliroot" = "xno" ; then
     AC_MSG_RESULT([$have_tpc_load_clusters])
 
   fi
-  AC_CHECK_HEADERS([AliTPCCalibPulser.h], [], [AC_DEFINE(HAVE_NOT_ALITPCCALIBPULSER)])
-  AC_CHECK_HEADERS([AliTPCCalibPedestal.h], [], [AC_DEFINE(HAVE_NOT_ALITPCCALIBPEDESTAL)])
+  AC_CHECK_HEADER([AliTPCCalibPulser.h], [], [AC_DEFINE(HAVE_NOT_ALITPCCALIBPULSER)])
+  AC_CHECK_HEADER([AliTPCCalibPedestal.h], [], [AC_DEFINE(HAVE_NOT_ALITPCCALIBPEDESTAL)])
 
   have_tpc_mapping=no
   if test ! "x$have_aliroot" = "xno" ; then