Index: /trunk/FACT++/Makefile.in
===================================================================
--- /trunk/FACT++/Makefile.in	(revision 10345)
+++ /trunk/FACT++/Makefile.in	(revision 10346)
@@ -38,17 +38,22 @@
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = README $(am__configure_deps) $(dist_noinst_SCRIPTS) \
-	$(libDim___la_HEADERS) $(libDim_la_HEADERS) \
-	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/aminclude.am $(top_srcdir)/configure \
-	.aux_dir/compile .aux_dir/config.guess .aux_dir/config.sub \
-	.aux_dir/depcomp .aux_dir/install-sh .aux_dir/ltmain.sh \
-	.aux_dir/missing AUTHORS COPYING ChangeLog INSTALL NEWS
+DIST_COMMON = README $(am__configure_deps) $(dist_man1_MANS) \
+	$(dist_noinst_SCRIPTS) $(libDim___la_HEADERS) \
+	$(libDim_la_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/aminclude.am \
+	$(top_srcdir)/configure .aux_dir/compile .aux_dir/config.guess \
+	.aux_dir/config.sub .aux_dir/depcomp .aux_dir/install-sh \
+	.aux_dir/ltmain.sh .aux_dir/missing AUTHORS COPYING ChangeLog \
+	INSTALL NEWS
 bin_PROGRAMS = dns$(EXEEXT) did$(EXEEXT) log$(EXEEXT) logtime$(EXEEXT) \
 	argv$(EXEEXT) time$(EXEEXT) test3$(EXEEXT) dclient5$(EXEEXT) \
-	dserver2$(EXEEXT)
+	dserver2$(EXEEXT) dataLogger$(EXEEXT)
+@HAS_GROFF_TRUE@am__append_1 = $(dist_man1_MANS:.man=.html)
+@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_2 = $(dist_man1_MANS:.man=.pdf)
+@HAS_HELP2MAN_TRUE@am__append_3 = $(dist_man1_MANS)
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/.macro_dir/ac_check_readline.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/.macro_dir/ac_check_package.m4 \
+	$(top_srcdir)/.macro_dir/ac_check_readline.m4 \
 	$(top_srcdir)/.macro_dir/ac_find_motif.m4 \
 	$(top_srcdir)/.macro_dir/libtool.m4 \
@@ -89,5 +94,6 @@
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
-	"$(DESTDIR)$(libDim___ladir)" "$(DESTDIR)$(libDim_ladir)"
+	"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(libDim___ladir)" \
+	"$(DESTDIR)$(libDim_ladir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libConfiguration_la_LIBADD =
@@ -118,5 +124,6 @@
 	src/StateMachine.lo src/ServiceList.lo \
 	src/DimErrorRedirecter.lo src/WindowLog.lo src/Readline.lo \
-	src/ReadlineWindow.lo src/Console.lo src/Shell.lo \
+	src/ReadlineColor.lo src/ReadlineWindow.lo src/Console.lo \
+	src/Shell.lo src/Description.lo src/DimDescriptionService.lo \
 	src/Connection.lo
 libStateMachine_la_OBJECTS = $(am_libStateMachine_la_OBJECTS)
@@ -131,4 +138,9 @@
 argv_OBJECTS = $(am_argv_OBJECTS)
 argv_DEPENDENCIES = libConfiguration.la
+am_dataLogger_OBJECTS = src/dataLogger.$(OBJEXT) \
+	src/LocalControl.$(OBJEXT)
+dataLogger_OBJECTS = $(am_dataLogger_OBJECTS)
+dataLogger_DEPENDENCIES = libDim.la libDim++.la libTools.la libTime.la \
+	libStateMachine.la libConfiguration.la
 am_dclient5_OBJECTS = src/dclient5.$(OBJEXT) \
 	src/LocalControl.$(OBJEXT)
@@ -208,13 +220,16 @@
 	$(libDim_la_SOURCES) $(libStateMachine_la_SOURCES) \
 	$(libTime_la_SOURCES) $(libTools_la_SOURCES) $(argv_SOURCES) \
-	$(dclient5_SOURCES) $(did_SOURCES) $(dns_SOURCES) \
-	$(dserver2_SOURCES) $(log_SOURCES) $(logtime_SOURCES) \
-	$(test3_SOURCES) $(time_SOURCES)
+	$(dataLogger_SOURCES) $(dclient5_SOURCES) $(did_SOURCES) \
+	$(dns_SOURCES) $(dserver2_SOURCES) $(log_SOURCES) \
+	$(logtime_SOURCES) $(test3_SOURCES) $(time_SOURCES)
 DIST_SOURCES = $(libConfiguration_la_SOURCES) $(libDim___la_SOURCES) \
 	$(libDim_la_SOURCES) $(libStateMachine_la_SOURCES) \
 	$(libTime_la_SOURCES) $(libTools_la_SOURCES) $(argv_SOURCES) \
-	$(dclient5_SOURCES) $(did_SOURCES) $(dns_SOURCES) \
-	$(dserver2_SOURCES) $(log_SOURCES) $(logtime_SOURCES) \
-	$(test3_SOURCES) $(time_SOURCES)
+	$(dataLogger_SOURCES) $(dclient5_SOURCES) $(did_SOURCES) \
+	$(dns_SOURCES) $(dserver2_SOURCES) $(log_SOURCES) \
+	$(logtime_SOURCES) $(test3_SOURCES) $(time_SOURCES)
+man1dir = $(mandir)/man1
+NROFF = nroff
+MANS = $(dist_man1_MANS)
 HEADERS = $(libDim___la_HEADERS) $(libDim_la_HEADERS)
 ETAGS = etags
@@ -294,4 +309,6 @@
 FGREP = @FGREP@
 GREP = @GREP@
+GROFF = @GROFF@
+HELP2MAN = @HELP2MAN@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -317,6 +334,4 @@
 MYSQLPP_LIB_DIR = @MYSQLPP_LIB_DIR@
 MYSQL_C_INC_DIR = @MYSQL_C_INC_DIR@
-MYSQL_C_LIB_DIR = @MYSQL_C_LIB_DIR@
-MYSQL_C_LIB_NAME = @MYSQL_C_LIB_NAME@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -333,4 +348,5 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PS2PDF = @PS2PDF@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
@@ -440,27 +456,23 @@
 # -no-undefined
 AM_LDFLAGS = -module -avoid-version
+#	sched astro test ftm ftmctrl 
 lib_LTLIBRARIES = libDim.la libDim++.la libTime.la libTools.la \
 		  libConfiguration.la libStateMachine.la
 
+# 		  libAstro.la
+dist_man1_MANS = test3.man
 
 #-------------------------------------------------------------------------
 dist_noinst_SCRIPTS = autogen.sh
-EXTRA_DIST = \
-	Doxyfile \
-	dim_v19r15/DIM_Performance.pdf \
-	dim_v19r15/LICENSE.GPL \
-	dim_v19r15/README.txt \
-	dim_v19r15/README_v9.txt \
-	dim_v19r15/README_v10.txt \
-	dim_v19r15/README_v11.txt \
-	dim_v19r15/README_v12.txt \
-	dim_v19r15/README_v13.txt \
-	dim_v19r15/README_v14.txt \
-	dim_v19r15/README_v15.txt \
-	dim_v19r15/README_v16.txt \
-	dim_v19r15/README_v17.txt \
-	dim_v19r15/README_v18.txt \
-	dim_v19r15/README_v19.txt
-
+EXTRA_DIST = Doxyfile dim_v19r15/DIM_Performance.pdf \
+	dim_v19r15/LICENSE.GPL dim_v19r15/README.txt \
+	dim_v19r15/README_v9.txt dim_v19r15/README_v10.txt \
+	dim_v19r15/README_v11.txt dim_v19r15/README_v12.txt \
+	dim_v19r15/README_v13.txt dim_v19r15/README_v14.txt \
+	dim_v19r15/README_v15.txt dim_v19r15/README_v16.txt \
+	dim_v19r15/README_v17.txt dim_v19r15/README_v18.txt \
+	dim_v19r15/README_v19.txt $(dist_man1_MANS:.man=.html) \
+	$(dist_man1_MANS:.man=.pdf)
+CLEANFILES = $(dist_man1_MANS:.man=.pdf)  $(dist_man1_MANS:.man=.html)
 dns_LDADD = libDim.la
 dns_SOURCES = dim_v19r15/src/dns.c
@@ -468,5 +480,9 @@
 did_LDADD = libDim.la 
 did_CPPFLAGS = $(AM_CPPFLAGS) -Idim_v19r15/src/did 
-did_SOURCES = dim_v19r15/src/did/did.c dim_v19r15/src/did/dui_util.c
+did_SOURCES = \
+	dim_v19r15/src/did/did.c dim_v19r15/src/did/did.h \
+	dim_v19r15/src/did/dui_util.c dim_v19r15/src/did/dui_util.h \
+	dim_v19r15/src/did/dui_colors.h
+
 
 #libDim_la_CPPFLAGS = $(AM_CPPFLAGS) $(DIM_FLAGS)
@@ -500,4 +516,5 @@
 libDim___la_HEADERS = \
 	dim_v19r15/dim/dic.hxx \
+	dim_v19r15/dim/dis.hxx \
 	dim_v19r15/dim/dim_core.hxx \
 	dim_v19r15/dim/dim.hxx \
@@ -528,33 +545,63 @@
 	src/WindowLog.h       src/WindowLog.cc \
 	src/Readline.h        src/Readline.cc \
+	src/ReadlineColor.h   src/ReadlineColor.cc \
 	src/ReadlineWindow.h  src/ReadlineWindow.cc \
 	src/Console.h         src/Console.cc \
 	src/Shell.h           src/Shell.cc \
+	src/Description.h     src/Description.cc \
+	src/DimDescriptionService.h \
+	src/DimDescriptionService.cc \
 	src/Connection.h      src/Connection.cc \
-	src/EventDim.h
+	src/EventDim.h \
+	src/DimErrorRedirecter.h
 
 libConfiguration_la_SOURCES = src/Configuration.h src/Configuration.cc
 libTime_la_SOURCES = src/Time.h src/Time.cc
+#libAstro_la_SOURCES = src/Astro.h src/Astro.cc
 libTools_la_SOURCES = src/tools.h src/tools.cc
 dserver2_SOURCES = src/dserver2.cc 
 dserver2_LDADD = libTime.la libTools.la libStateMachine.la libDim.la libDim++.la
+
+#ftm_SOURCES = src/ftm.cc 
+#ftm_LDADD   = libTime.la libTools.la libStateMachine.la libDim.la libDim++.la
 log_SOURCES = src/log.cc
 log_LDADD = libTime.la libTools.la libDim.la libDim++.la libStateMachine.la 
 logtime_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la
 logtime_SOURCES = src/logtime.cc
-dclient5_SOURCES = src/dclient5.cc src/LocalControl.cc
+dclient5_SOURCES = src/dclient5.cc src/LocalControl.cc src/LocalControl.h
 dclient5_LDADD = libDim.la libDim++.la libTools.la libTime.la libStateMachine.la \
     libConfiguration.la
 
+
+#ftmctrl_SOURCES = src/ftmctrl.cc src/LocalControl.cc src/LocalControl.h
+#ftmctrl_LDADD   = libDim.la libDim++.la libTools.la libTime.la libStateMachine.la \
+#    libConfiguration.la
+
+#sched_SOURCES = src/sched.cc src/LocalControl.cc src/LocalControl.h
+#sched_LDADD   = libDim.la libDim++.la libTools.la libTime.la libStateMachine.la \
+#    libConfiguration.la
 argv_SOURCES = src/argv.cc
 argv_LDADD = libConfiguration.la 
-test3_SOURCES = src/test3.cc src/RemoteControl.cc
+test3_SOURCES = src/test3.cc src/RemoteControl.cc src/RemoteControl.h
 test3_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
 time_SOURCES = src/time.cc
 time_LDADD = libTime.la 
+
+#astro_SOURCES = src/astro.cc
+#astro_LDADD = libAstro.la libTime.la 
+
+#test_SOURCES = src/test.cc
+#test_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
+dataLogger_SOURCES = src/dataLogger.cc src/LocalControl.cc src/LocalControl.h
+dataLogger_LDADD = libDim.la libDim++.la libTools.la libTime.la libStateMachine.la \
+    libConfiguration.la
+
+
+#-------------------------------------------------------------------------
+MAN_TARGETS = $(am__append_1) $(am__append_2) $(am__append_3)
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .c .cc .cxx .lo .o .obj
+.SUFFIXES: .c .cc .cxx .html .lo .man .o .obj .pdf
 am--refresh:
 	@:
@@ -693,8 +740,13 @@
 src/WindowLog.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/Readline.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/ReadlineColor.lo: src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
 src/ReadlineWindow.lo: src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/Console.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/Shell.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/Description.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/DimDescriptionService.lo: src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
 src/Connection.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 libStateMachine.la: $(libStateMachine_la_OBJECTS) $(libStateMachine_la_DEPENDENCIES) 
@@ -769,7 +821,12 @@
 	@rm -f argv$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(argv_OBJECTS) $(argv_LDADD) $(LIBS)
-src/dclient5.$(OBJEXT): src/$(am__dirstamp) \
+src/dataLogger.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/LocalControl.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+dataLogger$(EXEEXT): $(dataLogger_OBJECTS) $(dataLogger_DEPENDENCIES) 
+	@rm -f dataLogger$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(dataLogger_OBJECTS) $(dataLogger_LDADD) $(LIBS)
+src/dclient5.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 dclient5$(EXEEXT): $(dclient5_OBJECTS) $(dclient5_DEPENDENCIES) 
@@ -870,4 +927,8 @@
 	-rm -f src/Converter.$(OBJEXT)
 	-rm -f src/Converter.lo
+	-rm -f src/Description.$(OBJEXT)
+	-rm -f src/Description.lo
+	-rm -f src/DimDescriptionService.$(OBJEXT)
+	-rm -f src/DimDescriptionService.lo
 	-rm -f src/DimErrorRedirecter.$(OBJEXT)
 	-rm -f src/DimErrorRedirecter.lo
@@ -883,4 +944,6 @@
 	-rm -f src/Readline.$(OBJEXT)
 	-rm -f src/Readline.lo
+	-rm -f src/ReadlineColor.$(OBJEXT)
+	-rm -f src/ReadlineColor.lo
 	-rm -f src/ReadlineWindow.$(OBJEXT)
 	-rm -f src/ReadlineWindow.lo
@@ -901,4 +964,5 @@
 	-rm -f src/WindowLog.lo
 	-rm -f src/argv.$(OBJEXT)
+	-rm -f src/dataLogger.$(OBJEXT)
 	-rm -f src/dclient5.$(OBJEXT)
 	-rm -f src/dserver2.$(OBJEXT)
@@ -938,4 +1002,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Console.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Converter.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Description.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/DimDescriptionService.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/DimErrorRedirecter.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Event.Plo@am__quote@
@@ -945,4 +1011,5 @@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/MessageImp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Readline.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ReadlineColor.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ReadlineWindow.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/RemoteControl.Po@am__quote@
@@ -955,4 +1022,5 @@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/WindowLog.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/argv.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dataLogger.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dclient5.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dserver2.Po@am__quote@
@@ -1086,4 +1154,38 @@
 distclean-libtool:
 	-rm -f libtool config.lt
+install-man1: $(dist_man1_MANS)
+	@$(NORMAL_INSTALL)
+	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+	@list='$(dist_man1_MANS)'; test -n "$(man1dir)" || exit 0; \
+	{ for i in $$list; do echo "$$i"; done; \
+	} | while read p; do \
+	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; echo "$$p"; \
+	done | \
+	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+	sed 'N;N;s,\n, ,g' | { \
+	list=; while read file base inst; do \
+	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
+	  fi; \
+	done; \
+	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+	while read files; do \
+	  test -z "$$files" || { \
+	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
+	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
+	done; }
+
+uninstall-man1:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_man1_MANS)'; test -n "$(man1dir)" || exit 0; \
+	files=`{ for i in $$list; do echo "$$i"; done; \
+	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+	test -z "$$files" || { \
+	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
 install-libDim___laHEADERS: $(libDim___la_HEADERS)
 	@$(NORMAL_INSTALL)
@@ -1180,4 +1282,17 @@
 
 distdir: $(DISTFILES)
+	@list='$(MANS)'; if test -n "$$list"; then \
+	  list=`for p in $$list; do \
+	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
+	  if test -n "$$list" && \
+	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
+	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
+	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
+	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
+	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
+	    exit 1; \
+	  else :; fi; \
+	else :; fi
 	$(am__remove_distdir)
 	test -d "$(distdir)" || mkdir "$(distdir)"
@@ -1328,9 +1443,10 @@
 check-am: all-am
 check: check-am
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(HEADERS)
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) \
+		$(HEADERS)
 install-binPROGRAMS: install-libLTLIBRARIES
 
 installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libDim___ladir)" "$(DESTDIR)$(libDim_ladir)"; do \
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(libDim___ladir)" "$(DESTDIR)$(libDim_ladir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
@@ -1352,4 +1468,5 @@
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
@@ -1390,5 +1507,6 @@
 info-am:
 
-install-data-am: install-libDim___laHEADERS install-libDim_laHEADERS
+install-data-am: install-libDim___laHEADERS install-libDim_laHEADERS \
+	install-man
 
 install-dvi: install-dvi-am
@@ -1406,5 +1524,5 @@
 install-info-am:
 
-install-man:
+install-man: install-man1
 
 install-pdf: install-pdf-am
@@ -1439,5 +1557,8 @@
 
 uninstall-am: uninstall-binPROGRAMS uninstall-libDim___laHEADERS \
-	uninstall-libDim_laHEADERS uninstall-libLTLIBRARIES
+	uninstall-libDim_laHEADERS uninstall-libLTLIBRARIES \
+	uninstall-man
+
+uninstall-man: uninstall-man1
 
 .MAKE: install-am install-strip
@@ -1455,6 +1576,6 @@
 	install-info-am install-libDim___laHEADERS \
 	install-libDim_laHEADERS install-libLTLIBRARIES install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am \
+	install-man1 install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
 	installcheck-binPROGRAMS installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
@@ -1462,5 +1583,5 @@
 	tags uninstall uninstall-am uninstall-binPROGRAMS \
 	uninstall-libDim___laHEADERS uninstall-libDim_laHEADERS \
-	uninstall-libLTLIBRARIES
+	uninstall-libLTLIBRARIES uninstall-man uninstall-man1
 
 @DX_COND_doc_TRUE@@DX_CONFIG@:
@@ -1504,14 +1625,23 @@
 @DX_COND_doc_TRUE@	$(DX_ENV) $(DX_DOXYGEN) $(srcdir)/$(DX_CONFIG)
 
+@HAS_GROFF_TRUE@.man.html: $<
+@HAS_GROFF_TRUE@	$(AM_V_GEN)groff -mandoc `man -w ./$<` -T html > $@
+
+@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@.man.pdf: $<
+@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@	$(AM_V_GEN)groff -mandoc `man -w ./$<` | ps2pdf - $@
+
+@HAS_HELP2MAN_TRUE@$(dist_man1_MANS): $(dist_man1_MANS:.man=)
+@HAS_HELP2MAN_TRUE@	@mkdir -p man
+@HAS_HELP2MAN_TRUE@	$(AM_V_GEN)help2man -N -o $@ -m $(@:.man=) $(@:.man=)
+
+man: $(MAN_TARGETS) doxygen-doc
+
 diff:
 	@svn diff | $(COLORDIFF)
 
 # Overwrite rules for silent or other verbosity levels
-# pkg_verbose = $(pkg_verbose_$(V))
-#               pkg_verbose_ = $(pkg_verbose_$(AM_DEFAULT_VERBOSITY))
-#               pkg_verbose_0 = @echo GEN $@;
-#               
-#               foo: foo.in
-#                       $(pkg_verbose)cp $(srcdir)/foo.in $@
+#AM_V_MAN = $(AM_MAN_$(V))
+#AM_MAN_ = $(AM_V_GEN)
+#AM_MAN_0 = @echo  "  MAN    "$@;
 
 #$(MyAnalysisDS): $(MyAnalysisH) $(MyAnalysisL)
Index: /trunk/FACT++/configure
===================================================================
--- /trunk/FACT++/configure	(revision 10345)
+++ /trunk/FACT++/configure	(revision 10346)
@@ -747,4 +747,21 @@
 LTLIBOBJS
 LIBOBJS
+HAS_COLORGCC_FALSE
+HAS_COLORGCC_TRUE
+HAS_DOT_FALSE
+HAS_DOT_TRUE
+HAS_DOXYGEN_FALSE
+HAS_DOXYGEN_TRUE
+HAS_HELP2MAN_FALSE
+HAS_HELP2MAN_TRUE
+HAS_PS2PDF_FALSE
+HAS_PS2PDF_TRUE
+HAS_GROFF_FALSE
+HAS_GROFF_TRUE
+HAS_COLORDIFF_FALSE
+HAS_COLORDIFF_TRUE
+HELP2MAN
+PS2PDF
+GROFF
 COLORDIFF
 BOOST_THREAD_LIB
@@ -759,6 +776,4 @@
 MYSQLPP_INC_DIR
 MYSQLPP_LIB_DIR
-MYSQL_C_LIB_NAME
-MYSQL_C_LIB_DIR
 MYSQL_C_INC_DIR
 MOTIF_LIBS
@@ -962,4 +977,10 @@
 enable_doxygen_pdf
 with_readline
+with_cfitsio
+with_cfitsio_include
+with_cfitsio_libdir
+with_ccfits
+with_ccfits_include
+with_ccfits_libdir
 with_x
 with_motif_includes
@@ -1646,4 +1667,12 @@
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-readline[=dir]   Compile with readline/locate base dir
+  --with-cfitsio=DIR	root directory of cfitsio installation
+  --with-cfitsio-include=DIR        specify exact include dir for cfitsio headers
+  --with-cfitsio-libdir=DIR        specify exact library dir for cfitsio library
+  --without-cfitsio        disables cfitsio usage completely
+  --with-ccfits=DIR	root directory of ccfits installation
+  --with-ccfits-include=DIR        specify exact include dir for ccfits headers
+  --with-ccfits-libdir=DIR        specify exact library dir for ccfits library
+  --without-ccfits        disables ccfits usage completely
   --with-x                use the X Window System
   --with-motif-includes=DIR    Motif include files are in DIR
@@ -2261,4 +2290,95 @@
 
 } # ac_fn_c_check_header_mongrel
+
+# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES
+# ---------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_cxx_check_header_mongrel ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if eval "test \"\${$3+set}\"" = set; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval "test \"\${$3+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_header_compiler=yes
+else
+  ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <$2>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+  ac_header_preproc=yes
+else
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #((
+  yes:no: )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+( $as_echo "## ----------------------------------- ##
+## Report this to thomas.bretz@epfl.ch ##
+## ----------------------------------- ##"
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval "test \"\${$3+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_cxx_check_header_mongrel
 
 # ac_fn_cxx_check_func LINENO FUNC VAR
@@ -4250,11 +4370,11 @@
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4252: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4372: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4255: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4375: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4258: output\"" >&5)
+  (eval echo "\"\$as_me:4378: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
@@ -5462,5 +5582,5 @@
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5464 "configure"' > conftest.$ac_ext
+  echo '#line 5584 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
@@ -7390,9 +7510,9 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7392: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7512: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7396: \$? = $ac_status" >&5
+   echo "$as_me:7516: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -7729,9 +7849,9 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7731: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7851: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7735: \$? = $ac_status" >&5
+   echo "$as_me:7855: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -7834,9 +7954,9 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7836: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7956: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7840: \$? = $ac_status" >&5
+   echo "$as_me:7960: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -7889,9 +8009,9 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7891: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8011: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7895: \$? = $ac_status" >&5
+   echo "$as_me:8015: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -10273,5 +10393,5 @@
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10275 "configure"
+#line 10395 "configure"
 #include "confdefs.h"
 
@@ -10369,5 +10489,5 @@
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10371 "configure"
+#line 10491 "configure"
 #include "confdefs.h"
 
@@ -12325,9 +12445,9 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12327: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12447: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12331: \$? = $ac_status" >&5
+   echo "$as_me:12451: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -12424,9 +12544,9 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12426: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12546: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12430: \$? = $ac_status" >&5
+   echo "$as_me:12550: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -12476,9 +12596,9 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12478: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12598: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12482: \$? = $ac_status" >&5
+   echo "$as_me:12602: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -13451,6 +13571,7 @@
 #AC_PATH_XTRA
 
-
-
+######################################################################
+# Automake initial setup
+######################################################################
 
 am__api_version='1.11'
@@ -14400,5 +14521,5 @@
 
 DX_ENV="$DX_ENV ALL_GRAPHS='NO'"
-  # change to yet to switch on call(er) graphs
+  # change to yes to switch on call(er) graphs
 
 #DX_DOXYGEN_FEATURE(ON)
@@ -16343,5 +16464,5 @@
 
 
-
+# Needed to compile dim
 
 
@@ -16695,4 +16816,5 @@
 
 
+# Needed to compile FACT++
 
 
@@ -16778,4 +16900,5 @@
 #
 
+# Needed to compile FACT++
 for ac_header in panel.h
 do :
@@ -16787,13 +16910,11 @@
 
 else
-
-      echo "Error! Ncurses panel.h not properly installed in default include paths."
-      exit -1
-
-
+  as_fn_error $? "ncurses header not found" "$LINENO" 5
 fi
 
 done
 
+
+# Needed to compile FACT++
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for update_panels in -lpanel" >&5
 $as_echo_n "checking for update_panels in -lpanel... " >&6; }
@@ -16840,11 +16961,126 @@
 
 else
-
-      echo "Error! Ncurses libpanel not properly installed in the default libarary paths."
-      exit -1
-
-
-fi
-
+  as_fn_error $? "ncurses panel library not found" "$LINENO" 5
+fi
+
+
+# Needed to compile FACT++
+
+
+
+# Check whether --with-cfitsio was given.
+if test "${with_cfitsio+set}" = set; then :
+  withval=$with_cfitsio; with_cfitsio=$withval
+if test "${with_cfitsio}" != yes; then
+	cfitsio_include="$withval/include"
+	cfitsio_libdir="$withval/lib"
+fi
+
+fi
+
+
+
+# Check whether --with-cfitsio-include was given.
+if test "${with_cfitsio_include+set}" = set; then :
+  withval=$with_cfitsio_include; cfitsio_include="$withval"
+fi
+
+
+
+# Check whether --with-cfitsio-libdir was given.
+if test "${with_cfitsio_libdir+set}" = set; then :
+  withval=$with_cfitsio_libdir; cfitsio_libdir="$withval"
+fi
+
+
+if test "${with_cfitsio}" != no ; then
+	OLD_LIBS=$LIBS
+	OLD_LDFLAGS=$LDFLAGS
+	OLD_CFLAGS=$CFLAGS
+	OLD_CPPFLAGS=$CPPFLAGS
+
+	if test "${cfitsio_libdir}" ; then
+		LDFLAGS="$LDFLAGS -L${cfitsio_libdir}"
+	fi
+	if test "${cfitsio_include}" ; then
+		CPPFLAGS="$CPPFLAGS -I${cfitsio_include}"
+		CFLAGS="$CFLAGS -I${cfitsio_include}"
+	fi
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ffpss in -lcfitsio" >&5
+$as_echo_n "checking for ffpss in -lcfitsio... " >&6; }
+if test "${ac_cv_lib_cfitsio_ffpss+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcfitsio  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ffpss ();
+int
+main ()
+{
+return ffpss ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_cfitsio_ffpss=yes
+else
+  ac_cv_lib_cfitsio_ffpss=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cfitsio_ffpss" >&5
+$as_echo "$ac_cv_lib_cfitsio_ffpss" >&6; }
+if test "x$ac_cv_lib_cfitsio_ffpss" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBCFITSIO 1
+_ACEOF
+
+  LIBS="-lcfitsio $LIBS"
+
+else
+  no_good=yes
+fi
+
+	ac_fn_c_check_header_mongrel "$LINENO" "fitsio.h" "ac_cv_header_fitsio_h" "$ac_includes_default"
+if test "x$ac_cv_header_fitsio_h" = x""yes; then :
+
+else
+  no_good=yes
+fi
+
+
+	if test "$no_good" = yes; then
+		as_fn_error $? "cfitsio not properly installed/not found." "$LINENO" 5
+
+		LIBS=$OLD_LIBS
+		LDFLAGS=$OLD_LDFLAGS
+		CPPFLAGS=$OLD_CPPFLAGS
+		CFLAGS=$OLD_CFLAGS
+	else
+
+
+		$as_echo "#define HAVE_PKG_cfitsio 1" >>confdefs.h
+
+	fi
+
+fi
+
+
+
+#AC_CHECK_HEADERS([fitsio.h],,AC_MSG_ERROR([cfitsio headers not found]))
+#AC_CHECK_LIB([cfitsio], main,,AC_MSG_ERROR([cfitsio library not found]))
 
 ac_ext=cpp
@@ -16855,9 +17091,126 @@
 
 
+# Needed to compile FACT++
+
+
+
+
+# Check whether --with-ccfits was given.
+if test "${with_ccfits+set}" = set; then :
+  withval=$with_ccfits; with_ccfits=$withval
+if test "${with_ccfits}" != yes; then
+	ccfits_include="$withval/include"
+	ccfits_libdir="$withval/lib"
+fi
+
+fi
+
+
+
+# Check whether --with-ccfits-include was given.
+if test "${with_ccfits_include+set}" = set; then :
+  withval=$with_ccfits_include; ccfits_include="$withval"
+fi
+
+
+
+# Check whether --with-ccfits-libdir was given.
+if test "${with_ccfits_libdir+set}" = set; then :
+  withval=$with_ccfits_libdir; ccfits_libdir="$withval"
+fi
+
+
+if test "${with_ccfits}" != no ; then
+	OLD_LIBS=$LIBS
+	OLD_LDFLAGS=$LDFLAGS
+	OLD_CFLAGS=$CFLAGS
+	OLD_CPPFLAGS=$CPPFLAGS
+
+	if test "${ccfits_libdir}" ; then
+		LDFLAGS="$LDFLAGS -L${ccfits_libdir}"
+	fi
+	if test "${ccfits_include}" ; then
+		CPPFLAGS="$CPPFLAGS -I${ccfits_include}"
+		CFLAGS="$CFLAGS -I${ccfits_include}"
+	fi
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lCCfits" >&5
+$as_echo_n "checking for main in -lCCfits... " >&6; }
+if test "${ac_cv_lib_CCfits_main+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lCCfits  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+return main ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_lib_CCfits_main=yes
+else
+  ac_cv_lib_CCfits_main=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_CCfits_main" >&5
+$as_echo "$ac_cv_lib_CCfits_main" >&6; }
+if test "x$ac_cv_lib_CCfits_main" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBCCFITS 1
+_ACEOF
+
+  LIBS="-lCCfits $LIBS"
+
+else
+  no_good=yes
+fi
+
+	ac_fn_cxx_check_header_mongrel "$LINENO" "CCfits/CCfits" "ac_cv_header_CCfits_CCfits" "$ac_includes_default"
+if test "x$ac_cv_header_CCfits_CCfits" = x""yes; then :
+
+else
+  no_good=yes
+fi
+
+
+	if test "$no_good" = yes; then
+		as_fn_error $? "CCfits not properly installed/not found." "$LINENO" 5
+
+		LIBS=$OLD_LIBS
+		LDFLAGS=$OLD_LDFLAGS
+		CPPFLAGS=$OLD_CPPFLAGS
+		CFLAGS=$OLD_CFLAGS
+	else
+
+
+		$as_echo "#define HAVE_PKG_ccfits 1" >>confdefs.h
+
+	fi
+
+fi
+
+
+
+#AC_CHECK_HEADERS([CCfits/CCfits],,
+#   AC_MSG_ERROR(CCfits headers not found))
+#AC_CHECK_LIB(CCfits, main,,
+#   AC_MSG_ERROR(CCfits library not found))
+
+
 ######################################################################
 # Xm.h (lesstif/motif, needed by did)
 ######################################################################
 
-
+# Needed to compile dim
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
 $as_echo_n "checking for X... " >&6; }
@@ -17917,4 +18270,5 @@
 ######################################################################
 
+# Needed to compile FACT++
 
 	MYSQL_inc_check="/usr/include/mysql /usr/local/include/mysql /usr/local/mysql/include /usr/local/mysql/include/mysql /usr/mysql/include/mysql /opt/mysql/include/mysql /sw/include/mysql"
@@ -17955,6 +18309,4 @@
 
 	CPPFLAGS="$CPPFLAGS -I${MYSQL_C_INC_DIR}"
-
-
 
 
@@ -18081,4 +18433,5 @@
 ######################################################################
 
+# Needed to compile FACT++
 
 
@@ -19912,12 +20265,12 @@
 	fi
 
-#ax_boost_iostreams
-#ax_boost_python
-#ax_boost_serialization
-#ax_boost_signals
-#ax_boost_test_exec_monitor
-#ax_boost_unit_test_framework
-#ax_boost_wave
-#ax_boost_wserialization
+#AX_BOOST_IOSTREAMS
+#AX_BOOST_PYTHON
+#AX_BOOST_SERIALIZATION
+#AX_BOOST_SIGNALS
+#AX_BOOST_TEST_EXEC_MONITOR
+#AX_BOOST_UNIT_TEST_FRAMEWORK
+#AX_BOOST_WAVE
+#AX_BOOST_WSERIALIZATION
 
 LDFLAGS+=" -lboost_date_time"
@@ -19976,4 +20329,5 @@
 ######################################################################
 
+# Nice to have to support colored diff
 # Extract the first word of "colordiff", so it can be a program name with args.
 set dummy colordiff; ac_word=$2
@@ -20014,10 +20368,118 @@
 
 
-
-###########################################################################
-
-#AC_C_CONST
-#AC_TYPE_PID_T
-#AC_HEADER_STDC
+# Extract the first word of "groff", so it can be a program name with args.
+set dummy groff; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_GROFF+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$GROFF"; then
+  ac_cv_prog_GROFF="$GROFF" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_GROFF="yes"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_prog_GROFF" && ac_cv_prog_GROFF="no"
+fi
+fi
+GROFF=$ac_cv_prog_GROFF
+if test -n "$GROFF"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GROFF" >&5
+$as_echo "$GROFF" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "ps2pdf", so it can be a program name with args.
+set dummy ps2pdf; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_PS2PDF+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$PS2PDF"; then
+  ac_cv_prog_PS2PDF="$PS2PDF" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_PS2PDF="yes"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_prog_PS2PDF" && ac_cv_prog_PS2PDF="no"
+fi
+fi
+PS2PDF=$ac_cv_prog_PS2PDF
+if test -n "$PS2PDF"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PS2PDF" >&5
+$as_echo "$PS2PDF" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "help2man", so it can be a program name with args.
+set dummy help2man; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_HELP2MAN+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$HELP2MAN"; then
+  ac_cv_prog_HELP2MAN="$HELP2MAN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_HELP2MAN="yes"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_prog_HELP2MAN" && ac_cv_prog_HELP2MAN="no"
+fi
+fi
+HELP2MAN=$ac_cv_prog_HELP2MAN
+if test -n "$HELP2MAN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HELP2MAN" >&5
+$as_echo "$HELP2MAN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
 
 ##########################################################################
@@ -20041,10 +20503,69 @@
 #fi
 #
-###########################################################################
-#To get the changed compiler flags distributed among your final Makefiles you have to add the following line somewhere afterwards:
-#
-#AC_SUBST([AM_CXXFLAGS])
-
-
+
+##########################################################################
+# produce conditionals for Makefile.am and for summary
+##########################################################################
+
+ if test "$COLORDIFF" = colordiff; then
+  HAS_COLORDIFF_TRUE=
+  HAS_COLORDIFF_FALSE='#'
+else
+  HAS_COLORDIFF_TRUE='#'
+  HAS_COLORDIFF_FALSE=
+fi
+
+ if test "$GROFF" = yes; then
+  HAS_GROFF_TRUE=
+  HAS_GROFF_FALSE='#'
+else
+  HAS_GROFF_TRUE='#'
+  HAS_GROFF_FALSE=
+fi
+
+ if test "$PS2PDF" = yes; then
+  HAS_PS2PDF_TRUE=
+  HAS_PS2PDF_FALSE='#'
+else
+  HAS_PS2PDF_TRUE='#'
+  HAS_PS2PDF_FALSE=
+fi
+
+ if test "$HELP2MAN" = yes; then
+  HAS_HELP2MAN_TRUE=
+  HAS_HELP2MAN_FALSE='#'
+else
+  HAS_HELP2MAN_TRUE='#'
+  HAS_HELP2MAN_FALSE=
+fi
+
+ if test -n "$DX_DOXYGEN"; then
+  HAS_DOXYGEN_TRUE=
+  HAS_DOXYGEN_FALSE='#'
+else
+  HAS_DOXYGEN_TRUE='#'
+  HAS_DOXYGEN_FALSE=
+fi
+
+ if test -n "$DX_DOT"; then
+  HAS_DOT_TRUE=
+  HAS_DOT_FALSE='#'
+else
+  HAS_DOT_TRUE='#'
+  HAS_DOT_FALSE=
+fi
+
+ if test "$GCC" = colorgcc; then
+  HAS_COLORGCC_TRUE=
+  HAS_COLORGCC_FALSE='#'
+else
+  HAS_COLORGCC_TRUE='#'
+  HAS_COLORGCC_FALSE=
+fi
+
+
+##########################################################################
+# print summary
+##########################################################################
 
 cat >confcache <<\_ACEOF
@@ -20296,4 +20817,32 @@
 if test -z "${Have_Libxp_TRUE}" && test -z "${Have_Libxp_FALSE}"; then
   as_fn_error $? "conditional \"Have_Libxp\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAS_COLORDIFF_TRUE}" && test -z "${HAS_COLORDIFF_FALSE}"; then
+  as_fn_error $? "conditional \"HAS_COLORDIFF\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAS_GROFF_TRUE}" && test -z "${HAS_GROFF_FALSE}"; then
+  as_fn_error $? "conditional \"HAS_GROFF\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAS_PS2PDF_TRUE}" && test -z "${HAS_PS2PDF_FALSE}"; then
+  as_fn_error $? "conditional \"HAS_PS2PDF\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAS_HELP2MAN_TRUE}" && test -z "${HAS_HELP2MAN_FALSE}"; then
+  as_fn_error $? "conditional \"HAS_HELP2MAN\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAS_DOXYGEN_TRUE}" && test -z "${HAS_DOXYGEN_FALSE}"; then
+  as_fn_error $? "conditional \"HAS_DOXYGEN\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAS_DOT_TRUE}" && test -z "${HAS_DOT_FALSE}"; then
+  as_fn_error $? "conditional \"HAS_DOT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAS_COLORGCC_TRUE}" && test -z "${HAS_COLORGCC_FALSE}"; then
+  as_fn_error $? "conditional \"HAS_COLORGCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
@@ -22597,2 +23146,121 @@
 fi
 
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
+$as_echo "$as_me: " >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: ============================== summary =============================" >&5
+$as_echo "$as_me: ============================== summary =============================" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
+$as_echo "$as_me: " >&6;}
+
+if test "$COLORDIFF" = colordiff; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}:  colored svn diff       / 'colordiff'      found: yes" >&5
+$as_echo "$as_me:  colored svn diff       / 'colordiff'      found: yes" >&6;}
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}:  colored svn diff       / 'colordiff'      found: no" >&5
+$as_echo "$as_me:  colored svn diff       / 'colordiff'      found: no" >&6;}
+
+fi
+if test "$HELP2MAN" = yes; then
+
+   { $as_echo "$as_me:${as_lineno-$LINENO}:  man-pages enabled      / 'help2man'       found: $HELP2MAN" >&5
+$as_echo "$as_me:  man-pages enabled      / 'help2man'       found: $HELP2MAN" >&6;}
+   if test "$GROFF" = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}:  build of html enabled  / 'groff'          found: yes" >&5
+$as_echo "$as_me:  build of html enabled  / 'groff'          found: yes" >&6;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}:  build of pdf  enabled  / 'ps2pdf'         found: $PS2PDF" >&5
+$as_echo "$as_me:  build of pdf  enabled  / 'ps2pdf'         found: $PS2PDF" >&6;}
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}:  build of html and pdf  / 'groff'          found: no" >&5
+$as_echo "$as_me:  build of html and pdf  / 'groff'          found: no" >&6;}
+
+fi
+
+else
+
+   { $as_echo "$as_me:${as_lineno-$LINENO}:  man, html, pdf enabled / 'help2man'       found: no" >&5
+$as_echo "$as_me:  man, html, pdf enabled / 'help2man'       found: no" >&6;}
+
+fi
+
+if test -n "$DX_DOXYGEN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}:  doxygen docu enabled   / 'doxygen'        found: $DX_DOXYGEN" >&5
+$as_echo "$as_me:  doxygen docu enabled   / 'doxygen'        found: $DX_DOXYGEN" >&6;}
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}:  doxygen docu enabled   / 'doxygen'        found: no" >&5
+$as_echo "$as_me:  doxygen docu enabled   / 'doxygen'        found: no" >&6;}
+
+fi
+if test -n "$DX_DOT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}:  doxygen graphs enabled / 'dot' (graphviz) found: $DX_DOT" >&5
+$as_echo "$as_me:  doxygen graphs enabled / 'dot' (graphviz) found: $DX_DOT" >&6;}
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}:  doxagen graphs enabled / 'dot' (graphviz) found: no" >&5
+$as_echo "$as_me:  doxagen graphs enabled / 'dot' (graphviz) found: no" >&6;}
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
+$as_echo "$as_me: " >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: --------------------------------------------------------------------" >&5
+$as_echo "$as_me: --------------------------------------------------------------------" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
+$as_echo "$as_me: " >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Suggestions and hits:" >&5
+$as_echo "$as_me: Suggestions and hits:" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
+$as_echo "$as_me: " >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}:   - Add 'V=1' to you make-call to switch on verbose output." >&5
+$as_echo "$as_me:   - Add 'V=1' to you make-call to switch on verbose output." >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}:   - Do not try to create man-pages with doxygen," >&5
+$as_echo "$as_me:   - Do not try to create man-pages with doxygen," >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}:     it does most probably not work." >&5
+$as_echo "$as_me:     it does most probably not work." >&6;}
+if test "$GCC" = colorgcc; then
+  :
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}:   - Install colorgcc to get colored compiler output." >&5
+$as_echo "$as_me:   - Install colorgcc to get colored compiler output." >&6;}
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
+$as_echo "$as_me: " >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: --------------------------------------------------------------------" >&5
+$as_echo "$as_me: --------------------------------------------------------------------" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
+$as_echo "$as_me: " >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Some interesting build targets:" >&5
+$as_echo "$as_me: Some interesting build targets:" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
+$as_echo "$as_me: " >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}:  diff:          colored 'svn diff' if colordiff is installed" >&5
+$as_echo "$as_me:  diff:          colored 'svn diff' if colordiff is installed" >&6;}
+if test "$HELP2MAN" = yes; then
+
+   { $as_echo "$as_me:${as_lineno-$LINENO}:  program.man:   build man-page from 'program --help'" >&5
+$as_echo "$as_me:  program.man:   build man-page from 'program --help'" >&6;}
+   { $as_echo "$as_me:${as_lineno-$LINENO}:                 (display with 'man ./program.man')" >&5
+$as_echo "$as_me:                 (display with 'man ./program.man')" >&6;}
+   if test "$GROFF" = yes; then
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}:  program.html:  build html page from man-page" >&5
+$as_echo "$as_me:  program.html:  build html page from man-page" >&6;}
+      if test "$PS2PDF" = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}:  program.pdf:   build pdf documentation from man page" >&5
+$as_echo "$as_me:  program.pdf:   build pdf documentation from man page" >&6;}
+
+fi
+
+fi
+
+fi
+if test -n "$DX_DOXYGEN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}:  doxygen-run:   build html documentation with doxygen" >&5
+$as_echo "$as_me:  doxygen-run:   build html documentation with doxygen" >&6;}
+   { $as_echo "$as_me:${as_lineno-$LINENO}:  doxygen-doc:   build html and pdf documentation with doxygen" >&5
+$as_echo "$as_me:  doxygen-doc:   build html and pdf documentation with doxygen" >&6;}
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}:  man:           build all buildable documentation" >&5
+$as_echo "$as_me:  man:           build all buildable documentation" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
+$as_echo "$as_me: " >&6;}