Index: /trunk/FACT++/Makefile.am
===================================================================
--- /trunk/FACT++/Makefile.am	(revision 12755)
+++ /trunk/FACT++/Makefile.am	(revision 12756)
@@ -11,9 +11,9 @@
 
 AM_CPPFLAGS = -Idim/dim $(DIM_FLAGS) $(BOOST_FLAGS) $(ROOTCPPFLAGS) \
-   -O3 -Wall -Winit-self -Wpointer-arith -Wcast-align -Wextra -Wformat=2 \
+   -Wall -Winit-self -Wpointer-arith -Wcast-align -Wextra -Wformat=2 \
    $(SVN_REVISION)
 
 AM_CXXFLAGS = $(AM_CPPFLAGS) \
-   -Woverloaded-virtual -Wnon-virtual-dtor -Wshadow -std=c++0x
+   -Woverloaded-virtual -Wnon-virtual-dtor -Wshadow
 
 # -no-undefined
@@ -407,9 +407,11 @@
 	src/PixelMap.cc
 
+# Switch off most qwt warnings
+viewer_CXXFLAGS = $(AM_CXXFLAGS) -Wno-shadow
+
 viewer_LDADD = $(QT4_LIB) $(QT4_LDFLAGS) -L. -lQtOpenGL -lGLU \
 	libDim.la libDim++.la libDimExtension.la \
 	libConfiguration.la libTools.la libStateMachine.la \
 	libTime.la
-	
 
 viewer_SOURCES = $(viewer_SRCADD) $(viewer_QT_SOURCES) \
Index: /trunk/FACT++/Makefile.in
===================================================================
--- /trunk/FACT++/Makefile.in	(revision 12755)
+++ /trunk/FACT++/Makefile.in	(revision 12756)
@@ -49,7 +49,7 @@
 	chatclient$(EXEEXT) chatserv$(EXEEXT) biasctrl$(EXEEXT) \
 	drivectrl$(EXEEXT) mcp$(EXEEXT) feedback$(EXEEXT) \
-	ratescan$(EXEEXT) ratecontrol$(EXEEXT) fitsdump$(EXEEXT) \
-	$(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
-	$(am__EXEEXT_4)
+	ratescan$(EXEEXT) ratecontrol$(EXEEXT) magicweather$(EXEEXT) \
+	fitsdump$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \
+	$(am__EXEEXT_3) $(am__EXEEXT_4)
 @HAS_GUI_TRUE@am__append_1 = fact
 @HAS_VIEWER_TRUE@am__append_2 = viewer
@@ -358,18 +358,22 @@
 	src/DataProcessorImp.h src/FitsFile.cc src/FitsFile.h \
 	src/Fits.cc src/Fits.h src/PixelMap.cc
-@HAS_VIEWER_TRUE@am__objects_8 = gui/RawEventsViewer/RawEventsViewer.moc.$(OBJEXT) \
-@HAS_VIEWER_TRUE@	gui/BasicGlCamera.moc.$(OBJEXT) \
-@HAS_VIEWER_TRUE@	gui/QCameraWidget.moc.$(OBJEXT)
+@HAS_VIEWER_TRUE@am__objects_8 = gui/RawEventsViewer/viewer-RawEventsViewer.moc.$(OBJEXT) \
+@HAS_VIEWER_TRUE@	gui/viewer-BasicGlCamera.moc.$(OBJEXT) \
+@HAS_VIEWER_TRUE@	gui/viewer-QCameraWidget.moc.$(OBJEXT)
 @HAS_VIEWER_TRUE@am__objects_9 = $(am__objects_2) $(am__objects_8)
-@HAS_VIEWER_TRUE@am__objects_10 = gui/RawEventsViewer/RawEventsViewer.$(OBJEXT) \
-@HAS_VIEWER_TRUE@	gui/BasicGlCamera.$(OBJEXT) \
-@HAS_VIEWER_TRUE@	gui/QCameraWidget.$(OBJEXT)
+@HAS_VIEWER_TRUE@am__objects_10 = gui/RawEventsViewer/viewer-RawEventsViewer.$(OBJEXT) \
+@HAS_VIEWER_TRUE@	gui/viewer-BasicGlCamera.$(OBJEXT) \
+@HAS_VIEWER_TRUE@	gui/viewer-QCameraWidget.$(OBJEXT)
 am_viewer_OBJECTS = $(am__objects_9) $(am__objects_10) \
-	src/DataProcessorImp.$(OBJEXT) src/FitsFile.$(OBJEXT) \
-	src/Fits.$(OBJEXT) src/PixelMap.$(OBJEXT)
+	src/viewer-DataProcessorImp.$(OBJEXT) \
+	src/viewer-FitsFile.$(OBJEXT) src/viewer-Fits.$(OBJEXT) \
+	src/viewer-PixelMap.$(OBJEXT)
 viewer_OBJECTS = $(am_viewer_OBJECTS)
 viewer_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	libDim.la libDim++.la libDimExtension.la libConfiguration.la \
 	libTools.la libStateMachine.la libTime.la
+viewer_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(viewer_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 SCRIPTS = $(dist_noinst_SCRIPTS)
 DEFAULT_INCLUDES = -I.@am__isrc@
@@ -676,9 +680,9 @@
 BOOST_FLAGS = -DBOOST_DISABLE_ASSERTS
 AM_CPPFLAGS = -Idim/dim $(DIM_FLAGS) $(BOOST_FLAGS) $(ROOTCPPFLAGS) \
-   -O3 -Wall -Winit-self -Wpointer-arith -Wcast-align -Wextra -Wformat=2 \
+   -Wall -Winit-self -Wpointer-arith -Wcast-align -Wextra -Wformat=2 \
    $(SVN_REVISION)
 
 AM_CXXFLAGS = $(AM_CPPFLAGS) \
-   -Woverloaded-virtual -Wnon-virtual-dtor -Wshadow -std=c++0x
+   -Woverloaded-virtual -Wnon-virtual-dtor -Wshadow
 
 
@@ -965,4 +969,7 @@
 	src/PixelMap.cc
 
+
+# Switch off most qwt warnings
+viewer_CXXFLAGS = $(AM_CXXFLAGS) -Wno-shadow
 viewer_LDADD = $(QT4_LIB) $(QT4_LDFLAGS) -L. -lQtOpenGL -lGLU \
 	libDim.la libDim++.la libDimExtension.la \
@@ -1438,13 +1445,29 @@
 	@$(MKDIR_P) gui/RawEventsViewer/$(DEPDIR)
 	@: > gui/RawEventsViewer/$(DEPDIR)/$(am__dirstamp)
-gui/RawEventsViewer/RawEventsViewer.moc.$(OBJEXT):  \
+gui/RawEventsViewer/viewer-RawEventsViewer.moc.$(OBJEXT):  \
 	gui/RawEventsViewer/$(am__dirstamp) \
 	gui/RawEventsViewer/$(DEPDIR)/$(am__dirstamp)
-gui/RawEventsViewer/RawEventsViewer.$(OBJEXT):  \
+gui/viewer-BasicGlCamera.moc.$(OBJEXT): gui/$(am__dirstamp) \
+	gui/$(DEPDIR)/$(am__dirstamp)
+gui/viewer-QCameraWidget.moc.$(OBJEXT): gui/$(am__dirstamp) \
+	gui/$(DEPDIR)/$(am__dirstamp)
+gui/RawEventsViewer/viewer-RawEventsViewer.$(OBJEXT):  \
 	gui/RawEventsViewer/$(am__dirstamp) \
 	gui/RawEventsViewer/$(DEPDIR)/$(am__dirstamp)
+gui/viewer-BasicGlCamera.$(OBJEXT): gui/$(am__dirstamp) \
+	gui/$(DEPDIR)/$(am__dirstamp)
+gui/viewer-QCameraWidget.$(OBJEXT): gui/$(am__dirstamp) \
+	gui/$(DEPDIR)/$(am__dirstamp)
+src/viewer-DataProcessorImp.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/viewer-FitsFile.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/viewer-Fits.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/viewer-PixelMap.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
 viewer$(EXEEXT): $(viewer_OBJECTS) $(viewer_DEPENDENCIES) 
 	@rm -f viewer$(EXEEXT)
-	$(AM_V_CXXLD)$(CXXLINK) $(viewer_OBJECTS) $(viewer_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(viewer_LINK) $(viewer_OBJECTS) $(viewer_LDADD) $(LIBS)
 
 mostlyclean-compile:
@@ -1499,8 +1522,12 @@
 	-rm -f gui/QCameraWidget.$(OBJEXT)
 	-rm -f gui/QCameraWidget.moc.$(OBJEXT)
-	-rm -f gui/RawEventsViewer/RawEventsViewer.$(OBJEXT)
-	-rm -f gui/RawEventsViewer/RawEventsViewer.moc.$(OBJEXT)
+	-rm -f gui/RawEventsViewer/viewer-RawEventsViewer.$(OBJEXT)
+	-rm -f gui/RawEventsViewer/viewer-RawEventsViewer.moc.$(OBJEXT)
 	-rm -f gui/design.$(OBJEXT)
 	-rm -f gui/fact.$(OBJEXT)
+	-rm -f gui/viewer-BasicGlCamera.$(OBJEXT)
+	-rm -f gui/viewer-BasicGlCamera.moc.$(OBJEXT)
+	-rm -f gui/viewer-QCameraWidget.$(OBJEXT)
+	-rm -f gui/viewer-QCameraWidget.moc.$(OBJEXT)
 	-rm -f src/Configuration.$(OBJEXT)
 	-rm -f src/Configuration.lo
@@ -1604,4 +1631,8 @@
 	-rm -f src/tools.lo
 	-rm -f src/triggerschedule.$(OBJEXT)
+	-rm -f src/viewer-DataProcessorImp.$(OBJEXT)
+	-rm -f src/viewer-Fits.$(OBJEXT)
+	-rm -f src/viewer-FitsFile.$(OBJEXT)
+	-rm -f src/viewer-PixelMap.$(OBJEXT)
 
 distclean-compile:
@@ -1644,6 +1675,10 @@
 @AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/design.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/fact.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gui/RawEventsViewer/$(DEPDIR)/RawEventsViewer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gui/RawEventsViewer/$(DEPDIR)/RawEventsViewer.moc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/viewer-BasicGlCamera.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/viewer-BasicGlCamera.moc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/viewer-QCameraWidget.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/viewer-QCameraWidget.moc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gui/RawEventsViewer/$(DEPDIR)/viewer-RawEventsViewer.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gui/RawEventsViewer/$(DEPDIR)/viewer-RawEventsViewer.moc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Configuration.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Connection.Plo@am__quote@
@@ -1717,4 +1752,8 @@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/tools.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/triggerschedule.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/viewer-DataProcessorImp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/viewer-Fits.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/viewer-FitsFile.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/viewer-PixelMap.Po@am__quote@
 
 .c.o:
@@ -1803,4 +1842,164 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+
+gui/RawEventsViewer/viewer-RawEventsViewer.moc.o: gui/RawEventsViewer/RawEventsViewer.moc.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(viewer_CXXFLAGS) $(CXXFLAGS) -MT gui/RawEventsViewer/viewer-RawEventsViewer.moc.o -MD -MP -MF gui/RawEventsViewer/$(DEPDIR)/viewer-RawEventsViewer.moc.Tpo -c -o gui/RawEventsViewer/viewer-RawEventsViewer.moc.o `test -f 'gui/RawEventsViewer/RawEventsViewer.moc.cc' || echo '$(srcdir)/'`gui/RawEventsViewer/RawEventsViewer.moc.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) gui/RawEventsViewer/$(DEPDIR)/viewer-RawEventsViewer.moc.Tpo gui/RawEventsViewer/$(DEPDIR)/viewer-RawEventsViewer.moc.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/RawEventsViewer/RawEventsViewer.moc.cc' object='gui/RawEventsViewer/viewer-RawEventsViewer.moc.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(viewer_CXXFLAGS) $(CXXFLAGS) -c -o gui/RawEventsViewer/viewer-RawEventsViewer.moc.o `test -f 'gui/RawEventsViewer/RawEventsViewer.moc.cc' || echo '$(srcdir)/'`gui/RawEventsViewer/RawEventsViewer.moc.cc
+
+gui/RawEventsViewer/viewer-RawEventsViewer.moc.obj: gui/RawEventsViewer/RawEventsViewer.moc.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(viewer_CXXFLAGS) $(CXXFLAGS) -MT gui/RawEventsViewer/viewer-RawEventsViewer.moc.obj -MD -MP -MF gui/RawEventsViewer/$(DEPDIR)/viewer-RawEventsViewer.moc.Tpo -c -o gui/RawEventsViewer/viewer-RawEventsViewer.moc.obj `if test -f 'gui/RawEventsViewer/RawEventsViewer.moc.cc'; then $(CYGPATH_W) 'gui/RawEventsViewer/RawEventsViewer.moc.cc'; else $(CYGPATH_W) '$(srcdir)/gui/RawEventsViewer/RawEventsViewer.moc.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) gui/RawEventsViewer/$(DEPDIR)/viewer-RawEventsViewer.moc.Tpo gui/RawEventsViewer/$(DEPDIR)/viewer-RawEventsViewer.moc.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/RawEventsViewer/RawEventsViewer.moc.cc' object='gui/RawEventsViewer/viewer-RawEventsViewer.moc.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(viewer_CXXFLAGS) $(CXXFLAGS) -c -o gui/RawEventsViewer/viewer-RawEventsViewer.moc.obj `if test -f 'gui/RawEventsViewer/RawEventsViewer.moc.cc'; then $(CYGPATH_W) 'gui/RawEventsViewer/RawEventsViewer.moc.cc'; else $(CYGPATH_W) '$(srcdir)/gui/RawEventsViewer/RawEventsViewer.moc.cc'; fi`
+
+gui/viewer-BasicGlCamera.moc.o: gui/BasicGlCamera.moc.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(viewer_CXXFLAGS) $(CXXFLAGS) -MT gui/viewer-BasicGlCamera.moc.o -MD -MP -MF gui/$(DEPDIR)/viewer-BasicGlCamera.moc.Tpo -c -o gui/viewer-BasicGlCamera.moc.o `test -f 'gui/BasicGlCamera.moc.cc' || echo '$(srcdir)/'`gui/BasicGlCamera.moc.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) gui/$(DEPDIR)/viewer-BasicGlCamera.moc.Tpo gui/$(DEPDIR)/viewer-BasicGlCamera.moc.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/BasicGlCamera.moc.cc' object='gui/viewer-BasicGlCamera.moc.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(viewer_CXXFLAGS) $(CXXFLAGS) -c -o gui/viewer-BasicGlCamera.moc.o `test -f 'gui/BasicGlCamera.moc.cc' || echo '$(srcdir)/'`gui/BasicGlCamera.moc.cc
+
+gui/viewer-BasicGlCamera.moc.obj: gui/BasicGlCamera.moc.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(viewer_CXXFLAGS) $(CXXFLAGS) -MT gui/viewer-BasicGlCamera.moc.obj -MD -MP -MF gui/$(DEPDIR)/viewer-BasicGlCamera.moc.Tpo -c -o gui/viewer-BasicGlCamera.moc.obj `if test -f 'gui/BasicGlCamera.moc.cc'; then $(CYGPATH_W) 'gui/BasicGlCamera.moc.cc'; else $(CYGPATH_W) '$(srcdir)/gui/BasicGlCamera.moc.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) gui/$(DEPDIR)/viewer-BasicGlCamera.moc.Tpo gui/$(DEPDIR)/viewer-BasicGlCamera.moc.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/BasicGlCamera.moc.cc' object='gui/viewer-BasicGlCamera.moc.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(viewer_CXXFLAGS) $(CXXFLAGS) -c -o gui/viewer-BasicGlCamera.moc.obj `if test -f 'gui/BasicGlCamera.moc.cc'; then $(CYGPATH_W) 'gui/BasicGlCamera.moc.cc'; else $(CYGPATH_W) '$(srcdir)/gui/BasicGlCamera.moc.cc'; fi`
+
+gui/viewer-QCameraWidget.moc.o: gui/QCameraWidget.moc.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(viewer_CXXFLAGS) $(CXXFLAGS) -MT gui/viewer-QCameraWidget.moc.o -MD -MP -MF gui/$(DEPDIR)/viewer-QCameraWidget.moc.Tpo -c -o gui/viewer-QCameraWidget.moc.o `test -f 'gui/QCameraWidget.moc.cc' || echo '$(srcdir)/'`gui/QCameraWidget.moc.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) gui/$(DEPDIR)/viewer-QCameraWidget.moc.Tpo gui/$(DEPDIR)/viewer-QCameraWidget.moc.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/QCameraWidget.moc.cc' object='gui/viewer-QCameraWidget.moc.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(viewer_CXXFLAGS) $(CXXFLAGS) -c -o gui/viewer-QCameraWidget.moc.o `test -f 'gui/QCameraWidget.moc.cc' || echo '$(srcdir)/'`gui/QCameraWidget.moc.cc
+
+gui/viewer-QCameraWidget.moc.obj: gui/QCameraWidget.moc.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(viewer_CXXFLAGS) $(CXXFLAGS) -MT gui/viewer-QCameraWidget.moc.obj -MD -MP -MF gui/$(DEPDIR)/viewer-QCameraWidget.moc.Tpo -c -o gui/viewer-QCameraWidget.moc.obj `if test -f 'gui/QCameraWidget.moc.cc'; then $(CYGPATH_W) 'gui/QCameraWidget.moc.cc'; else $(CYGPATH_W) '$(srcdir)/gui/QCameraWidget.moc.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) gui/$(DEPDIR)/viewer-QCameraWidget.moc.Tpo gui/$(DEPDIR)/viewer-QCameraWidget.moc.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/QCameraWidget.moc.cc' object='gui/viewer-QCameraWidget.moc.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(viewer_CXXFLAGS) $(CXXFLAGS) -c -o gui/viewer-QCameraWidget.moc.obj `if test -f 'gui/QCameraWidget.moc.cc'; then $(CYGPATH_W) 'gui/QCameraWidget.moc.cc'; else $(CYGPATH_W) '$(srcdir)/gui/QCameraWidget.moc.cc'; fi`
+
+gui/RawEventsViewer/viewer-RawEventsViewer.o: gui/RawEventsViewer/RawEventsViewer.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(viewer_CXXFLAGS) $(CXXFLAGS) -MT gui/RawEventsViewer/viewer-RawEventsViewer.o -MD -MP -MF gui/RawEventsViewer/$(DEPDIR)/viewer-RawEventsViewer.Tpo -c -o gui/RawEventsViewer/viewer-RawEventsViewer.o `test -f 'gui/RawEventsViewer/RawEventsViewer.cc' || echo '$(srcdir)/'`gui/RawEventsViewer/RawEventsViewer.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) gui/RawEventsViewer/$(DEPDIR)/viewer-RawEventsViewer.Tpo gui/RawEventsViewer/$(DEPDIR)/viewer-RawEventsViewer.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/RawEventsViewer/RawEventsViewer.cc' object='gui/RawEventsViewer/viewer-RawEventsViewer.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(viewer_CXXFLAGS) $(CXXFLAGS) -c -o gui/RawEventsViewer/viewer-RawEventsViewer.o `test -f 'gui/RawEventsViewer/RawEventsViewer.cc' || echo '$(srcdir)/'`gui/RawEventsViewer/RawEventsViewer.cc
+
+gui/RawEventsViewer/viewer-RawEventsViewer.obj: gui/RawEventsViewer/RawEventsViewer.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(viewer_CXXFLAGS) $(CXXFLAGS) -MT gui/RawEventsViewer/viewer-RawEventsViewer.obj -MD -MP -MF gui/RawEventsViewer/$(DEPDIR)/viewer-RawEventsViewer.Tpo -c -o gui/RawEventsViewer/viewer-RawEventsViewer.obj `if test -f 'gui/RawEventsViewer/RawEventsViewer.cc'; then $(CYGPATH_W) 'gui/RawEventsViewer/RawEventsViewer.cc'; else $(CYGPATH_W) '$(srcdir)/gui/RawEventsViewer/RawEventsViewer.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) gui/RawEventsViewer/$(DEPDIR)/viewer-RawEventsViewer.Tpo gui/RawEventsViewer/$(DEPDIR)/viewer-RawEventsViewer.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/RawEventsViewer/RawEventsViewer.cc' object='gui/RawEventsViewer/viewer-RawEventsViewer.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(viewer_CXXFLAGS) $(CXXFLAGS) -c -o gui/RawEventsViewer/viewer-RawEventsViewer.obj `if test -f 'gui/RawEventsViewer/RawEventsViewer.cc'; then $(CYGPATH_W) 'gui/RawEventsViewer/RawEventsViewer.cc'; else $(CYGPATH_W) '$(srcdir)/gui/RawEventsViewer/RawEventsViewer.cc'; fi`
+
+gui/viewer-BasicGlCamera.o: gui/BasicGlCamera.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(viewer_CXXFLAGS) $(CXXFLAGS) -MT gui/viewer-BasicGlCamera.o -MD -MP -MF gui/$(DEPDIR)/viewer-BasicGlCamera.Tpo -c -o gui/viewer-BasicGlCamera.o `test -f 'gui/BasicGlCamera.cc' || echo '$(srcdir)/'`gui/BasicGlCamera.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) gui/$(DEPDIR)/viewer-BasicGlCamera.Tpo gui/$(DEPDIR)/viewer-BasicGlCamera.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/BasicGlCamera.cc' object='gui/viewer-BasicGlCamera.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(viewer_CXXFLAGS) $(CXXFLAGS) -c -o gui/viewer-BasicGlCamera.o `test -f 'gui/BasicGlCamera.cc' || echo '$(srcdir)/'`gui/BasicGlCamera.cc
+
+gui/viewer-BasicGlCamera.obj: gui/BasicGlCamera.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(viewer_CXXFLAGS) $(CXXFLAGS) -MT gui/viewer-BasicGlCamera.obj -MD -MP -MF gui/$(DEPDIR)/viewer-BasicGlCamera.Tpo -c -o gui/viewer-BasicGlCamera.obj `if test -f 'gui/BasicGlCamera.cc'; then $(CYGPATH_W) 'gui/BasicGlCamera.cc'; else $(CYGPATH_W) '$(srcdir)/gui/BasicGlCamera.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) gui/$(DEPDIR)/viewer-BasicGlCamera.Tpo gui/$(DEPDIR)/viewer-BasicGlCamera.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/BasicGlCamera.cc' object='gui/viewer-BasicGlCamera.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(viewer_CXXFLAGS) $(CXXFLAGS) -c -o gui/viewer-BasicGlCamera.obj `if test -f 'gui/BasicGlCamera.cc'; then $(CYGPATH_W) 'gui/BasicGlCamera.cc'; else $(CYGPATH_W) '$(srcdir)/gui/BasicGlCamera.cc'; fi`
+
+gui/viewer-QCameraWidget.o: gui/QCameraWidget.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(viewer_CXXFLAGS) $(CXXFLAGS) -MT gui/viewer-QCameraWidget.o -MD -MP -MF gui/$(DEPDIR)/viewer-QCameraWidget.Tpo -c -o gui/viewer-QCameraWidget.o `test -f 'gui/QCameraWidget.cc' || echo '$(srcdir)/'`gui/QCameraWidget.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) gui/$(DEPDIR)/viewer-QCameraWidget.Tpo gui/$(DEPDIR)/viewer-QCameraWidget.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/QCameraWidget.cc' object='gui/viewer-QCameraWidget.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(viewer_CXXFLAGS) $(CXXFLAGS) -c -o gui/viewer-QCameraWidget.o `test -f 'gui/QCameraWidget.cc' || echo '$(srcdir)/'`gui/QCameraWidget.cc
+
+gui/viewer-QCameraWidget.obj: gui/QCameraWidget.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(viewer_CXXFLAGS) $(CXXFLAGS) -MT gui/viewer-QCameraWidget.obj -MD -MP -MF gui/$(DEPDIR)/viewer-QCameraWidget.Tpo -c -o gui/viewer-QCameraWidget.obj `if test -f 'gui/QCameraWidget.cc'; then $(CYGPATH_W) 'gui/QCameraWidget.cc'; else $(CYGPATH_W) '$(srcdir)/gui/QCameraWidget.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) gui/$(DEPDIR)/viewer-QCameraWidget.Tpo gui/$(DEPDIR)/viewer-QCameraWidget.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/QCameraWidget.cc' object='gui/viewer-QCameraWidget.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(viewer_CXXFLAGS) $(CXXFLAGS) -c -o gui/viewer-QCameraWidget.obj `if test -f 'gui/QCameraWidget.cc'; then $(CYGPATH_W) 'gui/QCameraWidget.cc'; else $(CYGPATH_W) '$(srcdir)/gui/QCameraWidget.cc'; fi`
+
+src/viewer-DataProcessorImp.o: src/DataProcessorImp.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(viewer_CXXFLAGS) $(CXXFLAGS) -MT src/viewer-DataProcessorImp.o -MD -MP -MF src/$(DEPDIR)/viewer-DataProcessorImp.Tpo -c -o src/viewer-DataProcessorImp.o `test -f 'src/DataProcessorImp.cc' || echo '$(srcdir)/'`src/DataProcessorImp.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/viewer-DataProcessorImp.Tpo src/$(DEPDIR)/viewer-DataProcessorImp.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/DataProcessorImp.cc' object='src/viewer-DataProcessorImp.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(viewer_CXXFLAGS) $(CXXFLAGS) -c -o src/viewer-DataProcessorImp.o `test -f 'src/DataProcessorImp.cc' || echo '$(srcdir)/'`src/DataProcessorImp.cc
+
+src/viewer-DataProcessorImp.obj: src/DataProcessorImp.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(viewer_CXXFLAGS) $(CXXFLAGS) -MT src/viewer-DataProcessorImp.obj -MD -MP -MF src/$(DEPDIR)/viewer-DataProcessorImp.Tpo -c -o src/viewer-DataProcessorImp.obj `if test -f 'src/DataProcessorImp.cc'; then $(CYGPATH_W) 'src/DataProcessorImp.cc'; else $(CYGPATH_W) '$(srcdir)/src/DataProcessorImp.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/viewer-DataProcessorImp.Tpo src/$(DEPDIR)/viewer-DataProcessorImp.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/DataProcessorImp.cc' object='src/viewer-DataProcessorImp.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(viewer_CXXFLAGS) $(CXXFLAGS) -c -o src/viewer-DataProcessorImp.obj `if test -f 'src/DataProcessorImp.cc'; then $(CYGPATH_W) 'src/DataProcessorImp.cc'; else $(CYGPATH_W) '$(srcdir)/src/DataProcessorImp.cc'; fi`
+
+src/viewer-FitsFile.o: src/FitsFile.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(viewer_CXXFLAGS) $(CXXFLAGS) -MT src/viewer-FitsFile.o -MD -MP -MF src/$(DEPDIR)/viewer-FitsFile.Tpo -c -o src/viewer-FitsFile.o `test -f 'src/FitsFile.cc' || echo '$(srcdir)/'`src/FitsFile.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/viewer-FitsFile.Tpo src/$(DEPDIR)/viewer-FitsFile.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/FitsFile.cc' object='src/viewer-FitsFile.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(viewer_CXXFLAGS) $(CXXFLAGS) -c -o src/viewer-FitsFile.o `test -f 'src/FitsFile.cc' || echo '$(srcdir)/'`src/FitsFile.cc
+
+src/viewer-FitsFile.obj: src/FitsFile.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(viewer_CXXFLAGS) $(CXXFLAGS) -MT src/viewer-FitsFile.obj -MD -MP -MF src/$(DEPDIR)/viewer-FitsFile.Tpo -c -o src/viewer-FitsFile.obj `if test -f 'src/FitsFile.cc'; then $(CYGPATH_W) 'src/FitsFile.cc'; else $(CYGPATH_W) '$(srcdir)/src/FitsFile.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/viewer-FitsFile.Tpo src/$(DEPDIR)/viewer-FitsFile.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/FitsFile.cc' object='src/viewer-FitsFile.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(viewer_CXXFLAGS) $(CXXFLAGS) -c -o src/viewer-FitsFile.obj `if test -f 'src/FitsFile.cc'; then $(CYGPATH_W) 'src/FitsFile.cc'; else $(CYGPATH_W) '$(srcdir)/src/FitsFile.cc'; fi`
+
+src/viewer-Fits.o: src/Fits.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(viewer_CXXFLAGS) $(CXXFLAGS) -MT src/viewer-Fits.o -MD -MP -MF src/$(DEPDIR)/viewer-Fits.Tpo -c -o src/viewer-Fits.o `test -f 'src/Fits.cc' || echo '$(srcdir)/'`src/Fits.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/viewer-Fits.Tpo src/$(DEPDIR)/viewer-Fits.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/Fits.cc' object='src/viewer-Fits.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(viewer_CXXFLAGS) $(CXXFLAGS) -c -o src/viewer-Fits.o `test -f 'src/Fits.cc' || echo '$(srcdir)/'`src/Fits.cc
+
+src/viewer-Fits.obj: src/Fits.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(viewer_CXXFLAGS) $(CXXFLAGS) -MT src/viewer-Fits.obj -MD -MP -MF src/$(DEPDIR)/viewer-Fits.Tpo -c -o src/viewer-Fits.obj `if test -f 'src/Fits.cc'; then $(CYGPATH_W) 'src/Fits.cc'; else $(CYGPATH_W) '$(srcdir)/src/Fits.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/viewer-Fits.Tpo src/$(DEPDIR)/viewer-Fits.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/Fits.cc' object='src/viewer-Fits.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(viewer_CXXFLAGS) $(CXXFLAGS) -c -o src/viewer-Fits.obj `if test -f 'src/Fits.cc'; then $(CYGPATH_W) 'src/Fits.cc'; else $(CYGPATH_W) '$(srcdir)/src/Fits.cc'; fi`
+
+src/viewer-PixelMap.o: src/PixelMap.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(viewer_CXXFLAGS) $(CXXFLAGS) -MT src/viewer-PixelMap.o -MD -MP -MF src/$(DEPDIR)/viewer-PixelMap.Tpo -c -o src/viewer-PixelMap.o `test -f 'src/PixelMap.cc' || echo '$(srcdir)/'`src/PixelMap.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/viewer-PixelMap.Tpo src/$(DEPDIR)/viewer-PixelMap.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/PixelMap.cc' object='src/viewer-PixelMap.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(viewer_CXXFLAGS) $(CXXFLAGS) -c -o src/viewer-PixelMap.o `test -f 'src/PixelMap.cc' || echo '$(srcdir)/'`src/PixelMap.cc
+
+src/viewer-PixelMap.obj: src/PixelMap.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(viewer_CXXFLAGS) $(CXXFLAGS) -MT src/viewer-PixelMap.obj -MD -MP -MF src/$(DEPDIR)/viewer-PixelMap.Tpo -c -o src/viewer-PixelMap.obj `if test -f 'src/PixelMap.cc'; then $(CYGPATH_W) 'src/PixelMap.cc'; else $(CYGPATH_W) '$(srcdir)/src/PixelMap.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/viewer-PixelMap.Tpo src/$(DEPDIR)/viewer-PixelMap.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/PixelMap.cc' object='src/viewer-PixelMap.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(viewer_CXXFLAGS) $(CXXFLAGS) -c -o src/viewer-PixelMap.obj `if test -f 'src/PixelMap.cc'; then $(CYGPATH_W) 'src/PixelMap.cc'; else $(CYGPATH_W) '$(srcdir)/src/PixelMap.cc'; fi`
 
 .cxx.o:
Index: /trunk/FACT++/aclocal.m4
===================================================================
--- /trunk/FACT++/aclocal.m4	(revision 12755)
+++ /trunk/FACT++/aclocal.m4	(revision 12756)
@@ -19,4 +19,108 @@
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
+
+# ===========================================================================
+#        http://autoconf-archive.cryp.to/ac_cxx_compile_stdcxx_0x.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AC_CXX_COMPILE_STDCXX_0X
+#
+# DESCRIPTION
+#
+#   Check for baseline language coverage in the compiler for the C++0x
+#   standard.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved.
+
+AC_DEFUN([AC_CXX_COMPILE_STDCXX_0X], [
+  AC_CACHE_CHECK(if g++ supports C++0x features without additional flags,
+  ac_cv_cxx_compile_cxx0x_native,
+  [AC_LANG_SAVE
+  AC_LANG_CPLUSPLUS
+  AC_TRY_COMPILE([
+  template <typename T>
+    struct check
+    {
+      static_assert(sizeof(int) <= sizeof(T), "not big enough");
+    };
+
+    typedef check<check<bool>> right_angle_brackets;
+
+    int a;
+    decltype(a) b;
+
+    typedef check<int> check_type;
+    check_type c;
+    check_type&& cr = c;],,
+  ac_cv_cxx_compile_cxx0x_native=yes, ac_cv_cxx_compile_cxx0x_native=no)
+  AC_LANG_RESTORE
+  ])
+
+  AC_CACHE_CHECK(if g++ supports C++0x features with -std=c++0x,
+  ac_cv_cxx_compile_cxx0x_cxx,
+  [AC_LANG_SAVE
+  AC_LANG_CPLUSPLUS
+  ac_save_CXXFLAGS="$CXXFLAGS"
+  CXXFLAGS="$CXXFLAGS -std=c++0x"
+  AC_TRY_COMPILE([
+  template <typename T>
+    struct check
+    {
+      static_assert(sizeof(int) <= sizeof(T), "not big enough");
+    };
+
+    typedef check<check<bool>> right_angle_brackets;
+
+    int a;
+    decltype(a) b;
+
+    typedef check<int> check_type;
+    check_type c;
+    check_type&& cr = c;],,
+  ac_cv_cxx_compile_cxx0x_cxx=yes, ac_cv_cxx_compile_cxx0x_cxx=no)
+  CXXFLAGS="$ac_save_CXXFLAGS"
+  AC_LANG_RESTORE
+  ])
+
+  AC_CACHE_CHECK(if g++ supports C++0x features with -std=gnu++0x,
+  ac_cv_cxx_compile_cxx0x_gxx,
+  [AC_LANG_SAVE
+  AC_LANG_CPLUSPLUS
+  ac_save_CXXFLAGS="$CXXFLAGS"
+  CXXFLAGS="$CXXFLAGS -std=gnu++0x"
+  AC_TRY_COMPILE([
+  template <typename T>
+    struct check
+    {
+      static_assert(sizeof(int) <= sizeof(T), "not big enough");
+    };
+
+    typedef check<check<bool>> right_angle_brackets;
+
+    int a;
+    decltype(a) b;
+
+    typedef check<int> check_type;
+    check_type c;
+    check_type&& cr = c;],,
+  ac_cv_cxx_compile_cxx0x_gxx=yes, ac_cv_cxx_compile_cxx0x_gxx=no)
+  CXXFLAGS="$ac_save_CXXFLAGS"
+  AC_LANG_RESTORE
+  ])
+
+  if test "$ac_cv_cxx_compile_cxx0x_native" = yes ||
+     test "$ac_cv_cxx_compile_cxx0x_cxx" = yes ||
+     test "$ac_cv_cxx_compile_cxx0x_gxx" = yes; then
+    AC_DEFINE(HAVE_STDCXX_0X,,[Define if g++ supports C++0x features. ])
+  fi
+])
 
 # ===========================================================================
Index: /trunk/FACT++/configure
===================================================================
--- /trunk/FACT++/configure	(revision 12755)
+++ /trunk/FACT++/configure	(revision 12756)
@@ -1021,4 +1021,6 @@
 ac_user_opts='
 enable_option_checking
+enable_optimization
+enable_debug
 enable_static
 enable_shared
@@ -1731,4 +1733,8 @@
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --disable-optimization  Compile with -O0 instead of -O3
+
+  --enable-debug          Compile with debugging symbols (-g)
+
   --enable-static[=PKGS]  build static libraries [default=no]
   --enable-shared[=PKGS]  build shared libraries [default=yes]
@@ -2968,4 +2974,28 @@
 
 
+# Make sure none of the following will set -O2
+# Check whether --enable-optimization was given.
+if test "${enable_optimization+set}" = set; then :
+  enableval=$enable_optimization;
+fi
+
+if test "x$enable_optimization" != "xno"; then :
+  MYFLAGS+=" -O3"
+else
+  MYFLAGS+=" -O0"
+fi
+
+# Check whether --enable-debug was given.
+if test "${enable_debug+set}" = set; then :
+  enableval=$enable_debug;
+fi
+
+if test "x$enable_debug" = "xyes"; then :
+  MYFLAGS+=" -g"
+fi
+
+CFLAGS+=$MYFLAGS
+CXXFLAGS+=$MYFLAGS
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -3823,4 +3853,6 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+
+#AC_PROG_CC_C99
    case $ac_cv_prog_cc_stdc in #(
   no) :
@@ -4116,8 +4148,7 @@
 esac
 
-#AC_PROG_CC_C99
 
 ######################################################################
-# GNUC extension support (needed for the evnt builder)
+# GNUC extension support (needed for the event builder)
 ######################################################################
 
@@ -4581,4 +4612,193 @@
 
 
+
+######################################################################
+# Check for right C++ standard
+######################################################################
+
+#AC_CXX_HEADER_STDCXX_0X
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if g++ supports C++0x features without additional flags" >&5
+$as_echo_n "checking if g++ supports C++0x features without additional flags... " >&6; }
+if test "${ac_cv_cxx_compile_cxx0x_native+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+  template <typename T>
+    struct check
+    {
+      static_assert(sizeof(int) <= sizeof(T), "not big enough");
+    };
+
+    typedef check<check<bool>> right_angle_brackets;
+
+    int a;
+    decltype(a) b;
+
+    typedef check<int> check_type;
+    check_type c;
+    check_type&& cr = c;
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_cxx_compile_cxx0x_native=yes
+else
+  ac_cv_cxx_compile_cxx0x_native=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compile_cxx0x_native" >&5
+$as_echo "$ac_cv_cxx_compile_cxx0x_native" >&6; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if g++ supports C++0x features with -std=c++0x" >&5
+$as_echo_n "checking if g++ supports C++0x features with -std=c++0x... " >&6; }
+if test "${ac_cv_cxx_compile_cxx0x_cxx+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+  ac_save_CXXFLAGS="$CXXFLAGS"
+  CXXFLAGS="$CXXFLAGS -std=c++0x"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+  template <typename T>
+    struct check
+    {
+      static_assert(sizeof(int) <= sizeof(T), "not big enough");
+    };
+
+    typedef check<check<bool>> right_angle_brackets;
+
+    int a;
+    decltype(a) b;
+
+    typedef check<int> check_type;
+    check_type c;
+    check_type&& cr = c;
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_cxx_compile_cxx0x_cxx=yes
+else
+  ac_cv_cxx_compile_cxx0x_cxx=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CXXFLAGS="$ac_save_CXXFLAGS"
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compile_cxx0x_cxx" >&5
+$as_echo "$ac_cv_cxx_compile_cxx0x_cxx" >&6; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if g++ supports C++0x features with -std=gnu++0x" >&5
+$as_echo_n "checking if g++ supports C++0x features with -std=gnu++0x... " >&6; }
+if test "${ac_cv_cxx_compile_cxx0x_gxx+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+  ac_save_CXXFLAGS="$CXXFLAGS"
+  CXXFLAGS="$CXXFLAGS -std=gnu++0x"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+  template <typename T>
+    struct check
+    {
+      static_assert(sizeof(int) <= sizeof(T), "not big enough");
+    };
+
+    typedef check<check<bool>> right_angle_brackets;
+
+    int a;
+    decltype(a) b;
+
+    typedef check<int> check_type;
+    check_type c;
+    check_type&& cr = c;
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_cxx_compile_cxx0x_gxx=yes
+else
+  ac_cv_cxx_compile_cxx0x_gxx=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CXXFLAGS="$ac_save_CXXFLAGS"
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compile_cxx0x_gxx" >&5
+$as_echo "$ac_cv_cxx_compile_cxx0x_gxx" >&6; }
+
+  if test "$ac_cv_cxx_compile_cxx0x_native" = yes ||
+     test "$ac_cv_cxx_compile_cxx0x_cxx" = yes ||
+     test "$ac_cv_cxx_compile_cxx0x_gxx" = yes; then
+
+$as_echo "#define HAVE_STDCXX_0X /**/" >>confdefs.h
+
+  fi
+
+if test "$ac_cv_cxx_compile_cxx0x_cxx" != yes; then
+   as_fn_error $? "C++0x standard (-std=c++0x) not supported by compiler." "$LINENO" 5
+fi
+
+CXXFLAGS+=" -std=c++0x"
 
 ######################################################################
@@ -5136,11 +5356,11 @@
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:5138: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:5358: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5141: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:5361: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5144: output\"" >&5)
+  (eval echo "\"\$as_me:5364: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
@@ -6347,5 +6567,5 @@
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6349 "configure"' > conftest.$ac_ext
+  echo '#line 6569 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
@@ -7508,5 +7728,4 @@
 
 
-
 # Set options
 # Check whether --enable-static was given.
@@ -8008,9 +8227,9 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8010: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8229: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8014: \$? = $ac_status" >&5
+   echo "$as_me:8233: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -8347,9 +8566,9 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8349: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8568: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8353: \$? = $ac_status" >&5
+   echo "$as_me:8572: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -8452,9 +8671,9 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8454: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8673: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8458: \$? = $ac_status" >&5
+   echo "$as_me:8677: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -8507,9 +8726,9 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8509: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8728: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8513: \$? = $ac_status" >&5
+   echo "$as_me:8732: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -10891,5 +11110,5 @@
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10893 "configure"
+#line 11112 "configure"
 #include "confdefs.h"
 
@@ -10987,5 +11206,5 @@
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10989 "configure"
+#line 11208 "configure"
 #include "confdefs.h"
 
@@ -12943,9 +13162,9 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12945: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13164: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12949: \$? = $ac_status" >&5
+   echo "$as_me:13168: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -13042,9 +13261,9 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13044: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13263: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13048: \$? = $ac_status" >&5
+   echo "$as_me:13267: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -13094,9 +13313,9 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13096: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13315: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13100: \$? = $ac_status" >&5
+   echo "$as_me:13319: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -14072,5 +14291,4 @@
 # Automake initial setup
 ######################################################################
-
 am__api_version='1.11'
 
@@ -14881,4 +15099,5 @@
 esac
 AM_BACKSLASH='\'
+
 
 if test "x$CC" != xcc; then
@@ -17357,6 +17576,6 @@
 
 
-CPPFLAGS+=" "$PTHREAD_CFLAGS" "
-LDFLAGS+=" "$PTHREAD_CFLAGS" "
+CPPFLAGS+=" "$PTHREAD_CFLAGS
+LDFLAGS+=" "$PTHREAD_CFLAGS
 
 
@@ -17432,6 +17651,6 @@
 fi
 
-CPPFLAGS+=" "$READLINE_INCLUDES" "
-LDFLAGS+=" "$READLINE_LIBS" "
+CPPFLAGS+=" "$READLINE_INCLUDES
+LDFLAGS+=" "$READLINE_LIBS
 
 # Needed to compile FACT++
@@ -18544,6 +18763,6 @@
 
 
-CPPFLAGS+=" "$MOTIF_INCL" "
-LDFLAGS+=" "$MOTIF_LDFLAGS" "
+CPPFLAGS+=" "$MOTIF_INCL
+LDFLAGS+=" "$MOTIF_LDFLAGS
 
 if test "$lt_cv_libxp" = "yes"; then
@@ -19315,5 +19534,5 @@
 
 
-LDFLAGS+=" -lmysqlpp "
+LDFLAGS+=" -lmysqlpp"
 
 ######################################################################
@@ -21180,7 +21399,7 @@
 LDFLAGS+=" "$BOOST_PROGRAM_OPTIONS_LIB
 LDFLAGS+=" "$BOOST_REGEX_LIB
-LDFLAGS+=" "$BOOST_THREAD_LIB" "
-
-CPPFLAGS+=" "$BOOST_CPPFLAGS" "
+LDFLAGS+=" "$BOOST_THREAD_LIB
+
+CPPFLAGS+=" "$BOOST_CPPFLAGS
 
 #AC_CHECK_HEADERS(
@@ -22384,5 +22603,5 @@
 
 		cat > conftest.$ac_ext <<EOF
-#line 22386 "configure"
+#line 22605 "configure"
 #include "confdefs.h"
 #include <qglobal.h>
@@ -23032,5 +23251,5 @@
 
    ROOTCPPFLAGS=$ROOTCFLAGS" "$ROOTAUXCFLAGS
-   ROOTLDFLAGS="-L"$ROOTLIBDIR" -lGQt "
+   ROOTLDFLAGS="-L"$ROOTLIBDIR" -lGQt"
 
    #AC_CHECK_PROG(HAVE_ROOT_QT, libGQt.so.$ROOTSOVERSION, yes, no, $ROOTLIBDIR)
@@ -26090,4 +26309,12 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
 $as_echo "$as_me: " >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}:  CFLAGS   = $CFLAGS" >&5
+$as_echo "$as_me:  CFLAGS   = $CFLAGS" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
+$as_echo "$as_me: " >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}:  CXXFLAGS = $CXXFLAGS" >&5
+$as_echo "$as_me:  CXXFLAGS = $CXXFLAGS" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
+$as_echo "$as_me: " >&6;}
 { $as_echo "$as_me:${as_lineno-$LINENO}:  CPPFLAGS = $CPPFLAGS" >&5
 $as_echo "$as_me:  CPPFLAGS = $CPPFLAGS" >&6;}
Index: /trunk/FACT++/configure.ac
===================================================================
--- /trunk/FACT++/configure.ac	(revision 12755)
+++ /trunk/FACT++/configure.ac	(revision 12756)
@@ -15,14 +15,41 @@
 AC_CONFIG_AUX_DIR([.aux_dir])
 
+# Make sure none of the following will set -O2
+AC_ARG_ENABLE([optimization],
+    AS_HELP_STRING([--disable-optimization], [Compile with -O0 instead of -O3])
+)
+AS_IF([test "x$enable_optimization" != "xno"], [MYFLAGS+=" -O3"], [MYFLAGS+=" -O0"])
+
+AC_ARG_ENABLE([debug],
+    AS_HELP_STRING([--enable-debug], [Compile with debugging symbols (-g)])
+)
+AS_IF([test "x$enable_debug" = "xyes"], [MYFLAGS+=" -g"])
+
+CFLAGS+=$MYFLAGS
+CXXFLAGS+=$MYFLAGS
+
 AC_PROG_CC([colorgcc gcc])
 AC_PROG_CXX([colorgcc g++])
+
+#AC_PROG_CC_C99
 AC_PROG_CC_STDC
-#AC_PROG_CC_C99
-
-######################################################################
-# GNUC extension support (needed for the evnt builder)
+
+######################################################################
+# GNUC extension support (needed for the event builder)
 ######################################################################
 
 AC_USE_SYSTEM_EXTENSIONS(_GNU_SOURCE)
+
+######################################################################
+# Check for right C++ standard
+######################################################################
+
+#AC_CXX_HEADER_STDCXX_0X
+AC_CXX_COMPILE_STDCXX_0X
+if test "$ac_cv_cxx_compile_cxx0x_cxx" != yes; then
+   AC_MSG_ERROR([C++0x standard (-std=c++0x) not supported by compiler.])
+fi
+
+CXXFLAGS+=" -std=c++0x"
 
 ######################################################################
@@ -37,7 +64,7 @@
 # Automake initial setup
 ######################################################################
-
 AM_INIT_AUTOMAKE([1.11 -Wall subdir-objects std-options no-define color-tests parallel-tests silent-rules])
 AM_SILENT_RULES([yes])
+
 AM_PROG_CC_C_O
 
@@ -77,6 +104,6 @@
 ACX_PTHREAD
 
-CPPFLAGS+=" "$PTHREAD_CFLAGS" "
-LDFLAGS+=" "$PTHREAD_CFLAGS" "
+CPPFLAGS+=" "$PTHREAD_CFLAGS
+LDFLAGS+=" "$PTHREAD_CFLAGS
 
 
@@ -88,6 +115,6 @@
 fi
 
-CPPFLAGS+=" "$READLINE_INCLUDES" "
-LDFLAGS+=" "$READLINE_LIBS" "
+CPPFLAGS+=" "$READLINE_INCLUDES
+LDFLAGS+=" "$READLINE_LIBS
 
 # Needed to compile FACT++
@@ -102,6 +129,6 @@
 AC_FIND_MOTIF
 
-CPPFLAGS+=" "$MOTIF_INCL" "
-LDFLAGS+=" "$MOTIF_LDFLAGS" "
+CPPFLAGS+=" "$MOTIF_INCL
+LDFLAGS+=" "$MOTIF_LDFLAGS
 
 AM_COND_IF(HAS_LIBXP,, 
@@ -154,5 +181,5 @@
 MYSQLPP_DEVEL
 
-LDFLAGS+=" -lmysqlpp "
+LDFLAGS+=" -lmysqlpp"
 
 ######################################################################
@@ -195,7 +222,7 @@
 LDFLAGS+=" "$BOOST_PROGRAM_OPTIONS_LIB
 LDFLAGS+=" "$BOOST_REGEX_LIB
-LDFLAGS+=" "$BOOST_THREAD_LIB" "
-
-CPPFLAGS+=" "$BOOST_CPPFLAGS" "
+LDFLAGS+=" "$BOOST_THREAD_LIB
+
+CPPFLAGS+=" "$BOOST_CPPFLAGS
 
 #AC_CHECK_HEADERS(
@@ -248,5 +275,5 @@
 
    ROOTCPPFLAGS=$ROOTCFLAGS" "$ROOTAUXCFLAGS
-   ROOTLDFLAGS="-L"$ROOTLIBDIR" -lGQt "
+   ROOTLDFLAGS="-L"$ROOTLIBDIR" -lGQt"
 
    #AC_CHECK_PROG(HAVE_ROOT_QT, libGQt.so.$ROOTSOVERSION, yes, no, $ROOTLIBDIR)
@@ -342,4 +369,8 @@
 AC_MSG_NOTICE(============================== summary =============================)
 AC_MSG_NOTICE()
+AC_MSG_NOTICE([ CFLAGS   = $CFLAGS])
+AC_MSG_NOTICE()
+AC_MSG_NOTICE([ CXXFLAGS = $CXXFLAGS])
+AC_MSG_NOTICE()
 AC_MSG_NOTICE([ CPPFLAGS = $CPPFLAGS])
 AC_MSG_NOTICE()
