Index: /trunk/FACT++/Makefile.am
===================================================================
--- /trunk/FACT++/Makefile.am	(revision 14034)
+++ /trunk/FACT++/Makefile.am	(revision 14035)
@@ -40,4 +40,5 @@
 	magicweather \
 	smartfact \
+	timecheck \
 	fitsdump fitscheck 
 
@@ -93,4 +94,5 @@
 	fitscheck.man \
 	smartfact.man
+	timecheck.man
 endif
 
@@ -271,4 +273,9 @@
     	libConfiguration.la
 
+timecheck_SOURCES = src/timecheck.cc src/LocalControl.h
+timecheck_LDADD   = libDim++.la libDim.la libDimExtension.la \
+ 	libStateMachine.la libTools.la libTime.la \
+    	libConfiguration.la
+
 smartfact_SOURCES = src/smartfact.cc src/LocalControl.h src/PixelMap.cc
 smartfact_LDADD   = libDim++.la libDim.la libDimExtension.la \
Index: /trunk/FACT++/Makefile.in
===================================================================
--- /trunk/FACT++/Makefile.in	(revision 14034)
+++ /trunk/FACT++/Makefile.in	(revision 14035)
@@ -49,7 +49,8 @@
 	drivectrl$(EXEEXT) mcp$(EXEEXT) feedback$(EXEEXT) \
 	ratescan$(EXEEXT) ratecontrol$(EXEEXT) magicweather$(EXEEXT) \
-	smartfact$(EXEEXT) fitsdump$(EXEEXT) fitscheck$(EXEEXT) \
-	$(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
-	$(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6)
+	smartfact$(EXEEXT) timecheck$(EXEEXT) fitsdump$(EXEEXT) \
+	fitscheck$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \
+	$(am__EXEEXT_3) $(am__EXEEXT_4) $(am__EXEEXT_5) \
+	$(am__EXEEXT_6)
 @HAS_GUI_TRUE@am__append_1 = fact
 @HAS_SOPRANO_TRUE@am__append_2 = tngweather
@@ -369,4 +370,8 @@
 time_OBJECTS = $(am_time_OBJECTS)
 time_DEPENDENCIES = libTime.la
+am_timecheck_OBJECTS = src/timecheck.$(OBJEXT)
+timecheck_OBJECTS = $(am_timecheck_OBJECTS)
+timecheck_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \
+	libStateMachine.la libTools.la libTime.la libConfiguration.la
 am_tngweather_OBJECTS = src/tngweather.$(OBJEXT)
 tngweather_OBJECTS = $(am_tngweather_OBJECTS)
@@ -461,6 +466,6 @@
 	$(scheduler_SOURCES) $(skypeclient_SOURCES) \
 	$(smartfact_SOURCES) $(test_SOURCES) $(time_SOURCES) \
-	$(tngweather_SOURCES) $(triggerschedule_SOURCES) \
-	$(viewer_SOURCES)
+	$(timecheck_SOURCES) $(tngweather_SOURCES) \
+	$(triggerschedule_SOURCES) $(viewer_SOURCES)
 DIST_SOURCES = $(libConfiguration_la_SOURCES) $(libDim___la_SOURCES) \
 	$(libDim_la_SOURCES) $(libDimExtension_la_SOURCES) \
@@ -480,6 +485,6 @@
 	sched.c $(scheduler_SOURCES) $(skypeclient_SOURCES) \
 	$(smartfact_SOURCES) $(test_SOURCES) $(time_SOURCES) \
-	$(tngweather_SOURCES) $(triggerschedule_SOURCES) \
-	$(am__viewer_SOURCES_DIST)
+	$(timecheck_SOURCES) $(tngweather_SOURCES) \
+	$(triggerschedule_SOURCES) $(am__viewer_SOURCES_DIST)
 man1dir = $(mandir)/man1
 NROFF = nroff
@@ -715,7 +720,6 @@
 AM_CPPFLAGS = -Idim/dim $(DIM_FLAGS) $(BOOST_FLAGS) $(ROOTCPPFLAGS) \
    -Wall -Winit-self -Wpointer-arith -Wcast-align -Wextra -Wformat=2 \
-   $(SVN_REVISION) 
-
-#`pkg-config --cflags --libs dbus-1` `pkg-config --cflags --libs dbus-glib-1`
+   $(SVN_REVISION)
+
 AM_CXXFLAGS = $(AM_CPPFLAGS) \
    -Woverloaded-virtual -Wnon-virtual-dtor -Wshadow
@@ -894,4 +898,9 @@
 tngweather_SOURCES = src/tngweather.cc src/LocalControl.h
 tngweather_LDADD = libDim++.la libDim.la libDimExtension.la \
+ 	libStateMachine.la libTools.la libTime.la \
+    	libConfiguration.la
+
+timecheck_SOURCES = src/timecheck.cc src/LocalControl.h
+timecheck_LDADD = libDim++.la libDim.la libDimExtension.la \
  	libStateMachine.la libTools.la libTime.la \
     	libConfiguration.la
@@ -1504,4 +1513,9 @@
 	@rm -f time$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(time_OBJECTS) $(time_LDADD) $(LIBS)
+src/timecheck.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+timecheck$(EXEEXT): $(timecheck_OBJECTS) $(timecheck_DEPENDENCIES) 
+	@rm -f timecheck$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(timecheck_OBJECTS) $(timecheck_LDADD) $(LIBS)
 src/tngweather.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
@@ -1707,4 +1721,5 @@
 	-rm -f src/test.$(OBJEXT)
 	-rm -f src/time.$(OBJEXT)
+	-rm -f src/timecheck.$(OBJEXT)
 	-rm -f src/tngweather.$(OBJEXT)
 	-rm -f src/tools.$(OBJEXT)
@@ -1834,4 +1849,5 @@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/time.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/timecheck.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/tngweather.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/tools.Plo@am__quote@
@@ -2563,4 +2579,5 @@
 	uninstall-libLTLIBRARIES uninstall-man uninstall-man1
 
+@HAS_HELP2MAN_TRUE@	timecheck.man
 
 .ui.h: $<
Index: /trunk/FACT++/configure
===================================================================
--- /trunk/FACT++/configure	(revision 14034)
+++ /trunk/FACT++/configure	(revision 14035)
@@ -650,4 +650,6 @@
 HAS_ROOT_FALSE
 HAS_ROOT_TRUE
+HAS_SQL_FALSE
+HAS_SQL_TRUE
 HAS_QT4_FALSE
 HAS_QT4_TRUE
@@ -23857,5 +23859,5 @@
 
 		cat > conftest.$ac_ext <<EOF
-#line 23859 "configure"
+#line 23861 "configure"
 #include "confdefs.h"
 #include <qglobal.h>
@@ -24880,5 +24882,5 @@
 fi
 
- if test -n "$DX_DOXYGEN"; then
+ if test "$DX_DOXYGEN"; then
   HAS_DOXYGEN_TRUE=
   HAS_DOXYGEN_FALSE='#'
@@ -24888,5 +24890,5 @@
 fi
 
- if test -n "$DX_DOT"; then
+ if test "$DX_DOT"; then
   HAS_DOT_TRUE=
   HAS_DOT_FALSE='#'
@@ -24904,5 +24906,5 @@
 fi
 
- if test -n "$QT4_VERSION"; then
+ if test "$QT4_VERSION"; then
   HAS_QT4_TRUE=
   HAS_QT4_FALSE='#'
@@ -24910,4 +24912,12 @@
   HAS_QT4_TRUE='#'
   HAS_QT4_FALSE=
+fi
+
+ if test "$MYSQLPP_LIB_DIR" -a "$MYSQLPP_INC_DIR" ; then
+  HAS_SQL_TRUE=
+  HAS_SQL_FALSE='#'
+else
+  HAS_SQL_TRUE='#'
+  HAS_SQL_FALSE=
 fi
 
@@ -25071,4 +25081,8 @@
 if test "$HAVE_DBUS" = yes; then
   $as_echo "#define HAVE_DBUS 1" >>confdefs.h
+
+fi
+if test "$MYSQLPP_LIB_DIR" -a "$MYSQLPP_INC_DIR" ; then
+  $as_echo "#define HAVE_SQL 1" >>confdefs.h
 
 fi
@@ -25375,4 +25389,8 @@
 if test -z "${HAS_QT4_TRUE}" && test -z "${HAS_QT4_FALSE}"; then
   as_fn_error $? "conditional \"HAS_QT4\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAS_SQL_TRUE}" && test -z "${HAS_SQL_FALSE}"; then
+  as_fn_error $? "conditional \"HAS_SQL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
@@ -27845,5 +27863,19 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
 $as_echo "$as_me: " >&6;}
-if test -n "$QT4_VERSION"; then
+if test "$MYSQLPP_LIB_DIR" -a "$MYSQLPP_INC_DIR" ; then
+
+   { $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}:  MYSQLPP_INC_DIR = $MYSQLPP_INC_DIR" >&5
+$as_echo "$as_me:  MYSQLPP_INC_DIR = $MYSQLPP_INC_DIR" >&6;}
+   { $as_echo "$as_me:${as_lineno-$LINENO}:  MYSQLPP_LIB_DIR = $MYSQLPP_LIB_DIR" >&5
+$as_echo "$as_me:  MYSQLPP_LIB_DIR = $MYSQLPP_LIB_DIR" >&6;}
+   { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
+$as_echo "$as_me: " >&6;}
+
+fi
+if test "$QT4_VERSION"; then
 
    { $as_echo "$as_me:${as_lineno-$LINENO}: --------------------------------------------------------------------" >&5
@@ -27921,4 +27953,12 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}:  CCfits                 / 'CCfits/CCfits'    found: $HAVE_CCFITS" >&5
 $as_echo "$as_me:  CCfits                 / 'CCfits/CCfits'    found: $HAVE_CCFITS" >&6;}
+if test "$MYSQLPP_LIB_DIR" -a "$MYSQLPP_INC_DIR" ; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}:  MySQL/MySQL++          / 'mysql++.h'        found: yes" >&5
+$as_echo "$as_me:  MySQL/MySQL++          / 'mysql++.h'        found: yes" >&6;}
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}:  MySQL/MySQL++          / 'mysql++.h'        found: no" >&5
+$as_echo "$as_me:  MySQL/MySQL++          / 'mysql++.h'        found: no" >&6;}
+
+fi
 { $as_echo "$as_me:${as_lineno-$LINENO}:  DBus-1, DBus-glib-1    / pkg-config         found: $HAVE_DBUS" >&5
 $as_echo "$as_me:  DBus-1, DBus-glib-1    / pkg-config         found: $HAVE_DBUS" >&6;}
@@ -27970,5 +28010,5 @@
 fi
 
-if test -n "$DX_DOXYGEN"; then
+if test "$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;}
@@ -27978,5 +28018,5 @@
 
 fi
-if test -n "$DX_DOT"; then
+if test "$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;}
@@ -27986,5 +28026,5 @@
 
 fi
-if test -n "$QT4_VERSION"; then
+if test "$QT4_VERSION"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}:  QT4 support enabled    /  QT4 toolkit       found: yes" >&5
 $as_echo "$as_me:  QT4 support enabled    /  QT4 toolkit       found: yes" >&6;}
@@ -28064,5 +28104,5 @@
 
 fi
-if test -n "$DX_DOXYGEN"; then
+if test "$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;}
@@ -28110,5 +28150,5 @@
 
 fi
-if test -n "$QT4_VERSION"; then
+if test "$QT4_VERSION"; then
   :
 else
@@ -28154,4 +28194,10 @@
 
 fi
+if test "$MYSQLPP_LIB_DIR" -a "$MYSQLPP_INC_DIR" ; then
+  :
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  database support globally disabled!" >&5
+$as_echo "$as_me: WARNING:  database support globally disabled!" >&2;}
+fi
 if test "$HAVE_NOVA" = yes; then
   :
Index: /trunk/FACT++/configure.ac
===================================================================
--- /trunk/FACT++/configure.ac	(revision 14034)
+++ /trunk/FACT++/configure.ac	(revision 14035)
@@ -168,10 +168,4 @@
 #AX_CHECK_GLU
 #AX_CHECK_GLUT
-
-# Check for the fits header and zstream support from MARS
-#AC_CHECK_FILE(gui/RawEventsViewer/izstream.h, 
-#		HAVE_IZSTREAM_H=yes, HAVE_IZSTREAM_H=no)
-#AC_CHECK_FILE(gui/RawEventsViewer/fits.h, 
-#		HAVE_FITS_H=yes, HAVE_FITS_H=no)
 
 # Needed to compile FACT++
@@ -372,8 +366,9 @@
 AM_CONDITIONAL(HAS_PS2PDF,    [test "$PS2PDF" = yes])
 AM_CONDITIONAL(HAS_HELP2MAN,  [test "$HELP2MAN" = yes])
-AM_CONDITIONAL(HAS_DOXYGEN,   [test -n "$DX_DOXYGEN"])
-AM_CONDITIONAL(HAS_DOT,       [test -n "$DX_DOT"])
+AM_CONDITIONAL(HAS_DOXYGEN,   [test "$DX_DOXYGEN"])
+AM_CONDITIONAL(HAS_DOT,       [test "$DX_DOT"])
 AM_CONDITIONAL(HAS_COLORGCC,  [test "$COLORGCC"])
-AM_CONDITIONAL(HAS_QT4,       [test -n "$QT4_VERSION"])
+AM_CONDITIONAL(HAS_QT4,       [test "$QT4_VERSION"])
+AM_CONDITIONAL(HAS_SQL,       [test "$MYSQLPP_LIB_DIR" -a "$MYSQLPP_INC_DIR" ])
 AM_CONDITIONAL(HAS_ROOT,      [test "$ROOTEXEC" != no])
 AM_CONDITIONAL(HAS_ROOT_QT,   [test "$HAVE_ROOT_QT" = yes])
@@ -382,6 +377,4 @@
 AM_CONDITIONAL(HAS_FITS,      [test "$HAVE_CFITSIO" = yes -a "$HAVE_CCFITS" = yes])
 AM_CONDITIONAL(HAS_ZLIB,      [test "$HAVE_ZLIB" = yes])
-#AM_CONDITIONAL(HAS_IZSTREAM_H,[test "$HAVE_IZSTREAM_H" = yes])
-#AM_CONDITIONAL(HAS_FITS_H,    [test "$HAVE_FITS_H" = yes])
 AM_CONDITIONAL(HAS_GL,        [test "$HAVE_GL" = yes])
 AM_CONDITIONAL(HAS_GLU,       [test "$HAVE_GLU" = yes])
@@ -403,10 +396,5 @@
 AM_COND_IF(HAS_NOVA, [AC_DEFINE(HAVE_NOVA)], )
 AM_COND_IF(HAS_DBUS, [AC_DEFINE(HAVE_DBUS)], )
-
-#AM_COND_IF(HAS_FITS_H, [
-#   AM_COND_IF(HAS_IZSTREAM_H, [
-#   ])
-#],)
-
+AM_COND_IF(HAS_SQL,  [AC_DEFINE(HAVE_SQL)],  )
 
 ##########################################################################
@@ -432,4 +420,11 @@
 AC_MSG_NOTICE([ BOOST_LDFLAGS  = $BOOST_LDFLAGS])
 AC_MSG_NOTICE()
+AM_COND_IF(HAS_SQL, [
+   AC_MSG_NOTICE(--------------------------------------------------------------------)
+   AC_MSG_NOTICE()
+   AC_MSG_NOTICE([ MYSQLPP_INC_DIR = $MYSQLPP_INC_DIR])
+   AC_MSG_NOTICE([ MYSQLPP_LIB_DIR = $MYSQLPP_LIB_DIR])
+   AC_MSG_NOTICE()
+],[])
 AM_COND_IF(HAS_QT4, [
    AC_MSG_NOTICE(--------------------------------------------------------------------)
@@ -462,6 +457,4 @@
 AC_MSG_NOTICE([ zlib                   / 'zlib.h'           found: $HAVE_ZLIB])
 AC_MSG_NOTICE([ nova                   / libnova.so         found: $HAVE_NOVA])
-#AC_MSG_NOTICE([ gui/RawEventsViewer/izstream.h              found: $HAVE_IZSTREAM_H])
-#AC_MSG_NOTICE([ gui/RawEventsViewer/fits.h                  found: $HAVE_FITS_H])
 AC_MSG_NOTICE([ GL                     / GL/gl.h            found: $HAVE_GL])
 AC_MSG_NOTICE([ GLU                    / GL/glu.h           found: $HAVE_GLU])
@@ -471,4 +464,8 @@
 AC_MSG_NOTICE([ cfitsio                / 'fitsio.h'         found: $HAVE_CFITSIO])
 AC_MSG_NOTICE([ CCfits                 / 'CCfits/CCfits'    found: $HAVE_CCFITS])
+AM_COND_IF(HAS_SQL,
+   AC_MSG_NOTICE([ MySQL/MySQL++          / 'mysql++.h'        found: yes]),
+   AC_MSG_NOTICE([ MySQL/MySQL++          / 'mysql++.h'        found: no])
+)
 AC_MSG_NOTICE([ DBus-1, DBus-glib-1    / pkg-config         found: $HAVE_DBUS])
 AM_COND_IF(HAS_LIBXP,
@@ -576,4 +573,5 @@
       AC_MSG_WARN([ Either of the necessary packages not found - viewer GUI disabled!])
 )
+AM_COND_IF(HAS_SQL,,     AC_MSG_WARN([ database support globally disabled!]))
 AM_COND_IF(HAS_NOVA,,    AC_MSG_WARN([ libnova missing - smartfact will be compiles without astronomy support!]))
 AM_COND_IF(HAS_DBUS,,    AC_MSG_WARN([ DBus libraries missing - skypeclient will not be compiled!]))