Additional odifications to compile without ZeroMQ

diff --git a/EVE/EveBase/AliEveConfigManager.cxx b/EVE/EveBase/AliEveConfigManager.cxx
index 23232d7221fef913743eeac42459fb653a4f918c..75ab46ddfabf3f3a67c5f13056ea259256fcf539 100644 (file)
--- a/EVE/EveBase/AliEveConfigManager.cxx
+++ b/EVE/EveBase/AliEveConfigManager.cxx
@@ -22,8 +22,10 @@
 #include "AliEveMacro.h"
 
 //Storage Manager:
+#ifdef ZMQ
 #include "AliStorageAdministratorPanelListEvents.h"
 #include "AliStorageAdministratorPanelMarkEvent.h"
+#endif
 
 class AliEveMacroExecutor;
 class TEveProjectionManager;
@@ -185,8 +187,10 @@ AliEveConfigManager::AliEveConfigManager() :
 
   //Storage Manager:
   fStoragePopup = new TGPopupMenu(gClient->GetRoot());
+#ifdef ZMQ
   fStoragePopup->AddEntry("&List events",kStorageListEvents);
   fStoragePopup->AddEntry("&Mark event",kStorageMarkEvent);
+#endif
 
   fStoragePopup->Connect("Activated(Int_t)","AliEveConfigManager",
                         this, "AliEvePopupHandler(Int_t)");
@@ -1033,19 +1037,22 @@ void AliEveConfigManager::AliEvePopupHandler(Int_t id)
 */
   case kStorageListEvents:
   {
+#ifdef ZMQ
       fListEventsWindow =
                  AliStorageAdministratorPanelListEvents::GetInstance();
       
       fListEventsWindow->Connect("SelectedEvent()","AliEveConfigManager",this,"SetEventInEventManager()");
-      
+#endif      
       
          break;
 
   }
    case kStorageMarkEvent:
   {
+#ifdef ZMQ
          AliStorageAdministratorPanelMarkEvent *markEventWindow =
                  AliStorageAdministratorPanelMarkEvent::GetInstance();
+#endif
          break;
 
   }

diff --git a/MONITOR/CMakelibMONITOR.pkg b/MONITOR/CMakelibMONITOR.pkg
index 7a7aa96868a30d56402712793ab84a68eb688ca1..004470e1366c89f15dc429a630c9d4029413ad28 100644 (file)
--- a/MONITOR/CMakelibMONITOR.pkg
+++ b/MONITOR/CMakelibMONITOR.pkg
@@ -6,8 +6,6 @@ set ( SRCS
     AliChildProcTerminator.cxx
     alitestproc/AliTestChildProc.cxx
     alieventserver/AliEventServerPreferencesWindow.cxx
-    alieventserver/AliEventServerReconstruction.cxx
-    alieventserver/AliEventServerWindow.cxx
 )
 
 string ( REPLACE ".cxx" ".h" CINTHDRS "${SRCS}" )

diff --git a/MONITOR/CMakelibMONITORzmq.pkg b/MONITOR/CMakelibMONITORzmq.pkg
index 3b7719ee98d4315b22fe7aad4e99abd4770c2384..4ca5d74322973772bcfae9c6aa8c77359c7f7a6b 100644 (file)
--- a/MONITOR/CMakelibMONITORzmq.pkg
+++ b/MONITOR/CMakelibMONITORzmq.pkg
@@ -8,6 +8,9 @@ set ( SRCS
     alistoragemanager/AliStorageAdministratorPanelSetStorageParams.cxx
     alistoragemanager/AliStorageEventManager.cxx
     alistoragemanager/AliStorageDatabase.cxx
+    alieventserver/AliEventServerReconstruction.cxx
+    alieventserver/AliEventServerWindow.cxx
+
 )
 
 string ( REPLACE ".cxx" ".h" CINTHDRS "${SRCS}" )

diff --git a/MONITOR/MONITORLinkDef.h b/MONITOR/MONITORLinkDef.h
index ef487a34709f314621a47c2249b953a7f3f18d85..cdeb0b2dfaa6297d26e215deb6864bc3a9e7eabf 100644 (file)
--- a/MONITOR/MONITORLinkDef.h
+++ b/MONITOR/MONITORLinkDef.h
@@ -21,7 +21,4 @@
 #pragma link C++ class AliChildProcTerminator+;
 #pragma link C++ class AliTestChildProc+;
 
-#pragma link C++ class AliEventServerWindow+;
-#pragma link C++ class AliEventServerReconstruction+;
-
 #endif

diff --git a/MONITOR/MONITORzmqLinkDef.h b/MONITOR/MONITORzmqLinkDef.h
index 9bac78363f26e39e8f5a3f8166c169ca3c0488f9..2eab31688d389b54dc5d5cd12acfc0920f51752c 100644 (file)
--- a/MONITOR/MONITORzmqLinkDef.h
+++ b/MONITOR/MONITORzmqLinkDef.h
@@ -18,5 +18,7 @@
 #pragma link C++ class AliStorageAdministratorPanelMarkEvent+;
 #pragma link C++ class AliStorageAdministratorPanelListEvents+;
 #pragma link C++ class AliStorageAdministratorPanelSetStorageParams+;
+#pragma link C++ class AliEventServerReconstruction+;
+#pragma link C++ class AliEventServerWindow+;
 
 #endif