Index: trunk/FACT++/Makefile.in
===================================================================
--- trunk/FACT++/Makefile.in	(revision 10199)
+++ trunk/FACT++/Makefile.in	(revision 10200)
@@ -39,5 +39,5 @@
 host_triplet = @host@
 DIST_COMMON = README $(am__configure_deps) $(dist_noinst_SCRIPTS) \
-	$(libDimCpp_la_HEADERS) $(libDim_la_HEADERS) \
+	$(libDim___la_HEADERS) $(libDim_la_HEADERS) \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/aminclude.am $(top_srcdir)/configure \
@@ -55,4 +55,6 @@
 	$(top_srcdir)/.macro_dir/ltversion.m4 \
 	$(top_srcdir)/.macro_dir/lt~obsolete.m4 \
+	$(top_srcdir)/.macro_dir/mysql++_devel.m4 \
+	$(top_srcdir)/.macro_dir/mysql_devel.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -85,5 +87,5 @@
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
-	"$(DESTDIR)$(libDimCpp_ladir)" "$(DESTDIR)$(libDim_ladir)"
+	"$(DESTDIR)$(libDim___ladir)" "$(DESTDIR)$(libDim_ladir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libConfiguration_la_LIBADD =
@@ -94,4 +96,9 @@
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
 am__v_lt_0 = --silent
+libDim___la_LIBADD =
+am_libDim___la_OBJECTS = dim_v19r15/src/diccpp.lo \
+	dim_v19r15/src/dimcpp.lo dim_v19r15/src/tokenstring.lo \
+	dim_v19r15/src/discpp.lo
+libDim___la_OBJECTS = $(am_libDim___la_OBJECTS)
 libDim_la_LIBADD =
 am_libDim_la_OBJECTS = dim_v19r15/src/dic.lo dim_v19r15/src/dis.lo \
@@ -103,9 +110,4 @@
 	dim_v19r15/src/dim_thr.lo dim_v19r15/src/utilities.lo
 libDim_la_OBJECTS = $(am_libDim_la_OBJECTS)
-libDimCpp_la_LIBADD =
-am_libDimCpp_la_OBJECTS = dim_v19r15/src/diccpp.lo \
-	dim_v19r15/src/dimcpp.lo dim_v19r15/src/tokenstring.lo \
-	dim_v19r15/src/discpp.lo
-libDimCpp_la_OBJECTS = $(am_libDimCpp_la_OBJECTS)
 libStateMachine_la_LIBADD =
 am_libStateMachine_la_OBJECTS = src/EventImp.lo src/Event.lo \
@@ -130,5 +132,5 @@
 	src/LocalControl.$(OBJEXT)
 dclient5_OBJECTS = $(am_dclient5_OBJECTS)
-dclient5_DEPENDENCIES = libDim.la libDimCpp.la libTools.la libTime.la \
+dclient5_DEPENDENCIES = libDim.la libDim++.la libTools.la libTime.la \
 	libStateMachine.la libConfiguration.la
 am_did_OBJECTS = dim_v19r15/src/did/did-did.$(OBJEXT) \
@@ -142,17 +144,17 @@
 dserver2_OBJECTS = $(am_dserver2_OBJECTS)
 dserver2_DEPENDENCIES = libTime.la libTools.la libStateMachine.la \
-	libDim.la libDimCpp.la
+	libDim.la libDim++.la
 am_log_OBJECTS = src/log.$(OBJEXT)
 log_OBJECTS = $(am_log_OBJECTS)
-log_DEPENDENCIES = libTime.la libTools.la libDim.la libDimCpp.la \
+log_DEPENDENCIES = libTime.la libTools.la libDim.la libDim++.la \
 	libStateMachine.la
 am_logtime_OBJECTS = src/logtime.$(OBJEXT)
 logtime_OBJECTS = $(am_logtime_OBJECTS)
 logtime_DEPENDENCIES = libStateMachine.la libTools.la libTime.la \
-	libDim.la libDimCpp.la
+	libDim.la libDim++.la
 am_test3_OBJECTS = src/test3.$(OBJEXT) src/RemoteControl.$(OBJEXT)
 test3_OBJECTS = $(am_test3_OBJECTS)
 test3_DEPENDENCIES = libStateMachine.la libTools.la libTime.la \
-	libDim.la libDimCpp.la libConfiguration.la
+	libDim.la libDim++.la libConfiguration.la
 am_time_OBJECTS = src/time.$(OBJEXT)
 time_OBJECTS = $(am_time_OBJECTS)
@@ -201,17 +203,17 @@
 am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
 am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(libConfiguration_la_SOURCES) $(libDim_la_SOURCES) \
-	$(libDimCpp_la_SOURCES) $(libStateMachine_la_SOURCES) \
+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)
-DIST_SOURCES = $(libConfiguration_la_SOURCES) $(libDim_la_SOURCES) \
-	$(libDimCpp_la_SOURCES) $(libStateMachine_la_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)
-HEADERS = $(libDimCpp_la_HEADERS) $(libDim_la_HEADERS)
+HEADERS = $(libDim___la_HEADERS) $(libDim_la_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -304,4 +306,9 @@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
+MYSQLPP_INC_DIR = @MYSQLPP_INC_DIR@
+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@
@@ -318,4 +325,7 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PTHREAD_CC = @PTHREAD_CC@
+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+PTHREAD_LIBS = @PTHREAD_LIBS@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -331,4 +341,5 @@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+acx_pthread_config = @acx_pthread_config@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
@@ -407,5 +418,5 @@
 AM_CPPFLAGS = \
    -O3 -Wall -Winit-self -Wpointer-arith -Wcast-align -Wextra -Wformat=2 \
-   -Idim_v19r15/dim $(DIM_FLAGS)
+   -Idim_v19r15/dim $(DIM_FLAGS) $(PTHREAD_CFLAGS)
 
 AM_CXXFLAGS = $(AM_CPPFLAGS) -Woverloaded-virtual -Wshadow -std=c++0x
@@ -413,4 +424,6 @@
 # -no-undefined
 AM_LDFLAGS = -module -avoid-version \
+	$(PTHREAD_CFLAGS) \
+   	-lmysqlpp \
    	-lboost_system \
    	-lboost_thread \
@@ -418,8 +431,7 @@
    	-lboost_date_time \
    	-lboost_program_options \
-   	-lboost_filesystem \
-   	-lmysqlpp
-
-lib_LTLIBRARIES = libDim.la libDimCpp.la libTime.la libTools.la \
+   	-lboost_filesystem
+
+lib_LTLIBRARIES = libDim.la libDim++.la libTime.la libTools.la \
 		  libConfiguration.la libStateMachine.la
 
@@ -428,4 +440,5 @@
 dist_noinst_SCRIPTS = autogen.sh
 EXTRA_DIST = \
+	Doxyfile \
 	dim_v19r15/DIM_Performance.pdf \
 	dim_v19r15/LICENSE.GPL \
@@ -477,6 +490,6 @@
 
 #libDimCpp_la_CXXFLAGS = $(AM_CXXFLAGS) $(DIM_FLAGS)
-libDimCpp_ladir = 
-libDimCpp_la_HEADERS = \
+libDim___ladir = 
+libDim___la_HEADERS = \
 	dim_v19r15/dim/dic.hxx \
 	dim_v19r15/dim/dim_core.hxx \
@@ -487,5 +500,5 @@
 	dim_v19r15/dim/tokenstring.hxx 
 
-libDimCpp_la_SOURCES = \
+libDim___la_SOURCES = \
 	dim_v19r15/src/diccpp.cxx \
 	dim_v19r15/src/dimcpp.cxx \
@@ -518,11 +531,11 @@
 libTools_la_SOURCES = src/tools.h src/tools.cc
 dserver2_SOURCES = src/dserver2.cc 
-dserver2_LDADD = libTime.la libTools.la libStateMachine.la libDim.la libDimCpp.la
+dserver2_LDADD = libTime.la libTools.la libStateMachine.la libDim.la libDim++.la
 log_SOURCES = src/log.cc
-log_LDADD = libTime.la libTools.la libDim.la libDimCpp.la libStateMachine.la 
-logtime_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDimCpp.la
+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_LDADD = libDim.la libDimCpp.la libTools.la libTime.la libStateMachine.la \
+dclient5_LDADD = libDim.la libDim++.la libTools.la libTime.la libStateMachine.la \
     libConfiguration.la
 
@@ -530,5 +543,5 @@
 argv_LDADD = libConfiguration.la 
 test3_SOURCES = src/test3.cc src/RemoteControl.cc
-test3_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDimCpp.la libConfiguration.la
+test3_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
 time_SOURCES = src/time.cc
 time_LDADD = libTime.la 
@@ -618,4 +631,14 @@
 	@$(MKDIR_P) dim_v19r15/src/$(DEPDIR)
 	@: > dim_v19r15/src/$(DEPDIR)/$(am__dirstamp)
+dim_v19r15/src/diccpp.lo: dim_v19r15/src/$(am__dirstamp) \
+	dim_v19r15/src/$(DEPDIR)/$(am__dirstamp)
+dim_v19r15/src/dimcpp.lo: dim_v19r15/src/$(am__dirstamp) \
+	dim_v19r15/src/$(DEPDIR)/$(am__dirstamp)
+dim_v19r15/src/tokenstring.lo: dim_v19r15/src/$(am__dirstamp) \
+	dim_v19r15/src/$(DEPDIR)/$(am__dirstamp)
+dim_v19r15/src/discpp.lo: dim_v19r15/src/$(am__dirstamp) \
+	dim_v19r15/src/$(DEPDIR)/$(am__dirstamp)
+libDim++.la: $(libDim___la_OBJECTS) $(libDim___la_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK) -rpath $(libdir) $(libDim___la_OBJECTS) $(libDim___la_LIBADD) $(LIBS)
 dim_v19r15/src/dic.lo: dim_v19r15/src/$(am__dirstamp) \
 	dim_v19r15/src/$(DEPDIR)/$(am__dirstamp)
@@ -648,14 +671,4 @@
 libDim.la: $(libDim_la_OBJECTS) $(libDim_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(LINK) -rpath $(libdir) $(libDim_la_OBJECTS) $(libDim_la_LIBADD) $(LIBS)
-dim_v19r15/src/diccpp.lo: dim_v19r15/src/$(am__dirstamp) \
-	dim_v19r15/src/$(DEPDIR)/$(am__dirstamp)
-dim_v19r15/src/dimcpp.lo: dim_v19r15/src/$(am__dirstamp) \
-	dim_v19r15/src/$(DEPDIR)/$(am__dirstamp)
-dim_v19r15/src/tokenstring.lo: dim_v19r15/src/$(am__dirstamp) \
-	dim_v19r15/src/$(DEPDIR)/$(am__dirstamp)
-dim_v19r15/src/discpp.lo: dim_v19r15/src/$(am__dirstamp) \
-	dim_v19r15/src/$(DEPDIR)/$(am__dirstamp)
-libDimCpp.la: $(libDimCpp_la_OBJECTS) $(libDimCpp_la_DEPENDENCIES) 
-	$(AM_V_CXXLD)$(CXXLINK) -rpath $(libdir) $(libDimCpp_la_OBJECTS) $(libDimCpp_la_LIBADD) $(LIBS)
 src/EventImp.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/Event.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
@@ -1066,8 +1079,8 @@
 distclean-libtool:
 	-rm -f libtool config.lt
-install-libDimCpp_laHEADERS: $(libDimCpp_la_HEADERS)
+install-libDim___laHEADERS: $(libDim___la_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(libDimCpp_ladir)" || $(MKDIR_P) "$(DESTDIR)$(libDimCpp_ladir)"
-	@list='$(libDimCpp_la_HEADERS)'; test -n "$(libDimCpp_ladir)" || list=; \
+	test -z "$(libDim___ladir)" || $(MKDIR_P) "$(DESTDIR)$(libDim___ladir)"
+	@list='$(libDim___la_HEADERS)'; test -n "$(libDim___ladir)" || list=; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
@@ -1075,15 +1088,15 @@
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libDimCpp_ladir)'"; \
-	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(libDimCpp_ladir)" || exit $$?; \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libDim___ladir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(libDim___ladir)" || exit $$?; \
 	done
 
-uninstall-libDimCpp_laHEADERS:
+uninstall-libDim___laHEADERS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libDimCpp_la_HEADERS)'; test -n "$(libDimCpp_ladir)" || list=; \
+	@list='$(libDim___la_HEADERS)'; test -n "$(libDim___ladir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(libDimCpp_ladir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(libDimCpp_ladir)" && rm -f $$files
+	echo " ( cd '$(DESTDIR)$(libDim___ladir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libDim___ladir)" && rm -f $$files
 install-libDim_laHEADERS: $(libDim_la_HEADERS)
 	@$(NORMAL_INSTALL)
@@ -1312,5 +1325,5 @@
 
 installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libDimCpp_ladir)" "$(DESTDIR)$(libDim_ladir)"; do \
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libDim___ladir)" "$(DESTDIR)$(libDim_ladir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
@@ -1370,5 +1383,5 @@
 info-am:
 
-install-data-am: install-libDimCpp_laHEADERS install-libDim_laHEADERS
+install-data-am: install-libDim___laHEADERS install-libDim_laHEADERS
 
 install-dvi: install-dvi-am
@@ -1418,5 +1431,5 @@
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-libDimCpp_laHEADERS \
+uninstall-am: uninstall-binPROGRAMS uninstall-libDim___laHEADERS \
 	uninstall-libDim_laHEADERS uninstall-libLTLIBRARIES
 
@@ -1433,5 +1446,5 @@
 	install-data-am install-dvi install-dvi-am install-exec \
 	install-exec-am install-html install-html-am install-info \
-	install-info-am install-libDimCpp_laHEADERS \
+	install-info-am install-libDim___laHEADERS \
 	install-libDim_laHEADERS install-libLTLIBRARIES install-man \
 	install-pdf install-pdf-am install-ps install-ps-am \
@@ -1441,5 +1454,5 @@
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-libDimCpp_laHEADERS uninstall-libDim_laHEADERS \
+	uninstall-libDim___laHEADERS uninstall-libDim_laHEADERS \
 	uninstall-libLTLIBRARIES
 
@@ -1492,4 +1505,14 @@
 #                       $(pkg_verbose)cp $(srcdir)/foo.in $@
 
+#$(MyAnalysisDS): $(MyAnalysisH) $(MyAnalysisL)
+#	$(ROOTCINT) -f $@ -c -I$(top_builddir)/config $(INCLUDES) $^
+#	rootcint_files=`echo $@ | sed -ne 's/\(.*\)\..*/\1.cxx \1.h/p'` && \
+#        $(top_srcdir)/config/runsed $(top_srcdir)/config/rootcint.sed $$rootcint_files && \
+#        for i in $$rootcint_files; do \
+#          if test ! `diff $$i $(srcdir)/$$i >/dev/null 2>&1`; then \
+#            cp $$i $(srcdir)/; \
+#          fi; \
+#        done
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
Index: trunk/FACT++/configure
===================================================================
--- trunk/FACT++/configure	(revision 10199)
+++ trunk/FACT++/configure	(revision 10200)
@@ -747,4 +747,18 @@
 LTLIBOBJS
 LIBOBJS
+ROOTSOVERSION
+ROOTVERSION
+ROOTRPATH
+ROOTAUXCFLAGS
+ROOTAUXLIBS
+ROOTGLIBS
+ROOTLIBS
+ROOTCFLAGS
+ROOTETCDIR
+ROOTINCDIR
+ROOTLIBDIR
+ROOTCINT
+ROOTEXEC
+ROOTCONF
 BOOST_THREAD_LIB
 BOOST_SYSTEM_LIB
@@ -798,8 +812,8 @@
 DX_DOXYGEN
 DX_FLAG_doc
-DX_ENV
 DX_DOCDIR
 DX_CONFIG
 DX_PROJECT
+DX_ENV
 AM_BACKSLASH
 AM_DEFAULT_VERBOSITY
@@ -919,6 +933,6 @@
 ac_user_opts='
 enable_option_checking
+enable_shared
 enable_static
-enable_shared
 with_pic
 enable_fast_install
@@ -946,4 +960,5 @@
 with_boost_system
 with_boost_thread
+with_rootsys
 with_mysqlpp_lib_path
 '
@@ -1582,6 +1597,6 @@
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-static[=PKGS]  build static libraries [default=no]
   --enable-shared[=PKGS]  build shared libraries [default=yes]
+  --enable-static[=PKGS]  build static libraries [default=yes]
   --enable-fast-install[=PKGS]
                           optimize for fast installation [default=yes]
@@ -1600,5 +1615,5 @@
                           file
   --disable-doxygen-html  don't generate doxygen plain HTML documentation
-  --disable-doxygen-ps    don't generate doxygen PostScript documentation
+  --enable-doxygen-ps     generate doxygen PostScript documentation
   --disable-doxygen-pdf   don't generate doxygen PDF documentation
 
@@ -1647,4 +1662,5 @@
                           to specify a certain library for the linker e.g.
                           --with-boost-thread=boost_thread-gcc-mt
+  --with-rootsys          top of the ROOT installation directory
 
        --with-mysqlpp-lib-path location of the MySQL++ library, defaults to
@@ -3204,4 +3220,5 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+ #If output variable CXXFLAGS was not already set, set it to -g -O2
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -4141,11 +4158,11 @@
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4143: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4160: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4146: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4163: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4149: output\"" >&5)
+  (eval echo "\"\$as_me:4166: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
@@ -5353,5 +5370,5 @@
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5355 "configure"' > conftest.$ac_ext
+  echo '#line 5372 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
@@ -6783,33 +6800,4 @@
 
 # Set options
-# Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then :
-  enableval=$enable_static; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_static=no
-fi
-
-
-
-
-
-
-
 
 
@@ -6844,4 +6832,34 @@
 fi
 
+
+
+
+
+
+
+
+
+  # Check whether --enable-static was given.
+if test "${enable_static+set}" = set; then :
+  enableval=$enable_static; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_static=yes
+fi
 
 
@@ -7281,9 +7299,9 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7283: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7301: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7287: \$? = $ac_status" >&5
+   echo "$as_me:7305: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -7620,9 +7638,9 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7622: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7640: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7626: \$? = $ac_status" >&5
+   echo "$as_me:7644: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -7725,9 +7743,9 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7727: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7745: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7731: \$? = $ac_status" >&5
+   echo "$as_me:7749: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -7780,9 +7798,9 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7782: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7800: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7786: \$? = $ac_status" >&5
+   echo "$as_me:7804: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -10164,5 +10182,5 @@
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10166 "configure"
+#line 10184 "configure"
 #include "confdefs.h"
 
@@ -10260,5 +10278,5 @@
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10262 "configure"
+#line 10280 "configure"
 #include "confdefs.h"
 
@@ -12216,9 +12234,9 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12218: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12236: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12222: \$? = $ac_status" >&5
+   echo "$as_me:12240: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -12315,9 +12333,9 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12317: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12335: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12321: \$? = $ac_status" >&5
+   echo "$as_me:12339: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -12367,9 +12385,9 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12369: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12387: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12373: \$? = $ac_status" >&5
+   echo "$as_me:12391: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -13341,4 +13359,5 @@
 
 #AC_PATH_XTRA
+
 
 
@@ -14281,9 +14300,30 @@
 
 
-
+######################################################################
+# DOXYGEN SUPPORT
+######################################################################
+
+### FIXME: Need a configure commandline switch
+DX_ENV="$DX_ENV EXTRACT_ALL='YES'"
+
+DX_ENV="$DX_ENV RECURSIVE='YES'"
+
+DX_ENV="$DX_ENV ALL_GRAPHS='NO'"
+  # change to yet to switch on call(er) graphs
+
+#DX_DOXYGEN_FEATURE(ON)
+#DX_DOT_FEATURE(ON)               # sets HAVE_DOT
+#DX_HTML_FEATURE(ON)              # sets GENERATE_HTML (default)
+#DX_CHM_FEATURE(ON|OFF)           # sets GENERATE_HTMLHELP
+#DX_CHI_FEATURE(ON|OFF)           # sets GENERATE_CHI
+#DX_MAN_FEATURE(ON)               # sets GENERATE_MAN (segfaults)
+#DX_RTF_FEATURE(ON|OFF)           # sets GENERATE_RTF
+#DX_XML_FEATURE(ON|OFF)           # sets GENERATE_XML
+#DX_PDF_FEATURE(ON|OFF)           # sets GENERATE_PDF (default)
+                # sets GENERATE_PS  (default)
 
 
 # Files:
-DX_PROJECT=FACT++
+DX_PROJECT=$PACKAGE_NAME
 
 DX_CONFIG=Doxyfile
@@ -15300,5 +15340,5 @@
 else
 
-DX_FLAG_ps=1
+DX_FLAG_ps=0
 
 
@@ -16199,22 +16239,10 @@
 #echo DX_ENV=$DX_ENV
 #, DOXYFILE-PATH, [OUTPUT-DIR])
-#DX_DOXYGEN_FEATURE(ON)
-#DX_DOT_FEATURE(ON)
-#DX_HTML_FEATURE(ON)
-#DX_CHM_FEATURE(ON|OFF)
-#DX_CHI_FEATURE(ON|OFF)
-
-#DX_RTF_FEATURE(ON|OFF)
-#DX_XML_FEATURE(ON|OFF)
-#DX_PDF_FEATURE(ON|OFF)
-
-DX_ENV="$DX_ENV EXTRACT_ALL='YES'"
-
-DX_ENV="$DX_ENV RECURSIVE='YES'"
-
-DX_ENV="$DX_ENV ALL_GRAPHS='NO'"
-  # change to yet to switch on call(er) graphs
 
 #USE_HTAGS              = $(USE_HTAGS)
+
+######################################################################
+# BOOST SUPPORT
+######################################################################
 
 
@@ -18058,4 +18086,215 @@
 #ax_boost_wserialization
 
+######################################################################
+# ROOT SUPPORT
+######################################################################
+
+#ROOT_PATH([5.12/00, [ACTION-IF-FOUND, [ACTION-IF-NOT-FOUND]]])
+
+
+# Check whether --with-rootsys was given.
+if test "${with_rootsys+set}" = set; then :
+  withval=$with_rootsys; user_rootsys=$withval
+else
+  user_rootsys="none"
+fi
+
+  if test ! x"$user_rootsys" = xnone; then
+    rootbin="$user_rootsys/bin"
+  elif test ! x"$ROOTSYS" = x ; then
+    rootbin="$ROOTSYS/bin"
+  else
+   rootbin=$PATH
+  fi
+  # Extract the first word of "root-config ", so it can be a program name with args.
+set dummy root-config ; 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_path_ROOTCONF+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ROOTCONF in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ROOTCONF="$ROOTCONF" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $rootbin
+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_path_ROOTCONF="$as_dir/$ac_word$ac_exec_ext"
+    $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_path_ROOTCONF" && ac_cv_path_ROOTCONF="no"
+  ;;
+esac
+fi
+ROOTCONF=$ac_cv_path_ROOTCONF
+if test -n "$ROOTCONF"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ROOTCONF" >&5
+$as_echo "$ROOTCONF" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  # Extract the first word of "root ", so it can be a program name with args.
+set dummy root ; 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_path_ROOTEXEC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ROOTEXEC in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ROOTEXEC="$ROOTEXEC" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $rootbin
+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_path_ROOTEXEC="$as_dir/$ac_word$ac_exec_ext"
+    $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_path_ROOTEXEC" && ac_cv_path_ROOTEXEC="no"
+  ;;
+esac
+fi
+ROOTEXEC=$ac_cv_path_ROOTEXEC
+if test -n "$ROOTEXEC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ROOTEXEC" >&5
+$as_echo "$ROOTEXEC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  # Extract the first word of "rootcint ", so it can be a program name with args.
+set dummy rootcint ; 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_path_ROOTCINT+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ROOTCINT in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ROOTCINT="$ROOTCINT" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $rootbin
+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_path_ROOTCINT="$as_dir/$ac_word$ac_exec_ext"
+    $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_path_ROOTCINT" && ac_cv_path_ROOTCINT="no"
+  ;;
+esac
+fi
+ROOTCINT=$ac_cv_path_ROOTCINT
+if test -n "$ROOTCINT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ROOTCINT" >&5
+$as_echo "$ROOTCINT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+  if test ! x"$ROOTCONF" = "xno" && \
+     test ! x"$ROOTCINT" = "xno" ; then
+
+    # define some variables
+    ROOTLIBDIR=`$ROOTCONF --libdir`
+    ROOTINCDIR=`$ROOTCONF --incdir`
+    ROOTETCDIR=`$ROOTCONF --etcdir`
+    ROOTCFLAGS=`$ROOTCONF --noauxcflags --cflags`
+    ROOTLIBS=`$ROOTCONF --noauxlibs --noldflags --libs`
+    ROOTGLIBS=`$ROOTCONF --noauxlibs --noldflags --glibs`
+    ROOTAUXCFLAGS=`$ROOTCONF --auxcflags`
+    ROOTAUXLIBS=`$ROOTCONF --auxlibs`
+    ROOTRPATH=$ROOTLIBDIR
+    ROOTVERSION=`$ROOTCONF --version`
+    ROOTSOVERSION=`dirname $ROOTVERSION`
+
+    if test 5.12/00 ; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking wether ROOT version >= 5.12/00" >&5
+$as_echo_n "checking wether ROOT version >= 5.12/00... " >&6; }
+      vers=`$ROOTCONF --version | tr './' ' ' | awk 'BEGIN { FS = " "; } { printf "%d", ($''1 * 1000 + $''2) * 1000 + $''3;}'`
+      requ=`echo 5.12/00 | tr './' ' ' | awk 'BEGIN { FS = " "; } { printf "%d", ($''1 * 1000 + $''2) * 1000 + $''3;}'`
+      if test $vers -lt $requ ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	no_root="yes"
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      fi
+    fi
+  else
+    # otherwise, we say no_root
+    no_root="yes"
+  fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+  if test "x$no_root" = "x" ; then
+    :
+  else
+    :
+  fi
+
+# ROOTCONF           full path to root-config
+# ROOTEXEC           full path to root
+# ROOTCINT           full path to rootcint
+# ROOTLIBDIR         Where the ROOT libraries are
+# ROOTINCDIR         Where the ROOT headers are
+# ROOTETCDIR         Where the ROOT configuration is
+# ROOTCFLAGS         Extra compiler flags
+# ROOTLIBS           ROOT basic libraries
+# ROOTGLIBS          ROOT basic + GUI libraries
+# ROOTAUXLIBS        Auxilary libraries and linker flags for ROOT
+# ROOTAUXCFLAGS      Auxilary compiler flags
+# ROOTRPATH          Same as ROOTLIBDIR
+
 
 ac_ext=c
@@ -18536,4 +18775,43 @@
 #AC_TYPE_PID_T
 #AC_HEADER_STDC
+
+
+
+##########################################################################
+# debug compilation support
+##########################################################################
+#
+#AC_MSG_CHECKING([whether to build with debug information])
+#AC_ARG_ENABLE([debug],
+#    [AS_HELP_STRING([--enable-debug],
+#        [enable debug data generation (def=no)])],
+#    [debugit="$enableval"],
+#    [debugit=no])
+#AC_MSG_RESULT([$debugit])
+#
+#if test x"$debugit" = x"yes"; then
+#    AC_DEFINE([DEBUG],[],[Debug Mode])
+#    AM_CXXFLAGS="$AM_CXXFLAGS -g -Wall -Werror -Wno-uninitialized -O0"
+#else
+#    AC_DEFINE([NDEBUG],[],[No-debug Mode])
+#    AM_CXXFLAGS="$AM_CXXFLAGS -O3"
+#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])
+
+
+
+
+
+
+
+
+
+
+
+
 
 cat >confcache <<\_ACEOF
@@ -19364,6 +19642,6 @@
 macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
 macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
+enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
 enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
-enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
 pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
 enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
@@ -20200,9 +20478,9 @@
 macro_revision=$macro_revision
 
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
 # Whether or not to build static libraries.
 build_old_libs=$enable_static
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
 
 # What type of objects to build.