Index: /trunk/FACT++/Makefile.in
===================================================================
--- /trunk/FACT++/Makefile.in	(revision 11005)
+++ /trunk/FACT++/Makefile.in	(revision 11006)
@@ -134,4 +134,7 @@
 	dim/src/dim_thr.lo dim/src/utilities.lo
 libDim_la_OBJECTS = $(am_libDim_la_OBJECTS)
+libDimExtension_la_LIBADD =
+am_libDimExtension_la_OBJECTS = src/DimSetup.lo
+libDimExtension_la_OBJECTS = $(am_libDimExtension_la_OBJECTS)
 libStateMachine_la_LIBADD =
 am_libStateMachine_la_OBJECTS = src/WindowLog.lo src/Readline.lo \
@@ -191,7 +194,7 @@
 dimctrl_DEPENDENCIES = libTools.la libStateMachine.la libTime.la \
 	libDim.la libDim++.la libConfiguration.la
-am_dns_OBJECTS = dim/src/dns.$(OBJEXT)
+am_dns_OBJECTS = src/dns.$(OBJEXT)
 dns_OBJECTS = $(am_dns_OBJECTS)
-dns_DEPENDENCIES = libDim.la
+dns_DEPENDENCIES = libDim.la libDimExtension.la
 am_drivectrl_OBJECTS = src/drivectrl.$(OBJEXT) \
 	src/HeadersFTM.$(OBJEXT)
@@ -321,7 +324,8 @@
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libConfiguration_la_SOURCES) $(libDim___la_SOURCES) \
-	$(libDim_la_SOURCES) $(libStateMachine_la_SOURCES) \
-	$(libTime_la_SOURCES) $(libTools_la_SOURCES) $(argv_SOURCES) \
-	astro.c $(chatclient_SOURCES) $(chatserv_SOURCES) \
+	$(libDim_la_SOURCES) $(libDimExtension_la_SOURCES) \
+	$(libStateMachine_la_SOURCES) $(libTime_la_SOURCES) \
+	$(libTools_la_SOURCES) $(argv_SOURCES) astro.c \
+	$(chatclient_SOURCES) $(chatserv_SOURCES) \
 	$(dataLogger_SOURCES) $(dclient5_SOURCES) $(did_SOURCES) \
 	$(dimctrl_SOURCES) $(dns_SOURCES) $(drivectrl_SOURCES) \
@@ -332,7 +336,8 @@
 	$(test_SOURCES) $(time_SOURCES) $(triggerschedule_SOURCES)
 DIST_SOURCES = $(libConfiguration_la_SOURCES) $(libDim___la_SOURCES) \
-	$(libDim_la_SOURCES) $(libStateMachine_la_SOURCES) \
-	$(libTime_la_SOURCES) $(libTools_la_SOURCES) $(argv_SOURCES) \
-	astro.c $(chatclient_SOURCES) $(chatserv_SOURCES) \
+	$(libDim_la_SOURCES) $(libDimExtension_la_SOURCES) \
+	$(libStateMachine_la_SOURCES) $(libTime_la_SOURCES) \
+	$(libTools_la_SOURCES) $(argv_SOURCES) astro.c \
+	$(chatclient_SOURCES) $(chatserv_SOURCES) \
 	$(am__dataLogger_SOURCES_DIST) $(dclient5_SOURCES) \
 	$(did_SOURCES) $(dimctrl_SOURCES) $(dns_SOURCES) \
@@ -612,5 +617,5 @@
 @HAS_GUI_TRUE@QT4_EXECUTABLES = fact
 lib_LTLIBRARIES = \
-	libDim.la libDim++.la libTime.la libTools.la \
+	libDim.la libDim++.la libDimExtension.la libTime.la libTools.la \
 	libConfiguration.la libStateMachine.la
 
@@ -629,6 +634,6 @@
 	dim/README_v17.txt dim/README_v18.txt dim/README_v19.txt \
 	$(DIALOGS) $(RESOURCES) $(am__append_5) $(am__append_8)
-dns_LDADD = libDim.la
-dns_SOURCES = dim/src/dns.c
+dns_LDADD = libDim.la libDimExtension.la
+dns_SOURCES = src/dns.c
 #dns_CPPFLAGS = $(AM_CPPFLAGS) $(DIM_FLAGS)
 did_LDADD = libDim.la 
@@ -665,4 +670,5 @@
 	dim/src/utilities.c
 
+libDimExtension_la_SOURCES = src/DimSetup.cc src/DimSetup.h
 
 #libDimCpp_la_CXXFLAGS = $(AM_CXXFLAGS) $(DIM_FLAGS)
@@ -736,8 +742,8 @@
 log_SOURCES = src/log.cc
 log_LDADD = libTime.la libDim.la libDim++.la libTools.la libStateMachine.la 
+logtime_SOURCES = src/logtime.cc
 logtime_LDADD = libTools.la libStateMachine.la libTime.la libDim.la libDim++.la
-logtime_SOURCES = src/logtime.cc
+chatserv_SOURCES = src/chatserv.cc src/LocalControl.h
 chatserv_LDADD = libTools.la libStateMachine.la libConfiguration.la libTime.la libDim.la libDim++.la
-chatserv_SOURCES = src/chatserv.cc src/LocalControl.h
 dclient5_SOURCES = src/dclient5.cc src/LocalControl.h
 dclient5_LDADD = libDim.la libDim++.la libTime.la libTools.la libStateMachine.la \
@@ -942,4 +948,7 @@
 libDim.la: $(libDim_la_OBJECTS) $(libDim_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(LINK) -rpath $(libdir) $(libDim_la_OBJECTS) $(libDim_la_LIBADD) $(LIBS)
+src/DimSetup.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+libDimExtension.la: $(libDimExtension_la_OBJECTS) $(libDimExtension_la_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK) -rpath $(libdir) $(libDimExtension_la_OBJECTS) $(libDimExtension_la_LIBADD) $(LIBS)
 src/WindowLog.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/Readline.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
@@ -1088,6 +1097,5 @@
 	@rm -f dimctrl$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(dimctrl_OBJECTS) $(dimctrl_LDADD) $(LIBS)
-dim/src/dns.$(OBJEXT): dim/src/$(am__dirstamp) \
-	dim/src/$(DEPDIR)/$(am__dirstamp)
+src/dns.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 dns$(EXEEXT): $(dns_OBJECTS) $(dns_DEPENDENCIES) 
 	@rm -f dns$(EXEEXT)
@@ -1221,5 +1229,4 @@
 	-rm -f dim/src/dna.$(OBJEXT)
 	-rm -f dim/src/dna.lo
-	-rm -f dim/src/dns.$(OBJEXT)
 	-rm -f dim/src/dtq.$(OBJEXT)
 	-rm -f dim/src/dtq.lo
@@ -1269,4 +1276,6 @@
 	-rm -f src/DimServiceInfoList.$(OBJEXT)
 	-rm -f src/DimServiceInfoList.lo
+	-rm -f src/DimSetup.$(OBJEXT)
+	-rm -f src/DimSetup.lo
 	-rm -f src/Event.$(OBJEXT)
 	-rm -f src/Event.lo
@@ -1312,4 +1321,5 @@
 	-rm -f src/dclient5.$(OBJEXT)
 	-rm -f src/dimctrl.$(OBJEXT)
+	-rm -f src/dns.$(OBJEXT)
 	-rm -f src/drivectrl.$(OBJEXT)
 	-rm -f src/dserver2.$(OBJEXT)
@@ -1345,5 +1355,4 @@
 @AMDEP_TRUE@@am__include@ @am__quote@dim/src/$(DEPDIR)/dll.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@dim/src/$(DEPDIR)/dna.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@dim/src/$(DEPDIR)/dns.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@dim/src/$(DEPDIR)/dtq.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@dim/src/$(DEPDIR)/hash.Plo@am__quote@
@@ -1376,4 +1385,5 @@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/DimServerList.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/DimServiceInfoList.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/DimSetup.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Event.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/EventBuilder.Po@am__quote@
@@ -1403,4 +1413,5 @@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dclient5.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dimctrl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dns.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/drivectrl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dserver2.Po@am__quote@