Index: trunk/FACT++/configure.ac
===================================================================
--- trunk/FACT++/configure.ac	(revision 10429)
+++ trunk/FACT++/configure.ac	(revision 10430)
@@ -3,4 +3,9 @@
 ######################################################################
 
+#[AC_]PACKAGE_NAME
+#[AC_]PACKAGE_TARNAME
+#[AC_]PACKAGE_VERSION
+#[AC_]PACKAGE_STRING
+#[AC_]PACKAGE_BUGREPORT
 AC_INIT([FACT++],[1.0],[thomas.bretz@epfl.ch],[FACTpp],[http://hello.example.com/])
 AC_PREREQ([2.65])
@@ -140,8 +145,5 @@
 # Needed to compile FACT++
 AX_BOOST_BASE([1.40], [],
-   [
-      echo "Error! The boost C++ libraries are not properly installed." 
-      exit -1
-   ]
+   AC_MSG_ERROR([The boost C++ libraries (>=1.40) are not properly installed.])
 )
 
@@ -198,31 +200,27 @@
    [], [QT4_DO_IT_ALL])
 
-#AC_CHECK_PROG(QT4_MOC, moc, moc, 
-#   AC_MSG_ERROR([QT4 executable 'moc' not found in path.]))
-#AC_CHECK_PROG(QT4_UIC, uic, uic, 
-#   AC_MSG_ERROR([QT4 executable 'moc' not found in path.]))
-
 ######################################################################
 # ROOT SUPPORT
 ######################################################################
 
-# ROOT_PATH([5.12/00, [ACTION-IF-FOUND, [ACTION-IF-NOT-FOUND]]])
-# ROOT_PATH([5.12/00])
-# ROOT_PATH(3.03/05, , AC_MSG_ERROR(Your ROOT version is too old))
-# ROOT_PATH(, AC_DEFINE([HAVE_ROOT]))
-
-# 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_ARG_WITH([root], 
+   [AS_HELP_STRING([--without-root], [Disable root, i.e. disable gui support.])],
+   [], [ROOT_PATH([5.12/00])]
+)
+
+HAVE_ROOT_QT=no
+
+if test "$ROOTEXEC" != no ;
+then
+
+   ROOTCPPFLAGS=$ROOTCFLAGS" "$ROOTAUXCFLAGS
+   ROOTLDFLAGS="-L"$ROOTLIBDIR" "$ROOTGLIBS" -lGQt "$ROOTAUXLIBS
+
+   ROOT_FEATURE([qt], [HAVE_ROOT_QT=yes])
+
+   AC_SUBST(ROOTCPPFLAGS)
+   AC_SUBST(ROOTLDFLAGS)
+
+fi
 
 ######################################################################
@@ -269,4 +267,7 @@
 AM_CONDITIONAL(HAS_COLORGCC,  [test "$GCC" = colorgcc])
 AM_CONDITIONAL(HAS_QT4,       [test -n "$QT4_VERSION"])
+AM_CONDITIONAL(HAS_ROOT,      [test "$ROOTEXEC" != no])
+AM_CONDITIONAL(HAS_ROOT_QT,   [test "$HAVE_ROOT_QT" = yes])
+AM_CONDITIONAL(HAS_GUI,       [test "$QT4_VERSION" -a "$HAVE_ROOT_QT" = yes])
 
 ##########################################################################
@@ -304,7 +305,9 @@
 )
 AM_COND_IF(HAS_QT4,
-   AC_MSG_NOTICE([ GUI support enabled    / QT4 toolkit      found: yes]),
-   AC_MSG_NOTICE([ GUI support enabled    / QT4 toolkit      found: no])
-)
+   AC_MSG_NOTICE([ QT4 support enabled    /  QT4 toolkit     found: yes]),
+   AC_MSG_NOTICE([ QT4 support enabled    /  QT4 toolkit     found: no])
+)
+AC_MSG_NOTICE([ ROOT support enabled   /  root >= 5.12/00 found: $ROOTEXEC])
+AC_MSG_NOTICE([ ROOT built with --with-qt                 found: $HAVE_ROOT_QT])
 AM_COND_IF(HAS_QT4, [
    AC_MSG_NOTICE()
@@ -320,4 +323,16 @@
    AC_MSG_NOTICE([ UIC4 = $UIC4])
    AC_MSG_NOTICE([ RCC4 = $RCC4])
+],[])
+AM_COND_IF(HAS_QT4, [
+   AC_MSG_NOTICE()
+   AC_MSG_NOTICE(--------------------------------------------------------------------)
+   AC_MSG_NOTICE()
+   AC_MSG_NOTICE([ ROOTVERSION   = $ROOTVERSION])
+   AC_MSG_NOTICE()
+   AC_MSG_NOTICE([ ROOTEXEC      = $ROOTEXEC])
+   AC_MSG_NOTICE([ ROOTCONF      = $ROOTCONF])
+   AC_MSG_NOTICE([ ROOTCINT      = $ROOTCINT])
+   AC_MSG_NOTICE([ ROOTCPPFLAGS  = $ROOTCPPFLAGS])
+   AC_MSG_NOTICE([ ROOTLDFLAGS   = $ROOTLDFLAGS])
 ],[])
 AC_MSG_NOTICE()
@@ -354,8 +369,13 @@
 AC_MSG_NOTICE([ man:           build all buildable documentation])
 AC_MSG_NOTICE()
-
-#[AC_]PACKAGE_NAME
-#[AC_]PACKAGE_TARNAME
-#[AC_]PACKAGE_VERSION
-#[AC_]PACKAGE_STRING
-#[AC_]PACKAGE_BUGREPORT
+AC_MSG_NOTICE(--------------------------------------------------------------------)
+AC_MSG_NOTICE()
+AM_COND_IF(HAS_ROOT,  
+   [AM_COND_IF(HAS_ROOT_QT, [], 
+      AC_MSG_WARN([ root found but it was built without the --with-qt option])
+   )]
+)
+AM_COND_IF(HAS_GUI, [], 
+      AC_MSG_WARN([ Either QT4 or qt-root is missing: GUI disabled!])
+)
+AC_MSG_NOTICE()