Index: /trunk/FACT++/.aux_dir/config.guess
===================================================================
--- /trunk/FACT++/.aux_dir/config.guess	(revision 14327)
+++ /trunk/FACT++/.aux_dir/config.guess	(revision 14328)
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011 Free Software Foundation, Inc.
-
-timestamp='2011-05-11'
+#   2011, 2012 Free Software Foundation, Inc.
+
+timestamp='2012-02-10'
 
 # This file is free software; you can redistribute it and/or modify it
@@ -18,7 +18,5 @@
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
@@ -58,6 +56,6 @@
 Originally written by Per Bothner.
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -146,5 +144,5 @@
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
@@ -793,11 +791,10 @@
 	exit ;;
     *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case ${UNAME_PROCESSOR} in
 	    amd64)
 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	esac
 	exit ;;
@@ -807,4 +804,7 @@
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
+	exit ;;
+    i*:MSYS*:*)
+	echo ${UNAME_MACHINE}-pc-msys
 	exit ;;
     i*:windows32*:*)
@@ -862,4 +862,11 @@
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    aarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -896,11 +903,14 @@
 	exit ;;
     cris:Linux:*:*)
-	echo cris-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-gnu
 	exit ;;
     crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
-	echo frv-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    hexagon:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:Linux:*:*)
@@ -944,5 +954,5 @@
 	;;
     or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     padre:Linux:*:*)
@@ -979,5 +989,5 @@
 	exit ;;
     tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-tilera-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     vax:Linux:*:*)
@@ -985,5 +995,5 @@
 	exit ;;
     x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     xtensa*:Linux:*:*)
@@ -1316,4 +1326,7 @@
 	echo ${UNAME_MACHINE}-pc-aros
 	exit ;;
+    x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
+	exit ;;
 esac
 
Index: /trunk/FACT++/.aux_dir/config.sub
===================================================================
--- /trunk/FACT++/.aux_dir/config.sub	(revision 14327)
+++ /trunk/FACT++/.aux_dir/config.sub	(revision 14328)
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011 Free Software Foundation, Inc.
-
-timestamp='2011-03-23'
+#   2011, 2012 Free Software Foundation, Inc.
+
+timestamp='2012-02-10'
 
 # This file is (in principle) common to ALL GNU software.
@@ -22,7 +22,5 @@
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
@@ -77,6 +75,6 @@
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -133,4 +131,8 @@
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    ;;
   *)
     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
@@ -248,15 +250,20 @@
 	1750a | 580 \
 	| a29k \
+	| aarch64 | aarch64_be \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+        | be32 | be64 \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
+	| epiphany \
 	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
@@ -292,5 +299,5 @@
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
-	| rx \
+	| rl78 | rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
@@ -301,5 +308,5 @@
 	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
-	| v850 | v850e \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
 	| we32k \
 	| x86 | xc16x | xstormy16 | xtensa \
@@ -316,6 +323,5 @@
 		basic_machine=tic6x-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
-		# Motorola 68HC11/12.
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
@@ -330,5 +336,8 @@
 		basic_machine=arm-unknown
 		;;
-
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
 	xscaleeb)
 		basic_machine=armeb-unknown
@@ -353,4 +362,5 @@
 	580-* \
 	| a29k-* \
+	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
@@ -358,4 +368,5 @@
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
+	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
@@ -366,6 +377,8 @@
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
@@ -401,5 +414,5 @@
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
-	| romp-* | rs6000-* | rx-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
@@ -409,8 +422,9 @@
 	| tahoe-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile-* | tilegx-* \
+	| tile*-* \
 	| tron-* \
 	| ubicom32-* \
-	| v850-* | v850e-* | vax-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* \
@@ -712,5 +726,4 @@
 		basic_machine=i370-ibm
 		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
 	i*86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
@@ -809,7 +822,15 @@
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
+	msys)
+		basic_machine=i386-pc
+		os=-msys
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
+		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
 		;;
 	ncr3000)
@@ -1121,11 +1142,6 @@
 		os=-unicos
 		;;
-	# This must be matched before tile*.
-	tilegx*)
-		basic_machine=tilegx-unknown
-		os=-linux-gnu
-		;;
 	tile*)
-		basic_machine=tile-unknown
+		basic_machine=$basic_machine-unknown
 		os=-linux-gnu
 		;;
@@ -1337,5 +1353,5 @@
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -linux-android* \
 	      | -linux-newlib* | -linux-uclibc* \
@@ -1549,7 +1565,4 @@
 	m68000-sun)
 		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
 		;;
 	m68*-cisco)
Index: /trunk/FACT++/.aux_dir/ltmain.sh
===================================================================
--- /trunk/FACT++/.aux_dir/ltmain.sh	(revision 14327)
+++ /trunk/FACT++/.aux_dir/ltmain.sh	(revision 14328)
@@ -1,8 +1,8 @@
 
-# libtool (GNU libtool) 2.4
+# libtool (GNU libtool) 2.4.2
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -42,4 +42,5 @@
 #       --no-quiet, --no-silent
 #                            print informational messages (default)
+#       --no-warn            don't display warning messages
 #       --tag=TAG            use configuration variables from tag TAG
 #   -v, --verbose            print more informational messages than default
@@ -70,5 +71,5 @@
 #         compiler flags:		$LTCFLAGS
 #         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4 Debian-2.4-2ubuntu1
+#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1
 #         automake:	$automake_version
 #         autoconf:	$autoconf_version
@@ -80,7 +81,7 @@
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.4 Debian-2.4-2ubuntu1"
+VERSION="2.4.2 Debian-2.4.2-1ubuntu1"
 TIMESTAMP=""
-package_revision=1.3293
+package_revision=1.3337
 
 # Be Bourne compatible
@@ -137,13 +138,8 @@
 : ${CP="cp -f"}
 test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
-: ${EGREP="/bin/grep -E"}
-: ${FGREP="/bin/grep -F"}
-: ${GREP="/bin/grep"}
-: ${LN_S="ln -s"}
 : ${MAKE="make"}
 : ${MKDIR="mkdir"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
-: ${SED="/bin/sed"}
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
 : ${Xsed="$SED -e 1s/^X//"}
@@ -388,5 +384,5 @@
   *)
      save_IFS="$IFS"
-     IFS=:
+     IFS=${PATH_SEPARATOR-:}
      for progdir in $PATH; do
        IFS="$save_IFS"
@@ -772,6 +768,6 @@
 	s*\$LD*'"$LD"'*
 	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
+	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
 	p
 	d
@@ -1053,4 +1049,5 @@
 opt_help_all=false
 opt_silent=:
+opt_warning=:
 opt_verbose=:
 opt_silent=false
@@ -1119,4 +1116,8 @@
       --no-silent|--no-quiet)
 			opt_silent=false
+func_append preserve_args " $opt"
+			;;
+      --no-warning|--no-warn)
+			opt_warning=false
 func_append preserve_args " $opt"
 			;;
@@ -2060,5 +2061,5 @@
     *.ada | *.adb | *.ads | *.asm | \
     *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
+    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
       func_xform "$libobj"
       libobj=$func_xform_result
@@ -3202,9 +3203,11 @@
       # Set up the ranlib parameters.
       oldlib="$destdir/$name"
+      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+      tool_oldlib=$func_to_tool_file_result
 
       func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
 
       if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $oldlib" 'exit $?'
+	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
       fi
 
@@ -3471,5 +3474,5 @@
 	  # pic_flag when linking with -static.  The problem exists in
 	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
 	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
 	  *-*-hpux*)
@@ -3983,12 +3986,15 @@
 func_exec_program ()
 {
-  for lt_wr_arg
-  do
-    case \$lt_wr_arg in
-    --lt-*) ;;
-    *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
-    esac
-    shift
-  done
+  case \" \$* \" in
+  *\\ --lt-*)
+    for lt_wr_arg
+    do
+      case \$lt_wr_arg in
+      --lt-*) ;;
+      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+      esac
+      shift
+    done ;;
+  esac
   func_exec_program_core \${1+\"\$@\"}
 }
@@ -5058,7 +5064,13 @@
 EOF
 	    func_emit_wrapper yes |
-              $SED -e 's/\([\\"]\)/\\\1/g' \
-	           -e 's/^/  fputs ("/' -e 's/$/\\n", f);/'
-
+	      $SED -n -e '
+s/^\(.\{79\}\)\(..*\)/\1\
+\2/
+h
+s/\([\\"]\)/\\\1/g
+s/$/\\n/
+s/\([^\n]*\).*/  fputs ("\1", f);/p
+g
+D'
             cat <<"EOF"
 }
@@ -5644,5 +5656,6 @@
 	;;
 
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	func_append compiler_flags " $arg"
 	func_append compile_command " $arg"
@@ -6151,5 +6164,6 @@
 	found=no
 	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	  if test "$linkmode,$pass" = "prog,link"; then
 	    compile_deplibs="$deplib $compile_deplibs"
@@ -6702,4 +6716,13 @@
 	    fi
 	  done
+	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
+	    if test "$linkmode" != prog; then
+	    echo
+	    #  $ECHO "*** Warning: Linking the executable $output against the loadable module"
+	    #else
+	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
+	    $ECHO "*** $linklib is not portable!"
+	    fi
+	  fi
 	  if test "$linkmode" = lib &&
 	     test "$hardcode_into_libs" = yes; then
@@ -6826,5 +6849,5 @@
 		add="$dir/$linklib"
 	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
+		add_dir="-L$absdir"
 		# Try looking first in the location we're being installed to.
 		if test -n "$inst_prefix_dir"; then
@@ -7311,4 +7334,5 @@
 	  #
 	  case $version_type in
+	  # correct linux to gnu/linux during the next big refactor
 	  darwin|linux|osf|windows|none)
 	    func_arith $number_major + $number_minor
@@ -7430,5 +7454,5 @@
 	  ;;
 
-	linux)
+	linux) # correct to gnu/linux during the next big refactor
 	  func_arith $current - $age
 	  major=.$func_arith_result
@@ -8018,4 +8042,9 @@
       # Test again, we may have decided not to build it any more
       if test "$build_libtool_libs" = yes; then
+	# Remove ${wl} instances when linking with ld.
+	# FIXME: should test the right _cmds variable.
+	case $archive_cmds in
+	  *\$LD\ *) wl= ;;
+        esac
 	if test "$hardcode_into_libs" = yes; then
 	  # Hardcode the library paths
@@ -8048,5 +8077,5 @@
 	      case "$perm_rpath " in
 	      *" $libdir "*) ;;
-	      *) func_apped perm_rpath " $libdir" ;;
+	      *) func_append perm_rpath " $libdir" ;;
 	      esac
 	    fi
@@ -8056,9 +8085,5 @@
 	     test -n "$hardcode_libdirs"; then
 	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
+	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
 	  fi
 	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
@@ -9150,4 +9175,6 @@
 	  done
 	fi
+	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+	tool_oldlib=$func_to_tool_file_result
 	eval cmds=\"$old_archive_cmds\"
 
@@ -9259,5 +9286,6 @@
 		func_basename "$deplib"
 		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		func_resolve_sysroot "$deplib"
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
 		test -z "$libdir" && \
 		  func_fatal_error "\`$deplib' is not a valid libtool archive"
Index: /trunk/FACT++/.macro_dir/ltversion.m4
===================================================================
--- /trunk/FACT++/.macro_dir/ltversion.m4	(revision 14327)
+++ /trunk/FACT++/.macro_dir/ltversion.m4	(revision 14328)
@@ -10,13 +10,13 @@
 # @configure_input@
 
-# serial 3293 ltversion.m4
+# serial 3337 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.4])
-m4_define([LT_PACKAGE_REVISION], [1.3293])
+m4_define([LT_PACKAGE_VERSION], [2.4.2])
+m4_define([LT_PACKAGE_REVISION], [1.3337])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4'
-macro_revision='1.3293'
+[macro_version='2.4.2'
+macro_revision='1.3337'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
Index: /trunk/FACT++/aclocal.m4
===================================================================
--- /trunk/FACT++/aclocal.m4	(revision 14327)
+++ /trunk/FACT++/aclocal.m4	(revision 14328)
@@ -1,6 +1,7 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+# Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1372,5 +1373,5 @@
 #   warranty.
 
-#serial 11
+#serial 12
 
 
@@ -1476,10 +1477,9 @@
     :
 fi
+AM_CONDITIONAL(DX_COND_$1, DX_TEST_FEATURE([$1]))
 if DX_TEST_FEATURE([$1]); then
-    AM_CONDITIONAL(DX_COND_$1, :)
     $6
     :
 else
-    AM_CONDITIONAL(DX_COND_$1, false)
     $7
     :
@@ -1604,9 +1604,8 @@
 
 # LaTeX generation for PS and/or PDF:
+AM_CONDITIONAL(DX_COND_latex, DX_TEST_FEATURE(ps) || DX_TEST_FEATURE(pdf))
 if DX_TEST_FEATURE(ps) || DX_TEST_FEATURE(pdf); then
-    AM_CONDITIONAL(DX_COND_latex, :)
     DX_ENV_APPEND(GENERATE_LATEX, YES)
 else
-    AM_CONDITIONAL(DX_COND_latex, false)
     DX_ENV_APPEND(GENERATE_LATEX, NO)
 fi
@@ -1726,5 +1725,5 @@
 #   exception to the GPL to apply to your modified version as well.
 
-#serial 14
+#serial 16
 
 AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
@@ -1909,6 +1908,6 @@
         AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
             ax_cv_PTHREAD_PRIO_INHERIT, [
-                AC_LINK_IFELSE(
-                    AC_LANG_PROGRAM([[#include <pthread.h>]], [[int i = PTHREAD_PRIO_INHERIT;]]),
+                AC_LINK_IFELSE([
+                    AC_LANG_PROGRAM([[#include <pthread.h>]], [[int i = PTHREAD_PRIO_INHERIT;]])],
                     [ax_cv_PTHREAD_PRIO_INHERIT=yes],
                     [ax_cv_PTHREAD_PRIO_INHERIT=no])
@@ -2105,9 +2104,12 @@
 ])# PKG_CHECK_MODULES
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
+# Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
+
+# serial 1
 
 # AM_AUTOMAKE_VERSION(VERSION)
@@ -2120,5 +2122,5 @@
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.1], [],
+m4_if([$1], [1.11.3], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
@@ -2136,5 +2138,5 @@
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.1])dnl
+[AM_AUTOMAKE_VERSION([1.11.3])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
@@ -2143,9 +2145,11 @@
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
+
+# serial 1
 
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
@@ -2196,5 +2200,5 @@
 # AM_COND_IF                                            -*- Autoconf -*-
 
-# Copyright (C) 2008 Free Software Foundation, Inc.
+# Copyright (C) 2008, 2010 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
@@ -2202,5 +2206,5 @@
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
+# serial 3
 
 # _AM_COND_IF
@@ -2216,13 +2220,13 @@
 # AM_COND_IF(COND, [IF-TRUE], [IF-FALSE])
 # ---------------------------------------
-# If the shell condition matching COND is true, execute IF-TRUE,
-# otherwise execute IF-FALSE.  Allow automake to learn about conditional
-# instantiating macros (the AC_CONFIG_FOOS).
+# If the shell condition COND is true, execute IF-TRUE, otherwise execute
+# IF-FALSE.  Allow automake to learn about conditional instantiating macros
+# (the AC_CONFIG_FOOS).
 AC_DEFUN([AM_COND_IF],
 [m4_ifndef([_AM_COND_VALUE_$1],
 	   [m4_fatal([$0: no such condition "$1"])])dnl
 _AM_COND_IF([$1])dnl
-if _AM_COND_VALUE_$1; then
-  m4_default([$2], [:])
+if test -z "$$1_TRUE"; then :
+  m4_n([$2])[]dnl
 m4_ifval([$3],
 [_AM_COND_ELSE([$1])dnl
@@ -2270,6 +2274,6 @@
 fi])])
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
+# 2010, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
@@ -2277,5 +2281,5 @@
 # with or without modifications, as long as this notice is preserved.
 
-# serial 10
+# serial 12
 
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
@@ -2317,4 +2321,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
@@ -2381,5 +2386,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
@@ -2446,8 +2451,11 @@
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
 AC_SUBST([AMDEPBACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
 ])
 
@@ -2671,9 +2679,12 @@
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
+# Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
+
+# serial 1
 
 # AM_PROG_INSTALL_SH
@@ -2843,9 +2854,12 @@
 ])
 
-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
+# Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
+
+# serial 1
 
 # AM_PROG_MKDIR_P
@@ -2871,5 +2885,6 @@
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
+# Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
@@ -2877,5 +2892,5 @@
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 5
 
 # _AM_MANGLE_OPTION(NAME)
@@ -2885,5 +2900,5 @@
 
 # _AM_SET_OPTION(NAME)
-# ------------------------------
+# --------------------
 # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
@@ -2891,5 +2906,5 @@
 
 # _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
+# ------------------------
 # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN([_AM_SET_OPTIONS],
@@ -2967,5 +2982,5 @@
 AC_MSG_RESULT(yes)])
 
-# Copyright (C) 2009  Free Software Foundation, Inc.
+# Copyright (C) 2009, 2011  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
@@ -2973,5 +2988,5 @@
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
+# serial 2
 
 # AM_SILENT_RULES([DEFAULT])
@@ -2988,4 +3003,34 @@
 *)   AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
 esac
+dnl
+dnl A few `make' implementations (e.g., NonStop OS and NextStep)
+dnl do not support nested variable expansions.
+dnl See automake bug#9928 and bug#10237.
+am_make=${MAKE-make}
+AC_CACHE_CHECK([whether $am_make supports nested variables],
+   [am_cv_make_support_nested_variables],
+   [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])
+if test $am_cv_make_support_nested_variables = yes; then
+  dnl Using `$V' instead of `$(V)' breaks IRIX make.
+  AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
 AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
 AM_BACKSLASH='\'
@@ -2994,9 +3039,11 @@
 ])
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
+
+# serial 1
 
 # AM_PROG_INSTALL_STRIP
@@ -3022,5 +3069,5 @@
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
@@ -3028,5 +3075,5 @@
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
+# serial 3
 
 # _AM_SUBST_NOTMAKE(VARIABLE)
@@ -3037,5 +3084,5 @@
 
 # AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
+# --------------------------
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
@@ -3043,5 +3090,5 @@
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
@@ -3065,8 +3112,9 @@
 #     $(am__untar) < result.tar
 AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
+[# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
 m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
      [m4_case([$1], [ustar],, [pax],,
               [m4_fatal([Unknown tar format])])
Index: /trunk/FACT++/configure
===================================================================
--- /trunk/FACT++/configure	(revision 14327)
+++ /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;}