diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 2fe9376..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/cvc3-2.4.1.tar.gz
diff --git a/cvc3-aarch64.patch b/cvc3-aarch64.patch
deleted file mode 100644
index 657d572..0000000
--- a/cvc3-aarch64.patch
+++ /dev/null
@@ -1,1572 +0,0 @@
---- ./config.guess.orig 2009-03-05 16:36:32.000000000 -0700
-+++ ./config.guess 2013-04-29 17:53:51.985667590 -0600
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
--# Free Software Foundation, Inc.
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-+# 2011, 2012 Free Software Foundation, Inc.
-
--timestamp='2008-01-23'
-+timestamp='2012-09-25'
-
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -17,9 +17,7 @@ timestamp='2008-01-23'
- # General Public License for more details.
- #
- # 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 .
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-@@ -27,16 +25,16 @@ timestamp='2008-01-23'
- # the same distribution terms that you use for the rest of that program.
-
-
--# Originally written by Per Bothner .
--# Please send patches to . Submit a context
--# diff and a properly formatted ChangeLog entry.
-+# Originally written by Per Bothner. Please send patches (context
-+# diff format) to and include a ChangeLog
-+# entry.
- #
- # This script attempts to guess a canonical system name similar to
- # config.sub. If it succeeds, it prints the system name on stdout, and
- # exits with 0. Otherwise, it exits with 1.
- #
--# The plan is that this can be called by configure scripts if you
--# don't specify an explicit build system type.
-+# You can get the latest version of this script from:
-+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-
- me=`echo "$0" | sed -e 's,.*/,,'`
-
-@@ -56,8 +54,9 @@ version="\
- GNU config.guess ($timestamp)
-
- Originally written by Per Bothner.
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
--2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-+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
- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -144,7 +143,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` |
- case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- *: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
- # object file format. This provides both forward
-@@ -170,7 +169,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
- arm*|i386|m68k|ns32k|sh3*|sparc|vax)
- eval $set_cc_for_build
- if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-- | grep __ELF__ >/dev/null
-+ | grep -q __ELF__
- then
- # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
- # Return netbsd for either. FIX?
-@@ -180,7 +179,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
- fi
- ;;
- *)
-- os=netbsd
-+ os=netbsd
- ;;
- esac
- # The OS release
-@@ -201,6 +200,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
- # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- echo "${machine}-${os}${release}"
- exit ;;
-+ *:Bitrig:*:*)
-+ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
-+ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
-+ exit ;;
- *:OpenBSD:*:*)
- UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
- echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-@@ -223,7 +226,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
- ;;
- *5.*)
-- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
- ;;
- esac
- # According to Compaq, /usr/sbin/psrinfo has been available on
-@@ -269,7 +272,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
- # A Xn.n version is an unreleased experimental baselevel.
- # 1.2 uses "1.2" for uname -r.
- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-- exit ;;
-+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
-+ exitcode=$?
-+ trap '' 0
-+ exit $exitcode ;;
- Alpha\ *:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
- # Should we change UNAME_MACHINE based on the output of uname instead
-@@ -295,12 +301,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
- echo s390-ibm-zvmoe
- exit ;;
- *:OS400:*:*)
-- echo powerpc-ibm-os400
-+ echo powerpc-ibm-os400
- exit ;;
- arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- echo arm-acorn-riscix${UNAME_RELEASE}
- exit ;;
-- arm:riscos:*:*|arm:RISCOS:*:*)
-+ arm*:riscos:*:*|arm*:RISCOS:*:*)
- echo arm-unknown-riscos
- exit ;;
- SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-@@ -324,14 +330,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
- case `/usr/bin/uname -p` in
- sparc) echo sparc-icl-nx7; exit ;;
- esac ;;
-+ s390x:SunOS:*:*)
-+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+ exit ;;
- sun4H:SunOS:5.*:*)
- echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
-+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-+ echo i386-pc-auroraux${UNAME_RELEASE}
-+ exit ;;
- i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+ eval $set_cc_for_build
-+ SUN_ARCH="i386"
-+ # If there is a compiler, see if it is configured for 64-bit objects.
-+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-+ # This test works for both compilers.
-+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-+ grep IS_64BIT_ARCH >/dev/null
-+ then
-+ SUN_ARCH="x86_64"
-+ fi
-+ fi
-+ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- sun4*:SunOS:6*:*)
- # According to config.sub, this is the proper way to canonicalize
-@@ -375,23 +400,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
- # MiNT. But MiNT is downward compatible to TOS, so this should
- # be no problem.
- atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-- echo m68k-atari-mint${UNAME_RELEASE}
-+ echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
- atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
-- exit ;;
-+ exit ;;
- *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-- echo m68k-atari-mint${UNAME_RELEASE}
-+ echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
- milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-- echo m68k-milan-mint${UNAME_RELEASE}
-- exit ;;
-+ echo m68k-milan-mint${UNAME_RELEASE}
-+ exit ;;
- hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-- echo m68k-hades-mint${UNAME_RELEASE}
-- exit ;;
-+ echo m68k-hades-mint${UNAME_RELEASE}
-+ exit ;;
- *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-- echo m68k-unknown-mint${UNAME_RELEASE}
-- exit ;;
-+ echo m68k-unknown-mint${UNAME_RELEASE}
-+ exit ;;
- m68k:machten:*:*)
- echo m68k-apple-machten${UNAME_RELEASE}
- exit ;;
-@@ -461,8 +486,8 @@ EOF
- echo m88k-motorola-sysv3
- exit ;;
- AViiON:dgux:*:*)
-- # DG/UX returns AViiON for all architectures
-- UNAME_PROCESSOR=`/usr/bin/uname -p`
-+ # DG/UX returns AViiON for all architectures
-+ UNAME_PROCESSOR=`/usr/bin/uname -p`
- if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
- then
- if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-@@ -475,7 +500,7 @@ EOF
- else
- echo i586-dg-dgux${UNAME_RELEASE}
- fi
-- exit ;;
-+ exit ;;
- M88*:DolphinOS:*:*) # DolphinOS (SVR3)
- echo m88k-dolphin-sysv3
- exit ;;
-@@ -532,7 +557,7 @@ EOF
- echo rs6000-ibm-aix3.2
- fi
- exit ;;
-- *:AIX:*:[456])
-+ *:AIX:*:[4567])
- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
- IBM_ARCH=rs6000
-@@ -575,52 +600,52 @@ EOF
- 9000/[678][0-9][0-9])
- if [ -x /usr/bin/getconf ]; then
- sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-- case "${sc_cpu_version}" in
-- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-- 532) # CPU_PA_RISC2_0
-- case "${sc_kernel_bits}" in
-- 32) HP_ARCH="hppa2.0n" ;;
-- 64) HP_ARCH="hppa2.0w" ;;
-+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-+ case "${sc_cpu_version}" in
-+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-+ 532) # CPU_PA_RISC2_0
-+ case "${sc_kernel_bits}" in
-+ 32) HP_ARCH="hppa2.0n" ;;
-+ 64) HP_ARCH="hppa2.0w" ;;
- '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
-- esac ;;
-- esac
-+ esac ;;
-+ esac
- fi
- if [ "${HP_ARCH}" = "" ]; then
- eval $set_cc_for_build
-- sed 's/^ //' << EOF >$dummy.c
-+ sed 's/^ //' << EOF >$dummy.c
-
-- #define _HPUX_SOURCE
-- #include
-- #include
-+ #define _HPUX_SOURCE
-+ #include
-+ #include
-
-- int main ()
-- {
-- #if defined(_SC_KERNEL_BITS)
-- long bits = sysconf(_SC_KERNEL_BITS);
-- #endif
-- long cpu = sysconf (_SC_CPU_VERSION);
-+ int main ()
-+ {
-+ #if defined(_SC_KERNEL_BITS)
-+ long bits = sysconf(_SC_KERNEL_BITS);
-+ #endif
-+ long cpu = sysconf (_SC_CPU_VERSION);
-
-- switch (cpu)
-- {
-- case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-- case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-- case CPU_PA_RISC2_0:
-- #if defined(_SC_KERNEL_BITS)
-- switch (bits)
-- {
-- case 64: puts ("hppa2.0w"); break;
-- case 32: puts ("hppa2.0n"); break;
-- default: puts ("hppa2.0"); break;
-- } break;
-- #else /* !defined(_SC_KERNEL_BITS) */
-- puts ("hppa2.0"); break;
-- #endif
-- default: puts ("hppa1.0"); break;
-- }
-- exit (0);
-- }
-+ switch (cpu)
-+ {
-+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-+ case CPU_PA_RISC2_0:
-+ #if defined(_SC_KERNEL_BITS)
-+ switch (bits)
-+ {
-+ case 64: puts ("hppa2.0w"); break;
-+ case 32: puts ("hppa2.0n"); break;
-+ default: puts ("hppa2.0"); break;
-+ } break;
-+ #else /* !defined(_SC_KERNEL_BITS) */
-+ puts ("hppa2.0"); break;
-+ #endif
-+ default: puts ("hppa1.0"); break;
-+ }
-+ exit (0);
-+ }
- EOF
- (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
- test -z "$HP_ARCH" && HP_ARCH=hppa
-@@ -640,7 +665,7 @@ EOF
- # => hppa64-hp-hpux11.23
-
- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-- grep __LP64__ >/dev/null
-+ grep -q __LP64__
- then
- HP_ARCH="hppa2.0w"
- else
-@@ -711,22 +736,22 @@ EOF
- exit ;;
- C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
- echo c1-convex-bsd
-- exit ;;
-+ exit ;;
- C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
- if getsysinfo -f scalar_acc
- then echo c32-convex-bsd
- else echo c2-convex-bsd
- fi
-- exit ;;
-+ exit ;;
- C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
- echo c34-convex-bsd
-- exit ;;
-+ exit ;;
- C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
- echo c38-convex-bsd
-- exit ;;
-+ exit ;;
- C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
- echo c4-convex-bsd
-- exit ;;
-+ exit ;;
- CRAY*Y-MP:*:*:*)
- echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit ;;
-@@ -750,14 +775,14 @@ EOF
- exit ;;
- F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
- FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-- exit ;;
-+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+ exit ;;
- 5000:UNIX_System_V:4.*:*)
-- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit ;;
- i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
- echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-@@ -769,34 +794,39 @@ EOF
- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
- 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 ;;
- i*:CYGWIN*:*)
- echo ${UNAME_MACHINE}-pc-cygwin
- exit ;;
-+ *:MINGW64*:*)
-+ echo ${UNAME_MACHINE}-pc-mingw64
-+ exit ;;
- *:MINGW*:*)
- echo ${UNAME_MACHINE}-pc-mingw32
- exit ;;
-+ i*:MSYS*:*)
-+ echo ${UNAME_MACHINE}-pc-msys
-+ exit ;;
- i*:windows32*:*)
-- # uname -m includes "-pc" on this system.
-- echo ${UNAME_MACHINE}-mingw32
-+ # uname -m includes "-pc" on this system.
-+ echo ${UNAME_MACHINE}-mingw32
- exit ;;
- i*:PW*:*)
- echo ${UNAME_MACHINE}-pc-pw32
- exit ;;
-- *:Interix*:[3456]*)
-- case ${UNAME_MACHINE} in
-+ *:Interix*:*)
-+ case ${UNAME_MACHINE} in
- x86)
- echo i586-pc-interix${UNAME_RELEASE}
- exit ;;
-- EM64T | authenticamd)
-+ authenticamd | genuineintel | EM64T)
- echo x86_64-unknown-interix${UNAME_RELEASE}
- exit ;;
- IA64)
-@@ -806,6 +836,9 @@ EOF
- [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- echo i${UNAME_MACHINE}-pc-mks
- exit ;;
-+ 8664:Windows_NT:*)
-+ echo x86_64-pc-mks
-+ exit ;;
- i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
- # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-@@ -835,6 +868,27 @@ EOF
- i*86:Minix:*:*)
- 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
-+ EV5) UNAME_MACHINE=alphaev5 ;;
-+ EV56) UNAME_MACHINE=alphaev56 ;;
-+ PCA56) UNAME_MACHINE=alphapca56 ;;
-+ PCA57) UNAME_MACHINE=alphapca56 ;;
-+ EV6) UNAME_MACHINE=alphaev6 ;;
-+ EV67) UNAME_MACHINE=alphaev67 ;;
-+ EV68*) UNAME_MACHINE=alphaev68 ;;
-+ esac
-+ objdump --private-headers /bin/sh | grep -q ld.so.1
-+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-+ exit ;;
- arm*:Linux:*:*)
- eval $set_cc_for_build
- if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-@@ -842,20 +896,40 @@ EOF
- then
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- else
-- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
-+ | grep -q __ARM_PCS_VFP
-+ then
-+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-+ else
-+ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
-+ fi
- fi
- exit ;;
- avr32*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- 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:*:*)
-+ LIBC=gnu
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+ #ifdef __dietlibc__
-+ LIBC=dietlibc
-+ #endif
-+EOF
-+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
- exit ;;
- ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
-@@ -866,74 +940,33 @@ EOF
- m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
-- mips:Linux:*:*)
-- eval $set_cc_for_build
-- sed 's/^ //' << EOF >$dummy.c
-- #undef CPU
-- #undef mips
-- #undef mipsel
-- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-- CPU=mipsel
-- #else
-- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-- CPU=mips
-- #else
-- CPU=
-- #endif
-- #endif
--EOF
-- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-- /^CPU/{
-- s: ::g
-- p
-- }'`"
-- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-- ;;
-- mips64:Linux:*:*)
-+ mips:Linux:*:* | mips64:Linux:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #undef CPU
-- #undef mips64
-- #undef mips64el
-+ #undef ${UNAME_MACHINE}
-+ #undef ${UNAME_MACHINE}el
- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-- CPU=mips64el
-+ CPU=${UNAME_MACHINE}el
- #else
- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-- CPU=mips64
-+ CPU=${UNAME_MACHINE}
- #else
- CPU=
- #endif
- #endif
- EOF
-- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-- /^CPU/{
-- s: ::g
-- p
-- }'`"
-+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- ;;
- or32:Linux:*:*)
-- echo or32-unknown-linux-gnu
-- exit ;;
-- ppc:Linux:*:*)
-- echo powerpc-unknown-linux-gnu
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
-- ppc64:Linux:*:*)
-- echo powerpc64-unknown-linux-gnu
-+ padre:Linux:*:*)
-+ echo sparc-unknown-linux-gnu
- exit ;;
-- alpha:Linux:*:*)
-- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-- EV5) UNAME_MACHINE=alphaev5 ;;
-- EV56) UNAME_MACHINE=alphaev56 ;;
-- PCA56) UNAME_MACHINE=alphapca56 ;;
-- PCA57) UNAME_MACHINE=alphapca56 ;;
-- EV6) UNAME_MACHINE=alphaev6 ;;
-- EV67) UNAME_MACHINE=alphaev67 ;;
-- EV68*) UNAME_MACHINE=alphaev68 ;;
-- esac
-- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-+ parisc64:Linux:*:* | hppa64:Linux:*:*)
-+ echo hppa64-unknown-linux-gnu
- exit ;;
- parisc:Linux:*:* | hppa:Linux:*:*)
- # Look for CPU level
-@@ -943,14 +976,17 @@ EOF
- *) echo hppa-unknown-linux-gnu ;;
- esac
- exit ;;
-- parisc64:Linux:*:* | hppa64:Linux:*:*)
-- echo hppa64-unknown-linux-gnu
-+ ppc64:Linux:*:*)
-+ echo powerpc64-unknown-linux-gnu
-+ exit ;;
-+ ppc:Linux:*:*)
-+ echo powerpc-unknown-linux-gnu
- exit ;;
- s390:Linux:*:* | s390x:Linux:*:*)
- echo ${UNAME_MACHINE}-ibm-linux
- exit ;;
- sh64*:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
-@@ -958,78 +994,18 @@ EOF
- sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
-+ tile*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit ;;
- vax:Linux:*:*)
- echo ${UNAME_MACHINE}-dec-linux-gnu
- exit ;;
- x86_64:Linux:*:*)
-- echo x86_64-unknown-linux-gnu
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- xtensa*:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
-- i*86:Linux:*:*)
-- # The BFD linker knows what the default object file format is, so
-- # first see if it will tell us. cd to the root directory to prevent
-- # problems with other programs or directories called `ld' in the path.
-- # Set LC_ALL=C to ensure ld outputs messages in English.
-- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-- | sed -ne '/supported targets:/!d
-- s/[ ][ ]*/ /g
-- s/.*supported targets: *//
-- s/ .*//
-- p'`
-- case "$ld_supported_targets" in
-- elf32-i386)
-- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-- ;;
-- a.out-i386-linux)
-- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-- exit ;;
-- coff-i386)
-- echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-- exit ;;
-- "")
-- # Either a pre-BFD a.out linker (linux-gnuoldld) or
-- # one that does not give us useful --help.
-- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-- exit ;;
-- esac
-- # Determine whether the default compiler is a.out or elf
-- eval $set_cc_for_build
-- sed 's/^ //' << EOF >$dummy.c
-- #include
-- #ifdef __ELF__
-- # ifdef __GLIBC__
-- # if __GLIBC__ >= 2
-- LIBC=gnu
-- # else
-- LIBC=gnulibc1
-- # endif
-- # else
-- LIBC=gnulibc1
-- # endif
-- #else
-- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-- LIBC=gnu
-- #else
-- LIBC=gnuaout
-- #endif
-- #endif
-- #ifdef __dietlibc__
-- LIBC=dietlibc
-- #endif
--EOF
-- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-- /^LIBC/{
-- s: ::g
-- p
-- }'`"
-- test x"${LIBC}" != x && {
-- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-- exit
-- }
-- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-- ;;
- i*86:DYNIX/ptx:4*:*)
- # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
- # earlier versions are messed up and put the nodename in both
-@@ -1037,11 +1013,11 @@ EOF
- echo i386-sequent-sysv4
- exit ;;
- i*86:UNIX_SV:4.2MP:2.*)
-- # Unixware is an offshoot of SVR4, but it has its own version
-- # number series starting with 2...
-- # I am not positive that other SVR4 systems won't match this,
-+ # Unixware is an offshoot of SVR4, but it has its own version
-+ # number series starting with 2...
-+ # I am not positive that other SVR4 systems won't match this,
- # I just have to hope. -- rms.
-- # Use sysv4.2uw... so that sysv4* matches it.
-+ # Use sysv4.2uw... so that sysv4* matches it.
- echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
- exit ;;
- i*86:OS/2:*:*)
-@@ -1058,7 +1034,7 @@ EOF
- i*86:syllable:*:*)
- echo ${UNAME_MACHINE}-pc-syllable
- exit ;;
-- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
- echo i386-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- i*86:*DOS:*:*)
-@@ -1073,7 +1049,7 @@ EOF
- fi
- exit ;;
- i*86:*:5:[678]*)
-- # UnixWare 7.x, OpenUNIX and OpenServer 6.
-+ # UnixWare 7.x, OpenUNIX and OpenServer 6.
- case `/bin/uname -X | grep "^Machine"` in
- *486*) UNAME_MACHINE=i486 ;;
- *Pentium) UNAME_MACHINE=i586 ;;
-@@ -1101,10 +1077,13 @@ EOF
- exit ;;
- pc:*:*:*)
- # Left here for compatibility:
-- # uname -m prints for DJGPP always 'pc', but it prints nothing about
-- # the processor, so we play safe by assuming i386.
-- echo i386-pc-msdosdjgpp
-- exit ;;
-+ # uname -m prints for DJGPP always 'pc', but it prints nothing about
-+ # the processor, so we play safe by assuming i586.
-+ # Note: whatever this is, it MUST be the same as what config.sub
-+ # prints for the "djgpp" host, or else GDB configury will decide that
-+ # this is a cross-build.
-+ echo i586-pc-msdosdjgpp
-+ exit ;;
- Intel:Mach:3*:*)
- echo i386-pc-mach3
- exit ;;
-@@ -1139,8 +1118,18 @@ EOF
- /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
- 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-- && { echo i486-ncr-sysv4; exit; } ;;
-+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+ && { echo i486-ncr-sysv4; exit; } ;;
-+ NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-+ OS_REL='.3'
-+ test -r /etc/.relid \
-+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
-+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
- m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- echo m68k-unknown-lynxos${UNAME_RELEASE}
- exit ;;
-@@ -1153,7 +1142,7 @@ EOF
- rs6000:LynxOS:2.*:*)
- echo rs6000-unknown-lynxos${UNAME_RELEASE}
- exit ;;
-- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
- echo powerpc-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- SM[BE]S:UNIX_SV:*:*)
-@@ -1173,10 +1162,10 @@ EOF
- echo ns32k-sni-sysv
- fi
- exit ;;
-- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-- # says
-- echo i586-unisys-sysv4
-- exit ;;
-+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-+ # says
-+ echo i586-unisys-sysv4
-+ exit ;;
- *:UNIX_System_V:4*:FTX*)
- # From Gerald Hewes .
- # How about differentiating between stratus architectures? -djm
-@@ -1202,11 +1191,11 @@ EOF
- exit ;;
- R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
- if [ -d /usr/nec ]; then
-- echo mips-nec-sysv${UNAME_RELEASE}
-+ echo mips-nec-sysv${UNAME_RELEASE}
- else
-- echo mips-unknown-sysv${UNAME_RELEASE}
-+ echo mips-unknown-sysv${UNAME_RELEASE}
- fi
-- exit ;;
-+ exit ;;
- BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
- echo powerpc-be-beos
- exit ;;
-@@ -1216,6 +1205,12 @@ EOF
- BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
- echo i586-pc-beos
- exit ;;
-+ BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
-+ echo i586-pc-haiku
-+ exit ;;
-+ x86_64:Haiku:*:*)
-+ echo x86_64-unknown-haiku
-+ exit ;;
- SX-4:SUPER-UX:*:*)
- echo sx4-nec-superux${UNAME_RELEASE}
- exit ;;
-@@ -1243,6 +1238,16 @@ EOF
- *:Darwin:*:*)
- UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
- case $UNAME_PROCESSOR in
-+ i386)
-+ eval $set_cc_for_build
-+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-+ grep IS_64BIT_ARCH >/dev/null
-+ then
-+ UNAME_PROCESSOR="x86_64"
-+ fi
-+ fi ;;
- unknown) UNAME_PROCESSOR=powerpc ;;
- esac
- echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-@@ -1258,7 +1263,10 @@ EOF
- *:QNX:*:4*)
- echo i386-pc-qnx
- exit ;;
-- NSE-?:NONSTOP_KERNEL:*:*)
-+ NEO-?:NONSTOP_KERNEL:*:*)
-+ echo neo-tandem-nsk${UNAME_RELEASE}
-+ exit ;;
-+ NSE-*:NONSTOP_KERNEL:*:*)
- echo nse-tandem-nsk${UNAME_RELEASE}
- exit ;;
- NSR-?:NONSTOP_KERNEL:*:*)
-@@ -1303,13 +1311,13 @@ EOF
- echo pdp10-unknown-its
- exit ;;
- SEI:*:*:SEIUX)
-- echo mips-sei-seiux${UNAME_RELEASE}
-+ echo mips-sei-seiux${UNAME_RELEASE}
- exit ;;
- *:DragonFly:*:*)
- echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
- exit ;;
- *:*VMS:*:*)
-- UNAME_MACHINE=`(uname -p) 2>/dev/null`
-+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
- case "${UNAME_MACHINE}" in
- A*) echo alpha-dec-vms ; exit ;;
- I*) echo ia64-dec-vms ; exit ;;
-@@ -1324,11 +1332,14 @@ EOF
- i*86:rdos:*:*)
- echo ${UNAME_MACHINE}-pc-rdos
- exit ;;
-+ i*86:AROS:*:*)
-+ echo ${UNAME_MACHINE}-pc-aros
-+ exit ;;
-+ x86_64:VMkernel:*:*)
-+ echo ${UNAME_MACHINE}-unknown-esx
-+ exit ;;
- esac
-
--#echo '(No uname command or uname output not recognized.)' 1>&2
--#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
--
- eval $set_cc_for_build
- cat >$dummy.c <
- printf ("m68k-sony-newsos%s\n",
- #ifdef NEWSOS4
-- "4"
-+ "4"
- #else
-- ""
-+ ""
- #endif
-- ); exit (0);
-+ ); exit (0);
- #endif
- #endif
-
---- ./config.sub.orig 2009-03-05 16:36:33.000000000 -0700
-+++ ./config.sub 2013-04-29 17:53:51.988667347 -0600
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # Configuration validation subroutine script.
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
--# Free Software Foundation, Inc.
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-+# 2011, 2012 Free Software Foundation, Inc.
-
--timestamp='2008-01-16'
-+timestamp='2012-10-10'
-
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -21,9 +21,7 @@ timestamp='2008-01-16'
- # GNU General Public License for more details.
- #
- # 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 .
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-@@ -32,13 +30,16 @@ timestamp='2008-01-16'
-
-
- # Please send patches to . Submit a context
--# diff and a properly formatted ChangeLog entry.
-+# diff and a properly formatted GNU ChangeLog entry.
- #
- # Configuration subroutine to validate and canonicalize a configuration type.
- # Supply the specified configuration type as an argument.
- # If it is invalid, we print an error message on stderr and exit with code 1.
- # Otherwise, we print the canonical config type on stdout and succeed.
-
-+# You can get the latest version of this script from:
-+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-+
- # This file is supposed to be the same for all GNU packages
- # and recognize all the CPU types, system types and aliases
- # that are meaningful with *any* GNU software.
-@@ -72,8 +73,9 @@ Report bugs and patches to , where is the value of
--# the FILE_VERSION_FILTER tag, and is the name of an input file
--# provided by doxygen. Whatever the program writes to standard output
-+# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
-+# This will remove the Files entry from the Quick Index and from the
-+# Folder Tree View (if specified). The default is YES.
-+
-+SHOW_FILES = YES
-+
-+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
-+# Namespaces page.
-+# This will remove the Namespaces entry from the Quick Index
-+# and from the Folder Tree View (if specified). The default is YES.
-+
-+SHOW_NAMESPACES = YES
-+
-+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-+# doxygen should invoke to get the current version for each file (typically from
-+# the version control system). Doxygen will invoke the program by executing (via
-+# popen()) the command , where is the value of
-+# the FILE_VERSION_FILTER tag, and is the name of an input file
-+# provided by doxygen. Whatever the program writes to standard output
- # is used as the file version. See the manual for examples.
-
--FILE_VERSION_FILTER =
-+FILE_VERSION_FILTER =
-+
-+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
-+# by doxygen. The layout file controls the global structure of the generated
-+# output files in an output format independent way. The create the layout file
-+# that represents doxygen's defaults, run doxygen with the -l option.
-+# You can optionally specify a file name after the option, if omitted
-+# DoxygenLayout.xml will be used as the name of the layout file.
-+
-+LAYOUT_FILE =
-
- #---------------------------------------------------------------------------
- # configuration options related to warning and progress messages
- #---------------------------------------------------------------------------
-
--# The QUIET tag can be used to turn on/off the messages that are generated
-+# The QUIET tag can be used to turn on/off the messages that are generated
- # by doxygen. Possible values are YES and NO. If left blank NO is used.
-
- QUIET = NO
-
--# The WARNINGS tag can be used to turn on/off the warning messages that are
--# generated by doxygen. Possible values are YES and NO. If left blank
-+# The WARNINGS tag can be used to turn on/off the warning messages that are
-+# generated by doxygen. Possible values are YES and NO. If left blank
- # NO is used.
-
- WARNINGS = YES
-
--# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
--# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
-+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
-+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
- # automatically be disabled.
-
- WARN_IF_UNDOCUMENTED = YES
-
--# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
--# potential errors in the documentation, such as not documenting some
--# parameters in a documented function, or documenting parameters that
-+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
-+# potential errors in the documentation, such as not documenting some
-+# parameters in a documented function, or documenting parameters that
- # don't exist or using markup commands wrongly.
-
- WARN_IF_DOC_ERROR = YES
-
--# This WARN_NO_PARAMDOC option can be abled to get warnings for
--# functions that are documented, but have no documentation for their parameters
--# or return value. If set to NO (the default) doxygen will only warn about
--# wrong or incomplete parameter documentation, but not about the absence of
-+# The WARN_NO_PARAMDOC option can be enabled to get warnings for
-+# functions that are documented, but have no documentation for their parameters
-+# or return value. If set to NO (the default) doxygen will only warn about
-+# wrong or incomplete parameter documentation, but not about the absence of
- # documentation.
-
- WARN_NO_PARAMDOC = NO
-
--# The WARN_FORMAT tag determines the format of the warning messages that
--# doxygen can produce. The string should contain the $file, $line, and $text
--# tags, which will be replaced by the file and line number from which the
--# warning originated and the warning text. Optionally the format may contain
--# $version, which will be replaced by the version of the file (if it could
-+# The WARN_FORMAT tag determines the format of the warning messages that
-+# doxygen can produce. The string should contain the $file, $line, and $text
-+# tags, which will be replaced by the file and line number from which the
-+# warning originated and the warning text. Optionally the format may contain
-+# $version, which will be replaced by the version of the file (if it could
- # be obtained via FILE_VERSION_FILTER)
-
- WARN_FORMAT = "$file:$line: $text"
-
--# The WARN_LOGFILE tag can be used to specify a file to which warning
--# and error messages should be written. If left blank the output is written
-+# The WARN_LOGFILE tag can be used to specify a file to which warning
-+# and error messages should be written. If left blank the output is written
- # to stderr.
-
--WARN_LOGFILE =
-+WARN_LOGFILE =
-
- #---------------------------------------------------------------------------
- # configuration options related to the input files
- #---------------------------------------------------------------------------
-
--# The INPUT tag can be used to specify the files and/or directories that contain
--# documented source files. You may enter file names like "myfile.cpp" or
--# directories like "/usr/src/myproject". Separate the files or directories
-+# The INPUT tag can be used to specify the files and/or directories that contain
-+# documented source files. You may enter file names like "myfile.cpp" or
-+# directories like "/usr/src/myproject". Separate the files or directories
- # with spaces.
-
- INPUT = . \
-@@ -467,51 +615,49 @@
- ../README \
- ../LICENSE \
- ../INSTALL
--# \
--# ../windows/README \
--# ../windows/INSTALL
-
--# This tag can be used to specify the character encoding of the source files that
--# doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default
--# input encoding. Doxygen uses libiconv (or the iconv built into libc) for the transcoding.
--# See http://www.gnu.org/software/libiconv for the list of possible encodings.
-+# This tag can be used to specify the character encoding of the source files
-+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
-+# also the default input encoding. Doxygen uses libiconv (or the iconv built
-+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
-+# the list of possible encodings.
-
- INPUT_ENCODING = UTF-8
-
--# If the value of the INPUT tag contains directories, you can use the
--# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
--# and *.h) to filter out the source-files in the directories. If left
--# blank the following patterns are tested:
--# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
--# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py
-+# If the value of the INPUT tag contains directories, you can use the
-+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-+# and *.h) to filter out the source-files in the directories. If left
-+# blank the following patterns are tested:
-+# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
-+# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
-+# *.f90 *.f *.for *.vhd *.vhdl
-
- FILE_PATTERNS = *.h \
- *.cpp \
- *.dox
-
--# The RECURSIVE tag can be used to turn specify whether or not subdirectories
--# should be searched for input files as well. Possible values are YES and NO.
-+# The RECURSIVE tag can be used to turn specify whether or not subdirectories
-+# should be searched for input files as well. Possible values are YES and NO.
- # If left blank NO is used.
-
- RECURSIVE = YES
-
--# The EXCLUDE tag can be used to specify files and/or directories that should
--# excluded from the INPUT source files. This way you can easily exclude a
-+# The EXCLUDE tag can be used to specify files and/or directories that should
-+# excluded from the INPUT source files. This way you can easily exclude a
- # subdirectory from a directory tree whose root is specified with the INPUT tag.
-
--EXCLUDE = devel.dox \
-- theory_api.dox
-+EXCLUDE = devel.dox
-
--# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
--# directories that are symbolic links (a Unix filesystem feature) are excluded
-+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
-+# directories that are symbolic links (a Unix file system feature) are excluded
- # from the input.
-
- EXCLUDE_SYMLINKS = NO
-
--# If the value of the INPUT tag contains directories, you can use the
--# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
--# certain files from those directories. Note that the wildcards are matched
--# against the file with absolute path, so to exclude all test directories
-+# If the value of the INPUT tag contains directories, you can use the
-+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-+# certain files from those directories. Note that the wildcards are matched
-+# against the file with absolute path, so to exclude all test directories
- # for example use the pattern */test/*
-
- EXCLUDE_PATTERNS = parse*.cpp \
-@@ -519,94 +665,106 @@
- lex*.cpp \
- c_interface*.*
-
--# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
--# (namespaces, classes, functions, etc.) that should be excluded from the output.
--# The symbol name can be a fully qualified name, a word, or if the wildcard * is used,
--# a substring. Examples: ANamespace, AClass, AClass::ANamespace, ANamespace::*Test
-+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-+# (namespaces, classes, functions, etc.) that should be excluded from the
-+# output. The symbol name can be a fully qualified name, a word, or if the
-+# wildcard * is used, a substring. Examples: ANamespace, AClass,
-+# AClass::ANamespace, ANamespace::*Test
-
--EXCLUDE_SYMBOLS =
-+EXCLUDE_SYMBOLS =
-
--# The EXAMPLE_PATH tag can be used to specify one or more files or
--# directories that contain example code fragments that are included (see
-+# The EXAMPLE_PATH tag can be used to specify one or more files or
-+# directories that contain example code fragments that are included (see
- # the \include command).
-
--EXAMPLE_PATH =
-+EXAMPLE_PATH =
-
--# If the value of the EXAMPLE_PATH tag contains directories, you can use the
--# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
--# and *.h) to filter out the source-files in the directories. If left
-+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-+# and *.h) to filter out the source-files in the directories. If left
- # blank all files are included.
-
--EXAMPLE_PATTERNS =
-+EXAMPLE_PATTERNS =
-
--# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
--# searched for input files to be used with the \include or \dontinclude
--# commands irrespective of the value of the RECURSIVE tag.
-+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-+# searched for input files to be used with the \include or \dontinclude
-+# commands irrespective of the value of the RECURSIVE tag.
- # Possible values are YES and NO. If left blank NO is used.
-
- EXAMPLE_RECURSIVE = NO
-
--# The IMAGE_PATH tag can be used to specify one or more files or
--# directories that contain image that are included in the documentation (see
-+# The IMAGE_PATH tag can be used to specify one or more files or
-+# directories that contain image that are included in the documentation (see
- # the \image command).
-
- IMAGE_PATH = @TOP@/doc
-
--# The INPUT_FILTER tag can be used to specify a program that doxygen should
--# invoke to filter for each input file. Doxygen will invoke the filter program
--# by executing (via popen()) the command , where
--# is the value of the INPUT_FILTER tag, and is the name of an
--# input file. Doxygen will then use the output that the filter program writes
--# to standard output. If FILTER_PATTERNS is specified, this tag will be
-+# The INPUT_FILTER tag can be used to specify a program that doxygen should
-+# invoke to filter for each input file. Doxygen will invoke the filter program
-+# by executing (via popen()) the command , where
-+# is the value of the INPUT_FILTER tag, and is the name of an
-+# input file. Doxygen will then use the output that the filter program writes
-+# to standard output.
-+# If FILTER_PATTERNS is specified, this tag will be
- # ignored.
-
--INPUT_FILTER =
-+INPUT_FILTER =
-
--# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
--# basis. Doxygen will compare the file name with each pattern and apply the
--# filter if there is a match. The filters are a list of the form:
--# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
--# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
--# is applied to all files.
-+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-+# basis.
-+# Doxygen will compare the file name with each pattern and apply the
-+# filter if there is a match.
-+# The filters are a list of the form:
-+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-+# info on how filters are used. If FILTER_PATTERNS is empty or if
-+# non of the patterns match the file name, INPUT_FILTER is applied.
-
--FILTER_PATTERNS =
-+FILTER_PATTERNS =
-
--# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
--# INPUT_FILTER) will be used to filter the input files when producing source
-+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-+# INPUT_FILTER) will be used to filter the input files when producing source
- # files to browse (i.e. when SOURCE_BROWSER is set to YES).
-
- FILTER_SOURCE_FILES = NO
-
-+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
-+# pattern. A pattern will override the setting for FILTER_PATTERN (if any)
-+# and it is also possible to disable source filtering for a specific pattern
-+# using *.ext= (so without naming a filter). This option only has effect when
-+# FILTER_SOURCE_FILES is enabled.
-+
-+FILTER_SOURCE_PATTERNS =
-+
- #---------------------------------------------------------------------------
- # configuration options related to source browsing
- #---------------------------------------------------------------------------
-
--# If the SOURCE_BROWSER tag is set to YES then a list of source files will
--# be generated. Documented entities will be cross-referenced with these sources.
--# Note: To get rid of all source code in the generated output, make sure also
-+# If the SOURCE_BROWSER tag is set to YES then a list of source files will
-+# be generated. Documented entities will be cross-referenced with these sources.
-+# Note: To get rid of all source code in the generated output, make sure also
- # VERBATIM_HEADERS is set to NO.
-
- SOURCE_BROWSER = YES
-
--# Setting the INLINE_SOURCES tag to YES will include the body
-+# Setting the INLINE_SOURCES tag to YES will include the body
- # of functions and classes directly in the documentation.
-
- INLINE_SOURCES = NO
-
--# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
--# doxygen to hide any special comment blocks from generated source code
-+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
-+# doxygen to hide any special comment blocks from generated source code
- # fragments. Normal C and C++ comments will always remain visible.
-
- STRIP_CODE_COMMENTS = NO
-
--# If the REFERENCED_BY_RELATION tag is set to YES (the default)
--# then for each documented function all documented
-+# If the REFERENCED_BY_RELATION tag is set to YES
-+# then for each documented function all documented
- # functions referencing it will be listed.
-
- REFERENCED_BY_RELATION = YES
-
--# If the REFERENCES_RELATION tag is set to YES (the default)
--# then for each documented function all documented entities
-+# If the REFERENCES_RELATION tag is set to YES
-+# then for each documented function all documented entities
- # called/used by that function will be listed.
-
- REFERENCES_RELATION = YES
-@@ -614,20 +772,21 @@
- # If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
- # and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
- # functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
--# link to the source code. Otherwise they will link to the documentstion.
-+# link to the source code.
-+# Otherwise they will link to the documentation.
-
- REFERENCES_LINK_SOURCE = YES
-
--# If the USE_HTAGS tag is set to YES then the references to source code
--# will point to the HTML generated by the htags(1) tool instead of doxygen
--# built-in source browser. The htags tool is part of GNU's global source
--# tagging system (see http://www.gnu.org/software/global/global.html). You
-+# If the USE_HTAGS tag is set to YES then the references to source code
-+# will point to the HTML generated by the htags(1) tool instead of doxygen
-+# built-in source browser. The htags tool is part of GNU's global source
-+# tagging system (see http://www.gnu.org/software/global/global.html). You
- # will need version 4.8.6 or higher.
-
- USE_HTAGS = NO
-
--# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
--# will generate a verbatim copy of the header file for each class for
-+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
-+# will generate a verbatim copy of the header file for each class for
- # which an include is specified. Set to NO to disable this.
-
- VERBATIM_HEADERS = YES
-@@ -636,21 +795,21 @@
- # configuration options related to the alphabetical class index
- #---------------------------------------------------------------------------
-
--# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
--# of all compounds will be generated. Enable this if the project
-+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
-+# of all compounds will be generated. Enable this if the project
- # contains a lot of classes, structs, unions or interfaces.
-
- ALPHABETICAL_INDEX = YES
-
--# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
--# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
-+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
-+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
- # in which this list will be split (can be a number in the range [1..20])
-
- COLS_IN_ALPHA_INDEX = 5
-
--# In case all classes in a project start with a common prefix, all
--# classes will be put under the same header in the alphabetical index.
--# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
-+# In case all classes in a project start with a common prefix, all
-+# classes will be put under the same header in the alphabetical index.
-+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
- # should be ignored while generating the index headers.
-
- IGNORE_PREFIX = CVC3::
-@@ -659,256 +818,513 @@
- # configuration options related to the HTML output
- #---------------------------------------------------------------------------
-
--# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
-+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
- # generate HTML output.
-
- GENERATE_HTML = YES
-
--# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
--# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
-+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
- # put in front of it. If left blank `html' will be used as the default path.
-
- HTML_OUTPUT = html
-
--# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
--# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
-+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
-+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
- # doxygen will generate files with .html extension.
-
- HTML_FILE_EXTENSION = .html
-
--# The HTML_HEADER tag can be used to specify a personal HTML header for
--# each generated HTML page. If it is left blank doxygen will generate a
--# standard header.
-+# The HTML_HEADER tag can be used to specify a personal HTML header for
-+# each generated HTML page. If it is left blank doxygen will generate a
-+# standard header. Note that when using a custom header you are responsible
-+# for the proper inclusion of any scripts and style sheets that doxygen
-+# needs, which is dependent on the configuration options used.
-+# It is adviced to generate a default header using "doxygen -w html
-+# header.html footer.html stylesheet.css YourConfigFile" and then modify
-+# that header. Note that the header is subject to change so you typically
-+# have to redo this when upgrading to a newer version of doxygen or when changing the value of configuration settings such as GENERATE_TREEVIEW!
-
--HTML_HEADER =
-+HTML_HEADER =
-
--# The HTML_FOOTER tag can be used to specify a personal HTML footer for
--# each generated HTML page. If it is left blank doxygen will generate a
-+# The HTML_FOOTER tag can be used to specify a personal HTML footer for
-+# each generated HTML page. If it is left blank doxygen will generate a
- # standard footer.
-
--HTML_FOOTER =
-+HTML_FOOTER =
-
--# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
--# style sheet that is used by each HTML page. It can be used to
--# fine-tune the look of the HTML output. If the tag is left blank doxygen
--# will generate a default style sheet. Note that doxygen will try to copy
--# the style sheet file to the HTML output directory, so don't put your own
-+# If the HTML_TIMESTAMP tag is set to YES then the generated HTML documentation will contain the timesstamp.
-+
-+HTML_TIMESTAMP = NO
-+
-+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
-+# style sheet that is used by each HTML page. It can be used to
-+# fine-tune the look of the HTML output. If the tag is left blank doxygen
-+# will generate a default style sheet. Note that doxygen will try to copy
-+# the style sheet file to the HTML output directory, so don't put your own
- # stylesheet in the HTML output directory as well, or it will be erased!
-
--HTML_STYLESHEET =
-+HTML_STYLESHEET =
-
--# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
--# files or namespaces will be aligned in HTML using tables. If set to
-+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
-+# other source files which should be copied to the HTML output directory. Note
-+# that these files will be copied to the base HTML output directory. Use the
-+# $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
-+# files. In the HTML_STYLESHEET file, use the file name only. Also note that
-+# the files will be copied as-is; there are no commands or markers available.
-+
-+HTML_EXTRA_FILES =
-+
-+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
-+# Doxygen will adjust the colors in the stylesheet and background images
-+# according to this color. Hue is specified as an angle on a colorwheel,
-+# see http://en.wikipedia.org/wiki/Hue for more information.
-+# For instance the value 0 represents red, 60 is yellow, 120 is green,
-+# 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
-+# The allowed range is 0 to 359.
-+
-+HTML_COLORSTYLE_HUE = 220
-+
-+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
-+# the colors in the HTML output. For a value of 0 the output will use
-+# grayscales only. A value of 255 will produce the most vivid colors.
-+
-+HTML_COLORSTYLE_SAT = 100
-+
-+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
-+# the luminance component of the colors in the HTML output. Values below
-+# 100 gradually make the output lighter, whereas values above 100 make
-+# the output darker. The value divided by 100 is the actual gamma applied,
-+# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
-+# and 100 does not change the gamma.
-+
-+HTML_COLORSTYLE_GAMMA = 80
-+
-+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-+# page will contain the date and time when the page was generated. Setting
-+# this to NO can help when comparing the output of multiple runs.
-+
-+HTML_TIMESTAMP = YES
-+
-+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
-+# files or namespaces will be aligned in HTML using tables. If set to
- # NO a bullet list will be used.
-
- HTML_ALIGN_MEMBERS = NO
-
--# If the GENERATE_HTMLHELP tag is set to YES, additional index files
--# will be generated that can be used as input for tools like the
--# Microsoft HTML help workshop to generate a compressed HTML help file (.chm)
-+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-+# documentation will contain sections that can be hidden and shown after the
-+# page has loaded. For this to work a browser that supports
-+# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
-+# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
-+
-+HTML_DYNAMIC_SECTIONS = NO
-+
-+# If the GENERATE_DOCSET tag is set to YES, additional index files
-+# will be generated that can be used as input for Apple's Xcode 3
-+# integrated development environment, introduced with OSX 10.5 (Leopard).
-+# To create a documentation set, doxygen will generate a Makefile in the
-+# HTML output directory. Running make will produce the docset in that
-+# directory and running "make install" will install the docset in
-+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
-+# it at startup.
-+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
-+# for more information.
-+
-+GENERATE_DOCSET = NO
-+
-+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
-+# feed. A documentation feed provides an umbrella under which multiple
-+# documentation sets from a single provider (such as a company or product suite)
-+# can be grouped.
-+
-+DOCSET_FEEDNAME = "Doxygen generated docs"
-+
-+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
-+# should uniquely identify the documentation set bundle. This should be a
-+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
-+# will append .docset to the name.
-+
-+DOCSET_BUNDLE_ID = org.doxygen.Project
-+
-+# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify
-+# the documentation publisher. This should be a reverse domain-name style
-+# string, e.g. com.mycompany.MyDocSet.documentation.
-+
-+DOCSET_PUBLISHER_ID = org.doxygen.Publisher
-+
-+# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
-+
-+DOCSET_PUBLISHER_NAME = Publisher
-+
-+# If the GENERATE_HTMLHELP tag is set to YES, additional index files
-+# will be generated that can be used as input for tools like the
-+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
- # of the generated HTML documentation.
-
- GENERATE_HTMLHELP = NO
-
--# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
--# be used to specify the file name of the resulting .chm file. You
--# can add a path in front of the file if the result should not be
-+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
-+# be used to specify the file name of the resulting .chm file. You
-+# can add a path in front of the file if the result should not be
- # written to the html output directory.
-
--CHM_FILE =
-+CHM_FILE =
-
--# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
--# be used to specify the location (absolute path including file name) of
--# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
-+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
-+# be used to specify the location (absolute path including file name) of
-+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
- # the HTML help compiler on the generated index.hhp.
-
--HHC_LOCATION =
-+HHC_LOCATION =
-
--# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
--# controls if a separate .chi index file is generated (YES) or that
-+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
-+# controls if a separate .chi index file is generated (YES) or that
- # it should be included in the master .chm file (NO).
-
- GENERATE_CHI = NO
-
--# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
--# controls whether a binary table of contents is generated (YES) or a
-+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
-+# is used to encode HtmlHelp index (hhk), content (hhc) and project file
-+# content.
-+
-+CHM_INDEX_ENCODING =
-+
-+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
-+# controls whether a binary table of contents is generated (YES) or a
- # normal table of contents (NO) in the .chm file.
-
- BINARY_TOC = NO
-
--# The TOC_EXPAND flag can be set to YES to add extra items for group members
-+# The TOC_EXPAND flag can be set to YES to add extra items for group members
- # to the contents of the HTML help documentation and to the tree view.
-
- TOC_EXPAND = NO
-
--# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
--# top of each HTML page. The value NO (the default) enables the index and
-+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
-+# that can be used as input for Qt's qhelpgenerator to generate a
-+# Qt Compressed Help (.qch) of the generated HTML documentation.
-+
-+GENERATE_QHP = NO
-+
-+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
-+# be used to specify the file name of the resulting .qch file.
-+# The path specified is relative to the HTML output folder.
-+
-+QCH_FILE =
-+
-+# The QHP_NAMESPACE tag specifies the namespace to use when generating
-+# Qt Help Project output. For more information please see
-+# http://doc.trolltech.com/qthelpproject.html#namespace
-+
-+QHP_NAMESPACE = org.doxygen.Project
-+
-+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
-+# Qt Help Project output. For more information please see
-+# http://doc.trolltech.com/qthelpproject.html#virtual-folders
-+
-+QHP_VIRTUAL_FOLDER = doc
-+
-+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
-+# add. For more information please see
-+# http://doc.trolltech.com/qthelpproject.html#custom-filters
-+
-+QHP_CUST_FILTER_NAME =
-+
-+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
-+# custom filter to add. For more information please see
-+#
-+# Qt Help Project / Custom Filters.
-+
-+QHP_CUST_FILTER_ATTRS =
-+
-+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-+# project's
-+# filter section matches.
-+#
-+# Qt Help Project / Filter Attributes.
-+
-+QHP_SECT_FILTER_ATTRS =
-+
-+# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
-+# be used to specify the location of Qt's qhelpgenerator.
-+# If non-empty doxygen will try to run qhelpgenerator on the generated
-+# .qhp file.
-+
-+QHG_LOCATION =
-+
-+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
-+# will be generated, which together with the HTML files, form an Eclipse help
-+# plugin. To install this plugin and make it available under the help contents
-+# menu in Eclipse, the contents of the directory containing the HTML and XML
-+# files needs to be copied into the plugins directory of eclipse. The name of
-+# the directory within the plugins directory should be the same as
-+# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
-+# the help appears.
-+
-+GENERATE_ECLIPSEHELP = NO
-+
-+# A unique identifier for the eclipse help plugin. When installing the plugin
-+# the directory name containing the HTML and XML files should also have
-+# this name.
-+
-+ECLIPSE_DOC_ID = org.doxygen.Project
-+
-+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
-+# top of each HTML page. The value NO (the default) enables the index and
- # the value YES disables it.
-
- DISABLE_INDEX = NO
-
--# This tag can be used to set the number of enum values (range [1..20])
--# that doxygen will group on one line in the generated HTML documentation.
-+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values
-+# (range [0,1..20]) that doxygen will group on one line in the generated HTML
-+# documentation. Note that a value of 0 will completely suppress the enum
-+# values from appearing in the overview section.
-
- ENUM_VALUES_PER_LINE = 4
-
--# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
--# generated containing a tree-like index structure (just like the one that
--# is generated for HTML Help). For this to work a browser that supports
--# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+,
--# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are
--# probably better off using the HTML help feature.
-+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-+# structure should be generated to display hierarchical information.
-+# If the tag value is set to YES, a side panel will be generated
-+# containing a tree-like index structure (just like the one that
-+# is generated for HTML Help). For this to work a browser that supports
-+# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
-+# Windows users are probably better off using the HTML help feature.
-
- GENERATE_TREEVIEW = NO
-
--# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
--# used to set the initial width (in pixels) of the frame in which the tree
-+# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
-+# and Class Hierarchy pages using a tree view instead of an ordered list.
-+
-+USE_INLINE_TREES = NO
-+
-+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
-+# used to set the initial width (in pixels) of the frame in which the tree
- # is shown.
-
- TREEVIEW_WIDTH = 250
-
-+# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
-+# links to external symbols imported via tag files in a separate window.
-+
-+EXT_LINKS_IN_WINDOW = NO
-+
-+# Use this tag to change the font size of Latex formulas included
-+# as images in the HTML documentation. The default is 10. Note that
-+# when you change the font size after a successful doxygen run you need
-+# to manually remove any form_*.png images from the HTML output directory
-+# to force them to be regenerated.
-+
-+FORMULA_FONTSIZE = 10
-+
-+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
-+# generated for formulas are transparent PNGs. Transparent PNGs are
-+# not supported properly for IE 6.0, but are supported on all modern browsers.
-+# Note that when changing this option you need to delete any form_*.png files
-+# in the HTML output before the changes have effect.
-+
-+FORMULA_TRANSPARENT = YES
-+
-+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
-+# (see http://www.mathjax.org) which uses client side Javascript for the
-+# rendering instead of using prerendered bitmaps. Use this if you do not
-+# have LaTeX installed or if you want to formulas look prettier in the HTML
-+# output. When enabled you also need to install MathJax separately and
-+# configure the path to it using the MATHJAX_RELPATH option.
-+
-+USE_MATHJAX = NO
-+
-+# When MathJax is enabled you need to specify the location relative to the
-+# HTML output directory using the MATHJAX_RELPATH option. The destination
-+# directory should contain the MathJax.js script. For instance, if the mathjax
-+# directory is located at the same level as the HTML output directory, then
-+# MATHJAX_RELPATH should be ../mathjax. The default value points to the
-+# mathjax.org site, so you can quickly see the result without installing
-+# MathJax, but it is strongly recommended to install a local copy of MathJax
-+# before deployment.
-+
-+MATHJAX_RELPATH = http://www.mathjax.org/mathjax
-+
-+# When the SEARCHENGINE tag is enabled doxygen will generate a search box
-+# for the HTML output. The underlying search engine uses javascript
-+# and DHTML and should work on any modern browser. Note that when using
-+# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
-+# (GENERATE_DOCSET) there is already a search function so this one should
-+# typically be disabled. For large projects the javascript based search engine
-+# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
-+
-+SEARCHENGINE = NO
-+
-+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-+# implemented using a PHP enabled web server instead of at the web client
-+# using Javascript. Doxygen will generate the search PHP script and index
-+# file to put on the web server. The advantage of the server
-+# based approach is that it scales better to large projects and allows
-+# full text search. The disadvantages are that it is more difficult to setup
-+# and does not have live searching capabilities.
-+
-+SERVER_BASED_SEARCH = NO
-+
- #---------------------------------------------------------------------------
- # configuration options related to the LaTeX output
- #---------------------------------------------------------------------------
-
--# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
-+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
- # generate Latex output.
-
- GENERATE_LATEX = NO
-
--# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
--# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
-+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
- # put in front of it. If left blank `latex' will be used as the default path.
-
- LATEX_OUTPUT = latex
-
--# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
- # invoked. If left blank `latex' will be used as the default command name.
-+# Note that when enabling USE_PDFLATEX this option is only used for
-+# generating bitmaps for formulas in the HTML output, but not in the
-+# Makefile that is written to the output directory.
-
- LATEX_CMD_NAME = latex
-
--# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
--# generate index for LaTeX. If left blank `makeindex' will be used as the
-+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
-+# generate index for LaTeX. If left blank `makeindex' will be used as the
- # default command name.
-
- MAKEINDEX_CMD_NAME = makeindex
-
--# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
--# LaTeX documents. This may be useful for small projects and may help to
-+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
-+# LaTeX documents. This may be useful for small projects and may help to
- # save some trees in general.
-
- COMPACT_LATEX = NO
-
--# The PAPER_TYPE tag can be used to set the paper type that is used
--# by the printer. Possible values are: a4, a4wide, letter, legal and
-+# The PAPER_TYPE tag can be used to set the paper type that is used
-+# by the printer. Possible values are: a4, letter, legal and
- # executive. If left blank a4wide will be used.
-
- PAPER_TYPE = letter
-
--# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
-+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
- # packages that should be included in the LaTeX output.
-
- EXTRA_PACKAGES = amsmath
-
--# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
--# the generated latex document. The header should contain everything until
--# the first chapter. If it is left blank doxygen will generate a
-+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
-+# the generated latex document. The header should contain everything until
-+# the first chapter. If it is left blank doxygen will generate a
- # standard header. Notice: only use this tag if you know what you are doing!
-
--LATEX_HEADER =
-+LATEX_HEADER =
-
--# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
--# is prepared for conversion to pdf (using ps2pdf). The pdf file will
--# contain links (just like the HTML output) instead of page references
-+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for
-+# the generated latex document. The footer should contain everything after
-+# the last chapter. If it is left blank doxygen will generate a
-+# standard footer. Notice: only use this tag if you know what you are doing!
-+
-+LATEX_FOOTER =
-+
-+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
-+# is prepared for conversion to pdf (using ps2pdf). The pdf file will
-+# contain links (just like the HTML output) instead of page references
- # This makes the output suitable for online browsing using a pdf viewer.
-
- PDF_HYPERLINKS = NO
-
--# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
--# plain latex in the generated Makefile. Set this option to YES to get a
-+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
-+# plain latex in the generated Makefile. Set this option to YES to get a
- # higher quality PDF documentation.
-
- USE_PDFLATEX = NO
-
--# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
--# command to the generated LaTeX files. This will instruct LaTeX to keep
--# running if errors occur, instead of asking the user for help.
-+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
-+# command to the generated LaTeX files. This will instruct LaTeX to keep
-+# running if errors occur, instead of asking the user for help.
- # This option is also used when generating formulas in HTML.
-
- LATEX_BATCHMODE = NO
-
--# If LATEX_HIDE_INDICES is set to YES then doxygen will not
--# include the index chapters (such as File Index, Compound Index, etc.)
-+# If LATEX_HIDE_INDICES is set to YES then doxygen will not
-+# include the index chapters (such as File Index, Compound Index, etc.)
- # in the output.
-
- LATEX_HIDE_INDICES = NO
-
-+# If LATEX_SOURCE_CODE is set to YES then doxygen will include
-+# source code with syntax highlighting in the LaTeX output.
-+# Note that which sources are shown also depends on other settings
-+# such as SOURCE_BROWSER.
-+
-+LATEX_SOURCE_CODE = NO
-+
- #---------------------------------------------------------------------------
- # configuration options related to the RTF output
- #---------------------------------------------------------------------------
-
--# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
--# The RTF output is optimized for Word 97 and may not look very pretty with
-+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
-+# The RTF output is optimized for Word 97 and may not look very pretty with
- # other RTF readers or editors.
-
- GENERATE_RTF = NO
-
--# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
--# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
-+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
- # put in front of it. If left blank `rtf' will be used as the default path.
-
- RTF_OUTPUT = rtf
-
--# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
--# RTF documents. This may be useful for small projects and may help to
-+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
-+# RTF documents. This may be useful for small projects and may help to
- # save some trees in general.
-
- COMPACT_RTF = NO
-
--# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
--# will contain hyperlink fields. The RTF file will
--# contain links (just like the HTML output) instead of page references.
--# This makes the output suitable for online browsing using WORD or other
--# programs which support those fields.
-+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
-+# will contain hyperlink fields. The RTF file will
-+# contain links (just like the HTML output) instead of page references.
-+# This makes the output suitable for online browsing using WORD or other
-+# programs which support those fields.
- # Note: wordpad (write) and others do not support links.
-
- RTF_HYPERLINKS = NO
-
--# Load stylesheet definitions from file. Syntax is similar to doxygen's
--# config file, i.e. a series of assignments. You only have to provide
-+# Load stylesheet definitions from file. Syntax is similar to doxygen's
-+# config file, i.e. a series of assignments. You only have to provide
- # replacements, missing definitions are set to their default value.
-
--RTF_STYLESHEET_FILE =
-+RTF_STYLESHEET_FILE =
-
--# Set optional variables used in the generation of an rtf document.
-+# Set optional variables used in the generation of an rtf document.
- # Syntax is similar to doxygen's config file.
-
--RTF_EXTENSIONS_FILE =
-+RTF_EXTENSIONS_FILE =
-
- #---------------------------------------------------------------------------
- # configuration options related to the man page output
- #---------------------------------------------------------------------------
-
--# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
-+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
- # generate man pages
-
- GENERATE_MAN = NO
-
--# The MAN_OUTPUT tag is used to specify where the man pages will be put.
--# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-+# The MAN_OUTPUT tag is used to specify where the man pages will be put.
-+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
- # put in front of it. If left blank `man' will be used as the default path.
-
- MAN_OUTPUT = man
-
--# The MAN_EXTENSION tag determines the extension that is added to
-+# The MAN_EXTENSION tag determines the extension that is added to
- # the generated man pages (default is the subroutine's section .3)
-
- MAN_EXTENSION = .3
-
--# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
--# then it will generate one additional man file for each entity
--# documented in the real man page(s). These additional files
--# only source the real man page, but without them the man command
-+# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
-+# then it will generate one additional man file for each entity
-+# documented in the real man page(s). These additional files
-+# only source the real man page, but without them the man command
- # would be unable to find the correct page. The default is NO.
-
- MAN_LINKS = NO
-@@ -917,33 +1333,33 @@
- # configuration options related to the XML output
- #---------------------------------------------------------------------------
-
--# If the GENERATE_XML tag is set to YES Doxygen will
--# generate an XML file that captures the structure of
-+# If the GENERATE_XML tag is set to YES Doxygen will
-+# generate an XML file that captures the structure of
- # the code including all documentation.
-
- GENERATE_XML = NO
-
--# The XML_OUTPUT tag is used to specify where the XML pages will be put.
--# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-+# The XML_OUTPUT tag is used to specify where the XML pages will be put.
-+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
- # put in front of it. If left blank `xml' will be used as the default path.
-
- XML_OUTPUT = xml
-
--# The XML_SCHEMA tag can be used to specify an XML schema,
--# which can be used by a validating XML parser to check the
-+# The XML_SCHEMA tag can be used to specify an XML schema,
-+# which can be used by a validating XML parser to check the
- # syntax of the XML files.
-
--XML_SCHEMA =
-+XML_SCHEMA =
-
--# The XML_DTD tag can be used to specify an XML DTD,
--# which can be used by a validating XML parser to check the
-+# The XML_DTD tag can be used to specify an XML DTD,
-+# which can be used by a validating XML parser to check the
- # syntax of the XML files.
-
--XML_DTD =
-+XML_DTD =
-
--# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
--# dump the program listings (including syntax highlighting
--# and cross-referencing information) to the XML output. Note that
-+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
-+# dump the program listings (including syntax highlighting
-+# and cross-referencing information) to the XML output. Note that
- # enabling this will significantly increase the size of the XML output.
-
- XML_PROGRAMLISTING = YES
-@@ -952,10 +1368,10 @@
- # configuration options for the AutoGen Definitions output
- #---------------------------------------------------------------------------
-
--# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
--# generate an AutoGen Definitions (see autogen.sf.net) file
--# that captures the structure of the code including all
--# documentation. Note that this feature is still experimental
-+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
-+# generate an AutoGen Definitions (see autogen.sf.net) file
-+# that captures the structure of the code including all
-+# documentation. Note that this feature is still experimental
- # and incomplete at the moment.
-
- GENERATE_AUTOGEN_DEF = NO
-@@ -964,308 +1380,350 @@
- # configuration options related to the Perl module output
- #---------------------------------------------------------------------------
-
--# If the GENERATE_PERLMOD tag is set to YES Doxygen will
--# generate a Perl module file that captures the structure of
--# the code including all documentation. Note that this
--# feature is still experimental and incomplete at the
-+# If the GENERATE_PERLMOD tag is set to YES Doxygen will
-+# generate a Perl module file that captures the structure of
-+# the code including all documentation. Note that this
-+# feature is still experimental and incomplete at the
- # moment.
-
- GENERATE_PERLMOD = NO
-
--# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
--# the necessary Makefile rules, Perl scripts and LaTeX code to be able
-+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
-+# the necessary Makefile rules, Perl scripts and LaTeX code to be able
- # to generate PDF and DVI output from the Perl module output.
-
- PERLMOD_LATEX = NO
-
--# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
--# nicely formatted so it can be parsed by a human reader. This is useful
--# if you want to understand what is going on. On the other hand, if this
--# tag is set to NO the size of the Perl module output will be much smaller
-+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
-+# nicely formatted so it can be parsed by a human reader.
-+# This is useful
-+# if you want to understand what is going on.
-+# On the other hand, if this
-+# tag is set to NO the size of the Perl module output will be much smaller
- # and Perl will parse it just the same.
-
- PERLMOD_PRETTY = YES
-
--# The names of the make variables in the generated doxyrules.make file
--# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
--# This is useful so different doxyrules.make files included by the same
-+# The names of the make variables in the generated doxyrules.make file
-+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
-+# This is useful so different doxyrules.make files included by the same
- # Makefile don't overwrite each other's variables.
-
--PERLMOD_MAKEVAR_PREFIX =
-+PERLMOD_MAKEVAR_PREFIX =
-
- #---------------------------------------------------------------------------
--# Configuration options related to the preprocessor
-+# Configuration options related to the preprocessor
- #---------------------------------------------------------------------------
-
--# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
--# evaluate all C-preprocessor directives found in the sources and include
-+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
-+# evaluate all C-preprocessor directives found in the sources and include
- # files.
-
- ENABLE_PREPROCESSING = YES
-
--# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
--# names in the source code. If set to NO (the default) only conditional
--# compilation will be performed. Macro expansion can be done in a controlled
-+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
-+# names in the source code. If set to NO (the default) only conditional
-+# compilation will be performed. Macro expansion can be done in a controlled
- # way by setting EXPAND_ONLY_PREDEF to YES.
-
- MACRO_EXPANSION = YES
-
--# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
--# then the macro expansion is limited to the macros specified with the
-+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
-+# then the macro expansion is limited to the macros specified with the
- # PREDEFINED and EXPAND_AS_DEFINED tags.
-
- EXPAND_ONLY_PREDEF = YES
-
--# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
--# in the INCLUDE_PATH (see below) will be search if a #include is found.
-+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
-+# pointed to by INCLUDE_PATH will be searched when a #include is found.
-
- SEARCH_INCLUDES = YES
-
--# The INCLUDE_PATH tag can be used to specify one or more directories that
--# contain include files that are not input files but should be processed by
-+# The INCLUDE_PATH tag can be used to specify one or more directories that
-+# contain include files that are not input files but should be processed by
- # the preprocessor.
-
--INCLUDE_PATH =
-+INCLUDE_PATH =
-
--# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
--# patterns (like *.h and *.hpp) to filter out the header-files in the
--# directories. If left blank, the patterns specified with FILE_PATTERNS will
-+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-+# patterns (like *.h and *.hpp) to filter out the header-files in the
-+# directories. If left blank, the patterns specified with FILE_PATTERNS will
- # be used.
-
--INCLUDE_FILE_PATTERNS =
-+INCLUDE_FILE_PATTERNS =
-
--# The PREDEFINED tag can be used to specify one or more macro names that
--# are defined before the preprocessor is started (similar to the -D option of
--# gcc). The argument of the tag is a list of macros of the form: name
--# or name=definition (no spaces). If the definition and the = are
--# omitted =1 is assumed. To prevent a macro definition from being
--# undefined via #undef or recursively expanded use the := operator
-+# The PREDEFINED tag can be used to specify one or more macro names that
-+# are defined before the preprocessor is started (similar to the -D option of
-+# gcc). The argument of the tag is a list of macros of the form: name
-+# or name=definition (no spaces). If the definition and the = are
-+# omitted =1 is assumed. To prevent a macro definition from being
-+# undefined via #undef or recursively expanded use the := operator
- # instead of the = operator.
-
--PREDEFINED = DEBUG \
-- DOXYGEN
-+PREDEFINED = DOXYGEN
-
--# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
--# this tag can be used to specify a list of macro names that should be expanded.
--# The macro definition that is found in the sources will be used.
--# Use the PREDEFINED tag if you want to use a different macro definition.
-+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
-+# this tag can be used to specify a list of macro names that should be expanded.
-+# The macro definition that is found in the sources will be used.
-+# Use the PREDEFINED tag if you want to use a different macro definition that
-+# overrules the definition found in the source code.
-
- EXPAND_AS_DEFINED = IF_DEBUG
-
--# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
--# doxygen's preprocessor will remove all function-like macros that are alone
--# on a line, have an all uppercase name, and do not end with a semicolon. Such
--# function macros are typically used for boiler-plate code, and will confuse
--# the parser if not removed.
-+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-+# doxygen's preprocessor will remove all references to function-like macros
-+# that are alone on a line, have an all uppercase name, and do not end with a
-+# semicolon, because these will confuse the parser if not removed.
-
- SKIP_FUNCTION_MACROS = YES
-
- #---------------------------------------------------------------------------
--# Configuration::additions related to external references
-+# Configuration::additions related to external references
- #---------------------------------------------------------------------------
-
--# The TAGFILES option can be used to specify one or more tagfiles.
--# Optionally an initial location of the external documentation
--# can be added for each tagfile. The format of a tag file without
--# this location is as follows:
--# TAGFILES = file1 file2 ...
--# Adding location for the tag files is done as follows:
--# TAGFILES = file1=loc1 "file2 = loc2" ...
--# where "loc1" and "loc2" can be relative or absolute paths or
--# URLs. If a location is present for each tag, the installdox tool
-+# The TAGFILES option can be used to specify one or more tagfiles.
-+# Optionally an initial location of the external documentation
-+# can be added for each tagfile. The format of a tag file without
-+# this location is as follows:
-+#
-+# TAGFILES = file1 file2 ...
-+# Adding location for the tag files is done as follows:
-+#
-+# TAGFILES = file1=loc1 "file2 = loc2" ...
-+# where "loc1" and "loc2" can be relative or absolute paths or
-+# URLs. If a location is present for each tag, the installdox tool
- # does not have to be run to correct the links.
- # Note that each tag file must have a unique name
- # (where the name does NOT include the path)
--# If a tag file is not located in the directory in which doxygen
-+# If a tag file is not located in the directory in which doxygen
- # is run, you must also specify the path to the tagfile here.
-
--TAGFILES =
-+TAGFILES =
-
--# When a file name is specified after GENERATE_TAGFILE, doxygen will create
-+# When a file name is specified after GENERATE_TAGFILE, doxygen will create
- # a tag file that is based on the input files it reads.
-
--GENERATE_TAGFILE =
-+GENERATE_TAGFILE =
-
--# If the ALLEXTERNALS tag is set to YES all external classes will be listed
--# in the class index. If set to NO only the inherited external classes
-+# If the ALLEXTERNALS tag is set to YES all external classes will be listed
-+# in the class index. If set to NO only the inherited external classes
- # will be listed.
-
- ALLEXTERNALS = NO
-
--# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
--# in the modules index. If set to NO, only the current project's groups will
-+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
-+# in the modules index. If set to NO, only the current project's groups will
- # be listed.
-
- EXTERNAL_GROUPS = YES
-
--# The PERL_PATH should be the absolute path and name of the perl script
-+# The PERL_PATH should be the absolute path and name of the perl script
- # interpreter (i.e. the result of `which perl').
-
- PERL_PATH = /usr/bin/perl
-
- #---------------------------------------------------------------------------
--# Configuration options related to the dot tool
-+# Configuration options related to the dot tool
- #---------------------------------------------------------------------------
-
--# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
--# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
--# or super classes. Setting the tag to NO turns the diagrams off. Note that
--# this option is superseded by the HAVE_DOT option below. This is only a
--# fallback. It is recommended to install and use dot, since it yields more
--# powerful graphs.
-+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
-+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
-+# or super classes. Setting the tag to NO turns the diagrams off. Note that
-+# this option also works with HAVE_DOT disabled, but it is recommended to
-+# install and use dot, since it yields more powerful graphs.
-
- CLASS_DIAGRAMS = YES
-
--# You can define message sequence charts within doxygen comments using the \msc
--# command. Doxygen will then run the mscgen tool (see http://www.mcternan.me.uk/mscgen/) to
--# produce the chart and insert it in the documentation. The MSCGEN_PATH tag allows you to
--# specify the directory where the mscgen tool resides. If left empty the tool is assumed to
--# be found in the default search path.
-+# You can define message sequence charts within doxygen comments using the \msc
-+# command. Doxygen will then run the mscgen tool (see
-+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
-+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-+# the mscgen tool resides. If left empty the tool is assumed to be found in the
-+# default search path.
-
--MSCGEN_PATH =
-+MSCGEN_PATH =
-
--# If set to YES, the inheritance and collaboration graphs will hide
--# inheritance and usage relations if the target is undocumented
-+# If set to YES, the inheritance and collaboration graphs will hide
-+# inheritance and usage relations if the target is undocumented
- # or is not a class.
-
- HIDE_UNDOC_RELATIONS = YES
-
--# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
--# available from the path. This tool is part of Graphviz, a graph visualization
--# toolkit from AT&T and Lucent Bell Labs. The other options in this section
-+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-+# available from the path. This tool is part of Graphviz, a graph visualization
-+# toolkit from AT&T and Lucent Bell Labs. The other options in this section
- # have no effect if this option is set to NO (the default)
-
- HAVE_DOT = @HAVE_DOT@
-
--# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
--# will generate a graph for each documented class showing the direct and
--# indirect inheritance relations. Setting this tag to YES will force the
-+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
-+# allowed to run in parallel. When set to 0 (the default) doxygen will
-+# base this on the number of processors available in the system. You can set it
-+# explicitly to a value larger than 0 to get control over the balance
-+# between CPU load and processing speed.
-+
-+DOT_NUM_THREADS = 0
-+
-+# By default doxygen will write a font called Helvetica to the output
-+# directory and reference it in all dot files that doxygen generates.
-+# When you want a differently looking font you can specify the font name
-+# using DOT_FONTNAME. You need to make sure dot is able to find the font,
-+# which can be done by putting it in a standard location or by setting the
-+# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
-+# containing the font.
-+
-+DOT_FONTNAME = Helvetica
-+
-+# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
-+# The default size is 10pt.
-+
-+DOT_FONTSIZE = 10
-+
-+# By default doxygen will tell dot to use the output directory to look for the
-+# FreeSans.ttf font (which doxygen will put there itself). If you specify a
-+# different font using DOT_FONTNAME you can set the path where dot
-+# can find it using this tag.
-+
-+DOT_FONTPATH =
-+
-+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
-+# will generate a graph for each documented class showing the direct and
-+# indirect inheritance relations. Setting this tag to YES will force the
- # the CLASS_DIAGRAMS tag to NO.
-
- CLASS_GRAPH = YES
-
--# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
--# will generate a graph for each documented class showing the direct and
--# indirect implementation dependencies (inheritance, containment, and
-+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
-+# will generate a graph for each documented class showing the direct and
-+# indirect implementation dependencies (inheritance, containment, and
- # class references variables) of the class with other documented classes.
-
- COLLABORATION_GRAPH = YES
-
--# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
-+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
- # will generate a graph for groups, showing the direct groups dependencies
-
- GROUP_GRAPHS = YES
-
--# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
--# collaboration diagrams in a style similar to the OMG's Unified Modeling
-+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
-+# collaboration diagrams in a style similar to the OMG's Unified Modeling
- # Language.
-
- UML_LOOK = YES
-
--# If set to YES, the inheritance and collaboration graphs will show the
-+# If set to YES, the inheritance and collaboration graphs will show the
- # relations between templates and their instances.
-
- TEMPLATE_RELATIONS = YES
-
--# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
--# tags are set to YES then doxygen will generate a graph for each documented
--# file showing the direct and indirect include dependencies of the file with
-+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
-+# tags are set to YES then doxygen will generate a graph for each documented
-+# file showing the direct and indirect include dependencies of the file with
- # other documented files.
-
- INCLUDE_GRAPH = YES
-
--# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
--# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
--# documented header file showing the documented files that directly or
-+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
-+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
-+# documented header file showing the documented files that directly or
- # indirectly include this file.
-
- INCLUDED_BY_GRAPH = YES
-
--# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will
--# generate a call dependency graph for every global function or class method.
--# Note that enabling this option will significantly increase the time of a run.
--# So in most cases it will be better to enable call graphs for selected
--# functions only using the \callgraph command.
-+# If the CALL_GRAPH and HAVE_DOT options are set to YES then
-+# doxygen will generate a call dependency graph for every global function
-+# or class method. Note that enabling this option will significantly increase
-+# the time of a run. So in most cases it will be better to enable call graphs
-+# for selected functions only using the \callgraph command.
-
- CALL_GRAPH = NO
-
--# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then doxygen will
--# generate a caller dependency graph for every global function or class method.
--# Note that enabling this option will significantly increase the time of a run.
--# So in most cases it will be better to enable caller graphs for selected
--# functions only using the \callergraph command.
-+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
-+# doxygen will generate a caller dependency graph for every global function
-+# or class method. Note that enabling this option will significantly increase
-+# the time of a run. So in most cases it will be better to enable caller
-+# graphs for selected functions only using the \callergraph command.
-
- CALLER_GRAPH = NO
-
--# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
--# will graphical hierarchy of all classes instead of a textual one.
-+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
-+# will generate a graphical hierarchy of all classes instead of a textual one.
-
- GRAPHICAL_HIERARCHY = YES
-
--# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
--# then doxygen will show the dependencies a directory has on other directories
-+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
-+# then doxygen will show the dependencies a directory has on other directories
- # in a graphical way. The dependency relations are determined by the #include
- # relations between the files in the directories.
-
- DIRECTORY_GRAPH = YES
-
--# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
--# generated by dot. Possible values are png, jpg, or gif
-+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-+# generated by dot. Possible values are svg, png, jpg, or gif.
- # If left blank png will be used.
-
--DOT_IMAGE_FORMAT = gif
-+DOT_IMAGE_FORMAT = png
-
--# The tag DOT_PATH can be used to specify the path where the dot tool can be
-+# The tag DOT_PATH can be used to specify the path where the dot tool can be
- # found. If left blank, it is assumed the dot tool can be found in the path.
-
--DOT_PATH =
-+DOT_PATH =
-
--# The DOTFILE_DIRS tag can be used to specify one or more directories that
--# contain dot files that are included in the documentation (see the
-+# The DOTFILE_DIRS tag can be used to specify one or more directories that
-+# contain dot files that are included in the documentation (see the
- # \dotfile command).
-
--DOTFILE_DIRS =
-+DOTFILE_DIRS =
-
--# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
--# nodes that will be shown in the graph. If the number of nodes in a graph
--# becomes larger than this value, doxygen will truncate the graph, which is
--# visualized by representing a node as a red box. Note that doxygen will always
--# show the root nodes and its direct children regardless of this setting.
-+# The MSCFILE_DIRS tag can be used to specify one or more directories that
-+# contain msc files that are included in the documentation (see the
-+# \mscfile command).
-+
-+MSCFILE_DIRS =
-+
-+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
-+# nodes that will be shown in the graph. If the number of nodes in a graph
-+# becomes larger than this value, doxygen will truncate the graph, which is
-+# visualized by representing a node as a red box. Note that doxygen if the
-+# number of direct children of the root node in a graph is already larger than
-+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
-+# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-
- DOT_GRAPH_MAX_NODES = 1
-
--# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
--# background. This is disabled by default, which results in a white background.
--# Warning: Depending on the platform used, enabling this option may lead to
--# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
--# read).
-+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
-+# graphs generated by dot. A depth value of 3 means that only nodes reachable
-+# from the root by following a path via at most 3 edges will be shown. Nodes
-+# that lay further from the root node will be omitted. Note that setting this
-+# option to 1 or 2 may greatly reduce the computation time needed for large
-+# code bases. Also note that the size of a graph can be further restricted by
-+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-+
-+MAX_DOT_GRAPH_DEPTH = 0
-+
-+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-+# background. This is disabled by default, because dot on Windows does not
-+# seem to support this out of the box. Warning: Depending on the platform used,
-+# enabling this option may lead to badly anti-aliased labels on the edges of
-+# a graph (i.e. they become hard to read).
-
- DOT_TRANSPARENT = NO
-
--# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
--# files in one run (i.e. multiple -o and -T options on the command line). This
--# makes dot run faster, but since only newer versions of dot (>1.8.10)
-+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
-+# files in one run (i.e. multiple -o and -T options on the command line). This
-+# makes dot run faster, but since only newer versions of dot (>1.8.10)
- # support this, this feature is disabled by default.
-
--DOT_MULTI_TARGETS = NO
-+DOT_MULTI_TARGETS = YES
-
--# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
--# generate a legend page explaining the meaning of the various boxes and
-+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
-+# generate a legend page explaining the meaning of the various boxes and
- # arrows in the dot generated graphs.
-
- GENERATE_LEGEND = YES
-
--# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
--# remove the intermediate dot files that are used to generate
-+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
-+# remove the intermediate dot files that are used to generate
- # the various graphs.
-
- DOT_CLEANUP = YES
--
--#---------------------------------------------------------------------------
--# Configuration::additions related to the search engine
--#---------------------------------------------------------------------------
--
--# The SEARCHENGINE tag specifies whether or not a search engine should be
--# used. If set to NO the values of all tags below this one will be ignored.
--
--SEARCHENGINE = NO
diff --git a/cvc3-doxygen.patch b/cvc3-doxygen.patch
deleted file mode 100644
index 06660e0..0000000
--- a/cvc3-doxygen.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- src/theory_bitvector/bitvector_proof_rules.h.orig 2009-10-15 19:12:02.000000000 -0600
-+++ src/theory_bitvector/bitvector_proof_rules.h 2011-09-06 11:09:44.567370638 -0600
-@@ -540,14 +540,14 @@ namespace CVC3 {
- std::vector& output_bits) = 0;
-
- /**
-- * Rewrite x_1 \vee x_2 \vee \ldots \vee x_n = 0 into
-- * x_1 = 0 \wedge x_2 = 0 \wedge \ldots \wedge x_n = 0.
-+ * Rewrite \f[x_1 \vee x_2 \vee \ldots \vee x_n = 0\f] into
-+ * \f[x_1 = 0 \wedge x_2 = 0 \wedge \ldots \wedge x_n = 0\f].
- */
- virtual Theorem zeroBVOR(const Expr& orEqZero) = 0;
-
- /**
-- * Rewrite x_1 \wedge x_2 \wedge \ldots \wedge x_n = 1^n into
-- * x_1 = 1^n \wedge x_2 = 1^n \wedge \ldots \wedge x_n = 1^n.
-+ * Rewrite \f[x_1 \wedge x_2 \wedge \ldots \wedge x_n = 1^n\f] into
-+ * \f[x_1 = 1^n \wedge x_2 = 1^n \wedge \ldots \wedge x_n = 1^n\f].
- */
- virtual Theorem oneBVAND(const Expr& andEqOne) = 0;
-
---- src/theory_bitvector/bitvector_theorem_producer.h.orig 2009-10-15 19:12:03.000000000 -0600
-+++ src/theory_bitvector/bitvector_theorem_producer.h 2011-09-06 11:11:29.751366334 -0600
-@@ -577,7 +577,7 @@ namespace CVC3 {
-
- /**
- * Rewrite x/y to
-- * \exists s: s = x/y \wedge (y \neq 0 \implies x = y * s + m & 0 <= m < y)
-+ * \f[\exists s: s = x/y \wedge (y \neq 0 \implies x = y * s + m \wedge 0 <= m < y)\f]
- */
- virtual Theorem bvUDivTheorem(const Expr& divExpr);
-
-@@ -629,14 +629,14 @@ namespace CVC3 {
- virtual Theorem bvSModRewrite(const Expr& sModExpr);
-
- /**
-- * Rewrite x_1 \vee x_2 \vee \ldots \vee x_n = 0 into
-- * x_1 = 0 \wedge x_2 = 0 \wedge \ldots \wedge x_n = 0.
-+ * Rewrite \f[x_1 \vee x_2 \vee \ldots \vee x_n = 0\f] into
-+ * \f[x_1 = 0 \wedge x_2 = 0 \wedge \ldots \wedge x_n = 0\f].
- */
- virtual Theorem zeroBVOR(const Expr& orEqZero);
-
- /**
-- * Rewrite x_1 \wedge x_2 \wedge \ldots \wedge x_n = 1^n into
-- * x_1 = 1^n \wedge x_2 = 1^n \wedge \ldots \wedge x_n = 1^n.
-+ * Rewrite \f[x_1 \wedge x_2 \wedge \ldots \wedge x_n = 1^n\f] into
-+ * \f[x_1 = 1^n \wedge x_2 = 1^n \wedge \ldots \wedge x_n = 1^n\f].
- */
- virtual Theorem oneBVAND(const Expr& andEqOne);
-
diff --git a/cvc3.spec b/cvc3.spec
deleted file mode 100644
index 2ecd54a..0000000
--- a/cvc3.spec
+++ /dev/null
@@ -1,294 +0,0 @@
-Name: cvc3
-Version: 2.4.1
-Release: 14%{?dist}
-Summary: Validity checker of many-sorted first-order formulas with theories
-
-License: BSD and MIT
-URL: http://www.cs.nyu.edu/acsys/cvc3/
-Source: http://www.cs.nyu.edu/acsys/cvc3/download/%{version}/%{name}-%{version}.tar.gz
-# This patch is Fedora-specific. Set up doxygen so that the generated
-# documentation meets packaging standards.
-Patch0: %{name}-doc.patch
-# This patch was sent upstream 6 Sep 2011. It fixes some broken doxygen
-# comments.
-Patch1: %{name}-doxygen.patch
-# Not sent upstream, as cvc3 has reached end of life. Add support for aarch64.
-Patch2: %{name}-aarch64.patch
-
-BuildRequires: bison
-BuildRequires: doxygen
-BuildRequires: emacs
-BuildRequires: flex
-BuildRequires: gmp-devel
-BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: jpackage-utils
-BuildRequires: perl
-BuildRequires: python
-BuildRequires: time
-BuildRequires: transfig
-BuildRequires: tex(latex)
-BuildRequires: xemacs
-
-%description
-CVC3 is an automatic theorem prover for Satisfiability Modulo Theories (SMT)
-problems. It can be used to prove the validity (or, dually, the
-satisfiability) of first-order formulas in a large number of built-in logical
-theories and their combination.
-
-CVC3 is the latest offspring of a series of popular SMT provers, which
-originated at Stanford University with the SVC system. In particular, it
-builds on the code base of CVC Lite, its most recent predecessor. Its high
-level design follows that of the Sammy prover.
-
-CVC3 works with a version of first-order logic with polymorphic types and has
-a wide variety of features including:
-
- * several built-in base theories: rational and integer linear arithmetic,
- arrays, tuples, records, inductive data types, bit vectors, and equality
- over uninterpreted function symbols;
- * support for quantifiers;
- * an interactive text-based interface;
- * a rich C and C++ API for embedding in other systems;
- * proof and model generation abilities;
- * predicate subtyping;
- * essentially no limit on its use for research or commercial purposes (see
- license).
-
-For example, if you run 'cvc3 +interactive' and submit:
- i, j: INT; ASSERT i = j + 1; QUERY i>j;
-it will determine "Valid." If you then ask:
- QUERY i= %{_emacs_version}
-Requires: %{name} = %{version}-%{release}
-BuildArch: noarch
-
-%description emacs
-This package contains the byte compiled CVC3 mode for Emacs.
-
-%package emacs-el
-Summary: Elisp source files for the CVC3 Emacs mode
-Requires: %{name} = %{version}-%{release}
-BuildArch: noarch
-
-%description emacs-el
-This package contains the source Elisp files for the CVC3 mode for Emacs. You
-do not need to install this package to run %{name}. Install the %{name}-emacs
-package to use %{name} with Emacs.
-
-%package xemacs
-Summary: Compiled XEmacs mode for CVC3
-Requires: xemacs(bin) >= %{_xemacs_version}
-Requires: %{name} = %{version}-%{release}
-BuildArch: noarch
-
-%description xemacs
-This package contains the byte compiled CVC3 mode for XEmacs.
-
-%package xemacs-el
-Summary: Elisp source files for the CVC3 XEmacs mode
-Requires: %{name} = %{version}-%{release}
-BuildArch: noarch
-
-%description xemacs-el
-This package contains the source Elisp files for the CVC3 mode for XEmacs. You
-do not need to install this package to run %{name}. Install the %{name}-xemacs
-package to use %{name} with XEmacs.
-
-%prep
-%setup -q
-%patch0
-%patch1
-%patch2
-
-# Use the appropriate compiler flags
-sed -e "s|^ LOCAL_CXXFLAGS = -O2| LOCAL_CXXFLAGS =|" \
- -e "s|^LOCAL_CXXFLAGS += -Wall|LOCAL_CXXFLAGS +=|" \
- -i Makefile.std
-
-# We can't use loadLibrary, since the JNI libaries are not in a standard place
-sed -i \
- "s|loadLibrary(\"cvc3jni\")|load(\"%{_libdir}/%{name}/libcvc3jni.so\")|" \
- java/src/cvc3/Embedded.java
-
-# Get rid of an unused direct shared library dependency
-sed -i "s|-lcvc3 \$(LD_LIBS)|-Wl,--as-needed -lcvc3 \$(LD_LIBS)|" java/Makefile
-
-%build
-export CXXFLAGS="%{optflags} -std=gnu++98"
-%configure --with-build=optimized --enable-dynamic --enable-java \
- --disable-zchaff --with-java-home=%{java_home}
-# FIXME: %%{?_smp_mflags} sometimes leads to build failures
-make
-
-# Build the documentation
-make -C doc
-rm -f doc/html/*.{map,md5}
-
-%install
-mkdir -p %{buildroot}%{_libdir}/%{name}
-%makeinstall javadir=%{buildroot}%{_libdir}/%{name}
-
-# Byte compile the CVC3 mode file for Emacs
-mkdir -p %{buildroot}%{_emacs_sitelispdir}
-cp -p emacs/cvc-mode.el %{buildroot}%{_emacs_sitelispdir}
-pushd %{buildroot}%{_emacs_sitelispdir}
-%{_emacs_bytecompile} cvc-mode.el
-popd
-
-# Byte compile the CVC3 mode file for XEmacs
-mkdir -p %{buildroot}%{_xemacs_sitelispdir}
-cp -p emacs/cvc-mode.el %{buildroot}%{_xemacs_sitelispdir}
-pushd %{buildroot}%{_xemacs_sitelispdir}
-%{_xemacs_bytecompile} cvc-mode.el
-popd
-
-# Add missing executable bits to the shared libraries
-chmod a+x %{buildroot}%{_libdir}/*.so.*
-
-# Move the JNI libraries to the right place
-mv %{buildroot}%{_libdir}/libcvc3jni.* %{buildroot}%{_libdir}/%{name}
-
-%check
-# Due to Fedora's policy of changing System.loadLibrary() with a mutable path
-# to System.load() with a fixed path, it is not possible to run the Java tests,
-# since the JNI shared objects are not in the fixed location until the RPM is
-# installed.
-sed -i "s/^BUILD_JAVA = 1/BUILD_JAVA = 0/" Makefile.local
-LD_LIBRARY_PATH=`pwd`/lib make regress4
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%files
-%doc INSTALL PEOPLE README
-%license LICENSE
-%{_bindir}/cvc3
-%{_libdir}/libcvc3.so.*
-
-%files devel
-%{_includedir}/cvc3
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/%{name}.pc
-
-%files doc
-%doc doc/html
-
-%files java
-%{_libdir}/%{name}
-
-%files emacs
-%{_emacs_sitelispdir}/*.elc
-
-%files emacs-el
-%{_emacs_sitelispdir}/*.el
-
-%files xemacs
-%{_xemacs_sitelispdir}/*.elc
-
-%files xemacs-el
-%{_xemacs_sitelispdir}/*.el
-
-%changelog
-* Wed Feb 03 2016 Fedora Release Engineering - 2.4.1-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Jun 17 2015 Fedora Release Engineering - 2.4.1-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sat May 02 2015 Kalev Lember - 2.4.1-12
-- Rebuilt for GCC 5 C++11 ABI change
-
-* Thu Feb 12 2015 Jerry James - 2.4.1-11
-- Use license macro
-- Note bundled jquery
-
-* Sat Aug 16 2014 Fedora Release Engineering - 2.4.1-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sat Jun 07 2014 Fedora Release Engineering - 2.4.1-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Mon Feb 24 2014 Jerry James - 2.4.1-8
-- Make the -java subpackage R java-headless instead of java (bz 1068020)
-
-* Sat Aug 03 2013 Fedora Release Engineering - 2.4.1-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Mon Apr 29 2013 Jerry James - 2.4.1-6
-- Add -aarch64 support (bz 925213)
-- Turn off parallel builds; they sometimes fail while building the Java code
-
-* Wed Feb 13 2013 Fedora Release Engineering - 2.4.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Wed Jul 18 2012 Fedora Release Engineering - 2.4.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Tue Feb 28 2012 Fedora Release Engineering - 2.4.1-3
-- Rebuilt for c++ ABI breakage
-
-* Fri Jan 6 2012 Jerry James - 2.4.1-2
-- Rebuild for GCC 4.7
-
-* Thu Oct 20 2011 Marcela Mašláňová - 2.4.1-1.2
-- rebuild with new gmp without compat lib
-
-* Mon Oct 10 2011 Peter Schiffer - 2.4.1-1.1
-- rebuild with new gmp
-
-* Tue Sep 6 2011 Jerry James - 2.4.1-1
-- New upstream version
-- Drop unnecessary spec file elements (BuildRoot, etc.)
-- Don't run the Java tests; they can't find the JNI shared objects
-
-* Tue Feb 08 2011 Fedora Release Engineering - 2.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Thu Jun 3 2010 Jerry James - 2.2-2
-- Add python BR (bz 599887)
-
-* Thu Nov 19 2009 Jerry James - 2.2-1
-- Update to 2.2
-- Drop upstreamed patches (gcc4 and java)
-
-* Tue Oct 27 2009 Jerry James - 2.1-3
-- Drop the graphviz BR to block generation of huge class graphs
-- Use the new (X)Emacs RPM macros to simplify the spec file
-
-* Mon Oct 19 2009 Jerry James - 2.1-2
-- Fix problems found on review
-- Enable the Java interface
-
-* Thu Oct 15 2009 Jerry James - 2.1-1
-- Initial RPM
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..86f754c
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Unsupported by upstream. Most consumers have migrated to cvc4.
diff --git a/sources b/sources
deleted file mode 100644
index da84425..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-9b082b0e8c80e1459e9653de044e0d6e cvc3-2.4.1.tar.gz