diff --git a/MAC/APL/APLCommon/configure.in b/MAC/APL/APLCommon/configure.in
index e7da521b7bfc35aeda4887dedb3a0a5784c10e0e..41d4ad56f15ae4414ac4c422008c700822c3ac7b 100644
--- a/MAC/APL/APLCommon/configure.in
+++ b/MAC/APL/APLCommon/configure.in
@@ -55,15 +55,14 @@ lofar_CHECK_PRETTY_FUNCTION
lofar_QATOOLS
lofar_DOCXX
lofar_COMPILETOOLS
-#lofar_MPI(0)
lofar_PVSS(1)
-lofar_INTERNAL(LCS/Common,common,,1,Common/LofarTypes.h,,)
-lofar_INTERNAL(LCS/ACC/APS,ACC/APS,,1,APS/ParameterSet.h,,)
-lofar_INTERNAL(MAC/GCF/TM,GCFTM,,1,GCF/TM/GCF_Control.h,,)
-lofar_INTERNAL(LCS/Common,GCFCommon,,1,GCF/GCF_Defines.h,,)
-lofar_INTERNAL(MAC/GCF/PAL,GCFPAL,,1,GCF/PAL/GCF_Property.h,,)
-lofar_EXTERNAL(log4cplus,1,log4cplus/logger.h,,)
-lofar_EXTERNAL(boost,1,boost/shared_ptr.hpp,"")
+lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(LCS/ACC/APS, APS, LCS-ACC-2_0, 1, APS/ParameterSet.h,,)
+lofar_INTERNAL(MAC/GCF/TM, GCFTM, MAC-GCF-6_0, 1, GCF/TM/GCF_Control.h,,)
+lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
+lofar_INTERNAL(MAC/GCF/PAL, GCFPAL, MAC-GCF-6_0, 1, GCF/PAL/GCF_Property.h,,)
+lofar_LOG4CPLUS
+lofar_EXTERNAL(boost, 1, boost/shared_ptr.hpp, "")
dnl
dnl Output Makefiles
diff --git a/MAC/APL/PAC/BeamServer/configure.in b/MAC/APL/PAC/BeamServer/configure.in
index 973a7f2f21e7d496a11d7a13a613564dcfda4e41..e738fea608f9b4789644371fbfe9d77f83a38553 100644
--- a/MAC/APL/PAC/BeamServer/configure.in
+++ b/MAC/APL/PAC/BeamServer/configure.in
@@ -63,14 +63,14 @@ lofar_QATOOLS
lofar_DOCXX
lofar_COMPILETOOLS
-lofar_INTERNAL(LCS/Common,common,,1,Common/LofarTypes.h,,)
-lofar_INTERNAL(MAC/Test/Suite,suite,,1,Suite/suite.h,,)
-lofar_INTERNAL(MAC/APL/PAC/RSPDriver,rsp,,1,RSP_Protocol.ph,,)
-lofar_INTERNAL(MAC/APL/PAC/Calibration, cal,,1,CAL_Protocol.ph,,)
-lofar_INTERNAL(LCS/AMC/AMCBase,AMCBase,,1,AMCBase/EarthCoord.h,,)
-lofar_INTERNAL(MAC/GCF/TM,GCFTM,,1,GCF/TM/GCF_Control.h,,)
-lofar_INTERNAL(MAC/GCF/GCFCommon,GCFCommon,,1,GCF/GCF_Defines.h,,)
-lofar_EXTERNAL(log4cplus,1,log4cplus/logger.h,,)
+lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(MAC/Test/Suite, suite, MAC-GCF-6_0, 1, Suite/suite.h,,)
+lofar_INTERNAL(MAC/APL/PAC/RSPDriver, rsp, MAC-RTC-4_0, 1, RSP_Protocol.ph,,)
+lofar_INTERNAL(MAC/APL/PAC/Calibration, cal, MAC-RTC-4_0, 1, CAL_Protocol.ph,,)
+lofar_INTERNAL(LCS/AMC/AMCBase,AMCBase, LCS-AMC-1_0, 1, AMCBase/EarthCoord.h,,)
+lofar_INTERNAL(MAC/GCF/TM, GCFTM, MAC-GCF-6_0, 1, GCF/TM/GCF_Control.h,,)
+lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
+lofar_LOG4CPLUS
lofar_EXTERNAL(BLITZ,1,blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',,-lm)
dnl
diff --git a/MAC/APL/PAC/CalServer/configure.in b/MAC/APL/PAC/CalServer/configure.in
index f3c28ac23f5e522abaa82d08397c32fb0cf223d3..ad2b379af84cb1ad6323ec419ecafc585f7407f3 100644
--- a/MAC/APL/PAC/CalServer/configure.in
+++ b/MAC/APL/PAC/CalServer/configure.in
@@ -55,20 +55,18 @@ lofar_QATOOLS
lofar_DOCXX
lofar_COMPILETOOLS
-dnl lofar_AIPSPP(1)
-lofar_EXTERNAL(AMCBase,1,AMCBase/EarthCoord.h,,)
-dnl lofar_EXTERNAL(AMCImpl,1,AMCImpl/ConverterImpl.h,,)
+lofar_INTERNAL(LCS/AMC/AMCBase, AMCBase, LCS-AMC-1_0, 1, AMCBase/EarthCoord.h,,)
-lofar_INTERNAL(LCS/Common,common,,1,Common/LofarTypes.h,,)
-lofar_INTERNAL(MAC/Test/Suite,suite,,1,Suite/suite.h,,)
-lofar_INTERNAL(MAC/APL/PAC/RSPDriver,rsp,,1,RSP_Protocol.ph,,)
-lofar_INTERNAL(MAC/GCF/TM,GCFTM,,1,GCF/TM/GCF_Control.h,,)
-lofar_INTERNAL(MAC/GCF/GCFCommon,GCFCommon,,1,GCF/GCF_Defines.h,,)
-lofar_INTERNAL(MAC/APL/RTCCommon,RTCCommon,,1,Marshalling.h,,)
-lofar_EXTERNAL(g2c,1,,"","/usr/lib",,,,"-lg2c")
-lofar_EXTERNAL(cpplapack,1,cpplapack.h,"","/usr/local/lib/+pkg",,,,"-llapack -lblas -lm")
-lofar_EXTERNAL(log4cplus,1,log4cplus/logger.h,,)
-lofar_EXTERNAL(BLITZ,1,blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',,-lm)
+lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(MAC/Test/Suite, suite, MAC-GCF-6_0, 1, Suite/suite.h,,)
+lofar_INTERNAL(MAC/APL/PAC/RSPDriver, rsp, MAC-RTC-4_0, 1, RSP_Protocol.ph,,)
+lofar_INTERNAL(MAC/GCF/TM, GCFTM, MAC-GCF-6_0, 1, GCF/TM/GCF_Control.h,,)
+lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
+lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, MAC-RTC-4_0, 1, Marshalling.h,,)
+lofar_EXTERNAL(g2c, 1,, "", "/usr/lib",,,, "-lg2c")
+lofar_EXTERNAL(cpplapack, 1, cpplapack.h, "", "/usr/local/lib/+pkg",,,, "-llapack -lblas -lm")
+lofar_LOG4CPLUS
+lofar_EXTERNAL(BLITZ, 1, blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',, -lm)
dnl
dnl Output Makefiles
diff --git a/MAC/APL/PAC/Calibration/configure.in b/MAC/APL/PAC/Calibration/configure.in
index f3c28ac23f5e522abaa82d08397c32fb0cf223d3..ad2b379af84cb1ad6323ec419ecafc585f7407f3 100644
--- a/MAC/APL/PAC/Calibration/configure.in
+++ b/MAC/APL/PAC/Calibration/configure.in
@@ -55,20 +55,18 @@ lofar_QATOOLS
lofar_DOCXX
lofar_COMPILETOOLS
-dnl lofar_AIPSPP(1)
-lofar_EXTERNAL(AMCBase,1,AMCBase/EarthCoord.h,,)
-dnl lofar_EXTERNAL(AMCImpl,1,AMCImpl/ConverterImpl.h,,)
+lofar_INTERNAL(LCS/AMC/AMCBase, AMCBase, LCS-AMC-1_0, 1, AMCBase/EarthCoord.h,,)
-lofar_INTERNAL(LCS/Common,common,,1,Common/LofarTypes.h,,)
-lofar_INTERNAL(MAC/Test/Suite,suite,,1,Suite/suite.h,,)
-lofar_INTERNAL(MAC/APL/PAC/RSPDriver,rsp,,1,RSP_Protocol.ph,,)
-lofar_INTERNAL(MAC/GCF/TM,GCFTM,,1,GCF/TM/GCF_Control.h,,)
-lofar_INTERNAL(MAC/GCF/GCFCommon,GCFCommon,,1,GCF/GCF_Defines.h,,)
-lofar_INTERNAL(MAC/APL/RTCCommon,RTCCommon,,1,Marshalling.h,,)
-lofar_EXTERNAL(g2c,1,,"","/usr/lib",,,,"-lg2c")
-lofar_EXTERNAL(cpplapack,1,cpplapack.h,"","/usr/local/lib/+pkg",,,,"-llapack -lblas -lm")
-lofar_EXTERNAL(log4cplus,1,log4cplus/logger.h,,)
-lofar_EXTERNAL(BLITZ,1,blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',,-lm)
+lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(MAC/Test/Suite, suite, MAC-GCF-6_0, 1, Suite/suite.h,,)
+lofar_INTERNAL(MAC/APL/PAC/RSPDriver, rsp, MAC-RTC-4_0, 1, RSP_Protocol.ph,,)
+lofar_INTERNAL(MAC/GCF/TM, GCFTM, MAC-GCF-6_0, 1, GCF/TM/GCF_Control.h,,)
+lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
+lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, MAC-RTC-4_0, 1, Marshalling.h,,)
+lofar_EXTERNAL(g2c, 1,, "", "/usr/lib",,,, "-lg2c")
+lofar_EXTERNAL(cpplapack, 1, cpplapack.h, "", "/usr/local/lib/+pkg",,,, "-llapack -lblas -lm")
+lofar_LOG4CPLUS
+lofar_EXTERNAL(BLITZ, 1, blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',, -lm)
dnl
dnl Output Makefiles
diff --git a/MAC/APL/PAC/RSPDriver/configure.in b/MAC/APL/PAC/RSPDriver/configure.in
index 49f4ea8984a09ffe3dd98540c29cfe5d23ffce8e..fc9bd51d95427f6d284d6a49bbde0c3066a4b26b 100644
--- a/MAC/APL/PAC/RSPDriver/configure.in
+++ b/MAC/APL/PAC/RSPDriver/configure.in
@@ -94,14 +94,12 @@ AC_PROG_RANLIB
dnl wanted by: src/CaptureStats.cc:874
AC_STRUCT_TM
-dnl lofar_EXTERNAL(lofarlogger,1,LofarLogger/LofarLogger.h,,)
-lofar_INTERNAL(LCS/Common,common,,1,Common/LofarTypes.h,,)
-lofar_INTERNAL(MAC/Test/Suite,suite,,1,Suite/test.h,,)
-lofar_INTERNAL(MAC/GCF/TM,GCFTM,,1,GCF/TM/GCF_Control.h,,)
-lofar_INTERNAL(MAC/GCF/GCFCommon,GCFCommon,,1,GCF/GCF_Defines.h,,)
-lofar_INTERNAL(MAC/APL/RTCCommon,RTCCommon,,1,Marshalling.h,,)
-lofar_INTERNAL(MAC/APL/PAC/RSPDriver/src/rspctlfe,rspfe,,1,RSPFE_Protocol.ph,,)
-lofar_EXTERNAL(log4cplus,1,log4cplus/logger.h,,)
+lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(MAC/Test/Suite, suite, MAC-GCF-6_0, 1, Suite/test.h,,)
+lofar_INTERNAL(MAC/GCF/TM, GCFTM, MAC-GCF-6_0, 1, GCF/TM/GCF_Control.h,,)
+lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
+lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, MAC-RTC-4_0, 1, Marshalling.h,,)
+lofar_LOG4CPLUS
lofar_EXTERNAL(BLITZ,1,blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',,-lm)
dnl PPS_API needed by RSPDriver
diff --git a/MAC/APL/PAC/RSPDriver/src/rspctlfe/configure.in b/MAC/APL/PAC/RSPDriver/src/rspctlfe/configure.in
index e0761ae6c5d0bbb2fe6af7169bed25f0952d7171..f3ed59023f891bfe169171280fab7e7011f60f4b 100755
--- a/MAC/APL/PAC/RSPDriver/src/rspctlfe/configure.in
+++ b/MAC/APL/PAC/RSPDriver/src/rspctlfe/configure.in
@@ -70,13 +70,12 @@ lofar_DOCXX
lofar_COMPILETOOLS
lofar_PVSS(1)
-dnl lofar_EXTERNAL(lofarlogger,1,LofarLogger/LofarLogger.h,,)
-lofar_EXTERNAL(log4cplus,1,log4cplus/logger.h,,)
-lofar_EXTERNAL(common,1,Common/LofarTypes.h,,)
-lofar_EXTERNAL(GCFTM,1,GCF/TM/GCF_Control.h,,)
-lofar_EXTERNAL(GCFPAL,1,GCF/PAL/GCF_Answer.h,,)
-lofar_EXTERNAL(GCFCommon,1,GCF/GCF_Defines.h,,)
-lofar_EXTERNAL(RTCCommon,1,Marshalling.h,,)
+lofar_LOG4CPLUS
+lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(MAC/GCF/TM, GCFTM, MAC-GCF-6_0, 1, GCF/TM/GCF_Control.h,,)
+lofar_INTERNAL(MAC/GCF/PAL, GCFPAL, MAC-GCF-6_0, 1, GCF/PAL/GCF_Answer.h,,)
+lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
+lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, MAC-RTC-4_0, 1, Marshalling.h,,)
dnl
dnl Output Makefiles
diff --git a/MAC/APL/PAC/_StationOperations/configure.in b/MAC/APL/PAC/_StationOperations/configure.in
index 23e3bab4b4935fd21ac441a706cc759c05ec34f6..87a3c056bbadec0cae744268449f6bafc560e9fa 100644
--- a/MAC/APL/PAC/_StationOperations/configure.in
+++ b/MAC/APL/PAC/_StationOperations/configure.in
@@ -52,20 +52,18 @@ dnl Check for LOFAR specific things
dnl
lofar_DEBUG_OPTIMIZE
lofar_CHECK_PRETTY_FUNCTION
-#lofar_QT
lofar_QATOOLS
lofar_DOCXX
lofar_COMPILETOOLS
-#lofar_MPI(0)
lofar_PVSS(1)
-lofar_EXTERNAL(common,1,Common/LofarTypes.h,,)
-lofar_EXTERNAL(log4cplus,1,log4cplus/logger.h,,)
+
+lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
+lofar_LOG4CPLUS
lofar_EXTERNAL(boost,1,boost/shared_ptr.hpp,"")
-lofar_EXTERNAL(GCFTM,1,GCF/TM/GCF_Control.h,,)
-lofar_EXTERNAL(GCFCommon,1,GCF/GCF_Defines.h,,)
-lofar_EXTERNAL(GCFPAL,1,GCF/PAL/GCF_Property.h,,)
-#lofar_EXTERNAL(GCFPALlight,1,GCF/PALlight/GCF_RTMyProperty.h,,)
-lofar_EXTERNAL(APLCommon,1,APLCommon/APL_Defines.h,,)
+lofar_INTERNAL(MAC/GCF/TM, GCFTM, MAC-GCF-6_0, 1, GCF/TM/GCF_Control.h,,)
+lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
+lofar_INTERNAL(MAC/GCF/PAL, GCFPAL, MAC-GCF-6_0, 1, GCF/PAL/GCF_Property.h,,)
+lofar_INTERNAL(MAC/APL/APLCommon, APLCommon, MAC-APL-3_1, 1, APLCommon/APL_Defines.h,,)
dnl
dnl Output Makefiles
diff --git a/MAC/APL/PAC/_StationReceptorGroup/configure.in b/MAC/APL/PAC/_StationReceptorGroup/configure.in
index be3b99c8b30f663edfeb6be158c759b6eb9a35e8..b2675a11fd6d50d84e9dc3bdbfef0a22474b42b3 100644
--- a/MAC/APL/PAC/_StationReceptorGroup/configure.in
+++ b/MAC/APL/PAC/_StationReceptorGroup/configure.in
@@ -52,20 +52,18 @@ dnl Check for LOFAR specific things
dnl
lofar_DEBUG_OPTIMIZE
lofar_CHECK_PRETTY_FUNCTION
-#lofar_QT
lofar_QATOOLS
lofar_DOCXX
lofar_COMPILETOOLS
-#lofar_MPI(0)
lofar_PVSS(1)
-lofar_EXTERNAL(common,1,Common/LofarTypes.h,,)
-lofar_EXTERNAL(log4cplus,1,log4cplus/logger.h,,)
+
+lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
+lofar_LOG4CPLUS
lofar_EXTERNAL(boost,1,boost/shared_ptr.hpp,"")
-lofar_EXTERNAL(GCFTM,1,GCF/TM/GCF_Control.h,,)
-lofar_EXTERNAL(GCFCommon,1,GCF/GCF_Defines.h,,)
-lofar_EXTERNAL(GCFPAL,1,GCF/PAL/GCF_Property.h,,)
-#lofar_EXTERNAL(GCFPALlight,1,GCF/PALlight/GCF_RTMyProperty.h,,)
-lofar_EXTERNAL(APLCommon,1,APLCommon/APL_Defines.h,,)
+lofar_INTERNAL(MAC/GCF/TM, GCFTM, MAC-GCF-6_0, 1, GCF/TM/GCF_Control.h,,)
+lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
+lofar_INTERNAL(MAC/GCF/PAL, GCFPAL, MAC-GCF-6_0, 1, GCF/PAL/GCF_Property.h,,)
+lofar_INTERNAL(MAC/APL/APLCommon, APLCommon, MAC-APL-3_1, 1, APLCommon/APL_Defines.h,,)
dnl
dnl Output Makefiles
diff --git a/MAC/APL/PAC/_StationStartDaemon/configure.in b/MAC/APL/PAC/_StationStartDaemon/configure.in
index f67a14867e35f92aa6571c522c44c543572e5aa6..f58c5748fbb0a57577fd8e851ef3fc67510cccdf 100644
--- a/MAC/APL/PAC/_StationStartDaemon/configure.in
+++ b/MAC/APL/PAC/_StationStartDaemon/configure.in
@@ -52,24 +52,23 @@ dnl Check for LOFAR specific things
dnl
lofar_DEBUG_OPTIMIZE
lofar_CHECK_PRETTY_FUNCTION
-#lofar_QT
lofar_QATOOLS
lofar_DOCXX
lofar_COMPILETOOLS
-#lofar_MPI(0)
lofar_LOG4CPLUS
lofar_PVSS(1)
+
lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
lofar_INTERNAL(MAC/GCF/TM, gcftm, MAC-GCF-6_0, 1, GCF/TM/GCF_Task.h,,)
lofar_INTERNAL(MAC/GCF/PAL, gcfpal, MAC-GCF-6_0, 1, GCF/PAL/GCF_PVSSInfo.h,,)
-lofar_INTERNAL(MAC/APL/APLCommon, aplcommon, MAC-APL-3_0, 1, APLCommon/APL_Defines.h,,)
-lofar_INTERNAL(MAC/APL/PAC/RSPDriver, rsp, MAC-APL-3_0, 1, RSP_Protocol.ph,,)
-lofar_INTERNAL(MAC/APL/PAC/BeamServer, absdevel, MAC-APL-3_0, 1, BS_Protocol.ph,,)
-lofar_INTERNAL(MAC/APL/PAC/Calibration, caldevel, MAC-APL-3_0, 1, CAL_Protocol.ph,,)
-lofar_INTERNAL(MAC/APL/PAC/StationOperations, stationoperations, MAC-APL-3_0, 1, StationOperations/StationOperations.h,,)
-lofar_INTERNAL(MAC/APL/PAC/StationReceptorGroup, stationreceptorgroup, MAC-APL-3_0, 1, StationReceptorGroup/StationReceptorGroup.h,,)
-lofar_INTERNAL(MAC/APL/PAC/VirtualTelescope, virtualtelescope, MAC-APL-3_0, 1, VirtualTelescope/VirtualTelescope.h,,)
+lofar_INTERNAL(MAC/APL/APLCommon, aplcommon, MAC-APL-3_1, 1, APLCommon/APL_Defines.h,,)
+lofar_INTERNAL(MAC/APL/PAC/RSPDriver, rsp, MAC-RTC-4_0, 1, RSP_Protocol.ph,,)
+lofar_INTERNAL(MAC/APL/PAC/BeamServer, absdevel, MAC-RTC-4_0, 1, BS_Protocol.ph,,)
+lofar_INTERNAL(MAC/APL/PAC/Calibration, caldevel, MAC-RTC-4_0, 1, CAL_Protocol.ph,,)
+lofar_INTERNAL(MAC/APL/PAC/StationOperations, stationoperations, MAC-APL-3_1, 1, StationOperations/StationOperations.h,,)
+lofar_INTERNAL(MAC/APL/PAC/StationReceptorGroup, stationreceptorgroup, MAC-APL-3_1, 1, StationReceptorGroup/StationReceptorGroup.h,,)
+lofar_INTERNAL(MAC/APL/PAC/VirtualTelescope, virtualtelescope, MAC-APL-3_1, 1, VirtualTelescope/VirtualTelescope.h,,)
dnl
dnl Output Makefiles
diff --git a/MAC/APL/PAC/_VirtualBackend/configure.in b/MAC/APL/PAC/_VirtualBackend/configure.in
index 9a008d3921799d9b755b94c9bff90ce1ce195bf3..68c65fb31d15215ce20912077b26a0a3ef50b338 100644
--- a/MAC/APL/PAC/_VirtualBackend/configure.in
+++ b/MAC/APL/PAC/_VirtualBackend/configure.in
@@ -38,7 +38,7 @@ dnl
dnl Check for LOFAR specific things
dnl
lofar_DEBUG_OPTIMIZE
-lofar_CHECK_PRETTY_FUNCTION
+lofar_CHECK_PRETTY_FUNCTIOND
lofar_QATOOLS
lofar_LOG4CPLUS
lofar_DOCXX
@@ -48,8 +48,8 @@ lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,
lofar_INTERNAL(MAC/GCF/TM, gcftm, MAC-GCF-6_0, 1, GCF/TM/GCF_Task.h,,)
lofar_INTERNAL(MAC/GCF/PAL, gcfpal, MAC-GCF-6_0, 1, GCF/PAL/GCF_PVSSInfo.h,,)
lofar_EXTERNAL(boost, 1, boost/shared_ptr.hpp, "")
-lofar_INTERNAL(MAC/APL/APLCommon,aplcommon, MAC-APL-3_1devel1, 1, APLCommon/APL_Defines.h,,)
-lofar_INTERNAL(MAC/APL/PIC/NodeManager, nm, MAC-APL-3_1devel1, 1, APL/NodeManager.h,,)
+lofar_INTERNAL(MAC/APL/APLCommon, aplcommon, MAC-APL-3_1, 1, APLCommon/APL_Defines.h,,)
+lofar_INTERNAL(MAC/APL/PIC/NodeManager, nm, MAC-APL-3_1, 1, APL/NodeManager.h,,)
dnl
dnl Output Makefiles
diff --git a/MAC/APL/PAC/_VirtualTelescope/configure.in b/MAC/APL/PAC/_VirtualTelescope/configure.in
index cff3cf2cd6fc6c70b6cae915e1dc45365d0e4eea..31fc2ec1c999f4980f31a06dfecb846bb507e9b7 100644
--- a/MAC/APL/PAC/_VirtualTelescope/configure.in
+++ b/MAC/APL/PAC/_VirtualTelescope/configure.in
@@ -61,10 +61,10 @@ lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
lofar_INTERNAL(MAC/GCF/TM, gcftm, MAC-GCF-6_0, 1, GCF/TM/GCF_Task.h,,)
lofar_INTERNAL(MAC/GCF/PAL, gcfpal, MAC-GCF-6_0, 1, GCF/PAL/GCF_PVSSInfo.h,,)
-lofar_INTERNAL(MAC/APL/APLCommon, aplcommon, MAC-APL-3_0, 1, APLCommon/APL_Defines.h,,)
-lofar_INTERNAL(MAC/APL/PAC/RSPDriver, rsp, MAC-APL-3_0, 1, RSP_Protocol.ph,,)
-lofar_INTERNAL(MAC/APL/PAC/RSPDriver, epa, MAC-APL-3_0, 1, EPA_Protocol.ph,,)
-lofar_INTERNAL(MAC/APL/PAC/BeamServer, absdevel, MAC-APL-3_0, 1, BS_Protocol.ph,,)
+lofar_INTERNAL(MAC/APL/APLCommon, aplcommon, MAC-APL-3_1, 1, APLCommon/APL_Defines.h,,)
+lofar_INTERNAL(MAC/APL/PAC/RSPDriver, rsp, MAC-RTC-4_0, 1, RSP_Protocol.ph,,)
+lofar_INTERNAL(MAC/APL/PAC/RSPDriver, epa, MAC-RTC-4_0, 1, EPA_Protocol.ph,,)
+lofar_INTERNAL(MAC/APL/PAC/BeamServer, absdevel, MAC-RTC-4_0, 1, BS_Protocol.ph,,)
dnl
dnl Output Makefiles
diff --git a/MAC/APL/PAC/lofarconf.in b/MAC/APL/PAC/lofarconf.in
index 95da593d66f298f13b67d9ca6981e7a6a8bd7775..ce31096dc521a4c7ffa960aa3dfb1d5e57271b5f 100644
--- a/MAC/APL/PAC/lofarconf.in
+++ b/MAC/APL/PAC/lofarconf.in
@@ -5,5 +5,5 @@ BeamServer
StationOperations
StationReceptorGroup
VirtualTelescope
-VirtualBackend
StationStartDaemon
+VirtualBackend
diff --git a/MAC/APL/PIC/MIS/configure.in b/MAC/APL/PIC/MIS/configure.in
index caec0dd41aee2244d68de4bdbfc5c927ef943de8..95269784ea8737af078e27fe55ba6e07cd947c69 100644
--- a/MAC/APL/PIC/MIS/configure.in
+++ b/MAC/APL/PIC/MIS/configure.in
@@ -38,7 +38,6 @@ dnl
dnl Check for LOFAR specific things
dnl
lofar_DEBUG_OPTIMIZE
-#lofar_QT
lofar_QATOOLS
lofar_LOG4CPLUS
lofar_DOCXX
@@ -49,7 +48,7 @@ lofar_INTERNAL(MAC/GCF/TM, gcftm, MAC-GCF-6_0, 1, GCF/TM/GCF_Task.h,,)
lofar_INTERNAL(MAC/GCF/PAL, gcfpal, MAC-GCF-6_0, 1, GCF/PAL/GCF_PVSSInfo.h,,)
lofar_INTERNAL(MAC/GCF/LogSys, gcfkvlc, MAC-GCF-6_0, 1, GCF/LogSys/GCF_KeyValueLogger.h,,)
lofar_INTERNAL(MAC/APL/RTCCommon, rtccommon, MAC-RTC-4_0, 1, Timestamp.h,,)
-lofar_INTERNAL(MAC/APL/PAC/RSP, rsp, HEAD, 1, RSP_Protocol.ph,,)
+lofar_INTERNAL(MAC/APL/PAC/RSPDriver, rsp, MAC-RTC-4_0, 1, RSP_Protocol.ph,,)
lofar_EXTERNAL(BLITZ,1,blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',,-lm)
dnl
diff --git a/MAC/APL/PIC/MIS/src/MACInformationServer.conf.in b/MAC/APL/PIC/MIS/src/MACInformationServer.conf.in
index 87542191fdafb0f78fbb4f54274f4f434e11ca2c..678c68e9eb1174a88a00a386088e47e564346cd7 100644
--- a/MAC/APL/PIC/MIS/src/MACInformationServer.conf.in
+++ b/MAC/APL/PIC/MIS/src/MACInformationServer.conf.in
@@ -1,5 +1,5 @@
mac.ns.APL-MISD.server.type=TCP
-mac.ns.APL-MISD.server.port=27010
+mac.ns.APL-MISD.server.port=27009
mac.top.APL-MIS.client.remoteservice=APL-MISD:server
-#mac.top.APL-MISS.rspclient.remoteservice=RSPDriver:acceptor
-mac.top.APL-MISS.rspclient.remoteservice=ARATestDriver:ARAtestRSPserver
\ No newline at end of file
+mac.top.APL-MISS.rspclient.remoteservice=RSPDriver:acceptor_v2
+#mac.top.APL-MISS.rspclient.remoteservice=ARATestDriver:ARAtestRSPserver
diff --git a/MAC/APL/PIC/MIS/src/MISSession.cc b/MAC/APL/PIC/MIS/src/MISSession.cc
index 6d67a507132e415102a110d80dbb6c8a419897ee..9acbb2976cffd25ce74afe4f1e784ebfed45d9ac 100644
--- a/MAC/APL/PIC/MIS/src/MISSession.cc
+++ b/MAC/APL/PIC/MIS/src/MISSession.cc
@@ -326,7 +326,7 @@ GCFEvent::TResult MISSession::setDiagnosis_state(GCFEvent& e, GCFPortInterface&
_propertyProxy.setPropValue(resourceStatusPropName, resourceState);
if (resourceStatusPropName.find(":") == string::npos)
{
- resourceStatusPropName = GCFPVSSInfo::getLocalSystemName() + resourceStatusPropName;
+ resourceStatusPropName = GCFPVSSInfo::getLocalSystemName() + string(":") + resourceStatusPropName;
}
timeval ts = {pIn->timestamp_sec, pIn->timestamp_nsec / 1000};
string descr(formatString (
diff --git a/MAC/APL/PIC/RSPCtlFE/configure.in b/MAC/APL/PIC/RSPCtlFE/configure.in
index e0761ae6c5d0bbb2fe6af7169bed25f0952d7171..f3ed59023f891bfe169171280fab7e7011f60f4b 100755
--- a/MAC/APL/PIC/RSPCtlFE/configure.in
+++ b/MAC/APL/PIC/RSPCtlFE/configure.in
@@ -70,13 +70,12 @@ lofar_DOCXX
lofar_COMPILETOOLS
lofar_PVSS(1)
-dnl lofar_EXTERNAL(lofarlogger,1,LofarLogger/LofarLogger.h,,)
-lofar_EXTERNAL(log4cplus,1,log4cplus/logger.h,,)
-lofar_EXTERNAL(common,1,Common/LofarTypes.h,,)
-lofar_EXTERNAL(GCFTM,1,GCF/TM/GCF_Control.h,,)
-lofar_EXTERNAL(GCFPAL,1,GCF/PAL/GCF_Answer.h,,)
-lofar_EXTERNAL(GCFCommon,1,GCF/GCF_Defines.h,,)
-lofar_EXTERNAL(RTCCommon,1,Marshalling.h,,)
+lofar_LOG4CPLUS
+lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(MAC/GCF/TM, GCFTM, MAC-GCF-6_0, 1, GCF/TM/GCF_Control.h,,)
+lofar_INTERNAL(MAC/GCF/PAL, GCFPAL, MAC-GCF-6_0, 1, GCF/PAL/GCF_Answer.h,,)
+lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
+lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, MAC-RTC-4_0, 1, Marshalling.h,,)
dnl
dnl Output Makefiles
diff --git a/MAC/APL/PIC/RSPDriver/configure.in b/MAC/APL/PIC/RSPDriver/configure.in
index 49f4ea8984a09ffe3dd98540c29cfe5d23ffce8e..fc9bd51d95427f6d284d6a49bbde0c3066a4b26b 100644
--- a/MAC/APL/PIC/RSPDriver/configure.in
+++ b/MAC/APL/PIC/RSPDriver/configure.in
@@ -94,14 +94,12 @@ AC_PROG_RANLIB
dnl wanted by: src/CaptureStats.cc:874
AC_STRUCT_TM
-dnl lofar_EXTERNAL(lofarlogger,1,LofarLogger/LofarLogger.h,,)
-lofar_INTERNAL(LCS/Common,common,,1,Common/LofarTypes.h,,)
-lofar_INTERNAL(MAC/Test/Suite,suite,,1,Suite/test.h,,)
-lofar_INTERNAL(MAC/GCF/TM,GCFTM,,1,GCF/TM/GCF_Control.h,,)
-lofar_INTERNAL(MAC/GCF/GCFCommon,GCFCommon,,1,GCF/GCF_Defines.h,,)
-lofar_INTERNAL(MAC/APL/RTCCommon,RTCCommon,,1,Marshalling.h,,)
-lofar_INTERNAL(MAC/APL/PAC/RSPDriver/src/rspctlfe,rspfe,,1,RSPFE_Protocol.ph,,)
-lofar_EXTERNAL(log4cplus,1,log4cplus/logger.h,,)
+lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(MAC/Test/Suite, suite, MAC-GCF-6_0, 1, Suite/test.h,,)
+lofar_INTERNAL(MAC/GCF/TM, GCFTM, MAC-GCF-6_0, 1, GCF/TM/GCF_Control.h,,)
+lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
+lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, MAC-RTC-4_0, 1, Marshalling.h,,)
+lofar_LOG4CPLUS
lofar_EXTERNAL(BLITZ,1,blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',,-lm)
dnl PPS_API needed by RSPDriver
diff --git a/MAC/APL/PIC/RSPDriver/src/rspctlfe/configure.in b/MAC/APL/PIC/RSPDriver/src/rspctlfe/configure.in
index e0761ae6c5d0bbb2fe6af7169bed25f0952d7171..f3ed59023f891bfe169171280fab7e7011f60f4b 100755
--- a/MAC/APL/PIC/RSPDriver/src/rspctlfe/configure.in
+++ b/MAC/APL/PIC/RSPDriver/src/rspctlfe/configure.in
@@ -70,13 +70,12 @@ lofar_DOCXX
lofar_COMPILETOOLS
lofar_PVSS(1)
-dnl lofar_EXTERNAL(lofarlogger,1,LofarLogger/LofarLogger.h,,)
-lofar_EXTERNAL(log4cplus,1,log4cplus/logger.h,,)
-lofar_EXTERNAL(common,1,Common/LofarTypes.h,,)
-lofar_EXTERNAL(GCFTM,1,GCF/TM/GCF_Control.h,,)
-lofar_EXTERNAL(GCFPAL,1,GCF/PAL/GCF_Answer.h,,)
-lofar_EXTERNAL(GCFCommon,1,GCF/GCF_Defines.h,,)
-lofar_EXTERNAL(RTCCommon,1,Marshalling.h,,)
+lofar_LOG4CPLUS
+lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(MAC/GCF/TM, GCFTM, MAC-GCF-6_0, 1, GCF/TM/GCF_Control.h,,)
+lofar_INTERNAL(MAC/GCF/PAL, GCFPAL, MAC-GCF-6_0, 1, GCF/PAL/GCF_Answer.h,,)
+lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
+lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, MAC-RTC-4_0, 1, Marshalling.h,,)
dnl
dnl Output Makefiles
diff --git a/MAC/APL/PIC/_NodeManager/configure.in b/MAC/APL/PIC/_NodeManager/configure.in
index 50b2e7e6f4a501d415abeac055d60ce288f67c06..63d5775b56018bfc24b4dcc68a0d7c6311e52c49 100644
--- a/MAC/APL/PIC/_NodeManager/configure.in
+++ b/MAC/APL/PIC/_NodeManager/configure.in
@@ -38,7 +38,6 @@ dnl
dnl Check for LOFAR specific things
dnl
lofar_DEBUG_OPTIMIZE
-#lofar_QT
lofar_QATOOLS
lofar_LOG4CPLUS
lofar_DOCXX
diff --git a/MAC/APL/PIC/_RegisterAccess/configure.in b/MAC/APL/PIC/_RegisterAccess/configure.in
index 0321140465d930c225bdd46f3338d782e5c08846..69f5e74dc1cf2b7e16823e99400ab812e4eddf70 100644
--- a/MAC/APL/PIC/_RegisterAccess/configure.in
+++ b/MAC/APL/PIC/_RegisterAccess/configure.in
@@ -52,22 +52,21 @@ dnl Check for LOFAR specific things
dnl
lofar_DEBUG_OPTIMIZE
lofar_CHECK_PRETTY_FUNCTION
-#lofar_QT
lofar_QATOOLS
lofar_DOCXX
lofar_COMPILETOOLS
-#lofar_MPI(0)
lofar_PVSS(1)
-lofar_EXTERNAL(common,1,Common/LofarTypes.h,,)
lofar_LOG4CPLUS
-lofar_EXTERNAL(boost,1,boost/shared_ptr.hpp,"")
+
+lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(MAC/APL/PAC/RSPDriver, rsp, MAC-RTC-4_0, 1, RSP_Protocol.ph,,)
+lofar_INTERNAL(MAC/Test/Suite, suite, MAC-GCF-6_0, 1, Suite/test.h,,)
+lofar_INTERNAL(MAC/GCF/TM, GCFTM, MAC-GCF-6_0, 1, GCF/TM/GCF_Control.h,,)
+lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
+lofar_INTERNAL(MAC/GCF/PAL, GCFPAL, MAC-GCF-6_0, 1, GCF/PAL/GCF_Property.h,,)
+lofar_INTERNAL(MAC/APL/APLCommon, APLCommon, MAC-APL-3_1, 1, APLCommon/APL_Defines.h,,)
lofar_EXTERNAL(BLITZ,1,blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',,-lm)
-lofar_EXTERNAL(rsp,1,RSP_Protocol.ph,,)
-lofar_EXTERNAL(suite,1,Suite/test.h,,)
-lofar_EXTERNAL(GCFTM,1,GCF/TM/GCF_Control.h,,)
-lofar_EXTERNAL(GCFCommon,1,GCF/GCF_Defines.h,,)
-lofar_EXTERNAL(GCFPAL,1,GCF/PAL/GCF_Property.h,,)
-lofar_EXTERNAL(APLCommon,1,APLCommon/APL_Defines.h,,)
+lofar_EXTERNAL(boost,1,boost/shared_ptr.hpp,"")
dnl
dnl Output Makefiles
diff --git a/MAC/APL/PIC/lofarconf.in b/MAC/APL/PIC/lofarconf.in
index 3cea60a08f36faf8629c1861704de98fb4230a61..dad1be6763aad4c261f4462686272283f6133cc1 100644
--- a/MAC/APL/PIC/lofarconf.in
+++ b/MAC/APL/PIC/lofarconf.in
@@ -1,2 +1,3 @@
RegisterAccess
-NodeManager
\ No newline at end of file
+NodeManager
+MIS
diff --git a/MAC/APL/RTCCommon/configure.in b/MAC/APL/RTCCommon/configure.in
index 46fc05ce7989f984bc7c7ded581db3381f398f5c..72949db696536e5e46e7ec8e921b911826cf1083 100644
--- a/MAC/APL/RTCCommon/configure.in
+++ b/MAC/APL/RTCCommon/configure.in
@@ -64,15 +64,10 @@ lofar_DEBUG_OPTIMIZE
lofar_QATOOLS
lofar_DOCXX
lofar_COMPILETOOLS
-#lofar_PVSS(1)
-dnl lofar_EXTERNAL(lofarlogger,1,LofarLogger/LofarLogger.h,,)
-lofar_EXTERNAL(log4cplus,1,log4cplus/logger.h,,)
-lofar_EXTERNAL(common,1,Common/LofarTypes.h,,)
+lofar_LOG4CPLUS
+lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
lofar_EXTERNAL(BLITZ,1,blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',,-lm)
-dnl lofar_EXTERNAL(suite,1,Suite/test.h,,)
-dnl lofar_EXTERNAL(GCFTM,1,GCF/TM/GCF_Control.h,,)
-dnl lofar_EXTERNAL(GCFCommon,1,GCF/GCF_Defines.h,,)
dnl
dnl Output Makefiles
@@ -80,5 +75,4 @@ dnl
AC_OUTPUT(
Makefile
src/Makefile
-dnl test/Makefile
)
diff --git a/MAC/APL/_GSO/MACScheduler/configure.in b/MAC/APL/_GSO/MACScheduler/configure.in
index 873f4aee2ecd6cec35154693ccbc9f1da0b0e1b6..67c2e468c69160fb1334b587da9cb65c4889ba5f 100644
--- a/MAC/APL/_GSO/MACScheduler/configure.in
+++ b/MAC/APL/_GSO/MACScheduler/configure.in
@@ -55,16 +55,16 @@ lofar_CHECK_PRETTY_FUNCTION
lofar_QATOOLS
lofar_DOCXX
lofar_COMPILETOOLS
-#lofar_MPI(0)
lofar_PVSS(1)
lofar_LOG4CPLUS
+
lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(LCS/ACC/APS, aps, HEAD, 1, APS/ParameterSet.h,,)
+lofar_INTERNAL(LCS/ACC/APS, aps, LCS-ACC-2_0, 1, APS/ParameterSet.h,,)
lofar_INTERNAL(SAS/OTDB, otdb, HEAD, 1, OTDB/OTDBconnection.h,,)
lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
lofar_INTERNAL(MAC/GCF/TM, gcftm, MAC-GCF-6_0, 1, GCF/TM/GCF_Task.h,,)
lofar_INTERNAL(MAC/GCF/PAL, gcfpal, MAC-GCF-6_0, 1, GCF/PAL/GCF_PVSSInfo.h,,)
-lofar_INTERNAL(MAC/APL/APLCommon, aplcommon, MAC-APL-3_0, 1, APLCommon/APL_Defines.h,,)
+lofar_INTERNAL(MAC/APL/APLCommon, aplcommon, MAC-APL-3_1, 1, APLCommon/APL_Defines.h,,)
dnl
dnl Output Makefiles
diff --git a/MAC/APL/_VIC/ArrayOperations/configure.in b/MAC/APL/_VIC/ArrayOperations/configure.in
index 1e9519c5238090cba9f205362822156dbef3b212..6a68b946e828e284d478f86a9a60513029dff4e4 100644
--- a/MAC/APL/_VIC/ArrayOperations/configure.in
+++ b/MAC/APL/_VIC/ArrayOperations/configure.in
@@ -52,20 +52,18 @@ dnl Check for LOFAR specific things
dnl
lofar_DEBUG_OPTIMIZE
lofar_CHECK_PRETTY_FUNCTION
-#lofar_QT
lofar_QATOOLS
lofar_DOCXX
lofar_COMPILETOOLS
-#lofar_MPI(0)
lofar_PVSS(1)
-lofar_EXTERNAL(common,1,Common/LofarTypes.h,,)
-lofar_EXTERNAL(log4cplus,1,log4cplus/logger.h,,)
+lofar_LOG4CPLUS
+
+lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(MAC/GCF/TM, GCFTM, MAC-GCF-6_0, 1, GCF/TM/GCF_Control.h,,)
+lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
+lofar_INTERNAL(MAC/GCF/PAL, GCFPAL, MAC-GCF-6_0, 1, GCF/PAL/GCF_Property.h,,)
+lofar_INTERNAL(MAC/APL/APLCommon, APLCommon, MAC-APL-3_1, 1, APLCommon/APL_Defines.h,,)
lofar_EXTERNAL(boost,1,boost/shared_ptr.hpp,"")
-lofar_EXTERNAL(GCFTM,1,GCF/TM/GCF_Control.h,,)
-lofar_EXTERNAL(GCFCommon,1,GCF/GCF_Defines.h,,)
-lofar_EXTERNAL(GCFPAL,1,GCF/PAL/GCF_Property.h,,)
-#lofar_EXTERNAL(GCFPALlight,1,GCF/PALlight/GCF_RTMyProperty.h,,)
-lofar_EXTERNAL(APLCommon,1,APLCommon/APL_Defines.h,,)
dnl
dnl Output Makefiles
diff --git a/MAC/APL/_VIC/ArrayReceptorGroup/configure.in b/MAC/APL/_VIC/ArrayReceptorGroup/configure.in
index c18fad7c71aa142ed1031d80f70c604e1d455b78..917a29caa4a604ee6472ac3d3c7c0d6f3a8a2660 100644
--- a/MAC/APL/_VIC/ArrayReceptorGroup/configure.in
+++ b/MAC/APL/_VIC/ArrayReceptorGroup/configure.in
@@ -52,20 +52,18 @@ dnl Check for LOFAR specific things
dnl
lofar_DEBUG_OPTIMIZE
lofar_CHECK_PRETTY_FUNCTION
-#lofar_QT
lofar_QATOOLS
lofar_DOCXX
lofar_COMPILETOOLS
-#lofar_MPI(0)
lofar_PVSS(1)
-lofar_EXTERNAL(common,1,Common/LofarTypes.h,,)
-lofar_EXTERNAL(log4cplus,1,log4cplus/logger.h,,)
+lofar_LOG4CPLUS
+
+lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(MAC/GCF/TM, GCFTM, MAC-GCF-6_0, 1, GCF/TM/GCF_Control.h,,)
+lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
+lofar_INTERNAL(MAC/GCF/PAL, GCFPAL, MAC-GCF-6_0, 1, GCF/PAL/GCF_Property.h,,)
+lofar_INTERNAL(MAC/APL/APLCommon, APLCommon, MAC-APL-3_1, 1, APLCommon/APL_Defines.h,,)
lofar_EXTERNAL(boost,1,boost/shared_ptr.hpp,"")
-lofar_EXTERNAL(GCFTM,1,GCF/TM/GCF_Control.h,,)
-lofar_EXTERNAL(GCFCommon,1,GCF/GCF_Defines.h,,)
-lofar_EXTERNAL(GCFPAL,1,GCF/PAL/GCF_Property.h,,)
-#lofar_EXTERNAL(GCFPALlight,1,GCF/PALlight/GCF_RTMyProperty.h,,)
-lofar_EXTERNAL(APLCommon,1,APLCommon/APL_Defines.h,,)
dnl
dnl Output Makefiles
diff --git a/MAC/APL/_VIC/VirtualInstrument/configure.in b/MAC/APL/_VIC/VirtualInstrument/configure.in
index 6488422bf75b6fd373f8be9dee5632c1a6a876d7..3c13cfb4e0dfa769f2aa70efc378963fa4907782 100644
--- a/MAC/APL/_VIC/VirtualInstrument/configure.in
+++ b/MAC/APL/_VIC/VirtualInstrument/configure.in
@@ -55,16 +55,16 @@ lofar_CHECK_PRETTY_FUNCTION
lofar_QATOOLS
lofar_DOCXX
lofar_COMPILETOOLS
-#lofar_MPI(0)
lofar_PVSS(1)
lofar_LOG4CPLUS
+
lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
lofar_INTERNAL(MAC/GCF/TM, gcftm, MAC-GCF-6_0, 1, GCF/TM/GCF_Task.h,,)
lofar_INTERNAL(MAC/GCF/PAL, gcfpal, MAC-GCF-6_0, 1, GCF/PAL/GCF_PVSSInfo.h,,)
-lofar_INTERNAL(MAC/APL/APLCommon, aplcommon, MAC-APL-3_0, 1, APLCommon/APL_Defines.h,,)
-lofar_INTERNAL(MAC/APL/VIC/ArrayOperations, arrayoperations, MAC-APL-3_0, 1, ArrayOperations/ArrayOperations.h,,)
-lofar_INTERNAL(MAC/APL/VIC/ArrayReceptorGroup, arrayreceptorgroup, MAC-APL-3_0, 1, ArrayReceptorGroup/ArrayReceptorGroup.h,,)
+lofar_INTERNAL(MAC/APL/APLCommon, aplcommon, MAC-APL-3_1, 1, APLCommon/APL_Defines.h,,)
+lofar_INTERNAL(MAC/APL/VIC/ArrayOperations, arrayoperations, MAC-APL-3_1, 1, ArrayOperations/ArrayOperations.h,,)
+lofar_INTERNAL(MAC/APL/VIC/ArrayReceptorGroup, arrayreceptorgroup, MAC-APL-3_1, 1, ArrayReceptorGroup/ArrayReceptorGroup.h,,)
dnl
dnl Output Makefiles
diff --git a/MAC/APL/lofarconf.in b/MAC/APL/lofarconf.in
index 4504c361766c18bbe3054002f9ac59069f039946..a7485edd5b148bff256b8c7ec5de67e8e1d928ce 100644
--- a/MAC/APL/lofarconf.in
+++ b/MAC/APL/lofarconf.in
@@ -1,6 +1,6 @@
APLCommon
RTCCommon
-GSO
-PAC
PIC
-VIC
\ No newline at end of file
+PAC
+VIC
+GSO