Index: trunk/FACT++/configure
===================================================================
--- trunk/FACT++/configure	(revision 14134)
+++ trunk/FACT++/configure	(revision 14328)
@@ -782,4 +782,6 @@
 AM_BACKSLASH
 AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
 am__fastdepCXX_FALSE
 am__fastdepCXX_TRUE
@@ -788,4 +790,5 @@
 am__fastdepCC_TRUE
 CCDEPMODE
+am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
@@ -4939,6 +4942,6 @@
 
 
-macro_version='2.4'
-macro_revision='1.3293'
+macro_version='2.4.2'
+macro_revision='1.3337'
 
 
@@ -15772,4 +15775,5 @@
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
  if test "x$enable_dependency_tracking" != xno; then
@@ -15792,4 +15796,31 @@
 *)   AM_DEFAULT_VERBOSITY=1;;
 esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
 AM_BACKSLASH='\'
 
@@ -15837,9 +15868,9 @@
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
-# Always define AMTAR for backward compatibility.
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
+
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
@@ -15859,4 +15890,5 @@
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
@@ -15918,5 +15950,5 @@
       fi
       ;;
-    msvisualcpp | msvcmsys)
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
@@ -15986,4 +16018,5 @@
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
@@ -16045,5 +16078,5 @@
       fi
       ;;
-    msvisualcpp | msvcmsys)
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
@@ -16111,4 +16144,31 @@
 *)   AM_DEFAULT_VERBOSITY=0;;
 esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
 AM_BACKSLASH='\'
 
@@ -16529,6 +16589,5 @@
     :
 fi
-if test "$DX_FLAG_doc" = 1; then
-     if :; then
+ if test "$DX_FLAG_doc" = 1; then
   DX_COND_doc_TRUE=
   DX_COND_doc_FALSE='#'
@@ -16538,16 +16597,9 @@
 fi
 
+if test "$DX_FLAG_doc" = 1; then
     DX_ENV="$DX_ENV PERL_PATH='$DX_PERL'"
 
     :
 else
-     if false; then
-  DX_COND_doc_TRUE=
-  DX_COND_doc_FALSE='#'
-else
-  DX_COND_doc_TRUE='#'
-  DX_COND_doc_FALSE=
-fi
-
 
     :
@@ -16701,6 +16753,5 @@
     :
 fi
-if test "$DX_FLAG_dot" = 1; then
-     if :; then
+ if test "$DX_FLAG_dot" = 1; then
   DX_COND_dot_TRUE=
   DX_COND_dot_FALSE='#'
@@ -16710,4 +16761,5 @@
 fi
 
+if test "$DX_FLAG_dot" = 1; then
     DX_ENV="$DX_ENV HAVE_DOT='YES'"
 
@@ -16716,12 +16768,4 @@
     :
 else
-     if false; then
-  DX_COND_dot_TRUE=
-  DX_COND_dot_FALSE='#'
-else
-  DX_COND_dot_TRUE='#'
-  DX_COND_dot_FALSE=
-fi
-
     DX_ENV="$DX_ENV HAVE_DOT='NO'"
 
@@ -16771,6 +16815,5 @@
     :
 fi
-if test "$DX_FLAG_man" = 1; then
-     if :; then
+ if test "$DX_FLAG_man" = 1; then
   DX_COND_man_TRUE=
   DX_COND_man_FALSE='#'
@@ -16780,16 +16823,9 @@
 fi
 
+if test "$DX_FLAG_man" = 1; then
     DX_ENV="$DX_ENV GENERATE_MAN='YES'"
 
     :
 else
-     if false; then
-  DX_COND_man_TRUE=
-  DX_COND_man_FALSE='#'
-else
-  DX_COND_man_TRUE='#'
-  DX_COND_man_FALSE=
-fi
-
     DX_ENV="$DX_ENV GENERATE_MAN='NO'"
 
@@ -16839,6 +16875,5 @@
     :
 fi
-if test "$DX_FLAG_rtf" = 1; then
-     if :; then
+ if test "$DX_FLAG_rtf" = 1; then
   DX_COND_rtf_TRUE=
   DX_COND_rtf_FALSE='#'
@@ -16848,16 +16883,9 @@
 fi
 
+if test "$DX_FLAG_rtf" = 1; then
     DX_ENV="$DX_ENV GENERATE_RTF='YES'"
 
     :
 else
-     if false; then
-  DX_COND_rtf_TRUE=
-  DX_COND_rtf_FALSE='#'
-else
-  DX_COND_rtf_TRUE='#'
-  DX_COND_rtf_FALSE=
-fi
-
     DX_ENV="$DX_ENV GENERATE_RTF='NO'"
 
@@ -16907,6 +16935,5 @@
     :
 fi
-if test "$DX_FLAG_xml" = 1; then
-     if :; then
+ if test "$DX_FLAG_xml" = 1; then
   DX_COND_xml_TRUE=
   DX_COND_xml_FALSE='#'
@@ -16916,16 +16943,9 @@
 fi
 
+if test "$DX_FLAG_xml" = 1; then
     DX_ENV="$DX_ENV GENERATE_XML='YES'"
 
     :
 else
-     if false; then
-  DX_COND_xml_TRUE=
-  DX_COND_xml_FALSE='#'
-else
-  DX_COND_xml_TRUE='#'
-  DX_COND_xml_FALSE=
-fi
-
     DX_ENV="$DX_ENV GENERATE_XML='NO'"
 
@@ -17080,6 +17100,5 @@
     :
 fi
-if test "$DX_FLAG_chm" = 1; then
-     if :; then
+ if test "$DX_FLAG_chm" = 1; then
   DX_COND_chm_TRUE=
   DX_COND_chm_FALSE='#'
@@ -17089,4 +17108,5 @@
 fi
 
+if test "$DX_FLAG_chm" = 1; then
     DX_ENV="$DX_ENV HHC_PATH='$DX_HHC'"
 
@@ -17097,12 +17117,4 @@
     :
 else
-     if false; then
-  DX_COND_chm_TRUE=
-  DX_COND_chm_FALSE='#'
-else
-  DX_COND_chm_TRUE='#'
-  DX_COND_chm_FALSE=
-fi
-
     DX_ENV="$DX_ENV GENERATE_HTMLHELP='NO'"
 
@@ -17152,6 +17164,5 @@
     :
 fi
-if test "$DX_FLAG_chi" = 1; then
-     if :; then
+ if test "$DX_FLAG_chi" = 1; then
   DX_COND_chi_TRUE=
   DX_COND_chi_FALSE='#'
@@ -17161,16 +17172,9 @@
 fi
 
+if test "$DX_FLAG_chi" = 1; then
     DX_ENV="$DX_ENV GENERATE_CHI='YES'"
 
     :
 else
-     if false; then
-  DX_COND_chi_TRUE=
-  DX_COND_chi_FALSE='#'
-else
-  DX_COND_chi_TRUE='#'
-  DX_COND_chi_FALSE=
-fi
-
     DX_ENV="$DX_ENV GENERATE_CHI='NO'"
 
@@ -17226,6 +17230,5 @@
     :
 fi
-if test "$DX_FLAG_html" = 1; then
-     if :; then
+ if test "$DX_FLAG_html" = 1; then
   DX_COND_html_TRUE=
   DX_COND_html_FALSE='#'
@@ -17235,16 +17238,9 @@
 fi
 
+if test "$DX_FLAG_html" = 1; then
     DX_ENV="$DX_ENV GENERATE_HTML='YES'"
 
     :
 else
-     if false; then
-  DX_COND_html_TRUE=
-  DX_COND_html_FALSE='#'
-else
-  DX_COND_html_TRUE='#'
-  DX_COND_html_FALSE=
-fi
-
     test "$DX_FLAG_chm" = 1 || DX_ENV="$DX_ENV GENERATE_HTML='NO'"
 
@@ -17717,6 +17713,5 @@
     :
 fi
-if test "$DX_FLAG_ps" = 1; then
-     if :; then
+ if test "$DX_FLAG_ps" = 1; then
   DX_COND_ps_TRUE=
   DX_COND_ps_FALSE='#'
@@ -17726,15 +17721,8 @@
 fi
 
+if test "$DX_FLAG_ps" = 1; then
 
     :
 else
-     if false; then
-  DX_COND_ps_TRUE=
-  DX_COND_ps_FALSE='#'
-else
-  DX_COND_ps_TRUE='#'
-  DX_COND_ps_FALSE=
-fi
-
 
     :
@@ -18100,6 +18088,5 @@
     :
 fi
-if test "$DX_FLAG_pdf" = 1; then
-     if :; then
+ if test "$DX_FLAG_pdf" = 1; then
   DX_COND_pdf_TRUE=
   DX_COND_pdf_FALSE='#'
@@ -18109,15 +18096,8 @@
 fi
 
+if test "$DX_FLAG_pdf" = 1; then
 
     :
 else
-     if false; then
-  DX_COND_pdf_TRUE=
-  DX_COND_pdf_FALSE='#'
-else
-  DX_COND_pdf_TRUE='#'
-  DX_COND_pdf_FALSE=
-fi
-
 
     :
@@ -18126,6 +18106,5 @@
 
 # LaTeX generation for PS and/or PDF:
-if test "$DX_FLAG_ps" = 1 || test "$DX_FLAG_pdf" = 1; then
-     if :; then
+ if test "$DX_FLAG_ps" = 1 || test "$DX_FLAG_pdf" = 1; then
   DX_COND_latex_TRUE=
   DX_COND_latex_FALSE='#'
@@ -18135,15 +18114,8 @@
 fi
 
+if test "$DX_FLAG_ps" = 1 || test "$DX_FLAG_pdf" = 1; then
     DX_ENV="$DX_ENV GENERATE_LATEX='YES'"
 
 else
-     if false; then
-  DX_COND_latex_TRUE=
-  DX_COND_latex_FALSE='#'
-else
-  DX_COND_latex_TRUE='#'
-  DX_COND_latex_FALSE=
-fi
-
     DX_ENV="$DX_ENV GENERATE_LATEX='NO'"
 
@@ -18528,5 +18500,6 @@
                 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <pthread.h>
+
+                    #include <pthread.h>
 int
 main ()
@@ -19820,7 +19793,6 @@
 LDFLAGS+=" "$MOTIF_LDFLAGS
 
-if test "$lt_cv_libxp" = "yes"; then
-  :
-else
+if test -z "$HAS_LIBXP_TRUE"; then :
+  else
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  Motif/lesstif not found!" >&5
 $as_echo "$as_me: WARNING:  Motif/lesstif not found!" >&2;}
@@ -24002,5 +23974,5 @@
 
 		cat > conftest.$ac_ext <<EOF
-#line 24004 "configure"
+#line 23976 "configure"
 #include "confdefs.h"
 #include <qglobal.h>
@@ -25218,29 +25190,29 @@
 
 
-if test "$HAVE_CFITSIO" = yes -a "$HAVE_CCFITS" = yes; then
+if test -z "$HAS_FITS_TRUE"; then :
   $as_echo "#define HAVE_FITS 1" >>confdefs.h
 
 fi
-if test "$ROOTEXEC" != no; then
+if test -z "$HAS_ROOT_TRUE"; then :
   $as_echo "#define HAVE_ROOT 1" >>confdefs.h
 
 fi
-if test "$HAVE_ZLIB" = yes; then
+if test -z "$HAS_ZLIB_TRUE"; then :
   $as_echo "#define HAVE_ZLIB 1" >>confdefs.h
 
 fi
-if test "$HAVE_NOVA" = yes; then
+if test -z "$HAS_NOVA_TRUE"; then :
   $as_echo "#define HAVE_NOVA 1" >>confdefs.h
 
 fi
-if test "$HAVE_DBUS" = yes; then
+if test -z "$HAS_DBUS_TRUE"; then :
   $as_echo "#define HAVE_DBUS 1" >>confdefs.h
 
 fi
-if test "$MYSQLPP_LIB_DIR" -a "$MYSQLPP_INC_DIR" ; then
+if test -z "$HAS_SQL_TRUE"; then :
   $as_echo "#define HAVE_SQL 1" >>confdefs.h
 
 fi
-if test "$HAVE_V8" = yes; then
+if test -z "$HAS_V8_TRUE"; then :
   $as_echo "#define HAVE_V8 1" >>confdefs.h
 
@@ -25420,82 +25392,38 @@
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${DX_COND_doc_TRUE}" && test -z "${DX_COND_doc_FALSE}"; then
-  as_fn_error $? "conditional \"DX_COND_doc\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${DX_COND_dot_TRUE}" && test -z "${DX_COND_dot_FALSE}"; then
   as_fn_error $? "conditional \"DX_COND_dot\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${DX_COND_dot_TRUE}" && test -z "${DX_COND_dot_FALSE}"; then
-  as_fn_error $? "conditional \"DX_COND_dot\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${DX_COND_man_TRUE}" && test -z "${DX_COND_man_FALSE}"; then
   as_fn_error $? "conditional \"DX_COND_man\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${DX_COND_man_TRUE}" && test -z "${DX_COND_man_FALSE}"; then
-  as_fn_error $? "conditional \"DX_COND_man\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${DX_COND_rtf_TRUE}" && test -z "${DX_COND_rtf_FALSE}"; then
   as_fn_error $? "conditional \"DX_COND_rtf\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${DX_COND_rtf_TRUE}" && test -z "${DX_COND_rtf_FALSE}"; then
-  as_fn_error $? "conditional \"DX_COND_rtf\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${DX_COND_xml_TRUE}" && test -z "${DX_COND_xml_FALSE}"; then
   as_fn_error $? "conditional \"DX_COND_xml\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${DX_COND_xml_TRUE}" && test -z "${DX_COND_xml_FALSE}"; then
-  as_fn_error $? "conditional \"DX_COND_xml\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${DX_COND_chm_TRUE}" && test -z "${DX_COND_chm_FALSE}"; then
   as_fn_error $? "conditional \"DX_COND_chm\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${DX_COND_chm_TRUE}" && test -z "${DX_COND_chm_FALSE}"; then
-  as_fn_error $? "conditional \"DX_COND_chm\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${DX_COND_chi_TRUE}" && test -z "${DX_COND_chi_FALSE}"; then
   as_fn_error $? "conditional \"DX_COND_chi\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${DX_COND_chi_TRUE}" && test -z "${DX_COND_chi_FALSE}"; then
-  as_fn_error $? "conditional \"DX_COND_chi\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${DX_COND_html_TRUE}" && test -z "${DX_COND_html_FALSE}"; then
   as_fn_error $? "conditional \"DX_COND_html\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${DX_COND_html_TRUE}" && test -z "${DX_COND_html_FALSE}"; then
-  as_fn_error $? "conditional \"DX_COND_html\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${DX_COND_ps_TRUE}" && test -z "${DX_COND_ps_FALSE}"; then
   as_fn_error $? "conditional \"DX_COND_ps\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${DX_COND_ps_TRUE}" && test -z "${DX_COND_ps_FALSE}"; then
-  as_fn_error $? "conditional \"DX_COND_ps\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${DX_COND_pdf_TRUE}" && test -z "${DX_COND_pdf_FALSE}"; then
   as_fn_error $? "conditional \"DX_COND_pdf\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${DX_COND_pdf_TRUE}" && test -z "${DX_COND_pdf_FALSE}"; then
-  as_fn_error $? "conditional \"DX_COND_pdf\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${DX_COND_latex_TRUE}" && test -z "${DX_COND_latex_FALSE}"; then
-  as_fn_error $? "conditional \"DX_COND_latex\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
@@ -28020,5 +27948,5 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
 $as_echo "$as_me: " >&6;}
-if test "$MYSQLPP_LIB_DIR" -a "$MYSQLPP_INC_DIR" ; then
+if test -z "$HAS_SQL_TRUE"; then :
 
    { $as_echo "$as_me:${as_lineno-$LINENO}: --------------------------------------------------------------------" >&5
@@ -28034,5 +27962,5 @@
 
 fi
-if test "$QT4_VERSION"; then
+if test -z "$HAS_QT4_TRUE"; then :
 
    { $as_echo "$as_me:${as_lineno-$LINENO}: --------------------------------------------------------------------" >&5
@@ -28062,5 +27990,5 @@
 
 fi
-if test "$ROOTEXEC" != no; then
+if test -z "$HAS_ROOT_TRUE"; then :
 
    { $as_echo "$as_me:${as_lineno-$LINENO}: --------------------------------------------------------------------" >&5
@@ -28110,5 +28038,5 @@
 { $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
+if test -z "$HAS_SQL_TRUE"; 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;}
@@ -28120,5 +28048,5 @@
 { $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;}
-if test "$lt_cv_libxp" = "yes"; then
+if test -z "$HAS_LIBXP_TRUE"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}:  Motif/lesstif          / 'Xm/Xm.h' 'libXp'  found: yes" >&5
 $as_echo "$as_me:  Motif/lesstif          / 'Xm/Xm.h' 'libXp'  found: yes" >&6;}
@@ -28129,5 +28057,5 @@
 fi
 
-if test "$lt_cv_libxp" = "yes"; then
+if test -z "$HAS_LIBXP_TRUE"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}:  Motif/lesstif          / 'Xm/Xm.h' 'libXp'  found: yes" >&5
 $as_echo "$as_me:  Motif/lesstif          / 'Xm/Xm.h' 'libXp'  found: yes" >&6;}
@@ -28137,5 +28065,5 @@
 
 fi
-if test "$COLORDIFF" = colordiff; then
+if test -z "$HAS_COLORDIFF_TRUE"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}:  colored svn diff       / 'colordiff'        found: yes" >&5
 $as_echo "$as_me:  colored svn diff       / 'colordiff'        found: yes" >&6;}
@@ -28145,9 +28073,9 @@
 
 fi
-if test "$HELP2MAN" = yes; then
+if test -z "$HAS_HELP2MAN_TRUE"; then :
 
    { $as_echo "$as_me:${as_lineno-$LINENO}:  man-pages enabled      / 'help2man'         found: $HELP2MAN" >&5
 $as_echo "$as_me:  man-pages enabled      / 'help2man'         found: $HELP2MAN" >&6;}
-   if test "$GROFF" = yes; then
+   if test -z "$HAS_GROFF_TRUE"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}:  build of html enabled  / 'groff'            found: yes" >&5
 $as_echo "$as_me:  build of html enabled  / 'groff'            found: yes" >&6;}
@@ -28167,5 +28095,5 @@
 fi
 
-if test "$DX_DOXYGEN"; then
+if test -z "$HAS_DOXYGEN_TRUE"; 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;}
@@ -28175,5 +28103,5 @@
 
 fi
-if test "$DX_DOT"; then
+if test -z "$HAS_DOT_TRUE"; 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;}
@@ -28183,5 +28111,5 @@
 
 fi
-if test "$QT4_VERSION"; then
+if test -z "$HAS_QT4_TRUE"; 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;}
@@ -28193,5 +28121,5 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}:  ROOT support enabled   /  root >= 5.12/00   found: $ROOTEXEC" >&5
 $as_echo "$as_me:  ROOT support enabled   /  root >= 5.12/00   found: $ROOTEXEC" >&6;}
-if test "$HAVE_ROOT_QT" = yes; then
+if test -z "$HAS_ROOT_QT_TRUE"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}:  ROOT built with --with-qt                   found: yes" >&5
 $as_echo "$as_me:  ROOT built with --with-qt                   found: yes" >&6;}
@@ -28217,7 +28145,6 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}:    it does most probably not work." >&5
 $as_echo "$as_me:    it does most probably not work." >&6;}
-if test "$COLORGCC"; then
-  :
-else
+if test -z "$HAS_COLORGCC_TRUE"; then :
+  else
   { $as_echo "$as_me:${as_lineno-$LINENO}:  - Install colorgcc to get colored compiler output." >&5
 $as_echo "$as_me:  - Install colorgcc to get colored compiler output." >&6;}
@@ -28242,5 +28169,5 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}:  diff:          colored 'svn diff' if colordiff is installed" >&5
 $as_echo "$as_me:  diff:          colored 'svn diff' if colordiff is installed" >&6;}
-if test "$HELP2MAN" = yes; then
+if test -z "$HAS_HELP2MAN_TRUE"; then :
 
    { $as_echo "$as_me:${as_lineno-$LINENO}:  program.man:   build man-page from 'program --help'" >&5
@@ -28248,9 +28175,9 @@
    { $as_echo "$as_me:${as_lineno-$LINENO}:                 (display with 'man ./program.man')" >&5
 $as_echo "$as_me:                 (display with 'man ./program.man')" >&6;}
-   if test "$GROFF" = yes; then
+   if test -z "$HAS_GROFF_TRUE"; then :
 
       { $as_echo "$as_me:${as_lineno-$LINENO}:  program.html:  build html page from man-page" >&5
 $as_echo "$as_me:  program.html:  build html page from man-page" >&6;}
-      if test "$PS2PDF" = yes; then
+      if test -z "$HAS_PS2PDF_TRUE"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}:  program.pdf:   build pdf documentation from man page" >&5
 $as_echo "$as_me:  program.pdf:   build pdf documentation from man page" >&6;}
@@ -28261,5 +28188,5 @@
 
 fi
-if test "$DX_DOXYGEN"; then
+if test -z "$HAS_DOXYGEN_TRUE"; 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;}
@@ -28276,29 +28203,25 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
 $as_echo "$as_me: " >&6;}
-if test "$HAVE_ZLIB" = yes; then
-  :
-else
+if test -z "$HAS_ZLIB_TRUE"; then :
+  else
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  zlib not found. Support for reading .fits.gz disabled." >&5
 $as_echo "$as_me: WARNING:  zlib not found. Support for reading .fits.gz disabled." >&2;}
 
 fi
-if test "$lt_cv_libxp" = "yes"; then
-  :
-else
+if test -z "$HAS_LIBXP_TRUE"; then :
+  else
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  Motif/lesstif not found. The dim gui did will not be built!" >&5
 $as_echo "$as_me: WARNING:  Motif/lesstif not found. The dim gui did will not be built!" >&2;}
 
 fi
-if test "$HAVE_CFITSIO" = yes -a "$HAVE_CCFITS" = yes; then
-  :
-else
+if test -z "$HAS_FITS_TRUE"; then :
+  else
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  FITS support disabled. cfitsio/CCfits missing!" >&5
 $as_echo "$as_me: WARNING:  FITS support disabled. cfitsio/CCfits missing!" >&2;}
 
 fi
-if test "$ROOTEXEC" != no; then
-  if test "$HAVE_ROOT_QT" = yes; then
-  :
-else
+if test -z "$HAS_ROOT_TRUE"; then :
+  if test -z "$HAS_ROOT_QT_TRUE"; then :
+  else
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  root found but it was built without the --with-qt option" >&5
 $as_echo "$as_me: WARNING:  root found but it was built without the --with-qt option" >&2;}
@@ -28307,75 +28230,63 @@
 
 fi
-if test "$QT4_VERSION"; then
-  :
-else
+if test -z "$HAS_QT4_TRUE"; then :
+  else
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  QT4 missing - GUIs disabled!" >&5
 $as_echo "$as_me: WARNING:  QT4 missing - GUIs disabled!" >&2;}
 fi
-if test "$HAVE_GL" = yes; then
-  :
-else
+if test -z "$HAS_GL_TRUE"; then :
+  else
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  GL not found - GUIs will be disabled." >&5
 $as_echo "$as_me: WARNING:  GL not found - GUIs will be disabled." >&2;}
 fi
-if test "$HAVE_GLU" = yes; then
-  :
-else
+if test -z "$HAS_GLU_TRUE"; then :
+  else
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  GLU not found - GUIs will be disabled." >&5
 $as_echo "$as_me: WARNING:  GLU not found - GUIs will be disabled." >&2;}
 fi
-if test "$HAVE_QGL" = yes; then
-  :
-else
+if test -z "$HAS_QGL_TRUE"; then :
+  else
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  QtOpenGl not found - GUIs will be disabled." >&5
 $as_echo "$as_me: WARNING:  QtOpenGl not found - GUIs will be disabled." >&2;}
 fi
-if test "$HAVE_QWT" = yes; then
-  :
-else
+if test -z "$HAS_QWT_TRUE"; then :
+  else
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  Qwt not found - viewer will be disabled." >&5
 $as_echo "$as_me: WARNING:  Qwt not found - viewer will be disabled." >&2;}
 fi
-if test "$QT4_VERSION" -a "$HAVE_GL" = yes -a "$HAVE_GLU" = yes -a "$HAVE_QGL" = yes -a "$HAVE_ROOT_QT" = yes ; then
-  :
-else
+if test -z "$HAS_GUI_TRUE"; then :
+  else
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  Either of the necessary packages not found - fact GUI disabled!" >&5
 $as_echo "$as_me: WARNING:  Either of the necessary packages not found - fact GUI disabled!" >&2;}
 
 fi
-if test "$QT4_VERSION" -a "$HAVE_GL" = yes -a "$HAVE_GLU" = yes -a "$HAVE_QGL" = yes -a "$HAVE_QWT" = yes; then
-  :
-else
+if test -z "$HAS_VIEWER_TRUE"; then :
+  else
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  Either of the necessary packages not found - viewer GUI disabled!" >&5
 $as_echo "$as_me: WARNING:  Either of the necessary packages not found - viewer GUI disabled!" >&2;}
 
 fi
-if test "$MYSQLPP_LIB_DIR" -a "$MYSQLPP_INC_DIR" ; then
-  :
-else
+if test -z "$HAS_SQL_TRUE"; 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
-  :
-else
+if test -z "$HAS_NOVA_TRUE"; then :
+  else
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  libnova missing - smartfact will be compiles without astronomy support!" >&5
 $as_echo "$as_me: WARNING:  libnova missing - smartfact will be compiles without astronomy support!" >&2;}
 fi
-if test "$HAVE_V8" = yes; then
-  :
-else
+if test -z "$HAS_V8_TRUE"; then :
+  else
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  libv8 missing - JavaScript support will be disabled!" >&5
 $as_echo "$as_me: WARNING:  libv8 missing - JavaScript support will be disabled!" >&2;}
 fi
-if test "$HAVE_DBUS" = yes; then
-  :
-else
+if test -z "$HAS_DBUS_TRUE"; then :
+  else
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  DBus libraries missing - skypeclient will not be compiled!" >&5
 $as_echo "$as_me: WARNING:  DBus libraries missing - skypeclient will not be compiled!" >&2;}
 fi
-if test "$HAVE_SOPRANO" = yes; then
-  :
-else
+if test -z "$HAS_SOPRANO_TRUE"; then :
+  else
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  Soprano libraries missing - tngweather will not be compiled!" >&5
 $as_echo "$as_me: WARNING:  Soprano libraries missing - tngweather will not be compiled!" >&2;}
