From ba4b0dd7bbfd2e0e973e13eb8b9e251254d5284a Mon Sep 17 00:00:00 2001
From: richterm <richterm@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Fri, 20 Jun 2008 14:35:20 +0000
Subject: [PATCH] reverse logic of header checks in order to avoid unnecessary
 -D flags

---
 HLT/BASE/AliHLTMessage.cxx                      | 2 +-
 HLT/BASE/AliHLTMessage.h                        | 6 +-----
 HLT/TPCLib/OnlineDisplay/AliHLTTPCDisplay.cxx   | 4 ++--
 HLT/TPCLib/OnlineDisplay/AliHLTTPCDisplay3D.cxx | 4 ++--
 HLT/configure.ac                                | 8 ++++----
 5 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/HLT/BASE/AliHLTMessage.cxx b/HLT/BASE/AliHLTMessage.cxx
index b3d040471d0..3d6c5c84ced 100644
--- 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 90a89001a22..43e6d51726f 100644
--- 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 951609ef30f..c6cdf6ea4f2 100644
--- 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 512ab45161f..da4b98e65d7 100644
--- 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 3cc45228196..d79e14e3dd2 100644
--- 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
-- 
2.43.0