bug 1005: Tmp solution for cmakefile

RTCP/IONProc/src/CMakeLists.txt

@@ -26,6 +26,7 @@ file (GLOB libinterface_HEADERS BeamletBuffer.h
 				SlidingPointer.h
 				WallClockTime.h
 				WH_DelayCompensation.h
+				Lock.h
 				FCNP_ServerStream.h)
  
 enable_language(ASM-BGP)
@@ -49,6 +50,7 @@ file (GLOB libionproc_SOURCES BeamletBuffer.cc
 			      Scheduling.cc
 			      WH_DelayCompensation.cc
 			      FCNP_ServerStream.cc
+			      Lock.cc
 			      ${amsSrcs})
 
 add_library (ionproc ${libionproc_SOURCES})

RTCP/IONProc/src/ION_main.cc

@@ -34,8 +34,9 @@
 #include <Stream/NullStream.h>
 #include <Stream/SocketStream.h>
 //#include <TH_ZoidServer.h>
+#if !defined HAVE_PKVERSION
 #include <Package__Version.h>
-
+#endif
 #include <cmath>
 #include <cstdlib>
 #include <cstring>
@@ -364,9 +365,10 @@ static void unmapFlatMemory()
 
 void *master_thread(void *)
 {
+#if !defined HAVE_PKVERSION
   std::string type = "brief";
   Version::show<IONProcVersion> (std::clog, "IONProc", type);
-  
+#endif  
   clog_logger("starting master_thread");
 
   enableCoreDumps();