Merge branch 'master' into strRewritesstrRewrites

135 files changed, 292 insertions, 15826 deletions

diff --git a/.gitignore b/.gitignore
index 4bcdbe54a..9680cefd2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,34 +1,15 @@
-/autom4te.cache
 /stamp-h
-/config.h.in
-/config.log
-/config.status
-/config.cache
-/cvc4autoconfig.h.in
-/libtool
 /stamp-h1
 /cvc4-*.tar.gz
 /cvc4-*.tar.bz2
-/builds/
+/build/
 /doc/doxygen
-.dep
-Makefile.in
-/configure
-/aclocal.m4
 callgrind.out*
 gmon.out
 stamp-generated
 generated/
 *~
 \#*\#
-*.gcov
-/lcov/
-/config/compile
-/config/tap-driver.sh
-.cvc4_config
-config.reconfig
 *.swp
 /debug/
-/personal.conf
-/personal.mk
 /antlr-3.4
diff --git a/.travis.yml b/.travis.yml
index d8b1fc993..265f42bb4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,8 +27,6 @@ addons:
   - cxxtest
   - junit4
   - libantlr3c-dev
-  - libboost-dev         # Remove with autotools build
-  - libboost-thread-dev  # Remove with autotools build
   - libcln-dev
   - libgmp-dev
   - libhamcrest-java
@@ -66,29 +64,11 @@ script:
      echo;
      exit 1;
    }
-   makeAutotools() {
-     ./autogen.sh
-     ./configure debug --with-lfsc --disable-debug-symbols
-     make -j2 check REGRESSION_LEVEL=0 CVC4_REGRESSION_ARGS='--no-early-exit' || error "AUTOTOOLS BUILD/UNIT/SYSTEM/REGRESSION TEST FAILED"
-   }
-   #   makeDistcheck() {
-   #     make V=1 -j2 distcheck REGRESSION_LEVEL=0 CVC4_REGRESSION_ARGS='--no-early-exit' ||
-   #       error "DISTCHECK (WITH NEWTHEORY TESTS) FAILED";
-   #   }
    makeCheck() {
      cd build
      make -j2 check ARGS='-LE regress[1-4]' CVC4_REGRESSION_ARGS='--no-early-exit' || error "BUILD/UNIT/SYSTEM/REGRESSION TEST FAILED"
+     ctest -j2 -L example || error "RUNNING EXAMPLES FAILED"
    }
-   makeExamples() {
-     cd build
-     make -j2 examples || error "COULD NOT BUILD EXAMPLES${normal}";
-   }
-   #   addNewTheoryTest() {
-   #       contrib/new-theory test_newtheory || error "NEWTHEORY FAILED";
-   #       grep -q '^THEORIES *=.* test_newtheory' src/Makefile.theories || error "NEWTHEORY FAILED";
-   #       contrib/new-theory --alternate test_newtheory test_newalttheory || error "NEWTHEORY-ALTERNATE FAILED";
-   #       grep -q '^THEORIES *=.* test_newalttheory' src/Makefile.theories || error "NEWTHEORY-ALTERNATE FAILED";
-   #   }
    run() {
      echo "travis_fold:start:$1"
      echo "Running $1"
@@ -96,11 +76,8 @@ script:
      echo "travis_fold:end:$1"
    }
    [ -n "$TRAVIS_CVC4" ] && [ -n "$TRAVIS_WITH_LFSC" ] && run contrib/get-lfsc-checker
-   [ -n "$TRAVIS_AUTOTOOLS" ] && run makeAutotools
-   #   [ -n "$TRAVIS_CVC4" ] && [ -n "$TRAVIS_CVC4_DISTCHECK" ] && run addNewTheoryTest
-   [ -n "$TRAVIS_CVC4" ] && [ -z "$TRAVIS_AUTOTOOLS" ] && run configureCVC4
-   #   [ -n "$TRAVIS_CVC4" ] && [ -n "$TRAVIS_CVC4_DISTCHECK" ] && run makeDistcheck
-   [ -n "$TRAVIS_CVC4" ] && [ -z "$TRAVIS_CVC4_DISTCHECK" ] && [ -z "$TRAVIS_AUTOTOOLS" ] && run makeCheck && run makeExamples
+   [ -n "$TRAVIS_CVC4" ] && run configureCVC4
+   [ -n "$TRAVIS_CVC4" ] && run makeCheck
    [ -z "$TRAVIS_CVC4" ] && error "Unknown Travis-CI configuration"
    echo "travis_fold:end:load_script"
  - echo; echo "${green}EVERYTHING SEEMED TO PASS!${normal}"
@@ -116,18 +93,11 @@ matrix:
       env:
         - TRAVIS_CVC4=yes TRAVIS_WITH_LFSC=yes TRAVIS_CVC4_CONFIG='debug --lfsc --no-debug-symbols'
 
-    # Add autotools build until cmake is the default
-    - compiler: gcc
-      env:
-        - TRAVIS_CVC4=yes TRAVIS_WITH_LFSC=yes TRAVIS_AUTOTOOLS=yes
     #
     # Test with Clang
     - compiler: clang
       env:
         - TRAVIS_CVC4=yes TRAVIS_WITH_LFSC=yes TRAVIS_CVC4_CONFIG='debug --cln --gpl --no-debug-symbols --no-proofs'
-    - compiler: clang
-      env:
-        - TRAVIS_CVC4=yes TRAVIS_CVC4_DISTCHECK=yes TRAVIS_CVC4_CONFIG='--proofs'
 notifications:
   email:
     on_success: change
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 62a7a7ea0..a35d75dc9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -433,7 +433,7 @@ endif()
 # Generate CVC4's cvc4autoconfig.h header
 
 include(ConfigureCVC4)
-configure_file(cvc4autoconfig.new.h.in cvc4autoconfig.h)
+configure_file(cvc4autoconfig.h.in cvc4autoconfig.h)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 #-----------------------------------------------------------------------------#
diff --git a/Makefile b/Makefile
deleted file mode 100644
index b4c7589fe..000000000
--- a/Makefile
+++ /dev/null
@@ -1,172 +0,0 @@
-#  -*-makefile-*-
-#
-# This makefile is the _source_ directory's makefile, and is static,
-# not generated.  Makefile.am is the automake makefile for the build
-# top-level (its corresponding Makefile.in is here, too, but the
-# corresponding Makefile is under builds/$arch/$buildid.
-#
-builddir = builds
-
-.PHONY: all install examples install-examples
-all install examples install-examples .DEFAULT:
-	@if test -d $(builddir); then \
-		echo cd $(builddir); \
-		cd $(builddir); \
-		echo $(MAKE) $@; \
-		$(MAKE) $@ || exit 1; \
-		$(MAKE) show-config; \
-	else \
-		echo; \
-		echo 'Run configure first, or type "make" in a configured build directory.'; \
-		echo; \
-	fi
-
-distclean maintainerclean:
-	@if test -d $(builddir); then \
-		echo cd $(builddir); \
-		cd $(builddir); \
-		echo $(MAKE) $@; \
-		$(MAKE) $@ || exit 1; \
-	fi
-	test -z "$(builddir)" || rm -fr "$(builddir)"
-	rm -f config.reconfig
-
-# synonyms for "check"
-.PHONY: test
-test: check
-
-.PHONY: doc doc-internals
-doc: doc-builds
-doc-internals: doc-internals-builds
-
-YEAR := $(shell date +%Y)
-.PHONY: submission submission-main submission-application submission-parallel
-submission:
-	@if [ -d builds-smtcomp ]; then \
-	  echo 'ERROR:' >&2; \
-	  echo 'ERROR: remove the builds-smtcomp directory' >&2; \
-	  echo 'ERROR:' >&2; \
-	  exit 1; \
-	fi
-	@if test -d cvc4-smtcomp-$(YEAR) || test -e cvc4-smtcomp-$(YEAR).zip || \
-	    test -d cvc4-smtcomp-main-$(YEAR) || test -e cvc4-smtcomp-main-$(YEAR).zip || \
-	    test -d cvc4-smtcomp-application-$(YEAR) || test -e cvc4-smtcomp-application-$(YEAR).zip || \
-	    test -d cvc4-smtcomp-parallel-$(YEAR) || test -e cvc4-smtcomp-parallel-$(YEAR).zip; then \
-	  echo 'ERROR:' >&2; \
-	  echo 'ERROR: Please remove cvc4-smtcomp*-$(YEAR) and corresponding zipfiles.' >&2; \
-	  echo 'ERROR:' >&2; \
-	  exit 1; \
-	fi
-	$(MAKE) submission-main
-	$(MAKE) submission-application
-	$(MAKE) submission-parallel
-	mkdir -p cvc4-smtcomp-$(YEAR)/bin
-	cp -p cvc4-smtcomp-main-$(YEAR)/bin/cvc4 cvc4-smtcomp-$(YEAR)/bin/cvc4-main
-	cp -p cvc4-smtcomp-main-$(YEAR)/bin/starexec_run_default cvc4-smtcomp-$(YEAR)/bin/starexec_run_default
-	cp -p cvc4-smtcomp-application-$(YEAR)/bin/cvc4 cvc4-smtcomp-$(YEAR)/bin/cvc4-application
-	cp -p cvc4-smtcomp-application-$(YEAR)/bin/starexec_run_default cvc4-smtcomp-$(YEAR)/bin/starexec_run_application
-	cp -p cvc4-smtcomp-parallel-$(YEAR)/bin/pcvc4 cvc4-smtcomp-$(YEAR)/bin/pcvc4
-	#cp -p cvc4-smtcomp-parallel-$(YEAR)/bin/starexec_run_default cvc4-smtcomp-$(YEAR)/bin/starexec_run_parallel
-	cat cvc4-smtcomp-main-$(YEAR)/starexec_description.txt \
-	    cvc4-smtcomp-application-$(YEAR)/starexec_description.txt \
-	    cvc4-smtcomp-parallel-$(YEAR)/starexec_description.txt \
-	    > cvc4-smtcomp-$(YEAR)/starexec_description.txt
-	perl -pi -e 's,/cvc4\b,/cvc4-main,g' cvc4-smtcomp-$(YEAR)/bin/starexec_run_default
-	perl -pi -e 's,/cvc4\b,/cvc4-application,g' cvc4-smtcomp-$(YEAR)/bin/starexec_run_application
-	cd cvc4-smtcomp-$(YEAR) && zip -r ../cvc4-smtcomp-$(YEAR).zip *
-submission-main:
-	@if [ -d builds-smtcomp/main ]; then \
-	  echo 'ERROR:' >&2; \
-	  echo 'ERROR: Please remove the builds-smtcomp/main directory' >&2; \
-	  echo 'ERROR:' >&2; \
-	  exit 1; \
-	fi
-	@if [ -e contrib/run-script-smtcomp$(YEAR) ]; then :; else \
-	  echo 'ERROR:' >&2; \
-	  echo 'ERROR: Expected contrib/run-script-smtcomp$(YEAR) to exist!' >&2; \
-	  echo 'ERROR:' >&2; \
-	  exit 1; \
-	fi
-	@if test -d cvc4-smtcomp-main-$(YEAR) || test -e cvc4-smtcomp-main-$(YEAR).zip; then \
-	  echo 'ERROR:' >&2; \
-	  echo 'ERROR: Please remove cvc4-smtcomp-main-$(YEAR) and cvc4-smtcomp-main-$(YEAR).zip first.' >&2; \
-	  echo 'ERROR:' >&2; \
-	  exit 1; \
-	fi
-	./autogen.sh
-	mkdir -p builds-smtcomp/main
-	( cd builds-smtcomp/main; \
-	  ../../configure competition --disable-thread-support --disable-shared --enable-static-binary --with-cln --with-glpk --with-abc --without-readline --enable-gpl; \
-	  $(MAKE) V=1; \
-	  strip src/main/cvc4; \
-	  $(MAKE) check )
-	# main track
-	mkdir -p cvc4-smtcomp-main-$(YEAR)/bin
-	cp -p builds-smtcomp/main/src/main/cvc4 cvc4-smtcomp-main-$(YEAR)/bin/cvc4
-	cp contrib/run-script-smtcomp$(YEAR) cvc4-smtcomp-main-$(YEAR)/bin/starexec_run_default
-	chmod 755 cvc4-smtcomp-main-$(YEAR)/bin/starexec_run_default
-	echo "CVC4 for SMT_COMP main track `builds-smtcomp/main/src/main/cvc4 --version | head -1 | sed 's,.*version ,,;s,-,_,g;s,[^a-zA-Z0-9. _],,g'`" > cvc4-smtcomp-main-$(YEAR)/starexec_description.txt
-	cd cvc4-smtcomp-main-$(YEAR) && zip -r ../cvc4-smtcomp-main-$(YEAR).zip *
-submission-application:
-	# application track is a separate build because it has different preprocessor #defines
-	@if [ -d builds-smtcomp/application ]; then \
-	  echo 'ERROR:' >&2; \
-	  echo 'ERROR: Please remove the builds-smtcomp/application directory' >&2; \
-	  echo 'ERROR:' >&2; \
-	  exit 1; \
-	fi
-	@if test -d cvc4-smtcomp-application-$(YEAR) || test -e cvc4-smtcomp-application-$(YEAR).zip; then \
-	  echo 'ERROR:' >&2; \
-	  echo 'ERROR: Please remove cvc4-smtcomp-application-$(YEAR) and cvc4-smtcomp-application-$(YEAR).zip first.' >&2; \
-	  echo 'ERROR:' >&2; \
-	  exit 1; \
-	fi
-	@if [ -e contrib/run-script-smtcomp$(YEAR)-application ]; then :; else \
-	  echo 'ERROR:' >&2; \
-	  echo 'ERROR: Expected contrib/run-script-smtcomp$(YEAR)-application to exist!' >&2; \
-	  echo 'ERROR:' >&2; \
-	  exit 1; \
-	fi
-	./autogen.sh
-	mkdir -p builds-smtcomp/application
-	( cd builds-smtcomp/application; \
-	  ../../configure competition --disable-thread-support --disable-shared --enable-static-binary --with-cln --without-glpk --with-abc --without-readline --enable-gpl CXXFLAGS=-DCVC4_SMTCOMP_APPLICATION_TRACK CFLAGS=-DCVC4_SMTCOMP_APPLICATION_TRACK; \
-	  $(MAKE) V=1; \
-	  strip src/main/cvc4; \
-	  $(MAKE) check )
-	# package the application track zipfile
-	mkdir -p cvc4-smtcomp-application-$(YEAR)/bin
-	cp -p builds-smtcomp/application/src/main/cvc4 cvc4-smtcomp-application-$(YEAR)/bin/cvc4
-	cp contrib/run-script-smtcomp$(YEAR)-application cvc4-smtcomp-application-$(YEAR)/bin/starexec_run_default
-	chmod 755 cvc4-smtcomp-application-$(YEAR)/bin/starexec_run_default
-	echo "CVC4 for SMT_COMP application track `builds-smtcomp/application/src/main/cvc4 --version | head -1 | sed 's,.*version ,,;s,-,_,g;s,[^a-zA-Z0-9. _],,g'`" > cvc4-smtcomp-application-$(YEAR)/starexec_description.txt
-	cd cvc4-smtcomp-application-$(YEAR) && zip -r ../cvc4-smtcomp-application-$(YEAR).zip *
-submission-parallel:
-	# parallel track can't be built with -cln, so it's a separate build
-	@if [ -d builds-smtcomp/parallel ]; then \
-	  echo 'ERROR:' >&2; \
-	  echo 'ERROR: Please remove the builds-smtcomp/parallel directory' >&2; \
-	  echo 'ERROR:' >&2; \
-	  exit 1; \
-	fi
-	@if test -d cvc4-smtcomp-parallel-$(YEAR) || test -e cvc4-smtcomp-parallel-$(YEAR).zip; then \
-	  echo 'ERROR:' >&2; \
-	  echo 'ERROR: Please remove cvc4-smtcomp-parallel-$(YEAR) and cvc4-smtcomp-parallel-$(YEAR).zip first.' >&2; \
-	  echo 'ERROR:' >&2; \
-	  exit 1; \
-	fi
-	./autogen.sh
-	mkdir -p builds-smtcomp/parallel
-	( cd builds-smtcomp/parallel; \
-	  ../../configure competition --disable-shared --enable-static-binary --with-gmp --with-portfolio --with-glpk --with-abc --without-readline --enable-gpl; \
-	  $(MAKE) V=1; \
-	  strip src/main/pcvc4; \
-	  $(MAKE) check BINARY=pcvc4 CVC4_REGRESSION_ARGS=--fallback-sequential || true )
-	# package the parallel track zipfile
-	mkdir -p cvc4-smtcomp-parallel-$(YEAR)/bin
-	cp -p builds-smtcomp/parallel/src/main/pcvc4 cvc4-smtcomp-parallel-$(YEAR)/bin/pcvc4
-	( echo '#!/bin/sh'; \
-	  echo 'exec ./pcvc4 --threads 2 -L smt2 --no-checking --no-interactive --no-wait-to-join "$@"' ) > cvc4-smtcomp-parallel-$(YEAR)/bin/starexec_run_default
-	chmod 755 cvc4-smtcomp-parallel-$(YEAR)/bin/starexec_run_default
-	echo "CVC4 for SMT_COMP parallel track `builds-smtcomp/parallel/src/main/pcvc4 --version | head -1 | sed 's,.*version ,,;s,-,_,g;s,[^a-zA-Z0-9. _],,g'`" > cvc4-smtcomp-parallel-$(YEAR)/starexec_description.txt
-	cd cvc4-smtcomp-parallel-$(YEAR) && zip -r ../cvc4-smtcomp-parallel-$(YEAR).zip *
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 4f624e39a..000000000
--- a/Makefile.am
+++ /dev/null
@@ -1,172 +0,0 @@
-include $(top_srcdir)/config/doxygen.am
-
-AM_CXXFLAGS = -Wall -Wno-unknown-pragmas
-
-AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I config
-
-SUBDIRS_BASE = src test contrib
-if CVC4_PROOF
-  SUBDIRS = proofs/signatures $(SUBDIRS_BASE)
-else
-  SUBDIRS = $(SUBDIRS_BASE)
-endif
-DIST_SUBDIRS = $(SUBDIRS) examples
-
-
-.PHONY: examples
-examples: all
-	(cd examples && $(MAKE) $(AM_MAKEFLAGS))
-
-.PHONY: install-examples
-install-examples:
-	(cd examples && $(MAKE) $(AM_MAKEFLAGS) install-data)
-
-.PHONY: units systemtests regress regress0 regress1 regress2 regress3 regress4
-systemtests regress regress0 regress1 regress2 regress3 regress4: all
-	+(cd test && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1
-# We descend into "src" with the "check" target here to ensure that
-# the test prerequisites are all built.
-units:
-	(cd src && $(MAKE) $(AM_MAKEFLAGS) check)
-	+(cd test && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1
-
-LCOV = lcov
-GENHTML = genhtml
-
-LCOV_EXCLUDES = \
-	"$(CXXTEST)/*" \
-	"/usr/include/*" \
-	"$(abs_top_builddir)/test/*"
-
-.PHONY: show-config
-show-config:
-	@echo
-	@echo '==============================================================================='
-	@echo 'This CVC4 build was configured with:'
-	@echo '  configure $(cvc4_config_cmdline)'
-	@echo '==============================================================================='
-	@echo
-
-.PHONY: lcov lcov-all lcov18
-if COVERAGE_ENABLED
-
-# lcov 1.7 has some bugs that we have to work around (can't do
-# baseline measurement, merge between different test-names doesn't
-# work...)
-lcov: all
-	$(LCOV) -z -d .
-	(cd src && $(MAKE) $(AM_MAKEFLAGS) check)
-	+(cd test/unit && $(MAKE) $(AM_MAKEFLAGS) check)
-	$(LCOV) -c -d . -t cvc4_units -o cvc4-coverage-full.info
-	$(LCOV) -o cvc4-coverage.info -r cvc4-coverage-full.info $(LCOV_EXCLUDES)
-	mkdir -p "@top_srcdir@/html"
-	$(GENHTML) -o "@top_srcdir@/html" cvc4-coverage.info
-	@echo "De-mangling C++ symbols..."
-	@find "@top_srcdir@/html" -name '*.func.html' | \
-		xargs perl -pi -e 's#(<td class="coverFn"><a href=".*">)(.*)(</a></td>)#$$_=`c++filt "$$2"`;chomp;print "$$1<xmp>$$_</xmp>$$3\n";#e'
-
-lcov-all: all
-	$(LCOV) -z -d .
-	(cd src && $(MAKE) $(AM_MAKEFLAGS) check)
-	+(cd test && $(MAKE) $(AM_MAKEFLAGS) check)
-	$(LCOV) -c -d . -t cvc4_units -o cvc4-coverage-full.info
-	$(LCOV) -o cvc4-coverage.info -r cvc4-coverage-full.info $(LCOV_EXCLUDES)
-	mkdir -p "@top_srcdir@/html"
-	$(GENHTML) -o "@top_srcdir@/html" cvc4-coverage.info
-	@echo "De-mangling C++ symbols..."
-	@find "@top_srcdir@/html" -name '*.func.html' | \
-		xargs perl -pi -e 's#(<td class="coverFn"><a href=".*">)(.*)(</a></td>)#$$_=`c++filt "$$2"`;chomp;print "$$1<xmp>$$_</xmp>$$3\n";#e'
-
-# when we get a working lcov, we can do better stats for
-# modules/test-types; unfortunately lcov 1.8 directory paths
-# are broken(?) or at least different than 1.7
-lcov18: all
-	+@for testtype in public black white; do \
-		echo; echo "=== Collecting coverage data from $$testtype unit tests ==="; \
-		echo $(LCOV) -z -d .; \
-		$(LCOV) -z -d . || exit 1; \
-		echo "(cd src && $(MAKE) $(AM_MAKEFLAGS) check) || exit 1"; \
-		(cd src && $(MAKE) $(AM_MAKEFLAGS) check) || exit 1; \
-		echo "(cd test/unit && $(MAKE) $(AM_MAKEFLAGS) check TEST_SUFFIX=_$$testtype) || exit 1"; \
-		(cd test/unit && $(MAKE) $(AM_MAKEFLAGS) check TEST_SUFFIX=_$$testtype) || exit 1; \
-		echo $(LCOV) -c -d . -t $$testtype -o cvc4-coverage-$$testtype-full.info || exit 1; \
-		$(LCOV) -c -d . -t $$testtype -o cvc4-coverage-$$testtype-full.info || exit 1; \
-		echo $(LCOV) -o cvc4-coverage-$$testtype.info -r cvc4-coverage-$$testtype-full.info $(LCOV_EXCLUDES); \
-		$(LCOV) -o cvc4-coverage-$$testtype.info -r cvc4-coverage-$$testtype-full.info $(LCOV_EXCLUDES) || exit 1; \
-		echo; \
-	done
-	mkdir -p "@top_srcdir@/html"
-	$(GENHTML) -o "@top_srcdir@/html" cvc4-coverage-public.info cvc4-coverage-black.info cvc4-coverage-white.info
-	@echo "De-mangling C++ symbols..."
-	@find "@top_srcdir@/html" -name '*.func.html' | \
-		xargs perl -ni -e 's,(<td class="coverFn"><a href=".*">)(.*)(</a></td>.*),$$_=`c++filt "$$2"`;chomp;print "$$1<xmp>$$_</xmp>$$3\n";,e || print'
-
-else
-
-lcov lcov-all lcov18:
-	@echo
-	@echo "Coverage is not enabled in this build." >&2
-	@echo "Please run configure with --enable-coverage." >&2
-	@echo
-	@false
-
-endif
-
-# abs_srcdir is required here to get this Makefile instead of the
-# Makefile in the builddir (since $(srcdir) is stripped off of
-# EXTRA_DIST files)
-EXTRA_DIST = \
-	Makefile.builds.in \
-	Makefile.subdir \
-	library_versions \
-	RELEASE-NOTES \
-	config/build-type \
-	config/mkbuilddir \
-	config/doxygen.cfg \
-	doc/find_public_interface.sh \
-	doc/cvc4.1_template.in \
-	doc/cvc4.5.in \
-	doc/libcvc4.3.in \
-	doc/SmtEngine.3cvc_template.in \
-	doc/options.3cvc_template.in \
-	doc/libcvc4parser.3.in
-
-man_MANS = \
-	doc/cvc4.1 \
-	doc/pcvc4.1 \
-	doc/cvc4.5 \
-	doc/libcvc4.3 \
-	doc/SmtEngine.3cvc \
-	doc/options.3cvc \
-	doc/libcvc4parser.3
-
-doc/pcvc4.1: doc/cvc4.1
-	rm -f doc/pcvc4.1
-	cp -p "$<" "$@"
-
-# Can't put the first several in EXTRA_DIST because those are processed
-# *before* recursive "make dist", and these files are generated in a
-# subdirectory invocation of "make dist".
-#
-# The Makefile also can't go in EXTRA_DIST, because then automake thinks
-# it's the one in the builddir and we want the one from the srcdir.
-dist-hook: doc/cvc4.1 doc/libcvc4.3 doc/SmtEngine.3cvc doc/options.3cvc
-	cp -p $^ "$(distdir)/doc"
-	cp -p "$(srcdir)/Makefile" "$(distdir)/Makefile"
-
-distclean-local:
-	test -z "$(DX_DOCDIR)" || rm -fr "$(DX_DOCDIR)"
-
-# these have .in versions
-DISTCLEANFILES = \
-	doc/cvc4.1 \
-	doc/cvc4.1_template \
-	doc/pcvc4.1 \
-	doc/cvc4.5 \
-	doc/libcvc4.3 \
-	doc/libcvc4parser.3 \
-	doc/SmtEngine.3cvc \
-	doc/SmtEngine.3cvc_template \
-	doc/options.3cvc \
-	doc/options.3cvc_template
diff --git a/Makefile.builds.in b/Makefile.builds.in
deleted file mode 100644
index 7f34e69aa..000000000
--- a/Makefile.builds.in
+++ /dev/null
@@ -1,130 +0,0 @@
-# -*- makefile -*-
-#
-# This Makefile produces the Makefile in the top-level builds/
-# directory for standard-path builds (e.g., those configured from the
-# source tree).  It has some autoconf cruft in it, documented below.
-#
-# Its main purposes are to:
-# 1. build the current build profile
-# 2. set up builds/$(CURRENT_BUILD)/{bin,lib} symlinks
-# 3. set up builds/bin and builds/lib symlinks
-
-# Include the "current" build profile.
-include current
-
-# Set up $(MAKE)
-@SET_MAKE@
-
-# Set up some basic autoconf make vars
-srcdir = @srcdir@
-builddir = @builddir@
-install_sh = @install_sh@
-mkinstalldirs = $(install_sh) -d
-exec_prefix = @exec_prefix@
-prefix = @prefix@
-bindir = @bindir@
-libdir = @libdir@
-abs_builddir = @abs_builddir@
-distdir = @PACKAGE@-@VERSION@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-EXEEXT = @EXEEXT@
-SHELL = @SHELL@
-LIBTOOL = $(CURRENT_BUILD)/libtool
-
-# @
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-am__v_at_1 =
-# mkinstalldirs (never prefix with @; not a top-level instruction)
-AM_V_mkdir_noat = $(am__v_mkdir_noat_$(V))
-am__v_mkdir_noat_ = $(am__v_mkdir_noat_$(AM_DEFAULT_VERBOSITY))
-am__v_mkdir_noat_0 = $(SHELL) -c 'echo "   MKDIR $$@"; $(mkinstalldirs) "$$@"' bash
-am__v_mkdir_noat_1 = $(mkinstalldirs)
-# mkinstalldirs (can prefix with @)
-AM_V_mkdir = $(am__v_mkdir_$(V))
-am__v_mkdir_ = $(am__v_mkdir_$(AM_DEFAULT_VERBOSITY))
-am__v_mkdir_0 = @$(am__v_mkdir_noat_0)
-am__v_mkdir_1 = $(am__v_mkdir_noat_1)
-
-# all the binaries that might need to be installed
-# (it's not a fatal error for one/some don't exist in a given build
-# configuration)
-CVC4_BINARIES = cvc4$(EXEEXT) pcvc4$(EXEEXT)
-
-.PHONY: _default_build_ all examples
-_default_build_: all
-all:
-#	build the current build profile
-	$(AM_V_at)(cd $(CURRENT_BUILD) && $(MAKE) $@)
-#	set up builds/$(CURRENT_BUILD)/{bin,lib}
-	$(AM_V_mkdir) $(CURRENT_BUILD)/bin
-	$(AM_V_mkdir) $(CURRENT_BUILD)/lib
-#	symlink libcvc4, libcvc4parser
-	$(AM_V_at)cd $(CURRENT_BUILD)/lib && \
-	ln -sf ../src/libcvc4.* \
-		../src/parser/libcvc4parser.* \
-		.
-	-$(AM_V_at)cd $(CURRENT_BUILD)/lib && \
-	test -d ../src/.libs && \
-	ln -sf ../src/.libs/libcvc4.* \
-		.
-	-$(AM_V_at)cd $(CURRENT_BUILD)/lib && \
-	test -d ../src/parser/.libs && \
-	ln -sf ../src/parser/.libs/libcvc4parser.* \
-		.
-#	symlink the binaries
-	$(AM_V_at)cd $(CURRENT_BUILD)/bin && \
-	for binary in $(CVC4_BINARIES); do \
-		if test -x ../src/main/$$binary; then \
-			ln -sf ../src/main/$$binary \
-				. ; \
-		else \
-			rm -f "$$binary"; \
-		fi; \
-	done
-#	set up builds/doc and builds/examples
-	$(AM_V_at)rm -f bin; ln -sf $(CURRENT_BUILD)/bin bin
-	$(AM_V_at)rm -f lib; ln -sf $(CURRENT_BUILD)/lib lib
-	$(AM_V_at)rm -f doc; ln -sf $(CURRENT_BUILD)/doc doc
-	$(AM_V_at)rm -f examples; ln -sf $(CURRENT_BUILD)/examples examples
-
-# The descent into "src" with target "check" is to build check
-# prerequisites (e.g. CHECK_PROGRAMS, CHECK_LTLIBRARIES, ...).
-check test units: all
-	(cd $(CURRENT_BUILD)/src && $(MAKE) check)
-	+(cd $(CURRENT_BUILD)/test && $(MAKE) $@)
-systemtests regress: all
-	+(cd $(CURRENT_BUILD)/test && $(MAKE) $@)
-units%: all
-	(cd $(CURRENT_BUILD)/src && $(MAKE) check)
-	+(cd $(CURRENT_BUILD)/test && $(MAKE) units TEST_PREFIX=$(subst units:,,$@))
-regress%: all
-	+(cd $(CURRENT_BUILD)/test && $(MAKE) $@)
-
-dist:
-	(cd $(CURRENT_BUILD) && $(MAKE) $@)
-	$(install_sh) \
-		$(CURRENT_BUILD)/$(distdir).tar.gz \
-		"`pwd`"
-
-TAGS tags:
-	+(cd $(CURRENT_BUILD) && $(MAKE) $@)
-	ln -sf $(CURRENT_BUILD)/TAGS .
-
-.PHONY: TAGS tags
-
-.PHONY: doc-builds doc-prereq
-doc-builds: doc-prereq
-	+(cd $(CURRENT_BUILD) && $(MAKE) doxygen-doc CVC4_DOXYGEN_INPUT="`builddir="$(builddir)" srcdir="$(srcdir)" "$(srcdir)/doc/find_public_interface.sh"`")
-doc-internals-builds: doc-prereq
-	+(cd $(CURRENT_BUILD) && $(MAKE) doxygen-doc CVC4_DOXYGEN_INPUT="$(srcdir)/src src")
-doc-prereq:
-	+(cd $(CURRENT_BUILD) && for dir in `find . -name Makefile | xargs grep -l BUILT_SOURCES`; do (cd `dirname "$$dir"`; (cat Makefile; echo 'doc-prereq: $$(BUILT_SOURCES)') | $(MAKE) -f- doc-prereq); done)
-
-# Any other target than the default doesn't do the extra stuff above.
-# Split out "examples" target, recent Makes don't want them combined.
-examples:
-	+(cd $(CURRENT_BUILD) && $(MAKE) $@)
-%:
-	+(cd $(CURRENT_BUILD) && $(MAKE) $@)
diff --git a/Makefile.subdir b/Makefile.subdir
deleted file mode 100644
index 4bafe4684..000000000
--- a/Makefile.subdir
+++ /dev/null
@@ -1,58 +0,0 @@
-# -*-makefile-*-
-#
-# This makefile is included from source directories in order to
-# trigger a build in the corresponding build directory.
-#
-# See src/Makefile for an example.
-#
-include $(topdir)/builds/current
-builddir = $(topdir)/builds/$(CURRENT_BUILD)/$(srcdir)
-unittestdir = $(topdir)/builds/$(CURRENT_BUILD)/test/unit
-unittestprefix = $(srcdir:src/%=%)
-
-.PHONY: all
-all .DEFAULT:
-	@if test -e $(builddir); then \
-		echo cd $(builddir); \
-		cd $(builddir); \
-		echo $(MAKE) $@; \
-		$(MAKE) $@; \
-	else \
-		echo; \
-		echo 'Run configure first, or type "make" in a configured build directory.'; \
-		echo; \
-	fi
-
-.PHONY: check units
-ifeq ($(srcdir:test/%=test),test)
-# under the test/ directory, additional subtargets
-.PHONY: systemtests regress regress0 regress1 regress2 regress3
-check units systemtests regress regress0 regress1 regress2 regress3:
-	@if test -e $(builddir); then \
-		echo cd $(builddir); \
-		cd $(builddir); \
-		echo $(MAKE) $@; \
-		$(MAKE) $@; \
-	else \
-		echo; \
-		echo "** ERROR: could not find testing dir \`$(builddir)'"; \
-		echo; \
-	fi
-else
-check units:
-	@if test -e $(unittestdir); then \
-		echo cd $(unittestdir); \
-		cd $(unittestdir); \
-		echo $(MAKE) TEST_PREFIX=$(unittestprefix)/ $@; \
-		$(MAKE) TEST_PREFIX=$(unittestprefix)/ $@; \
-	else \
-		echo; \
-		echo "** ERROR: could not find unit testing dir \`$(unittestdir)'"; \
-		echo; \
-		exit 1; \
-	fi
-endif
-
-# synonyms for "check"
-.PHONY: test
-test: check
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index 2bbdd850b..000000000
--- a/autogen.sh
+++ /dev/null
@@ -1,1581 +0,0 @@
-#!/bin/sh
-#                        a u t o g e n . s h
-#
-# Copyright (c) 2005-2009 United States Government as represented by
-# the U.S. Army Research Laboratory.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-#
-# 3. The name of the author may not be used to endorse or promote
-# products derived from this software without specific prior written
-# permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-###
-#
-# Script for automatically preparing the sources for compilation by
-# performing the myriad of necessary steps.  The script attempts to
-# detect proper version support, and outputs warnings about particular
-# systems that have autotool peculiarities.
-#
-# Basically, if everything is set up and installed correctly, the
-# script will validate that minimum versions of the GNU Build System
-# tools are installed, account for several common configuration
-# issues, and then simply run autoreconf for you.
-#
-# If autoreconf fails, which can happen for many valid configurations,
-# this script proceeds to run manual preparation steps effectively
-# providing a POSIX shell script (mostly complete) reimplementation of
-# autoreconf.
-#
-# The AUTORECONF, AUTOCONF, AUTOMAKE, LIBTOOLIZE, ACLOCAL, AUTOHEADER
-# environment variables and corresponding _OPTIONS variables (e.g.
-# AUTORECONF_OPTIONS) may be used to override the default automatic
-# detection behaviors.  Similarly the _VERSION variables will override
-# the minimum required version numbers.
-#
-# Examples:
-#
-#   To obtain help on usage:
-#     ./autogen.sh --help
-#
-#   To obtain verbose output:
-#     ./autogen.sh --verbose
-#
-#   To skip autoreconf and prepare manually:
-#     AUTORECONF=false ./autogen.sh
-#
-#   To verbosely try running with an older (unsupported) autoconf:
-#     AUTOCONF_VERSION=2.50 ./autogen.sh --verbose
-#
-# Author:
-#   Christopher Sean Morrison <morrison@brlcad.org>
-#
-# Patches:
-#   Sebastian Pipping <sebastian@pipping.org>
-#
-######################################################################
-
-# set to minimum acceptable version of autoconf
-if [ "x$AUTOCONF_VERSION" = "x" ] ; then
-#    AUTOCONF_VERSION=2.52
-    AUTOCONF_VERSION=2.61
-fi
-# set to minimum acceptable version of automake
-if [ "x$AUTOMAKE_VERSION" = "x" ] ; then
-#    AUTOMAKE_VERSION=1.6.0
-    AUTOMAKE_VERSION=1.11
-fi
-# set to minimum acceptable version of libtool
-if [ "x$LIBTOOL_VERSION" = "x" ] ; then
-#    LIBTOOL_VERSION=1.4.2
-    LIBTOOL_VERSION=2.2
-fi
-
-
-##################
-# ident function #
-##################
-ident ( ) {
-    # extract copyright from header
-    __copyright="`grep Copyright $AUTOGEN_SH | head -${HEAD_N}1 | awk '{print $4}'`"
-    if [ "x$__copyright" = "x" ] ; then
-	__copyright="`date +%Y`"
-    fi
-
-    # extract version from CVS Id string
-    __id="$Id: autogen.sh 33925 2009-03-01 23:27:06Z brlcad $"
-    __version="`echo $__id | sed 's/.*\([0-9][0-9][0-9][0-9]\)[-\/]\([0-9][0-9]\)[-\/]\([0-9][0-9]\).*/\1\2\3/'`"
-    if [ "x$__version" = "x" ] ; then
-	__version=""
-    fi
-
-    echo "autogen.sh build preparation script by Christopher Sean Morrison"
-    echo "  + config.guess download patch by Sebastian Pipping (2008-12-03)"
-    echo "revised 3-clause BSD-style license, copyright (c) $__copyright"
-    echo "script version $__version, ISO/IEC 9945 POSIX shell script"
-}
-
-
-##################
-# USAGE FUNCTION #
-##################
-usage ( ) {
-    echo "Usage: $AUTOGEN_SH [-h|--help] [-v|--verbose] [-q|--quiet] [-d|--download] [--version]"
-    echo "    --help      Help on $NAME_OF_AUTOGEN usage"
-    echo "    --verbose   Verbose progress output"
-    echo "    --quiet     Quiet suppressed progress output"
-    echo "    --download  Download the latest config.guess from gnulib"
-    echo "    --version   Only perform GNU Build System version checks"
-    echo
-    echo "Description: This script will validate that minimum versions of the"
-    echo "GNU Build System tools are installed and then run autoreconf for you."
-    echo "Should autoreconf fail, manual preparation steps will be run"
-    echo "potentially accounting for several common preparation issues.  The"
-
-    echo "AUTORECONF, AUTOCONF, AUTOMAKE, LIBTOOLIZE, ACLOCAL, AUTOHEADER,"
-    echo "PROJECT, & CONFIGURE environment variables and corresponding _OPTIONS"
-    echo "variables (e.g. AUTORECONF_OPTIONS) may be used to override the"
-    echo "default automatic detection behavior."
-    echo
-
-    ident
-
-    return 0
-}
-
-
-##########################
-# VERSION_ERROR FUNCTION #
-##########################
-version_error ( ) {
-    if [ "x$1" = "x" ] ; then
-	echo "INTERNAL ERROR: version_error was not provided a version"
-	exit 1
-    fi
-    if [ "x$2" = "x" ] ; then
-	echo "INTERNAL ERROR: version_error was not provided an application name"
-	exit 1
-    fi
-    $ECHO
-    $ECHO "ERROR:  To prepare the ${PROJECT} build system from scratch,"
-    $ECHO "        at least version $1 of $2 must be installed."
-    $ECHO
-    $ECHO "$NAME_OF_AUTOGEN does not need to be run on the same machine that will"
-    $ECHO "run configure or make.  Either the GNU Autotools will need to be installed"
-    $ECHO "or upgraded on this system, or $NAME_OF_AUTOGEN must be run on the source"
-    $ECHO "code on another system and then transferred to here. -- Cheers!"
-    $ECHO
-}
-
-##########################
-# VERSION_CHECK FUNCTION #
-##########################
-version_check ( ) {
-    if [ "x$1" = "x" ] ; then
-	echo "INTERNAL ERROR: version_check was not provided a minimum version"
-	exit 1
-    fi
-    _min="$1"
-    if [ "x$2" = "x" ] ; then
-	echo "INTERNAL ERROR: version check was not provided a comparison version"
-	exit 1
-    fi
-    _cur="$2"
-
-    # needed to handle versions like 1.10 and 1.4-p6
-    _min="`echo ${_min}. | sed 's/[^0-9]/./g' | sed 's/\.\././g'`"
-    _cur="`echo ${_cur}. | sed 's/[^0-9]/./g' | sed 's/\.\././g'`"
-
-    _min_major="`echo $_min | cut -d. -f1`"
-    _min_minor="`echo $_min | cut -d. -f2`"
-    _min_patch="`echo $_min | cut -d. -f3`"
-
-    _cur_major="`echo $_cur | cut -d. -f1`"
-    _cur_minor="`echo $_cur | cut -d. -f2`"
-    _cur_patch="`echo $_cur | cut -d. -f3`"
-
-    if [ "x$_min_major" = "x" ] ; then
-	_min_major=0
-    fi
-    if [ "x$_min_minor" = "x" ] ; then
-	_min_minor=0
-    fi
-    if [ "x$_min_patch" = "x" ] ; then
-	_min_patch=0
-    fi
-    if [ "x$_cur_minor" = "x" ] ; then
-	_cur_major=0
-    fi
-    if [ "x$_cur_minor" = "x" ] ; then
-	_cur_minor=0
-    fi
-    if [ "x$_cur_patch" = "x" ] ; then
-	_cur_patch=0
-    fi
-
-    $VERBOSE_ECHO "Checking if ${_cur_major}.${_cur_minor}.${_cur_patch} is greater than ${_min_major}.${_min_minor}.${_min_patch}"
-
-    if [ $_min_major -lt $_cur_major ] ; then
-	return 0
-    elif [ $_min_major -eq $_cur_major ] ; then
-	if [ $_min_minor -lt $_cur_minor ] ; then
-	    return 0
-	elif [ $_min_minor -eq $_cur_minor ] ; then
-	    if [ $_min_patch -lt $_cur_patch ] ; then
-		return 0
-	    elif [ $_min_patch -eq $_cur_patch ] ; then
-		return 0
-	    fi
-	fi
-    fi
-    return 1
-}
-
-
-######################################
-# LOCATE_CONFIGURE_TEMPLATE FUNCTION #
-######################################
-locate_configure_template ( ) {
-    _pwd="`pwd`"
-    if test -f "./configure.ac" ; then
-	echo "./configure.ac"
-    elif test -f "./configure.in" ; then
-	echo "./configure.in"
-    elif test -f "$_pwd/configure.ac" ; then
-	echo "$_pwd/configure.ac"
-    elif test -f "$_pwd/configure.in" ; then
-	echo "$_pwd/configure.in"
-    elif test -f "$PATH_TO_AUTOGEN/configure.ac" ; then
-	echo "$PATH_TO_AUTOGEN/configure.ac"
-    elif test -f "$PATH_TO_AUTOGEN/configure.in" ; then
-	echo "$PATH_TO_AUTOGEN/configure.in"
-    fi
-}
-
-
-##################
-# argument check #
-##################
-ARGS="$*"
-PATH_TO_AUTOGEN="`dirname $0`"
-NAME_OF_AUTOGEN="`basename $0`"
-AUTOGEN_SH="$PATH_TO_AUTOGEN/$NAME_OF_AUTOGEN"
-
-LIBTOOL_M4="${PATH_TO_AUTOGEN}/misc/libtool.m4"
-
-if [ "x$HELP" = "x" ] ; then
-    HELP=no
-fi
-if [ "x$QUIET" = "x" ] ; then
-    QUIET=no
-fi
-if [ "x$VERBOSE" = "x" ] ; then
-    VERBOSE=no
-fi
-if [ "x$VERSION_ONLY" = "x" ] ; then
-    VERSION_ONLY=no
-fi
-if [ "x$DOWNLOAD" = "x" ] ; then
-    DOWNLOAD=no
-fi
-if [ "x$AUTORECONF_OPTIONS" = "x" ] ; then
-    AUTORECONF_OPTIONS="-i -f"
-fi
-if [ "x$AUTOCONF_OPTIONS" = "x" ] ; then
-    AUTOCONF_OPTIONS="-f"
-fi
-if [ "x$AUTOMAKE_OPTIONS" = "x" ] ; then
-    AUTOMAKE_OPTIONS="-a -c -f -Wno-portability"
-fi
-ALT_AUTOMAKE_OPTIONS="-a -c -Wno-portability"
-if [ "x$LIBTOOLIZE_OPTIONS" = "x" ] ; then
-    LIBTOOLIZE_OPTIONS="--automake -c -f"
-fi
-ALT_LIBTOOLIZE_OPTIONS="--automake --copy --force"
-if [ "x$ACLOCAL_OPTIONS" = "x" ] ; then
-    ACLOCAL_OPTIONS=""
-fi
-if [ "x$AUTOHEADER_OPTIONS" = "x" ] ; then
-    AUTOHEADER_OPTIONS=""
-fi
-if [ "x$CONFIG_GUESS_URL" = "x" ] ; then
-    CONFIG_GUESS_URL="http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;f=build-aux/config.guess;hb=HEAD"
-fi
-for arg in $ARGS ; do
-    case "x$arg" in
-	x--help) HELP=yes ;;
-	x-[hH]) HELP=yes ;;
-	x--quiet) QUIET=yes ;;
-	x-[qQ]) QUIET=yes ;;
-	x--verbose) VERBOSE=yes ;;
-	x-[dD]) DOWNLOAD=yes ;;
-	x--download) DOWNLOAD=yes ;;
-	x-[vV]) VERBOSE=yes ;;
-	x--version) VERSION_ONLY=yes ;;
-	*)
-	    echo "Unknown option: $arg"
-	    echo
-	    usage
-	    exit 1
-	    ;;
-    esac
-done
-
-
-#####################
-# environment check #
-#####################
-
-# sanity check before recursions potentially begin
-if [ ! -f "$AUTOGEN_SH" ] ; then
-    echo "INTERNAL ERROR: $AUTOGEN_SH does not exist"
-    if [ ! "x$0" = "x$AUTOGEN_SH" ] ; then
-	echo "INTERNAL ERROR: dirname/basename inconsistency: $0 != $AUTOGEN_SH"
-    fi
-    exit 1
-fi
-
-# force locale setting to C so things like date output as expected
-LC_ALL=C
-
-# commands that this script expects
-for __cmd in echo head tail pwd ; do
-    echo "test" | $__cmd > /dev/null 2>&1
-    if [ $? != 0 ] ; then
-	echo "INTERNAL ERROR: '${__cmd}' command is required"
-	exit 2
-    fi
-done
-echo "test" | grep "test" > /dev/null 2>&1
-if test ! x$? = x0 ; then
-    echo "INTERNAL ERROR: grep command is required"
-    exit 1
-fi
-echo "test" | sed "s/test/test/" > /dev/null 2>&1
-if test ! x$? = x0 ; then
-    echo "INTERNAL ERROR: sed command is required"
-    exit 1
-fi
-
-
-# determine the behavior of echo
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-    *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-    *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-    *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-# determine the behavior of head
-case "x`echo 'head' | head -n 1 2>&1`" in
-    *xhead*) HEAD_N="n " ;;
-    *) HEAD_N="" ;;
-esac
-
-# determine the behavior of tail
-case "x`echo 'tail' | tail -n 1 2>&1`" in
-    *xtail*) TAIL_N="n " ;;
-    *) TAIL_N="" ;;
-esac
-
-VERBOSE_ECHO=:
-ECHO=:
-if [ "x$QUIET" = "xyes" ] ; then
-    if [ "x$VERBOSE" = "xyes" ] ; then
-	echo "Verbose output quelled by quiet option.  Further output disabled."
-    fi
-else
-    ECHO=echo
-    if [ "x$VERBOSE" = "xyes" ] ; then
-	echo "Verbose output enabled"
-	VERBOSE_ECHO=echo
-    fi
-fi
-
-
-# allow a recursive run to disable further recursions
-if [ "x$RUN_RECURSIVE" = "x" ] ; then
-    RUN_RECURSIVE=yes
-fi
-
-
-################################################
-# check for help arg and bypass version checks #
-################################################
-if [ "x`echo $ARGS | sed 's/.*[hH][eE][lL][pP].*/help/'`" = "xhelp" ] ; then
-    HELP=yes
-fi
-if [ "x$HELP" = "xyes" ] ; then
-    usage
-    $ECHO "---"
-    $ECHO "Help was requested.  No preparation or configuration will be performed."
-    exit 0
-fi
-
-
-#######################
-# set up signal traps #
-#######################
-untrap_abnormal ( ) {
-    for sig in 1 2 13 15; do
-	trap - $sig
-    done
-}
-
-# do this cleanup whenever we exit.
-trap '
-    # start from the root
-    if test -d "$START_PATH" ; then
-	cd "$START_PATH"
-    fi
-
-    # restore/delete backup files
-    if test "x$PFC_INIT" = "x1" ; then
-	recursive_restore
-    fi
-' 0
-
-# trap SIGHUP (1), SIGINT (2), SIGPIPE (13), SIGTERM (15)
-for sig in 1 2 13 15; do
-    trap '
-	$ECHO ""
-	$ECHO "Aborting $NAME_OF_AUTOGEN: caught signal '$sig'"
-
-	# start from the root
-	if test -d "$START_PATH" ; then
-	    cd "$START_PATH"
-	fi
-
-	# clean up on abnormal exit
-	$VERBOSE_ECHO "rm -rf autom4te.cache"
-	rm -rf autom4te.cache
-
-	if test -f "acinclude.m4.$$.backup" ; then
-	    $VERBOSE_ECHO "cat acinclude.m4.$$.backup > acinclude.m4"
-	    chmod u+w acinclude.m4
-	    cat acinclude.m4.$$.backup > acinclude.m4
-
-	    $VERBOSE_ECHO "rm -f acinclude.m4.$$.backup"
-	    rm -f acinclude.m4.$$.backup
-        fi
-
-	{ (exit 1); exit 1; }
-' $sig
-done
-
-
-#############################
-# look for a configure file #
-#############################
-if [ "x$CONFIGURE" = "x" ] ; then
-    CONFIGURE="`locate_configure_template`"
-    if [ ! "x$CONFIGURE" = "x" ] ; then
-	$VERBOSE_ECHO "Found a configure template: $CONFIGURE"
-    fi
-else
-    $ECHO "Using CONFIGURE environment variable override: $CONFIGURE"
-fi
-if [ "x$CONFIGURE" = "x" ] ; then
-    if [ "x$VERSION_ONLY" = "xyes" ] ; then
-	CONFIGURE=/dev/null
-    else
-	$ECHO
-	$ECHO "A configure.ac or configure.in file could not be located implying"
-	$ECHO "that the GNU Build System is at least not used in this directory.  In"
-	$ECHO "any case, there is nothing to do here without one of those files."
-	$ECHO
-	$ECHO "ERROR: No configure.in or configure.ac file found in `pwd`"
-	exit 1
-    fi
-fi
-
-####################
-# get project name #
-####################
-if [ "x$PROJECT" = "x" ] ; then
-    PROJECT="`grep AC_INIT $CONFIGURE | grep -v '.*#.*AC_INIT' | tail -${TAIL_N}1 | sed 's/^[ 	]*AC_INIT(\([^,)]*\).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`"
-    if [ "x$PROJECT" = "xAC_INIT" ] ; then
-	# projects might be using the older/deprecated arg-less AC_INIT .. look for AM_INIT_AUTOMAKE instead
-	PROJECT="`grep AM_INIT_AUTOMAKE $CONFIGURE | grep -v '.*#.*AM_INIT_AUTOMAKE' | tail -${TAIL_N}1 | sed 's/^[ 	]*AM_INIT_AUTOMAKE(\([^,)]*\).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`"
-    fi
-    if [ "x$PROJECT" = "xAM_INIT_AUTOMAKE" ] ; then
-	PROJECT="project"
-    fi
-    if [ "x$PROJECT" = "x" ] ; then
-	PROJECT="project"
-    fi
-else
-    $ECHO "Using PROJECT environment variable override: $PROJECT"
-fi
-$ECHO "Preparing the $PROJECT build system...please wait"
-$ECHO
-
-
-########################
-# check for autoreconf #
-########################
-HAVE_AUTORECONF=no
-if [ "x$AUTORECONF" = "x" ] ; then
-    for AUTORECONF in autoreconf ; do
-	$VERBOSE_ECHO "Checking autoreconf version: $AUTORECONF --version"
-	$AUTORECONF --version > /dev/null 2>&1
-	if [ $? = 0 ] ; then
-	    HAVE_AUTORECONF=yes
-	    break
-	fi
-    done
-else
-    HAVE_AUTORECONF=yes
-    $ECHO "Using AUTORECONF environment variable override: $AUTORECONF"
-fi
-
-
-##########################
-# autoconf version check #
-##########################
-_acfound=no
-if [ "x$AUTOCONF" = "x" ] ; then
-    for AUTOCONF in autoconf ; do
-	$VERBOSE_ECHO "Checking autoconf version: $AUTOCONF --version"
-	$AUTOCONF --version > /dev/null 2>&1
-	if [ $? = 0 ] ; then
-	    _acfound=yes
-	    break
-	fi
-    done
-else
-    _acfound=yes
-    $ECHO "Using AUTOCONF environment variable override: $AUTOCONF"
-fi
-
-_report_error=no
-if [ ! "x$_acfound" = "xyes" ] ; then
-    $ECHO "ERROR:  Unable to locate GNU Autoconf."
-    _report_error=yes
-else
-    _version="`$AUTOCONF --version | head -${HEAD_N}1 | sed 's/[^0-9]*\([0-9\.][0-9\.]*\)/\1/'`"
-    if [ "x$_version" = "x" ] ; then
-	_version="0.0.0"
-    fi
-    $ECHO "Found GNU Autoconf version $_version"
-    version_check "$AUTOCONF_VERSION" "$_version"
-    if [ $? -ne 0 ] ; then
-	_report_error=yes
-    fi
-fi
-if [ "x$_report_error" = "xyes" ] ; then
-    version_error "$AUTOCONF_VERSION" "GNU Autoconf"
-    exit 1
-fi
-
-
-##########################
-# automake version check #
-##########################
-_amfound=no
-if [ "x$AUTOMAKE" = "x" ] ; then
-    for AUTOMAKE in automake ; do
-	$VERBOSE_ECHO "Checking automake version: $AUTOMAKE --version"
-	$AUTOMAKE --version > /dev/null 2>&1
-	if [ $? = 0 ] ; then
-	    _amfound=yes
-	    break
-	fi
-    done
-else
-    _amfound=yes
-    $ECHO "Using AUTOMAKE environment variable override: $AUTOMAKE"
-fi
-
-
-_report_error=no
-if [ ! "x$_amfound" = "xyes" ] ; then
-    $ECHO
-    $ECHO "ERROR: Unable to locate GNU Automake."
-    _report_error=yes
-else
-    _version="`$AUTOMAKE --version | head -${HEAD_N}1 | sed 's/[^0-9]*\([0-9\.][0-9\.]*\)/\1/'`"
-    if [ "x$_version" = "x" ] ; then
-	_version="0.0.0"
-    fi
-    $ECHO "Found GNU Automake version $_version"
-    version_check "$AUTOMAKE_VERSION" "$_version"
-    if [ $? -ne 0 ] ; then
-	_report_error=yes
-    fi
-fi
-if [ "x$_report_error" = "xyes" ] ; then
-    version_error "$AUTOMAKE_VERSION" "GNU Automake"
-    exit 1
-fi
-
-
-########################
-# check for libtoolize #
-########################
-HAVE_LIBTOOLIZE=yes
-HAVE_ALT_LIBTOOLIZE=no
-_ltfound=no
-if [ "x$LIBTOOLIZE" = "x" ] ; then
-    LIBTOOLIZE=libtoolize
-    $VERBOSE_ECHO "Checking libtoolize version: $LIBTOOLIZE --version"
-    $LIBTOOLIZE --version > /dev/null 2>&1
-    if [ ! $? = 0 ] ; then
-	HAVE_LIBTOOLIZE=no
-	$ECHO
-	if [ "x$HAVE_AUTORECONF" = "xno" ] ; then
-	    $ECHO "Warning:  libtoolize does not appear to be available."
-	else
-	    $ECHO "Warning:  libtoolize does not appear to be available.  This means that"
-	    $ECHO "the automatic build preparation via autoreconf will probably not work."
-	    $ECHO "Preparing the build by running each step individually, however, should"
-	    $ECHO "work and will be done automatically for you if autoreconf fails."
-	fi
-
-	# look for some alternates
-	for tool in glibtoolize libtoolize15 libtoolize14 libtoolize13 ; do
-	    $VERBOSE_ECHO "Checking libtoolize alternate: $tool --version"
-	    _glibtoolize="`$tool --version > /dev/null 2>&1`"
-	    if [ $? = 0 ] ; then
-		$VERBOSE_ECHO "Found $tool --version"
-		_glti="`which $tool`"
-		if [ "x$_glti" = "x" ] ; then
-		    $VERBOSE_ECHO "Cannot find $tool with which"
-		    continue;
-		fi
-		if test ! -f "$_glti" ; then
-		    $VERBOSE_ECHO "Cannot use $tool, $_glti is not a file"
-		    continue;
-		fi
-		_gltidir="`dirname $_glti`"
-		if [ "x$_gltidir" = "x" ] ; then
-		    $VERBOSE_ECHO "Cannot find $tool path with dirname of $_glti"
-		    continue;
-		fi
-		if test ! -d "$_gltidir" ; then
-		    $VERBOSE_ECHO "Cannot use $tool, $_gltidir is not a directory"
-		    continue;
-		fi
-		HAVE_ALT_LIBTOOLIZE=yes
-		LIBTOOLIZE="$tool"
-		$ECHO
-		$ECHO "Fortunately, $tool was found which means that your system may simply"
-		$ECHO "have a non-standard or incomplete GNU Autotools install.  If you have"
-		$ECHO "sufficient system access, it may be possible to quell this warning by"
-		$ECHO "running:"
-		$ECHO
-		sudo -V > /dev/null 2>&1
-		if [ $? = 0 ] ; then
-		    $ECHO "   sudo ln -s $_glti $_gltidir/libtoolize"
-		    $ECHO
-		else
-		    $ECHO "   ln -s $_glti $_gltidir/libtoolize"
-		    $ECHO
-		    $ECHO "Run that as root or with proper permissions to the $_gltidir directory"
-		    $ECHO
-		fi
-		_ltfound=yes
-		break
-	    fi
-	done
-    else
-	_ltfound=yes
-    fi
-else
-    _ltfound=yes
-    $ECHO "Using LIBTOOLIZE environment variable override: $LIBTOOLIZE"
-fi
-
-
-############################
-# libtoolize version check #
-############################
-_report_error=no
-if [ ! "x$_ltfound" = "xyes" ] ; then
-    $ECHO
-    $ECHO "ERROR: Unable to locate GNU Libtool."
-    _report_error=yes
-else
-    _version="`$LIBTOOLIZE --version | head -${HEAD_N}1 | sed 's/[^0-9]*\([0-9\.][0-9\.]*\)/\1/'`"
-    if [ "x$_version" = "x" ] ; then
-	_version="0.0.0"
-    fi
-    $ECHO "Found GNU Libtool version $_version"
-    version_check "$LIBTOOL_VERSION" "$_version"
-    if [ $? -ne 0 ] ; then
-	_report_error=yes
-    fi
-fi
-if [ "x$_report_error" = "xyes" ] ; then
-    version_error "$LIBTOOL_VERSION" "GNU Libtool"
-    exit 1
-fi
-
-
-#####################
-# check for aclocal #
-#####################
-if [ "x$ACLOCAL" = "x" ] ; then
-    for ACLOCAL in aclocal ; do
-	$VERBOSE_ECHO "Checking aclocal version: $ACLOCAL --version"
-	$ACLOCAL --version > /dev/null 2>&1
-	if [ $? = 0 ] ; then
-	    break
-	fi
-    done
-else
-    $ECHO "Using ACLOCAL environment variable override: $ACLOCAL"
-fi
-
-
-########################
-# check for autoheader #
-########################
-if [ "x$AUTOHEADER" = "x" ] ; then
-    for AUTOHEADER in autoheader ; do
-	$VERBOSE_ECHO "Checking autoheader version: $AUTOHEADER --version"
-	$AUTOHEADER --version > /dev/null 2>&1
-	if [ $? = 0 ] ; then
-	    break
-	fi
-    done
-else
-    $ECHO "Using AUTOHEADER environment variable override: $AUTOHEADER"
-fi
-
-
-#########################
-# check if version only #
-#########################
-$VERBOSE_ECHO "Checking whether to only output version information"
-if [ "x$VERSION_ONLY" = "xyes" ] ; then
-    $ECHO
-    ident
-    $ECHO "---"
-    $ECHO "Version requested.  No preparation or configuration will be performed."
-    exit 0
-fi
-
-
-#################################
-# PROTECT_FROM_CLOBBER FUNCTION #
-#################################
-protect_from_clobber ( ) {
-    PFC_INIT=1
-
-    # protect COPYING & INSTALL from overwrite by automake.  the
-    # automake force option will (inappropriately) ignore the existing
-    # contents of a COPYING and/or INSTALL files (depending on the
-    # version) instead of just forcing *missing* files like it does
-    # for AUTHORS, NEWS, and README. this is broken but extremely
-    # prevalent behavior, so we protect against it by keeping a backup
-    # of the file that can later be restored.
-
-    for file in COPYING INSTALL ; do
-	if test -f ${file} ; then
-	    if test -f ${file}.$$.protect_from_automake.backup ; then
-		$VERBOSE_ECHO "Already backed up ${file} in `pwd`"
-	    else
-		$VERBOSE_ECHO "Backing up ${file} in `pwd`"
-		$VERBOSE_ECHO "cp -p ${file} ${file}.$$.protect_from_automake.backup"
-		cp -p ${file} ${file}.$$.protect_from_automake.backup
-	    fi
-	fi
-    done
-}
-
-
-##############################
-# RECURSIVE_PROTECT FUNCTION #
-##############################
-recursive_protect ( ) {
-
-    # for projects using recursive configure, run the build
-    # preparation steps for the subdirectories.  this function assumes
-    # START_PATH was set to pwd before recursion begins so that
-    # relative paths work.
-
-    # git 'r done, protect COPYING and INSTALL from being clobbered
-    protect_from_clobber
-
-    if test -d autom4te.cache ; then
-	$VERBOSE_ECHO "Found an autom4te.cache directory, deleting it"
-	$VERBOSE_ECHO "rm -rf autom4te.cache"
-	rm -rf autom4te.cache
-    fi
-
-    # find configure template
-    _configure="`locate_configure_template`"
-    if [ "x$_configure" = "x" ] ; then
-	return
-    fi
-    # $VERBOSE_ECHO "Looking for configure template found `pwd`/$_configure"
-
-    # look for subdirs
-    # $VERBOSE_ECHO "Looking for subdirs in `pwd`"
-    _det_config_subdirs="`grep AC_CONFIG_SUBDIRS $_configure | grep -v '.*#.*AC_CONFIG_SUBDIRS' | sed 's/^[ 	]*AC_CONFIG_SUBDIRS(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`"
-    CHECK_DIRS=""
-    for dir in $_det_config_subdirs ; do
-	if test -d "`pwd`/$dir" ; then
-	    CHECK_DIRS="$CHECK_DIRS \"`pwd`/$dir\""
-	fi
-    done
-
-    # process subdirs
-    if [ ! "x$CHECK_DIRS" = "x" ] ; then
-	$VERBOSE_ECHO "Recursively scanning the following directories:"
-	$VERBOSE_ECHO "  $CHECK_DIRS"
-	for dir in $CHECK_DIRS ; do
-	    $VERBOSE_ECHO "Protecting files from automake in $dir"
-	    cd "$START_PATH"
-	    eval "cd $dir"
-
-	    # recursively git 'r done
-	    recursive_protect
-	done
-    fi
-} # end of recursive_protect
-
-
-#############################
-# RESTORE_CLOBBERED FUNCION #
-#############################
-restore_clobbered ( ) {
-
-    # The automake (and autoreconf by extension) -f/--force-missing
-    # option may overwrite COPYING and INSTALL even if they do exist.
-    # Here we restore the files if necessary.
-
-    spacer=no
-
-    for file in COPYING INSTALL ; do
-	if test -f ${file}.$$.protect_from_automake.backup ; then
-	    if test -f ${file} ; then
-	    # compare entire content, restore if needed
-	    if test "x`cat ${file}`" != "x`cat ${file}.$$.protect_from_automake.backup`" ; then
-		if test "x$spacer" = "xno" ; then
-		    $VERBOSE_ECHO
-		    spacer=yes
-		fi
-		# restore the backup
-		$VERBOSE_ECHO "Restoring ${file} from backup (automake -f likely clobbered it)"
-		$VERBOSE_ECHO "rm -f ${file}"
-		rm -f ${file}
-		$VERBOSE_ECHO "mv ${file}.$$.protect_from_automake.backup ${file}"
-		mv ${file}.$$.protect_from_automake.backup ${file}
-	    fi # check contents
-	    elif test -f ${file}.$$.protect_from_automake.backup ; then
-		$VERBOSE_ECHO "mv ${file}.$$.protect_from_automake.backup ${file}"
-		mv ${file}.$$.protect_from_automake.backup ${file}
-	    fi # -f ${file}
-	
-	    # just in case
-	    $VERBOSE_ECHO "rm -f ${file}.$$.protect_from_automake.backup"
-	    rm -f ${file}.$$.protect_from_automake.backup
-	fi # -f ${file}.$$.protect_from_automake.backup
-    done
-
-    CONFIGURE="`locate_configure_template`"
-    if [ "x$CONFIGURE" = "x" ] ; then
-	return
-    fi
-
-    _aux_dir="`grep AC_CONFIG_AUX_DIR $CONFIGURE | grep -v '.*#.*AC_CONFIG_AUX_DIR' | tail -${TAIL_N}1 | sed 's/^[ 	]*AC_CONFIG_AUX_DIR(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`"
-    if test ! -d "$_aux_dir" ; then
-	_aux_dir=.
-    fi
-
-    for file in config.guess config.sub ltmain.sh ; do
-	if test -f "${_aux_dir}/${file}" ; then
-	    $VERBOSE_ECHO "rm -f \"${_aux_dir}/${file}.backup\""
-	    rm -f "${_aux_dir}/${file}.backup"
-	fi
-    done
-} # end of restore_clobbered
-
-
-##############################
-# RECURSIVE_RESTORE FUNCTION #
-##############################
-recursive_restore ( ) {
-
-    # restore COPYING and INSTALL from backup if they were clobbered
-    # for each directory recursively.
-
-    # git 'r undone
-    restore_clobbered
-
-    # find configure template
-    _configure="`locate_configure_template`"
-    if [ "x$_configure" = "x" ] ; then
-	return
-    fi
-
-    # look for subdirs
-    _det_config_subdirs="`grep AC_CONFIG_SUBDIRS $_configure | grep -v '.*#.*AC_CONFIG_SUBDIRS' | sed 's/^[ 	]*AC_CONFIG_SUBDIRS(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`"
-    CHECK_DIRS=""
-    for dir in $_det_config_subdirs ; do
-	if test -d "`pwd`/$dir" ; then
-	    CHECK_DIRS="$CHECK_DIRS \"`pwd`/$dir\""
-	fi
-    done
-
-    # process subdirs
-    if [ ! "x$CHECK_DIRS" = "x" ] ; then
-	$VERBOSE_ECHO "Recursively scanning the following directories:"
-	$VERBOSE_ECHO "  $CHECK_DIRS"
-	for dir in $CHECK_DIRS ; do
-	    $VERBOSE_ECHO "Checking files for automake damage in $dir"
-	    cd "$START_PATH"
-	    eval "cd $dir"
-
-	    # recursively git 'r undone
-	    recursive_restore
-	done
-    fi
-} # end of recursive_restore
-
-
-#######################
-# INITIALIZE FUNCTION #
-#######################
-initialize ( ) {
-
-    # this routine performs a variety of directory-specific
-    # initializations.  some are sanity checks, some are preventive,
-    # and some are necessary setup detection.
-    #
-    # this function sets:
-    #   CONFIGURE
-    #   SEARCH_DIRS
-    #   CONFIG_SUBDIRS
-
-    ##################################
-    # check for a configure template #
-    ##################################
-    CONFIGURE="`locate_configure_template`"
-    if [ "x$CONFIGURE" = "x" ] ; then
-	$ECHO
-	$ECHO "A configure.ac or configure.in file could not be located implying"
-	$ECHO "that the GNU Build System is at least not used in this directory.  In"
-	$ECHO "any case, there is nothing to do here without one of those files."
-	$ECHO
-	$ECHO "ERROR: No configure.in or configure.ac file found in `pwd`"
-	exit 1
-    fi
-
-    #####################
-    # detect an aux dir #
-    #####################
-    _aux_dir="`grep AC_CONFIG_AUX_DIR $CONFIGURE | grep -v '.*#.*AC_CONFIG_AUX_DIR' | tail -${TAIL_N}1 | sed 's/^[ 	]*AC_CONFIG_AUX_DIR(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`"
-    if test ! -d "$_aux_dir" ; then
-	_aux_dir=.
-    else
-	$VERBOSE_ECHO "Detected auxillary directory: $_aux_dir"
-    fi
-
-    ################################
-    # detect a recursive configure #
-    ################################
-    CONFIG_SUBDIRS=""
-    _det_config_subdirs="`grep AC_CONFIG_SUBDIRS $CONFIGURE | grep -v '.*#.*AC_CONFIG_SUBDIRS' | sed 's/^[ 	]*AC_CONFIG_SUBDIRS(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`"
-    for dir in $_det_config_subdirs ; do
-	if test -d "`pwd`/$dir" ; then
-	    $VERBOSE_ECHO "Detected recursive configure directory: `pwd`/$dir"
-	    CONFIG_SUBDIRS="$CONFIG_SUBDIRS `pwd`/$dir"
-	fi
-    done
-
-    ###########################################################
-    # make sure certain required files exist for GNU projects #
-    ###########################################################
-    _marker_found=""
-    _marker_found_message_intro='Detected non-GNU marker "'
-    _marker_found_message_mid='" in '
-    for marker in foreign cygnus ; do
-	_marker_found_message=${_marker_found_message_intro}${marker}${_marker_found_message_mid}
-	_marker_found="`grep 'AM_INIT_AUTOMAKE.*'${marker} $CONFIGURE`"
-	if [ ! "x$_marker_found" = "x" ] ; then
-	    $VERBOSE_ECHO "${_marker_found_message}`basename \"$CONFIGURE\"`"
-	    break
-	fi
-	if test -f "`dirname \"$CONFIGURE\"/Makefile.am`" ; then
-	    _marker_found="`grep 'AUTOMAKE_OPTIONS.*'${marker} Makefile.am`"
-	    if [ ! "x$_marker_found" = "x" ] ; then
-		$VERBOSE_ECHO "${_marker_found_message}Makefile.am"
-		break
-	    fi
-	fi
-    done
-    if [ "x${_marker_found}" = "x" ] ; then
-	_suggest_foreign=no
-	for file in AUTHORS COPYING ChangeLog INSTALL NEWS README ; do
-	    if [ ! -f $file ] ; then
-		$VERBOSE_ECHO "Touching ${file} since it does not exist"
-		_suggest_foreign=yes
-		touch $file
-	    fi
-	done
-
-	if [ "x${_suggest_foreign}" = "xyes" ] ; then
-	    $ECHO
-	    $ECHO "Warning: Several files expected of projects that conform to the GNU"
-	    $ECHO "coding standards were not found.  The files were automatically added"
-	    $ECHO "for you since you do not have a 'foreign' declaration specified."
-	    $ECHO
-	    $ECHO "Considered adding 'foreign' to AM_INIT_AUTOMAKE in `basename \"$CONFIGURE\"`"
-	    if test -f "`dirname \"$CONFIGURE\"/Makefile.am`" ; then
-		$ECHO "or to AUTOMAKE_OPTIONS in your top-level Makefile.am file."
-	    fi
-	    $ECHO
-	fi
-    fi
-
-    ##################################################
-    # make sure certain generated files do not exist #
-    ##################################################
-    for file in config.guess config.sub ltmain.sh ; do
-	if test -f "${_aux_dir}/${file}" ; then
-	    $VERBOSE_ECHO "mv -f \"${_aux_dir}/${file}\" \"${_aux_dir}/${file}.backup\""
-	    mv -f "${_aux_dir}/${file}" "${_aux_dir}/${file}.backup"
-	fi
-    done
-
-    ############################
-    # search alternate m4 dirs #
-    ############################
-    SEARCH_DIRS=""
-    for dir in m4 ; do
-	if [ -d $dir ] ; then
-	    $VERBOSE_ECHO "Found extra aclocal search directory: $dir"
-	    SEARCH_DIRS="$SEARCH_DIRS -I $dir"
-	fi
-    done
-
-    ######################################
-    # remove any previous build products #
-    ######################################
-    if test -d autom4te.cache ; then
-	$VERBOSE_ECHO "Found an autom4te.cache directory, deleting it"
-	$VERBOSE_ECHO "rm -rf autom4te.cache"
-	rm -rf autom4te.cache
-    fi
-# tcl/tk (and probably others) have a customized aclocal.m4, so can't delete it
-#     if test -f aclocal.m4 ; then
-# 	$VERBOSE_ECHO "Found an aclocal.m4 file, deleting it"
-# 	$VERBOSE_ECHO "rm -f aclocal.m4"
-# 	rm -f aclocal.m4
-#     fi
-
-} # end of initialize()
-
-
-##############
-# initialize #
-##############
-
-# stash path
-START_PATH="`pwd`"
-
-# Before running autoreconf or manual steps, some prep detection work
-# is necessary or useful.  Only needs to occur once per directory, but
-# does need to traverse the entire subconfigure hierarchy to protect
-# files from being clobbered even by autoreconf.
-recursive_protect
-
-# start from where we started
-cd "$START_PATH"
-
-# get ready to process
-initialize
-
-
-#########################################
-# DOWNLOAD_GNULIB_CONFIG_GUESS FUNCTION #
-#########################################
-
-# TODO - should make sure wget/curl exist and/or work before trying to
-# use them.
-
-download_gnulib_config_guess () {
-    # abuse gitweb to download gnulib's latest config.guess via HTTP
-    config_guess_temp="config.guess.$$.download"
-    ret=1
-    for __cmd in wget curl fetch ; do
-	$VERBOSE_ECHO "Checking for command ${__cmd}"
-	${__cmd} --version > /dev/null 2>&1
-	ret=$?
-	if [ ! $ret = 0 ] ; then
-	    continue
-        fi
-
-	__cmd_version=`${__cmd} --version | head -n 1 | sed -e 's/^[^0-9]\+//' -e 's/ .*//'`
-	$VERBOSE_ECHO "Found ${__cmd} ${__cmd_version}"
-
-	opts=""
-	case ${__cmd} in
-	    wget)
-		opts="-O" 
-		;;
-	    curl)
-		opts="-o"
-		;;
-	    fetch)
-		opts="-t 5 -f"
-		;;
-	esac
-
-	$VERBOSE_ECHO "Running $__cmd \"${CONFIG_GUESS_URL}\" $opts \"${config_guess_temp}\""
-	eval "$__cmd \"${CONFIG_GUESS_URL}\" $opts \"${config_guess_temp}\"" > /dev/null 2>&1
-	if [ $? = 0 ] ; then
-	    mv -f "${config_guess_temp}" ${_aux_dir}/config.guess
-	    ret=0
-	    break
-	fi
-    done
-
-    if [ ! $ret = 0 ] ; then
-	$ECHO "Warning: config.guess download failed from: $CONFIG_GUESS_URL"
-	rm -f "${config_guess_temp}"
-    fi
-}
-
-
-##############################
-# LIBTOOLIZE_NEEDED FUNCTION #
-##############################
-libtoolize_needed () {
-    ret=1 # means no, don't need libtoolize
-    for feature in AC_PROG_LIBTOOL AM_PROG_LIBTOOL LT_INIT ; do
-	$VERBOSE_ECHO "Searching for $feature in $CONFIGURE"
-	found="`grep \"^$feature.*\" $CONFIGURE`"
-	if [ ! "x$found" = "x" ] ; then
-	    ret=0 # means yes, need to run libtoolize
-	    break
-	fi
-    done
-    return ${ret}
-}
-
-
-
-############################################
-# prepare build via autoreconf or manually #
-############################################
-reconfigure_manually=no
-if [ "x$HAVE_AUTORECONF" = "xyes" ] ; then
-    $ECHO
-    $ECHO $ECHO_N "Automatically preparing build ... $ECHO_C"
-
-    $VERBOSE_ECHO "$AUTORECONF $SEARCH_DIRS $AUTORECONF_OPTIONS"
-    autoreconf_output="`$AUTORECONF $SEARCH_DIRS $AUTORECONF_OPTIONS 2>&1`"
-    ret=$?
-    $VERBOSE_ECHO "$autoreconf_output"
-
-    if [ ! $ret = 0 ] ; then
-	if [ "x$HAVE_ALT_LIBTOOLIZE" = "xyes" ] ; then
-	    if [ ! "x`echo \"$autoreconf_output\" | grep libtoolize | grep \"No such file or directory\"`" = "x" ] ; then
-		$ECHO
-		$ECHO "Warning: autoreconf failed but due to what is usually a common libtool"
-		$ECHO "misconfiguration issue.  This problem is encountered on systems that"
-		$ECHO "have installed libtoolize under a different name without providing a"
-		$ECHO "symbolic link or without setting the LIBTOOLIZE environment variable."
-		$ECHO
-		$ECHO "Restarting the preparation steps with LIBTOOLIZE set to $LIBTOOLIZE"
-
-		export LIBTOOLIZE
-		RUN_RECURSIVE=no
-		export RUN_RECURSIVE
-		untrap_abnormal
-
-		$VERBOSE_ECHO sh $AUTOGEN_SH "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9"
-		sh "$AUTOGEN_SH" "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9"
-		exit $?
-	    fi
-	fi
-
-	$ECHO "Warning: $AUTORECONF failed"
-
-	if test -f ltmain.sh ; then
-	    $ECHO "libtoolize being run by autoreconf is not creating ltmain.sh in the auxillary directory like it should"
-	fi
-
-	$ECHO "Attempting to run the preparation steps individually"
-	reconfigure_manually=yes
-    else
-	if [ "x$DOWNLOAD" = "xyes" ] ; then
-	    if libtoolize_needed ; then
-		download_gnulib_config_guess
-	    fi
-	fi
-    fi
-else
-    reconfigure_manually=yes
-fi
-
-
-############################
-# LIBTOOL_FAILURE FUNCTION #
-############################
-libtool_failure ( ) {
-
-    # libtool is rather error-prone in comparison to the other
-    # autotools and this routine attempts to compensate for some
-    # common failures.  the output after a libtoolize failure is
-    # parsed for an error related to AC_PROG_LIBTOOL and if found, we
-    # attempt to inject a project-provided libtool.m4 file.
-
-    _autoconf_output="$1"
-
-    if [ "x$RUN_RECURSIVE" = "xno" ] ; then
-	# we already tried the libtool.m4, don't try again
-	return 1
-    fi
-
-    if test -f "$LIBTOOL_M4" ; then
-	found_libtool="`$ECHO $_autoconf_output | grep AC_PROG_LIBTOOL`"
-	if test ! "x$found_libtool" = "x" ; then
-	    if test -f acinclude.m4 ; then
-		rm -f acinclude.m4.$$.backup
-		$VERBOSE_ECHO "cat acinclude.m4 > acinclude.m4.$$.backup"
-		cat acinclude.m4 > acinclude.m4.$$.backup
-	    fi
-	    $VERBOSE_ECHO "cat \"$LIBTOOL_M4\" >> acinclude.m4"
-	    chmod u+w acinclude.m4
-	    cat "$LIBTOOL_M4" >> acinclude.m4
-
-	    # don't keep doing this
-	    RUN_RECURSIVE=no
-	    export RUN_RECURSIVE
-	    untrap_abnormal
-
-	    $ECHO
-	    $ECHO "Restarting the preparation steps with libtool macros in acinclude.m4"
-	    $VERBOSE_ECHO sh $AUTOGEN_SH "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9"
-	    sh "$AUTOGEN_SH" "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9"
-	    exit $?
-	fi
-    fi
-}
-
-
-###########################
-# MANUAL_AUTOGEN FUNCTION #
-###########################
-manual_autogen ( ) {
-
-    ##################################################
-    # Manual preparation steps taken are as follows: #
-    #   aclocal [-I m4]                              #
-    #   libtoolize --automake -c -f                  #
-    #   aclocal [-I m4]                              #
-    #   autoconf -f                                  #
-    #   autoheader                                   #
-    #   automake -a -c -f                            #
-    ##################################################
-
-    ###########
-    # aclocal #
-    ###########
-    $VERBOSE_ECHO "$ACLOCAL $SEARCH_DIRS $ACLOCAL_OPTIONS"
-    aclocal_output="`$ACLOCAL $SEARCH_DIRS $ACLOCAL_OPTIONS 2>&1`"
-    ret=$?
-    $VERBOSE_ECHO "$aclocal_output"
-    if [ ! $ret = 0 ] ; then $ECHO "ERROR: $ACLOCAL failed" && exit 2 ; fi
-
-    ##############
-    # libtoolize #
-    ##############
-    if libtoolize_needed ; then
-	if [ "x$HAVE_LIBTOOLIZE" = "xyes" ] ; then
-	    $VERBOSE_ECHO "$LIBTOOLIZE $LIBTOOLIZE_OPTIONS"
-	    libtoolize_output="`$LIBTOOLIZE $LIBTOOLIZE_OPTIONS 2>&1`"
-	    ret=$?
-	    $VERBOSE_ECHO "$libtoolize_output"
-
-	    if [ ! $ret = 0 ] ; then $ECHO "ERROR: $LIBTOOLIZE failed" && exit 2 ; fi
-	else
-	    if [ "x$HAVE_ALT_LIBTOOLIZE" = "xyes" ] ; then
-		$VERBOSE_ECHO "$LIBTOOLIZE $ALT_LIBTOOLIZE_OPTIONS"
-		libtoolize_output="`$LIBTOOLIZE $ALT_LIBTOOLIZE_OPTIONS 2>&1`"
-		ret=$?
-		$VERBOSE_ECHO "$libtoolize_output"
-
-		if [ ! $ret = 0 ] ; then $ECHO "ERROR: $LIBTOOLIZE failed" && exit 2 ; fi
-	    fi
-	fi
-
-	###########
-	# aclocal #
-	###########
-	# re-run again as instructed by libtoolize
-	$VERBOSE_ECHO "$ACLOCAL $SEARCH_DIRS $ACLOCAL_OPTIONS"
-	aclocal_output="`$ACLOCAL $SEARCH_DIRS $ACLOCAL_OPTIONS 2>&1`"
-	ret=$?
-	$VERBOSE_ECHO "$aclocal_output"
-
-	# libtoolize might put ltmain.sh in the wrong place
-	if test -f ltmain.sh ; then
-	    if test ! -f "${_aux_dir}/ltmain.sh" ; then
-		$ECHO
-		$ECHO "Warning:  $LIBTOOLIZE is creating ltmain.sh in the wrong directory"
-		$ECHO
-		$ECHO "Fortunately, the problem can be worked around by simply copying the"
-		$ECHO "file to the appropriate location (${_aux_dir}/).  This has been done for you."
-		$ECHO
-		$VERBOSE_ECHO "cp -p ltmain.sh \"${_aux_dir}/ltmain.sh\""
-		cp -p ltmain.sh "${_aux_dir}/ltmain.sh"
-		$ECHO $ECHO_N "Continuing build preparation ... $ECHO_C"
-	    fi
-	fi # ltmain.sh
-
-	if [ "x$DOWNLOAD" = "xyes" ] ; then
-	    download_gnulib_config_guess
-	fi
-    fi # libtoolize_needed
-
-    ############
-    # autoconf #
-    ############
-    $VERBOSE_ECHO
-    $VERBOSE_ECHO "$AUTOCONF $AUTOCONF_OPTIONS"
-    autoconf_output="`$AUTOCONF $AUTOCONF_OPTIONS 2>&1`"
-    ret=$?
-    $VERBOSE_ECHO "$autoconf_output"
-
-    if [ ! $ret = 0 ] ; then
-	# retry without the -f and check for usage of macros that are too new
-	ac2_59_macros="AC_C_RESTRICT AC_INCLUDES_DEFAULT AC_LANG_ASSERT AC_LANG_WERROR AS_SET_CATFILE"
-	ac2_55_macros="AC_COMPILER_IFELSE AC_FUNC_MBRTOWC AC_HEADER_STDBOOL AC_LANG_CONFTEST AC_LANG_SOURCE AC_LANG_PROGRAM AC_LANG_CALL AC_LANG_FUNC_TRY_LINK AC_MSG_FAILURE AC_PREPROC_IFELSE"
-	ac2_54_macros="AC_C_BACKSLASH_A AC_CONFIG_LIBOBJ_DIR AC_GNU_SOURCE AC_PROG_EGREP AC_PROG_FGREP AC_REPLACE_FNMATCH AC_FUNC_FNMATCH_GNU AC_FUNC_REALLOC AC_TYPE_MBSTATE_T"
-
-	macros_to_search=""
-	ac_major="`echo ${AUTOCONF_VERSION}. | cut -d. -f1 | sed 's/[^0-9]//g'`"
-	ac_minor="`echo ${AUTOCONF_VERSION}. | cut -d. -f2 | sed 's/[^0-9]//g'`"
-
-	if [ $ac_major -lt 2 ] ; then
-	    macros_to_search="$ac2_59_macros $ac2_55_macros $ac2_54_macros"
-	else
-	    if [ $ac_minor -lt 54 ] ; then
-		macros_to_search="$ac2_59_macros $ac2_55_macros $ac2_54_macros"
-	    elif [ $ac_minor -lt 55 ] ; then
-		macros_to_search="$ac2_59_macros $ac2_55_macros"
-	    elif [ $ac_minor -lt 59 ] ; then
-		macros_to_search="$ac2_59_macros"
-	    fi
-	fi
-
-	configure_ac_macros=__none__
-	for feature in $macros_to_search ; do
-	    $VERBOSE_ECHO "Searching for $feature in $CONFIGURE"
-	    found="`grep \"^$feature.*\" $CONFIGURE`"
-	    if [ ! "x$found" = "x" ] ; then
-		if [ "x$configure_ac_macros" = "x__none__" ] ; then
-		    configure_ac_macros="$feature"
-		else
-		    configure_ac_macros="$feature $configure_ac_macros"
-		fi
-	    fi
-	done
-	if [ ! "x$configure_ac_macros" = "x__none__" ] ; then
-	    $ECHO
-	    $ECHO "Warning:  Unsupported macros were found in $CONFIGURE"
-	    $ECHO
-	    $ECHO "The `basename \"$CONFIGURE\"` file was scanned in order to determine if any"
-	    $ECHO "unsupported macros are used that exceed the minimum version"
-	    $ECHO "settings specified within this file.  As such, the following macros"
-	    $ECHO "should be removed from configure.ac or the version numbers in this"
-	    $ECHO "file should be increased:"
-	    $ECHO
-	    $ECHO "$configure_ac_macros"
-	    $ECHO
-	    $ECHO $ECHO_N "Ignorantly continuing build preparation ... $ECHO_C"
-	fi
-
-	###################
-	# autoconf, retry #
-	###################
-	$VERBOSE_ECHO
-	$VERBOSE_ECHO "$AUTOCONF"
-	autoconf_output="`$AUTOCONF 2>&1`"
-	ret=$?
-	$VERBOSE_ECHO "$autoconf_output"
-
-	if [ ! $ret = 0 ] ; then
-	    # test if libtool is busted
-	    libtool_failure "$autoconf_output"
-
-	    # let the user know what went wrong
-	    cat <<EOF
-$autoconf_output
-EOF
-	    $ECHO "ERROR: $AUTOCONF failed"
-	    exit 2
-	else
-	    # autoconf sans -f and possibly sans unsupported options succeed so warn verbosely
-	    $ECHO
-	    $ECHO "Warning: autoconf seems to have succeeded by removing the following options:"
-	    $ECHO "	AUTOCONF_OPTIONS=\"$AUTOCONF_OPTIONS\""
-	    $ECHO
-	    $ECHO "Removing those options should not be necessary and indicate some other"
-	    $ECHO "problem with the build system.  The build preparation is highly suspect"
-	    $ECHO "and may result in configuration or compilation errors.  Consider"
-	    if [ "x$VERBOSE_ECHO" = "x:" ] ; then
-		$ECHO "rerunning the build preparation with verbose output enabled."
-		$ECHO "	$AUTOGEN_SH --verbose"
-	    else
-		$ECHO "reviewing the minimum GNU Autotools version settings contained in"
-		$ECHO "this script along with the macros being used in your `basename \"$CONFIGURE\"` file."
-	    fi
-	    $ECHO
-	    $ECHO $ECHO_N "Continuing build preparation ... $ECHO_C"
-	fi # autoconf ret = 0
-    fi # autoconf ret = 0
-
-    ##############
-    # autoheader #
-    ##############
-    need_autoheader=no
-    for feature in AM_CONFIG_HEADER AC_CONFIG_HEADER ; do
-	$VERBOSE_ECHO "Searching for $feature in $CONFIGURE"
-	found="`grep \"^$feature.*\" $CONFIGURE`"
-	if [ ! "x$found" = "x" ] ; then
-	    need_autoheader=yes
-	    break
-	fi
-    done
-    if [ "x$need_autoheader" = "xyes" ] ; then
-	$VERBOSE_ECHO "$AUTOHEADER $AUTOHEADER_OPTIONS"
-	autoheader_output="`$AUTOHEADER $AUTOHEADER_OPTIONS 2>&1`"
-	ret=$?
-	$VERBOSE_ECHO "$autoheader_output"
-	if [ ! $ret = 0 ] ; then $ECHO "ERROR: $AUTOHEADER failed" && exit 2 ; fi
-    fi # need_autoheader
-
-    ############
-    # automake #
-    ############
-    need_automake=no
-    for feature in AM_INIT_AUTOMAKE ; do
-	$VERBOSE_ECHO "Searching for $feature in $CONFIGURE"
-	found="`grep \"^$feature.*\" $CONFIGURE`"
-	if [ ! "x$found" = "x" ] ; then
-	    need_automake=yes
-	    break
-	fi
-    done
-
-    if [ "x$need_automake" = "xyes" ] ; then
-	$VERBOSE_ECHO "$AUTOMAKE $AUTOMAKE_OPTIONS"
-	automake_output="`$AUTOMAKE $AUTOMAKE_OPTIONS 2>&1`"
-	ret=$?
-	$VERBOSE_ECHO "$automake_output"
-
-	if [ ! $ret = 0 ] ; then
-
-	    ###################
-	    # automake, retry #
-	    ###################
-	    $VERBOSE_ECHO
-	    $VERBOSE_ECHO "$AUTOMAKE $ALT_AUTOMAKE_OPTIONS"
-	    # retry without the -f
-	    automake_output="`$AUTOMAKE $ALT_AUTOMAKE_OPTIONS 2>&1`"
-	    ret=$?
-	    $VERBOSE_ECHO "$automake_output"
-
-	    if [ ! $ret = 0 ] ; then
-	 	# test if libtool is busted
-		libtool_failure "$automake_output"
-
-		# let the user know what went wrong
-		cat <<EOF
-$automake_output
-EOF
-		$ECHO "ERROR: $AUTOMAKE failed"
-		exit 2
-	    fi # automake retry
-	fi # automake ret = 0
-    fi # need_automake
-} # end of manual_autogen
-
-
-#####################################
-# RECURSIVE_MANUAL_AUTOGEN FUNCTION #
-#####################################
-recursive_manual_autogen ( ) {
-
-    # run the build preparation steps manually for this directory
-    manual_autogen
-
-    # for projects using recursive configure, run the build
-    # preparation steps for the subdirectories.
-    if [ ! "x$CONFIG_SUBDIRS" = "x" ] ; then
-	$VERBOSE_ECHO "Recursively configuring the following directories:"
-	$VERBOSE_ECHO "  $CONFIG_SUBDIRS"
-	for dir in $CONFIG_SUBDIRS ; do
-	    $VERBOSE_ECHO "Processing recursive configure in $dir"
-	    cd "$START_PATH"
-	    cd "$dir"
-
-	    # new directory, prepare
-	    initialize
-
-	    # run manual steps for the subdir and any others below
-	    recursive_manual_autogen
-	done
-    fi
-}
-
-
-################################
-# run manual preparation steps #
-################################
-if [ "x$reconfigure_manually" = "xyes" ] ; then
-    $ECHO
-    $ECHO $ECHO_N "Preparing build ... $ECHO_C"
-
-    recursive_manual_autogen
-fi
-
-
-#########################
-# restore and summarize #
-#########################
-cd "$START_PATH"
-
-# restore COPYING and INSTALL from backup if necessary
-recursive_restore
-
-# make sure we end up with a configure script
-config_ac="`locate_configure_template`"
-config="`echo $config_ac | sed 's/\.ac$//' | sed 's/\.in$//'`"
-if [ "x$config" = "x" ] ; then
-    $VERBOSE_ECHO "Could not locate the configure template (from `pwd`)"
-fi
-
-# summarize
-$ECHO "done"
-$ECHO
-if test "x$config" = "x" -o ! -f "$config" ; then
-    $ECHO "WARNING: The $PROJECT build system should now be prepared but there"
-    $ECHO "does not seem to be a resulting configure file.  This is unexpected"
-    $ECHO "and likely the result of an error.  You should run $NAME_OF_AUTOGEN"
-    $ECHO "with the --verbose option to get more details on a potential"
-    $ECHO "misconfiguration."
-else
-    $ECHO "The $PROJECT build system is now prepared.  To build here, run:"
-    $ECHO "  $config"
-    $ECHO "  make"
-fi
-
-
-# Local Variables:
-# mode: sh
-# tab-width: 8
-# sh-basic-offset: 4
-# sh-indentation: 4
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=4 tabstop=8
diff --git a/config/.gitignore b/config/.gitignore
deleted file mode 100644
index c1e3d2423..000000000
--- a/config/.gitignore
+++ /dev/null
@@ -1,12 +0,0 @@
-/libtool.m4
-/depcomp
-/lt~obsolete.m4
-/config.guess
-/config.sub
-/ltmain.sh
-/ltsugar.m4
-/ltversion.m4
-/missing
-/ltoptions.m4
-/install-sh
-/test-driver
diff --git a/config/abc.m4 b/config/abc.m4
deleted file mode 100644
index 6f095de7b..000000000
--- a/config/abc.m4
+++ /dev/null
@@ -1,145 +0,0 @@
-# CVC4_CHECK_FOR_ABC
-# ------------------
-# Look for abc and link it in, but only if user requested.
-AC_DEFUN([CVC4_CHECK_FOR_ABC], [
-AC_MSG_CHECKING([whether user requested abc support])
-LIBABC=
-have_libabc=0
-ABC_LIBS=
-ABC_LDFLAGS=
-if test "$with_abc" = no; then
-  AC_MSG_RESULT([no, abc disabled by user])
-elif test -n "$with_abc"; then
-  AC_MSG_RESULT([yes, abc requested by user])
-
-  # Get the location of all the ABC stuff
-  AC_ARG_VAR(ABC_HOME, [path to top level of abc source tree])
-  AC_ARG_WITH(
-    [abc-dir],
-    AS_HELP_STRING(
-      [--with-abc-dir=PATH],
-      [path to top level of abc source tree]
-    ),
-    [ABC_HOME="$withval"],
-    [ if test -z "$ABC_HOME" && ! test -e "$ac_abs_confdir/abc/alanmi-abc-53f39c11b58d/arch_flags"; then
-        AC_MSG_FAILURE([must give --with-abc-dir=PATH, define environment variable ABC_HOME, or use contrib/get-abc to setup ABC for CVC4!])
-      fi
-    ]
-  )
-  # Check if ABC was installed via contrib/get-abc
-  AC_MSG_CHECKING([whether ABC was already installed via contrib/get-abc])
-  if test -z "$ABC_HOME" && test -e "$ac_abs_confdir/abc/alanmi-abc-53f39c11b58d/arch_flags"; then
-    ABC_HOME="$ac_abs_confdir/abc/alanmi-abc-53f39c11b58d"
-    AC_MSG_RESULT([yes, $ABC_HOME])
-  else
-    AC_MSG_RESULT([no])
-  fi
-
-  if ! test -d "$ABC_HOME" || ! test -x "$ABC_HOME/arch_flags"; then
-    AC_MSG_FAILURE([either $ABC_HOME is not an abc source tree or it's not yet built])
-  fi
-
-  AC_MSG_CHECKING([for arch_flags to use with libabc])
-  libabc_arch_flags="$("$ABC_HOME/arch_flags")"
-  AC_MSG_RESULT([$libabc_arch_flags])
-  CVC4CPPFLAGS="${CVC4CPPFLAGS:+$CVC4CPPFLAGS }-I$ABC_HOME/src $libabc_arch_flags"
-  ABC_LDFLAGS="-L$ABC_HOME"
-
-  dnl Try a bunch of combinations until something works :-/
-  cvc4_save_LDFLAGS="$LDFLAGS"
-  ABC_LIBS=
-  CPPFLAGS="$CPPFLAGS -I$ABC_HOME/src $libabc_arch_flags"
-  LDFLAGS="$LDFLAGS $ABC_LDFLAGS"
-  AC_CHECK_HEADER([base/abc/abc.h], [], [AC_MSG_FAILURE([cannot find abc.h, the ABC header!])])
-  AC_MSG_CHECKING([how to link abc])
-  CVC4_TRY_ABC_WITH([])
-  CVC4_TRY_ABC_WITH([-lm])
-  CVC4_TRY_ABC_WITH([-lm -lrt])
-  CVC4_TRY_ABC_WITH([-lm -lrt -ldl])
-  CVC4_TRY_ABC_WITH([-lm -lrt -lreadline -ldl])
-  CVC4_TRY_ABC_WITH([-lm -lpthread])
-  CVC4_TRY_ABC_WITH([-lm -lpthread -lrt])
-  CVC4_TRY_ABC_WITH([-lm -lpthread -lrt -ldl])
-  CVC4_TRY_ABC_WITH([-lm -lpthread -lrt -lreadline -ldl])
-  dnl CVC4_TRY_ABC_WITH([-lm -rdynamic -lreadline -lpthread -lrt -ldl])
-  if test -z "$ABC_LIBS"; then
-    AC_MSG_FAILURE([cannot link against libabc!])
-  else
-    AC_MSG_RESULT([$ABC_LIBS])
-    # make sure it works in static builds, too
-    if test "$enable_static_binary" = yes; then
-      ABC_LIBS=
-      AC_MSG_CHECKING([whether statically-linked abc is functional])
-      CVC4_TRY_STATIC_ABC_WITH([])
-      CVC4_TRY_STATIC_ABC_WITH([-lm])
-      CVC4_TRY_STATIC_ABC_WITH([-lm -lrt])
-      CVC4_TRY_STATIC_ABC_WITH([-lm -lrt -ldl])
-      CVC4_TRY_STATIC_ABC_WITH([-lm -lrt -lreadline -ldl])
-      CVC4_TRY_STATIC_ABC_WITH([-lm -lpthread])
-      CVC4_TRY_STATIC_ABC_WITH([-lm -lpthread -lrt])
-      CVC4_TRY_STATIC_ABC_WITH([-lm -lpthread -lrt -ldl])
-      CVC4_TRY_STATIC_ABC_WITH([-lm -lpthread -lrt -lreadline -ldl])
-      if test -n "$ABC_LIBS"; then
-        AC_MSG_RESULT([yes, it works])
-        with_abc=yes
-      else
-        AC_MSG_RESULT([no])
-        AC_MSG_FAILURE([abc installation appears incompatible with static-binary])
-      fi
-    else
-      with_abc=yes
-    fi
-  fi
-  if test "$with_abc" = yes; then
-    have_libabc=1
-  else
-    with_abc=no
-    have_libreadline=0
-    ABC_LIBS=
-  fi
-  LDFLAGS="$cvc4_save_LDFLAGS"
-else
-  AC_MSG_RESULT([no, user didn't request abc])
-  with_abc=no
-fi
-])# CVC4_CHECK_FOR_ABC
-
-# CVC4_TRY_ABC_WITH(LIBS)
-# -----------------------
-# Try AC_CHECK_LIB(abc) with the given linking libraries
-AC_DEFUN([CVC4_TRY_ABC_WITH], [
-if test -z "$ABC_LIBS"; then
-  AC_LANG_PUSH([C++])
-  cvc4_save_LIBS="$LIBS"
-  LIBS="-labc $1"
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([extern "C" { void Abc_Start(); }],
-                                  [Abc_Start()])],
-    [ABC_LIBS="-labc $1"],
-    [])
-  LIBS="$cvc4_save_LIBS"
-  AC_LANG_POP([C++])
-fi
-])# CVC4_TRY_ABC_WITH
-
-# CVC4_TRY_STATIC_ABC_WITH(LIBS)
-# ------------------------------
-# Try AC_CHECK_LIB(abc) with the given linking libraries
-AC_DEFUN([CVC4_TRY_STATIC_ABC_WITH], [
-if test -z "$ABC_LIBS"; then
-  AC_LANG_PUSH([C++])
-  cvc4_save_LIBS="$LIBS"
-  cvc4_save_LDFLAGS="$LDFLAGS"
-  LDFLAGS="-static $LDFLAGS"
-  LIBS="-labc-static $1"
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([extern "C" { void Abc_Start(); }],
-                                  [Abc_Start()])],
-    [ABC_LIBS="-labc-static $1"],
-    [ LIBS="-labc $1"
-      AC_LINK_IFELSE([AC_LANG_PROGRAM([extern "C" { void Abc_Start(); }],
-                                      [Abc_Start()])],
-        [ABC_LIBS="-labc $1"]) ])
-  LIBS="$cvc4_save_LIBS"
-  LDFLAGS="$cvc4_save_LDFLAGS"
-  AC_LANG_POP([C++])
-fi
-])# CVC4_TRY_STATIC_ABC_WITH
diff --git a/config/antlr.m4 b/config/antlr.m4
deleted file mode 100644
index aa161989c..000000000
--- a/config/antlr.m4
+++ /dev/null
@@ -1,153 +0,0 @@
-##
-# Check for ANTLR's antlr3 script.
-# Will set ANTLR to the location of the script.
-##
-AC_DEFUN([AC_PROG_ANTLR], [
-  AC_ARG_VAR([ANTLR],[location of the antlr3 script])
-
-  # Check the existence of the runantlr script
-  if test "x$ANTLR" = "x"; then
-    AC_PATH_PROG(ANTLR, [antlr3])
-  else
-    AC_MSG_CHECKING([antlr3 script ($ANTLR)])
-    if test ! -e "$ANTLR"; then
-      AC_MSG_RESULT([not found])
-      unset ANTLR
-    elif test ! -x "$ANTLR"; then
-      AC_MSG_RESULT([not executable])
-      unset ANTLR
-    else
-      AC_MSG_RESULT([OK])
-    fi
-  fi
-  # Check if antlr-3.4 was installed via contrib/get-antlr3.4
-  if test -e "$ac_abs_confdir/antlr-3.4/bin/antlr3"; then
-    ANTLR="$ac_abs_confdir/antlr-3.4/bin/antlr3"
-  fi
-  if test "x$ANTLR" = "x"; then
-    AC_MSG_WARN(
-[No usable antlr3 script found. Make sure that the parser code has
-been generated already. To obtain ANTLR see <http://www.antlr3.org/>.]
-    )
-    ANTLR_VERSION=
-  else
-    ANTLR_VERSION="`$ANTLR -version 2>&1 | sed 's,.*Version  *\([[0-9.]]*\).*,\1,'`"
-    case "$ANTLR_VERSION" in
-      3.2|3.2.*) ANTLR_VERSION=3.2 ;;
-      3.4|3.4.*) ANTLR_VERSION=3.4 ;;
-      *) AC_MSG_WARN([unknown version of antlr: $ANTLR_VERSION]);;
-    esac
-  fi
-])
-
-##
-# Check the existence of the ANTLR3 C runtime library and headers
-# Will set ANTLR_INCLUDES and ANTLR_LIBS to the location of the ANTLR
-# headers and library respectively
-##
-AC_DEFUN([AC_LIB_ANTLR],[
-  AC_ARG_VAR(ANTLR_HOME, [path to libantlr3c installation])
-
-  # Get the location of the ANTLR3 C includes and libraries
-  AC_ARG_WITH(
-    [antlr-dir],
-    AS_HELP_STRING(
-      [--with-antlr-dir=PATH],
-      [path to ANTLR C headers and libraries]
-    ),
-    ANTLR_PREFIXES="$withval",
-    ANTLR_PREFIXES="$ANTLR_HOME /usr/local /usr /opt/local /opt"
-  )
-
-  # Check if antlr-3.4 was installed via contrib/get-antlr3.4
-  if test -e "$ac_abs_confdir/antlr-3.4"; then
-    ANTLR_PREFIXES="$ac_abs_confdir/antlr-3.4"
-  fi
-
-  AC_MSG_CHECKING(for ANTLR3 C runtime library)
-
-  # Use C and remember the variables we are changing
-  AC_LANG_PUSH(C)
-  OLD_CPPFLAGS="$CPPFLAGS"
-  OLD_LIBS="$LIBS"
-
-  # Try all the includes/libs set in ANTLR_PREFIXES
-  for antlr_prefix in $ANTLR_PREFIXES
-  do
-    CPPFLAGS="$OLD_CPPFLAGS -I$antlr_prefix/include"
-    LIBS="$OLD_LIBS -L$antlr_prefix/lib -lantlr3c"
-    AC_LINK_IFELSE([AC_LANG_SOURCE(
-      [
-        #include <antlr3.h>
-
-        int main() {
-          pANTLR3_TOKEN_FACTORY factory = antlr3TokenFactoryNew((pANTLR3_INPUT_STREAM) NULL);
-          return 0;
-        }
-      ])],
-      [
-        AC_MSG_RESULT(found in $antlr_prefix)
-        ANTLR_INCLUDES="-I$antlr_prefix/include"
-        ANTLR_LDFLAGS="-L$antlr_prefix/lib -lantlr3c"
-        break
-      ],
-          [
-            AC_MSG_RESULT(no)
-            AC_MSG_ERROR([ANTLR3 C runtime not found, see <http://www.antlr3.org/>])
-          ]
-    )
-  done
-
-  AC_MSG_CHECKING([for presence of older antlr3AsciiFileStreamNew()])
-  AC_LINK_IFELSE([AC_LANG_SOURCE(
-    [
-      #include <antlr3.h>
-
-      int main() {
-        pANTLR3_UINT8 fName = (pANTLR3_UINT8)"foo";
-        pANTLR3_INPUT_STREAM input = antlr3AsciiFileStreamNew(fName);
-        return 0;
-      }
-    ])],
-    [
-      AC_MSG_RESULT([found it (must be antlr3 3.2 or similar)])
-      if test -n "$ANTLR_VERSION" -a "$ANTLR_VERSION" != 3.2; then
-        AC_MSG_WARN([your antlr parser generator is version $ANTLR_VERSION, which doesn't match the library!])
-      fi
-      CVC4CPPFLAGS="${CVC4CPPFLAGS:+$CVC4CPPFLAGS }-DCVC4_ANTLR3_OLD_INPUT_STREAM"
-    ],
-        [
-          AC_MSG_RESULT(failed)
-          AC_MSG_CHECKING([for presence of newer antlr3FileStreamNew()])
-          AC_LINK_IFELSE([AC_LANG_SOURCE(
-            [
-              #include <antlr3.h>
-
-              int main() {
-                pANTLR3_UINT8 fName = (pANTLR3_UINT8)"foo";
-                pANTLR3_INPUT_STREAM input = antlr3FileStreamNew(fName, ANTLR3_ENC_8BIT);
-                return 0;
-              }
-            ])],
-            [
-              AC_MSG_RESULT([found it (must be antlr3 3.4 or similar)])
-              if test -n "$ANTLR_VERSION" -a "$ANTLR_VERSION" != 3.4; then
-                AC_MSG_WARN([your antlr parser generator is version $ANTLR_VERSION, which doesn't match the library!])
-              fi
-            ],
-                [
-                  AC_MSG_ERROR([cannot figure out how to create an antlr3 input stream, bailing..])
-                ]
-          )
-        ]
-  )
-
-  # Return the old compile variables and pop the language.
-  LIBS="$OLD_LIBS"
-  CPPFLAGS="$OLD_CPPFLAGS"
-  AC_LANG_POP()
-
-  # Define the ANTLR include/libs variables
-  AC_SUBST(ANTLR_INCLUDES)
-  AC_SUBST(ANTLR_LDFLAGS)
-])
diff --git a/config/ax_cxx_compile_stdcxx.m4 b/config/ax_cxx_compile_stdcxx.m4
deleted file mode 100644
index 5032bba80..000000000
--- a/config/ax_cxx_compile_stdcxx.m4
+++ /dev/null
@@ -1,982 +0,0 @@
-# ===========================================================================
-#  https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional])
-#
-# DESCRIPTION
-#
-#   Check for baseline language coverage in the compiler for the specified
-#   version of the C++ standard.  If necessary, add switches to CXX and
-#   CXXCPP to enable support.  VERSION may be '11' (for the C++11 standard)
-#   or '14' (for the C++14 standard).
-#
-#   The second argument, if specified, indicates whether you insist on an
-#   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
-#   -std=c++11).  If neither is specified, you get whatever works, with
-#   preference for an extended mode.
-#
-#   The third argument, if specified 'mandatory' or if left unspecified,
-#   indicates that baseline support for the specified C++ standard is
-#   required and that the macro should error out if no mode with that
-#   support is found.  If specified 'optional', then configuration proceeds
-#   regardless, after defining HAVE_CXX${VERSION} if and only if a
-#   supporting mode is found.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
-#   Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
-#   Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
-#   Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <sokolov@google.com>
-#   Copyright (c) 2015 Paul Norman <penorman@mac.com>
-#   Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu>
-#   Copyright (c) 2016 Krzesimir Nowak <qdlacz@gmail.com>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.  This file is offered as-is, without any
-#   warranty.
-
-#serial 7
-
-dnl  This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro
-dnl  (serial version number 13).
-
-AX_REQUIRE_DEFINED([AC_MSG_WARN])
-AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
-  m4_if([$1], [11], [ax_cxx_compile_alternatives="11 0x"],
-        [$1], [14], [ax_cxx_compile_alternatives="14 1y"],
-        [$1], [17], [ax_cxx_compile_alternatives="17 1z"],
-        [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl
-  m4_if([$2], [], [],
-        [$2], [ext], [],
-        [$2], [noext], [],
-        [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX])])dnl
-  m4_if([$3], [], [ax_cxx_compile_cxx$1_required=true],
-        [$3], [mandatory], [ax_cxx_compile_cxx$1_required=true],
-        [$3], [optional], [ax_cxx_compile_cxx$1_required=false],
-        [m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])])
-  AC_LANG_PUSH([C++])dnl
-  ac_success=no
-  AC_CACHE_CHECK(whether $CXX supports C++$1 features by default,
-  ax_cv_cxx_compile_cxx$1,
-  [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
-    [ax_cv_cxx_compile_cxx$1=yes],
-    [ax_cv_cxx_compile_cxx$1=no])])
-  if test x$ax_cv_cxx_compile_cxx$1 = xyes; then
-    ac_success=yes
-  fi
-
-  m4_if([$2], [noext], [], [dnl
-  if test x$ac_success = xno; then
-    for alternative in ${ax_cxx_compile_alternatives}; do
-      switch="-std=gnu++${alternative}"
-      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
-      AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
-                     $cachevar,
-        [ac_save_CXX="$CXX"
-         CXX="$CXX $switch"
-         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
-          [eval $cachevar=yes],
-          [eval $cachevar=no])
-         CXX="$ac_save_CXX"])
-      if eval test x\$$cachevar = xyes; then
-        CXX="$CXX $switch"
-        if test -n "$CXXCPP" ; then
-          CXXCPP="$CXXCPP $switch"
-        fi
-        ac_success=yes
-        break
-      fi
-    done
-  fi])
-
-  m4_if([$2], [ext], [], [dnl
-  if test x$ac_success = xno; then
-    dnl HP's aCC needs +std=c++11 according to:
-    dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf
-    dnl Cray's crayCC needs "-h std=c++11"
-    for alternative in ${ax_cxx_compile_alternatives}; do
-      for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do
-        cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
-        AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
-                       $cachevar,
-          [ac_save_CXX="$CXX"
-           CXX="$CXX $switch"
-           AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
-            [eval $cachevar=yes],
-            [eval $cachevar=no])
-           CXX="$ac_save_CXX"])
-        if eval test x\$$cachevar = xyes; then
-          CXX="$CXX $switch"
-          if test -n "$CXXCPP" ; then
-            CXXCPP="$CXXCPP $switch"
-          fi
-          ac_success=yes
-          break
-        fi
-      done
-      if test x$ac_success = xyes; then
-        break
-      fi
-    done
-  fi])
-  AC_LANG_POP([C++])
-  if test x$ax_cxx_compile_cxx$1_required = xtrue; then
-    if test x$ac_success = xno; then
-      AC_MSG_ERROR([*** A compiler with support for C++$1 language features is required.])
-    fi
-  fi
-  if test x$ac_success = xno; then
-    HAVE_CXX$1=0
-    AC_MSG_NOTICE([No compiler with C++$1 support was found])
-  else
-    HAVE_CXX$1=1
-    AC_DEFINE(HAVE_CXX$1,1,
-              [define if the compiler supports basic C++$1 syntax])
-  fi
-  AC_SUBST(HAVE_CXX$1)
-  m4_if([$1], [17], [AC_MSG_WARN([C++17 is not yet standardized, so the checks may change in incompatible ways anytime])])
-])
-
-
-dnl  Test body for checking C++11 support
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_11],
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
-)
-
-
-dnl  Test body for checking C++14 support
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14],
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
-)
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_17],
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_17
-)
-
-dnl  Tests for new features in C++11
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_11], [[
-
-// If the compiler admits that it is not ready for C++11, why torture it?
-// Hopefully, this will speed up the test.
-
-#ifndef __cplusplus
-
-#error "This is not a C++ compiler"
-
-#elif __cplusplus < 201103L
-
-#error "This is not a C++11 compiler"
-
-#else
-
-namespace cxx11
-{
-
-  namespace test_static_assert
-  {
-
-    template <typename T>
-    struct check
-    {
-      static_assert(sizeof(int) <= sizeof(T), "not big enough");
-    };
-
-  }
-
-  namespace test_final_override
-  {
-
-    struct Base
-    {
-      virtual void f() {}
-    };
-
-    struct Derived : public Base
-    {
-      virtual void f() override {}
-    };
-
-  }
-
-  namespace test_double_right_angle_brackets
-  {
-
-    template < typename T >
-    struct check {};
-
-    typedef check<void> single_type;
-    typedef check<check<void>> double_type;
-    typedef check<check<check<void>>> triple_type;
-    typedef check<check<check<check<void>>>> quadruple_type;
-
-  }
-
-  namespace test_decltype
-  {
-
-    int
-    f()
-    {
-      int a = 1;
-      decltype(a) b = 2;
-      return a + b;
-    }
-
-  }
-
-  namespace test_type_deduction
-  {
-
-    template < typename T1, typename T2 >
-    struct is_same
-    {
-      static const bool value = false;
-    };
-
-    template < typename T >
-    struct is_same<T, T>
-    {
-      static const bool value = true;
-    };
-
-    template < typename T1, typename T2 >
-    auto
-    add(T1 a1, T2 a2) -> decltype(a1 + a2)
-    {
-      return a1 + a2;
-    }
-
-    int
-    test(const int c, volatile int v)
-    {
-      static_assert(is_same<int, decltype(0)>::value == true, "");
-      static_assert(is_same<int, decltype(c)>::value == false, "");
-      static_assert(is_same<int, decltype(v)>::value == false, "");
-      auto ac = c;
-      auto av = v;
-      auto sumi = ac + av + 'x';
-      auto sumf = ac + av + 1.0;
-      static_assert(is_same<int, decltype(ac)>::value == true, "");
-      static_assert(is_same<int, decltype(av)>::value == true, "");
-      static_assert(is_same<int, decltype(sumi)>::value == true, "");
-      static_assert(is_same<int, decltype(sumf)>::value == false, "");
-      static_assert(is_same<int, decltype(add(c, v))>::value == true, "");
-      return (sumf > 0.0) ? sumi : add(c, v);
-    }
-
-  }
-
-  namespace test_noexcept
-  {
-
-    int f() { return 0; }
-    int g() noexcept { return 0; }
-
-    static_assert(noexcept(f()) == false, "");
-    static_assert(noexcept(g()) == true, "");
-
-  }
-
-  namespace test_constexpr
-  {
-
-    template < typename CharT >
-    unsigned long constexpr
-    strlen_c_r(const CharT *const s, const unsigned long acc) noexcept
-    {
-      return *s ? strlen_c_r(s + 1, acc + 1) : acc;
-    }
-
-    template < typename CharT >
-    unsigned long constexpr
-    strlen_c(const CharT *const s) noexcept
-    {
-      return strlen_c_r(s, 0UL);
-    }
-
-    static_assert(strlen_c("") == 0UL, "");
-    static_assert(strlen_c("1") == 1UL, "");
-    static_assert(strlen_c("example") == 7UL, "");
-    static_assert(strlen_c("another\0example") == 7UL, "");
-
-  }
-
-  namespace test_rvalue_references
-  {
-
-    template < int N >
-    struct answer
-    {
-      static constexpr int value = N;
-    };
-
-    answer<1> f(int&)       { return answer<1>(); }
-    answer<2> f(const int&) { return answer<2>(); }
-    answer<3> f(int&&)      { return answer<3>(); }
-
-    void
-    test()
-    {
-      int i = 0;
-      const int c = 0;
-      static_assert(decltype(f(i))::value == 1, "");
-      static_assert(decltype(f(c))::value == 2, "");
-      static_assert(decltype(f(0))::value == 3, "");
-    }
-
-  }
-
-  namespace test_uniform_initialization
-  {
-
-    struct test
-    {
-      static const int zero {};
-      static const int one {1};
-    };
-
-    static_assert(test::zero == 0, "");
-    static_assert(test::one == 1, "");
-
-  }
-
-  namespace test_lambdas
-  {
-
-    void
-    test1()
-    {
-      auto lambda1 = [](){};
-      auto lambda2 = lambda1;
-      lambda1();
-      lambda2();
-    }
-
-    int
-    test2()
-    {
-      auto a = [](int i, int j){ return i + j; }(1, 2);
-      auto b = []() -> int { return '0'; }();
-      auto c = [=](){ return a + b; }();
-      auto d = [&](){ return c; }();
-      auto e = [a, &b](int x) mutable {
-        const auto identity = [](int y){ return y; };
-        for (auto i = 0; i < a; ++i)
-          a += b--;
-        return x + identity(a + b);
-      }(0);
-      return a + b + c + d + e;
-    }
-
-    int
-    test3()
-    {
-      const auto nullary = [](){ return 0; };
-      const auto unary = [](int x){ return x; };
-      using nullary_t = decltype(nullary);
-      using unary_t = decltype(unary);
-      const auto higher1st = [](nullary_t f){ return f(); };
-      const auto higher2nd = [unary](nullary_t f1){
-        return [unary, f1](unary_t f2){ return f2(unary(f1())); };
-      };
-      return higher1st(nullary) + higher2nd(nullary)(unary);
-    }
-
-  }
-
-  namespace test_variadic_templates
-  {
-
-    template <int...>
-    struct sum;
-
-    template <int N0, int... N1toN>
-    struct sum<N0, N1toN...>
-    {
-      static constexpr auto value = N0 + sum<N1toN...>::value;
-    };
-
-    template <>
-    struct sum<>
-    {
-      static constexpr auto value = 0;
-    };
-
-    static_assert(sum<>::value == 0, "");
-    static_assert(sum<1>::value == 1, "");
-    static_assert(sum<23>::value == 23, "");
-    static_assert(sum<1, 2>::value == 3, "");
-    static_assert(sum<5, 5, 11>::value == 21, "");
-    static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, "");
-
-  }
-
-  // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae
-  // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function
-  // because of this.
-  namespace test_template_alias_sfinae
-  {
-
-    struct foo {};
-
-    template<typename T>
-    using member = typename T::member_type;
-
-    template<typename T>
-    void func(...) {}
-
-    template<typename T>
-    void func(member<T>*) {}
-
-    void test();
-
-    void test() { func<foo>(0); }
-
-  }
-
-}  // namespace cxx11
-
-#endif  // __cplusplus >= 201103L
-
-]])
-
-
-dnl  Tests for new features in C++14
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_14], [[
-
-// If the compiler admits that it is not ready for C++14, why torture it?
-// Hopefully, this will speed up the test.
-
-#ifndef __cplusplus
-
-#error "This is not a C++ compiler"
-
-#elif __cplusplus < 201402L
-
-#error "This is not a C++14 compiler"
-
-#else
-
-namespace cxx14
-{
-
-  namespace test_polymorphic_lambdas
-  {
-
-    int
-    test()
-    {
-      const auto lambda = [](auto&&... args){
-        const auto istiny = [](auto x){
-          return (sizeof(x) == 1UL) ? 1 : 0;
-        };
-        const int aretiny[] = { istiny(args)... };
-        return aretiny[0];
-      };
-      return lambda(1, 1L, 1.0f, '1');
-    }
-
-  }
-
-  namespace test_binary_literals
-  {
-
-    constexpr auto ivii = 0b0000000000101010;
-    static_assert(ivii == 42, "wrong value");
-
-  }
-
-  namespace test_generalized_constexpr
-  {
-
-    template < typename CharT >
-    constexpr unsigned long
-    strlen_c(const CharT *const s) noexcept
-    {
-      auto length = 0UL;
-      for (auto p = s; *p; ++p)
-        ++length;
-      return length;
-    }
-
-    static_assert(strlen_c("") == 0UL, "");
-    static_assert(strlen_c("x") == 1UL, "");
-    static_assert(strlen_c("test") == 4UL, "");
-    static_assert(strlen_c("another\0test") == 7UL, "");
-
-  }
-
-  namespace test_lambda_init_capture
-  {
-
-    int
-    test()
-    {
-      auto x = 0;
-      const auto lambda1 = [a = x](int b){ return a + b; };
-      const auto lambda2 = [a = lambda1(x)](){ return a; };
-      return lambda2();
-    }
-
-  }
-
-  namespace test_digit_separators
-  {
-
-    constexpr auto ten_million = 100'000'000;
-    static_assert(ten_million == 100000000, "");
-
-  }
-
-  namespace test_return_type_deduction
-  {
-
-    auto f(int& x) { return x; }
-    decltype(auto) g(int& x) { return x; }
-
-    template < typename T1, typename T2 >
-    struct is_same
-    {
-      static constexpr auto value = false;
-    };
-
-    template < typename T >
-    struct is_same<T, T>
-    {
-      static constexpr auto value = true;
-    };
-
-    int
-    test()
-    {
-      auto x = 0;
-      static_assert(is_same<int, decltype(f(x))>::value, "");
-      static_assert(is_same<int&, decltype(g(x))>::value, "");
-      return x;
-    }
-
-  }
-
-}  // namespace cxx14
-
-#endif  // __cplusplus >= 201402L
-
-]])
-
-
-dnl  Tests for new features in C++17
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_17], [[
-
-// If the compiler admits that it is not ready for C++17, why torture it?
-// Hopefully, this will speed up the test.
-
-#ifndef __cplusplus
-
-#error "This is not a C++ compiler"
-
-#elif __cplusplus <= 201402L
-
-#error "This is not a C++17 compiler"
-
-#else
-
-#if defined(__clang__)
-  #define REALLY_CLANG
-#else
-  #if defined(__GNUC__)
-    #define REALLY_GCC
-  #endif
-#endif
-
-#include <initializer_list>
-#include <utility>
-#include <type_traits>
-
-namespace cxx17
-{
-
-#if !defined(REALLY_CLANG)
-  namespace test_constexpr_lambdas
-  {
-
-    // TODO: test it with clang++ from git
-
-    constexpr int foo = [](){return 42;}();
-
-  }
-#endif // !defined(REALLY_CLANG)
-
-  namespace test::nested_namespace::definitions
-  {
-
-  }
-
-  namespace test_fold_expression
-  {
-
-    template<typename... Args>
-    int multiply(Args... args)
-    {
-      return (args * ... * 1);
-    }
-
-    template<typename... Args>
-    bool all(Args... args)
-    {
-      return (args && ...);
-    }
-
-  }
-
-  namespace test_extended_static_assert
-  {
-
-    static_assert (true);
-
-  }
-
-  namespace test_auto_brace_init_list
-  {
-
-    auto foo = {5};
-    auto bar {5};
-
-    static_assert(std::is_same<std::initializer_list<int>, decltype(foo)>::value);
-    static_assert(std::is_same<int, decltype(bar)>::value);
-  }
-
-  namespace test_typename_in_template_template_parameter
-  {
-
-    template<template<typename> typename X> struct D;
-
-  }
-
-  namespace test_fallthrough_nodiscard_maybe_unused_attributes
-  {
-
-    int f1()
-    {
-      return 42;
-    }
-
-    [[nodiscard]] int f2()
-    {
-      [[maybe_unused]] auto unused = f1();
-
-      switch (f1())
-      {
-      case 17:
-        f1();
-        [[fallthrough]];
-      case 42:
-        f1();
-      }
-      return f1();
-    }
-
-  }
-
-  namespace test_extended_aggregate_initialization
-  {
-
-    struct base1
-    {
-      int b1, b2 = 42;
-    };
-
-    struct base2
-    {
-      base2() {
-        b3 = 42;
-      }
-      int b3;
-    };
-
-    struct derived : base1, base2
-    {
-        int d;
-    };
-
-    derived d1 {{1, 2}, {}, 4};  // full initialization
-    derived d2 {{}, {}, 4};      // value-initialized bases
-
-  }
-
-  namespace test_general_range_based_for_loop
-  {
-
-    struct iter
-    {
-      int i;
-
-      int& operator* ()
-      {
-        return i;
-      }
-
-      const int& operator* () const
-      {
-        return i;
-      }
-
-      iter& operator++()
-      {
-        ++i;
-        return *this;
-      }
-    };
-
-    struct sentinel
-    {
-      int i;
-    };
-
-    bool operator== (const iter& i, const sentinel& s)
-    {
-      return i.i == s.i;
-    }
-
-    bool operator!= (const iter& i, const sentinel& s)
-    {
-      return !(i == s);
-    }
-
-    struct range
-    {
-      iter begin() const
-      {
-        return {0};
-      }
-
-      sentinel end() const
-      {
-        return {5};
-      }
-    };
-
-    void f()
-    {
-      range r {};
-
-      for (auto i : r)
-      {
-        [[maybe_unused]] auto v = i;
-      }
-    }
-
-  }
-
-  namespace test_lambda_capture_asterisk_this_by_value
-  {
-
-    struct t
-    {
-      int i;
-      int foo()
-      {
-        return [*this]()
-        {
-          return i;
-        }();
-      }
-    };
-
-  }
-
-  namespace test_enum_class_construction
-  {
-
-    enum class byte : unsigned char
-    {};
-
-    byte foo {42};
-
-  }
-
-  namespace test_constexpr_if
-  {
-
-    template <bool cond>
-    int f ()
-    {
-      if constexpr(cond)
-      {
-        return 13;
-      }
-      else
-      {
-        return 42;
-      }
-    }
-
-  }
-
-  namespace test_selection_statement_with_initializer
-  {
-
-    int f()
-    {
-      return 13;
-    }
-
-    int f2()
-    {
-      if (auto i = f(); i > 0)
-      {
-        return 3;
-      }
-
-      switch (auto i = f(); i + 4)
-      {
-      case 17:
-        return 2;
-
-      default:
-        return 1;
-      }
-    }
-
-  }
-
-#if !defined(REALLY_CLANG)
-  namespace test_template_argument_deduction_for_class_templates
-  {
-
-    // TODO: test it with clang++ from git
-
-    template <typename T1, typename T2>
-    struct pair
-    {
-      pair (T1 p1, T2 p2)
-        : m1 {p1},
-          m2 {p2}
-      {}
-
-      T1 m1;
-      T2 m2;
-    };
-
-    void f()
-    {
-      [[maybe_unused]] auto p = pair{13, 42u};
-    }
-
-  }
-#endif // !defined(REALLY_CLANG)
-
-  namespace test_non_type_auto_template_parameters
-  {
-
-    template <auto n>
-    struct B
-    {};
-
-    B<5> b1;
-    B<'a'> b2;
-
-  }
-
-#if !defined(REALLY_CLANG)
-  namespace test_structured_bindings
-  {
-
-    // TODO: test it with clang++ from git
-
-    int arr[2] = { 1, 2 };
-    std::pair<int, int> pr = { 1, 2 };
-
-    auto f1() -> int(&)[2]
-    {
-      return arr;
-    }
-
-    auto f2() -> std::pair<int, int>&
-    {
-      return pr;
-    }
-
-    struct S
-    {
-      int x1 : 2;
-      volatile double y1;
-    };
-
-    S f3()
-    {
-      return {};
-    }
-
-    auto [ x1, y1 ] = f1();
-    auto& [ xr1, yr1 ] = f1();
-    auto [ x2, y2 ] = f2();
-    auto& [ xr2, yr2 ] = f2();
-    const auto [ x3, y3 ] = f3();
-
-  }
-#endif // !defined(REALLY_CLANG)
-
-#if !defined(REALLY_CLANG)
-  namespace test_exception_spec_type_system
-  {
-
-    // TODO: test it with clang++ from git
-
-    struct Good {};
-    struct Bad {};
-
-    void g1() noexcept;
-    void g2();
-
-    template<typename T>
-    Bad
-    f(T*, T*);
-
-    template<typename T1, typename T2>
-    Good
-    f(T1*, T2*);
-
-    static_assert (std::is_same_v<Good, decltype(f(g1, g2))>);
-
-  }
-#endif // !defined(REALLY_CLANG)
-
-  namespace test_inline_variables
-  {
-
-    template<class T> void f(T)
-    {}
-
-    template<class T> inline T g(T)
-    {
-      return T{};
-    }
-
-    template<> inline void f<>(int)
-    {}
-
-    template<> int g<>(int)
-    {
-      return 5;
-    }
-
-  }
-
-}  // namespace cxx17
-
-#endif  // __cplusplus <= 201402L
-
-]])
diff --git a/config/ax_cxx_compile_stdcxx_11.m4 b/config/ax_cxx_compile_stdcxx_11.m4
deleted file mode 100644
index 1733fd85f..000000000
--- a/config/ax_cxx_compile_stdcxx_11.m4
+++ /dev/null
@@ -1,39 +0,0 @@
-# =============================================================================
-#  https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html
-# =============================================================================
-#
-# SYNOPSIS
-#
-#   AX_CXX_COMPILE_STDCXX_11([ext|noext], [mandatory|optional])
-#
-# DESCRIPTION
-#
-#   Check for baseline language coverage in the compiler for the C++11
-#   standard; if necessary, add switches to CXX and CXXCPP to enable
-#   support.
-#
-#   This macro is a convenience alias for calling the AX_CXX_COMPILE_STDCXX
-#   macro with the version set to C++11.  The two optional arguments are
-#   forwarded literally as the second and third argument respectively.
-#   Please see the documentation for the AX_CXX_COMPILE_STDCXX macro for
-#   more information.  If you want to use this macro, you also need to
-#   download the ax_cxx_compile_stdcxx.m4 file.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
-#   Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
-#   Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
-#   Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <sokolov@google.com>
-#   Copyright (c) 2015 Paul Norman <penorman@mac.com>
-#   Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 18
-
-AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX])
-AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [AX_CXX_COMPILE_STDCXX([11], [$1], [$2])])
diff --git a/config/ax_prog_doxygen.m4 b/config/ax_prog_doxygen.m4
deleted file mode 100644
index 3a9744aa9..000000000
--- a/config/ax_prog_doxygen.m4
+++ /dev/null
@@ -1,323 +0,0 @@
-# This file is part of Autoconf.                       -*- Autoconf -*-
-
-# Renamed doxygen.m4 from acinclude.m4 for inclusion in CVC4
-
-# Copyright (C) 2004 Oren Ben-Kiki
-# This file is distributed under the same terms as the Autoconf macro files.
-
-########## CHANGELOG ##################
-# 2009-01-14 Martin Mann
-# * DX_ARG_ABLE : new variable 'DX_FLAG_DX_CURRENT_FEATURE'
-# * DX_CLEAR_DEPEND : use of explicit variable 'DX_FLAG_DX_CURRENT_FEATURE'
-#   in AC_SUBST instead of 'DX_FLAG[]DX_CURRENT_FEATURE' which is rejected by
-#   newer autotools  
-
-# Generate automatic documentation using Doxygen. Works in concert with the
-# aminclude.m4 file and a compatible doxygen configuration file. Defines the
-# following public macros:
-#
-# DX_???_FEATURE(ON|OFF) - control the default setting fo a Doxygen feature.
-# Supported features are 'DOXYGEN' itself, 'DOT' for generating graphics,
-# 'HTML' for plain HTML, 'CHM' for compressed HTML help (for MS users), 'CHI'
-# for generating a seperate .chi file by the .chm file, and 'MAN', 'RTF',
-# 'XML', 'PDF' and 'PS' for the appropriate output formats. The environment
-# variable DOXYGEN_PAPER_SIZE may be specified to override the default 'a4wide'
-# paper size.
-#
-# By default, HTML, PDF and PS documentation is generated as this seems to be
-# the most popular and portable combination. MAN pages created by Doxygen are
-# usually problematic, though by picking an appropriate subset and doing some
-# massaging they might be better than nothing. CHM and RTF are specific for MS
-# (note that you can't generate both HTML and CHM at the same time). The XML is
-# rather useless unless you apply specialized post-processing to it.
-#
-# The macro mainly controls the default state of the feature. The use can
-# override the default by specifying --enable or --disable. The macros ensure
-# that contradictory flags are not given (e.g., --enable-doxygen-html and
-# --enable-doxygen-chm, --enable-doxygen-anything with --disable-doxygen, etc.)
-# Finally, each feature will be automatically disabled (with a warning) if the
-# required programs are missing.
-#
-# Once all the feature defaults have been specified, call DX_INIT_DOXYGEN with
-# the following parameters: a one-word name for the project for use as a
-# filename base etc., an optional configuration file name (the default is
-# 'Doxyfile', the same as Doxygen's default), and an optional output directory
-# name (the default is 'doxygen-doc').
-
-## ----------##
-## Defaults. ##
-## ----------##
-
-DX_ENV=""
-AC_DEFUN([DX_FEATURE_doc],  ON)
-AC_DEFUN([DX_FEATURE_dot],  ON)
-AC_DEFUN([DX_FEATURE_man],  OFF)
-AC_DEFUN([DX_FEATURE_html], ON)
-AC_DEFUN([DX_FEATURE_chm],  OFF)
-AC_DEFUN([DX_FEATURE_chi],  OFF)
-AC_DEFUN([DX_FEATURE_rtf],  OFF)
-AC_DEFUN([DX_FEATURE_xml],  OFF)
-AC_DEFUN([DX_FEATURE_pdf],  ON)
-AC_DEFUN([DX_FEATURE_ps],   ON)
-
-## --------------- ##
-## Private macros. ##
-## --------------- ##
-
-# DX_ENV_APPEND(VARIABLE, VALUE)
-# ------------------------------
-# Append VARIABLE="VALUE" to DX_ENV for invoking doxygen.
-AC_DEFUN([DX_ENV_APPEND], [AC_SUBST([DX_ENV], ["$DX_ENV $1='$2'"])])
-
-# DX_DIRNAME_EXPR
-# ---------------
-# Expand into a shell expression prints the directory part of a path.
-AC_DEFUN([DX_DIRNAME_EXPR],
-         [[expr ".$1" : '\(\.\)[^/]*$' \| "x$1" : 'x\(.*\)/[^/]*$']])
-
-# DX_IF_FEATURE(FEATURE, IF-ON, IF-OFF)
-# -------------------------------------
-# Expands according to the M4 (static) status of the feature.
-AC_DEFUN([DX_IF_FEATURE], [ifelse(DX_FEATURE_$1, ON, [$2], [$3])])
-
-# DX_REQUIRE_PROG(VARIABLE, PROGRAM)
-# ----------------------------------
-# Require the specified program to be found for the DX_CURRENT_FEATURE to work.
-AC_DEFUN([DX_REQUIRE_PROG], [
-AC_PATH_TOOL([$1], [$2])
-if test "$DX_FLAG_DX_CURRENT_FEATURE$$1" = 1; then
-    AC_MSG_WARN([$2 not found - will not DX_CURRENT_DESCRIPTION])
-    AC_SUBST([DX_FLAG_DX_CURRENT_FEATURE], 0)
-fi
-])
-
-# DX_TEST_FEATURE(FEATURE)
-# ------------------------
-# Expand to a shell expression testing whether the feature is active.
-AC_DEFUN([DX_TEST_FEATURE], [test "$DX_FLAG_$1" = 1])
-
-# DX_CHECK_DEPEND(REQUIRED_FEATURE, REQUIRED_STATE)
-# -------------------------------------------------
-# Verify that a required features has the right state before trying to turn on
-# the DX_CURRENT_FEATURE.
-AC_DEFUN([DX_CHECK_DEPEND], [
-test "$DX_FLAG_$1" = "$2" \
-|| AC_MSG_ERROR([doxygen-DX_CURRENT_FEATURE ifelse([$2], 1,
-                            requires, contradicts) doxygen-DX_CURRENT_FEATURE])
-])
-
-# DX_CLEAR_DEPEND(FEATURE, REQUIRED_FEATURE, REQUIRED_STATE)
-# ----------------------------------------------------------
-# Turn off the DX_CURRENT_FEATURE if the required feature is off.
-AC_DEFUN([DX_CLEAR_DEPEND], [
-test "$DX_FLAG_$1" = "$2" || AC_SUBST([DX_FLAG_DX_CURRENT_FEATURE], 0)
-])
-
-
-# DX_FEATURE_ARG(FEATURE, DESCRIPTION,
-#                CHECK_DEPEND, CLEAR_DEPEND,
-#                REQUIRE, DO-IF-ON, DO-IF-OFF)
-# --------------------------------------------
-# Parse the command-line option controlling a feature. CHECK_DEPEND is called
-# if the user explicitly turns the feature on (and invokes DX_CHECK_DEPEND),
-# otherwise CLEAR_DEPEND is called to turn off the default state if a required
-# feature is disabled (using DX_CLEAR_DEPEND). REQUIRE performs additional
-# requirement tests (DX_REQUIRE_PROG). Finally, an automake flag is set and
-# DO-IF-ON or DO-IF-OFF are called according to the final state of the feature.
-AC_DEFUN([DX_ARG_ABLE], [
-    AC_DEFUN([DX_CURRENT_FEATURE], [$1])
-    AC_DEFUN([DX_FLAG_DX_CURRENT_FEATURE], [DX_FLAG_$1])
-    AC_DEFUN([DX_CURRENT_DESCRIPTION], [$2])
-    AC_ARG_ENABLE(doxygen-$1,
-                  [AS_HELP_STRING(DX_IF_FEATURE([$1], [--disable-doxygen-$1],
-                                                      [--enable-doxygen-$1]),
-                                  DX_IF_FEATURE([$1], [don't $2], [$2]))],
-                  [
-case "$enableval" in
-#(
-y|Y|yes|Yes|YES)
-    AC_SUBST([DX_FLAG_$1], 1)
-    $3
-;; #(
-n|N|no|No|NO)
-    AC_SUBST([DX_FLAG_$1], 0)
-;; #(
-*)
-    AC_MSG_ERROR([invalid value '$enableval' given to doxygen-$1])
-;;
-esac
-], [
-AC_SUBST([DX_FLAG_$1], [DX_IF_FEATURE([$1], 1, 0)])
-$4
-])
-if DX_TEST_FEATURE([$1]); then
-    $5
-    :
-fi
-if DX_TEST_FEATURE([$1]); then
-    AM_CONDITIONAL(DX_COND_$1, :)
-    $6
-    :
-else
-    AM_CONDITIONAL(DX_COND_$1, false)
-    $7
-    :
-fi
-])
-
-## -------------- ##
-## Public macros. ##
-## -------------- ##
-
-# DX_XXX_FEATURE(DEFAULT_STATE)
-# -----------------------------
-AC_DEFUN([DX_DOXYGEN_FEATURE], [AC_DEFUN([DX_FEATURE_doc],  [$1])])
-AC_DEFUN([DX_MAN_FEATURE],     [AC_DEFUN([DX_FEATURE_man],  [$1])])
-AC_DEFUN([DX_HTML_FEATURE],    [AC_DEFUN([DX_FEATURE_html], [$1])])
-AC_DEFUN([DX_CHM_FEATURE],     [AC_DEFUN([DX_FEATURE_chm],  [$1])])
-AC_DEFUN([DX_CHI_FEATURE],     [AC_DEFUN([DX_FEATURE_chi],  [$1])])
-AC_DEFUN([DX_RTF_FEATURE],     [AC_DEFUN([DX_FEATURE_rtf],  [$1])])
-AC_DEFUN([DX_XML_FEATURE],     [AC_DEFUN([DX_FEATURE_xml],  [$1])])
-AC_DEFUN([DX_DOT_FEATURE],     [AC_DEFUN([DX_FEATURE_dot],  [$1])])
-AC_DEFUN([DX_PDF_FEATURE],     [AC_DEFUN([DX_FEATURE_pdf],  [$1])])
-AC_DEFUN([DX_PS_FEATURE],      [AC_DEFUN([DX_FEATURE_ps],   [$1])])
-
-# DX_INIT_DOXYGEN(PROJECT, [CONFIG-FILE], [OUTPUT-DOC-DIR])
-# ---------------------------------------------------------
-# PROJECT also serves as the base name for the documentation files.
-# The default CONFIG-FILE is "Doxyfile" and OUTPUT-DOC-DIR is "doxygen-doc".
-AC_DEFUN([DX_INIT_DOXYGEN], [
-
-# Files:
-AC_SUBST([DX_PROJECT], [$1])
-AC_SUBST([DX_CONFIG], [ifelse([$2], [], Doxyfile, [$2])])
-AC_SUBST([DX_DOCDIR], [ifelse([$3], [], doxygen-doc, [$3])])
-
-# Environment variables used inside doxygen.cfg:
-DX_ENV_APPEND(SRCDIR, $srcdir)
-DX_ENV_APPEND(PROJECT, $DX_PROJECT)
-DX_ENV_APPEND(DOCDIR, $DX_DOCDIR)
-DX_ENV_APPEND(VERSION, $PACKAGE_VERSION)
-
-# Doxygen itself:
-DX_ARG_ABLE(doc, [generate any doxygen documentation],
-            [],
-            [],
-            [DX_REQUIRE_PROG([DX_DOXYGEN], doxygen)
-             DX_REQUIRE_PROG([DX_PERL], perl)],
-            [DX_ENV_APPEND(PERL_PATH, $DX_PERL)])
-
-# Dot for graphics:
-DX_ARG_ABLE(dot, [generate graphics for doxygen documentation],
-            [DX_CHECK_DEPEND(doc, 1)],
-            [DX_CLEAR_DEPEND(doc, 1)],
-            [DX_REQUIRE_PROG([DX_DOT], dot)],
-            [DX_ENV_APPEND(HAVE_DOT, YES)
-             DX_ENV_APPEND(DOT_PATH, [`DX_DIRNAME_EXPR($DX_DOT)`])],
-            [DX_ENV_APPEND(HAVE_DOT, NO)])
-
-# Man pages generation:
-DX_ARG_ABLE(man, [generate doxygen manual pages],
-            [DX_CHECK_DEPEND(doc, 1)],
-            [DX_CLEAR_DEPEND(doc, 1)],
-            [],
-            [DX_ENV_APPEND(GENERATE_MAN, YES)],
-            [DX_ENV_APPEND(GENERATE_MAN, NO)])
-
-# RTF file generation:
-DX_ARG_ABLE(rtf, [generate doxygen RTF documentation],
-            [DX_CHECK_DEPEND(doc, 1)],
-            [DX_CLEAR_DEPEND(doc, 1)],
-            [],
-            [DX_ENV_APPEND(GENERATE_RTF, YES)],
-            [DX_ENV_APPEND(GENERATE_RTF, NO)])
-
-# XML file generation:
-DX_ARG_ABLE(xml, [generate doxygen XML documentation],
-            [DX_CHECK_DEPEND(doc, 1)],
-            [DX_CLEAR_DEPEND(doc, 1)],
-            [],
-            [DX_ENV_APPEND(GENERATE_XML, YES)],
-            [DX_ENV_APPEND(GENERATE_XML, NO)])
-
-# (Compressed) HTML help generation:
-DX_ARG_ABLE(chm, [generate doxygen compressed HTML help documentation],
-            [DX_CHECK_DEPEND(doc, 1)],
-            [DX_CLEAR_DEPEND(doc, 1)],
-            [DX_REQUIRE_PROG([DX_HHC], hhc)],
-            [DX_ENV_APPEND(HHC_PATH, $DX_HHC)
-             DX_ENV_APPEND(GENERATE_HTML, YES)
-             DX_ENV_APPEND(GENERATE_HTMLHELP, YES)],
-            [DX_ENV_APPEND(GENERATE_HTMLHELP, NO)])
-
-# Seperate CHI file generation.
-DX_ARG_ABLE(chi, [generate doxygen seperate compressed HTML help index file],
-            [DX_CHECK_DEPEND(chm, 1)],
-            [DX_CLEAR_DEPEND(chm, 1)],
-            [],
-            [DX_ENV_APPEND(GENERATE_CHI, YES)],
-            [DX_ENV_APPEND(GENERATE_CHI, NO)])
-
-# Plain HTML pages generation:
-DX_ARG_ABLE(html, [generate doxygen plain HTML documentation],
-            [DX_CHECK_DEPEND(doc, 1) DX_CHECK_DEPEND(chm, 0)],
-            [DX_CLEAR_DEPEND(doc, 1) DX_CLEAR_DEPEND(chm, 0)],
-            [],
-            [DX_ENV_APPEND(GENERATE_HTML, YES)],
-            [DX_TEST_FEATURE(chm) || DX_ENV_APPEND(GENERATE_HTML, NO)])
-
-# PostScript file generation:
-DX_ARG_ABLE(ps, [generate doxygen PostScript documentation],
-            [DX_CHECK_DEPEND(doc, 1)],
-            [DX_CLEAR_DEPEND(doc, 1)],
-            [DX_REQUIRE_PROG([DX_LATEX], latex)
-             DX_REQUIRE_PROG([DX_MAKEINDEX], makeindex)
-             DX_REQUIRE_PROG([DX_DVIPS], dvips)
-             DX_REQUIRE_PROG([DX_EGREP], egrep)])
-
-# PDF file generation:
-DX_ARG_ABLE(pdf, [generate doxygen PDF documentation],
-            [DX_CHECK_DEPEND(doc, 1)],
-            [DX_CLEAR_DEPEND(doc, 1)],
-            [DX_REQUIRE_PROG([DX_PDFLATEX], pdflatex)
-             DX_REQUIRE_PROG([DX_MAKEINDEX], makeindex)
-             DX_REQUIRE_PROG([DX_EGREP], egrep)])
-
-# LaTeX generation for PS and/or PDF:
-if DX_TEST_FEATURE(ps) || DX_TEST_FEATURE(pdf); then
-    AM_CONDITIONAL(DX_COND_latex, :)
-    DX_ENV_APPEND(GENERATE_LATEX, YES)
-else
-    AM_CONDITIONAL(DX_COND_latex, false)
-    DX_ENV_APPEND(GENERATE_LATEX, NO)
-fi
-
-# Paper size for PS and/or PDF:
-AC_ARG_VAR(DOXYGEN_PAPER_SIZE,
-           [a4wide (default), a4, letter, legal or executive])
-case "$DOXYGEN_PAPER_SIZE" in
-#(
-"")
-    AC_SUBST(DOXYGEN_PAPER_SIZE, "")
-;; #(
-a4wide|a4|letter|legal|executive)
-    DX_ENV_APPEND(PAPER_SIZE, $DOXYGEN_PAPER_SIZE)
-;; #(
-*)
-    AC_MSG_ERROR([unknown DOXYGEN_PAPER_SIZE='$DOXYGEN_PAPER_SIZE'])
-;;
-esac
-
-#For debugging:
-#echo DX_FLAG_doc=$DX_FLAG_doc
-#echo DX_FLAG_dot=$DX_FLAG_dot
-#echo DX_FLAG_man=$DX_FLAG_man
-#echo DX_FLAG_html=$DX_FLAG_html
-#echo DX_FLAG_chm=$DX_FLAG_chm
-#echo DX_FLAG_chi=$DX_FLAG_chi
-#echo DX_FLAG_rtf=$DX_FLAG_rtf
-#echo DX_FLAG_xml=$DX_FLAG_xml
-#echo DX_FLAG_pdf=$DX_FLAG_pdf
-#echo DX_FLAG_ps=$DX_FLAG_ps
-#echo DX_ENV=$DX_ENV
-])
diff --git a/config/bindings.m4 b/config/bindings.m4
deleted file mode 100644
index bc7c0e2b8..000000000
--- a/config/bindings.m4
+++ /dev/null
@@ -1,231 +0,0 @@
-# CVC4_SUPPORTED_BINDINGS
-# -----------------------
-# Supported language bindings for CVC4.
-AC_DEFUN([CVC4_SUPPORTED_BINDINGS],
-[c,c++,java])
-
-# CVC4_ALL_BINDINGS
-# -----------------
-# All language bindings for CVC4 (may include unofficial bindings).
-AC_DEFUN([CVC4_ALL_BINDINGS],
-[c,java,csharp,perl,php,python,ruby,tcl,ocaml])
-
-# CVC4_NEED_SWIG_FOR_BINDING
-# --------------------------
-# Used by CVC4_CHECK_BINDINGS to ensure swig is available (and correct
-# version) when a binding needs it
-AC_DEFUN([CVC4_NEED_SWIG_FOR_BINDING], [
-  if test -z "$SWIG"; then
-    AC_MSG_WARN([swig not available or incompatible version; $binding bindings require swig 2.0.0 or later])
-    binding_error=yes
-  fi
-])
-
-# CVC4_CHECK_BINDINGS(DEFAULT_BINDINGS_LIST)
-# ------------------------------------------
-# Check for user language binding preferences, and what is possible
-# to build on the build host.
-AC_DEFUN([CVC4_CHECK_BINDINGS], [
-dnl Check for SWIG (for building language bindings)
-noswig=no
-
-m4_foreach(lang,[CVC4_ALL_BINDINGS],
-[[cvc4_build_]]lang[[_bindings=no
-]])
-
-AC_ARG_VAR(SWIG, [SWIG binary (used to generate language bindings)])
-AC_ARG_WITH([swig],
-  [AS_HELP_STRING([--with-swig=BINARY], [path to swig binary])],
-  [if test "$withval" = no; then noswig=yes; else SWIG="$withval"; fi])
-AC_ARG_ENABLE([language-bindings],
-  [AS_HELP_STRING([--enable-language-bindings=][CVC4_SUPPORTED_BINDINGS][ | all], [specify language bindings to build])],
-  [if test "$enableval" = yes; then cvc4_check_for_bindings=yes; try_bindings='$1'; else cvc4_check_for_bindings=no; if test "$enableval" = no; then try_bindings=; else try_bindings="$enableval"; fi; fi],
-  [cvc4_check_for_bindings=no; try_bindings=])
-CVC4_LANGUAGE_BINDINGS=
-if test "$noswig" = yes; then
-  AC_MSG_WARN([use of swig disabled by user, native API bindings disabled.])
-  SWIG=
-else
-  if test -z "$SWIG"; then
-    AC_CHECK_PROGS(SWIG, [swig swig3.0 swig-3], [], [])
-  else
-    AC_CHECK_PROG(SWIG, "$SWIG", "$SWIG", [])
-  fi
-  if test -z "$SWIG"; then
-    AC_MSG_RESULT([not found])
-    AC_MSG_WARN([language bindings for native API disabled, swig not found.])
-  else
-    AC_MSG_CHECKING([compatibility with version of swig])
-    cat > conftest.c << _CVC4EOF
-%module conftest
-#if !defined(SWIG_VERSION) || SWIG_VERSION < 0x030000
-#error bad version
-#endif
-_CVC4EOF
-    if $SWIG conftest.c >&AS_MESSAGE_LOG_FD 2>&1; then
-      AC_MSG_RESULT([compatible version])
-    else
-      AC_MSG_RESULT([incompatible version])
-      AC_MSG_WARN([swig version 3.0.0 or later is required to build native API bindings])
-      SWIG=
-      echo '===Failed swig input was:' >&AS_MESSAGE_LOG_FD
-      cat conftest.c >&AS_MESSAGE_LOG_FD
-      echo '===End failed swig input' >&AS_MESSAGE_LOG_FD
-      rm -f conftest.c
-    fi
-  fi
-fi
-
-AC_MSG_CHECKING([for requested user language bindings])
-if test "$try_bindings" = all; then
-  try_bindings='CVC4_SUPPORTED_BINDINGS'
-fi
-try_bindings=$(echo "$try_bindings" | sed 's/,/ /g')
-if test -z "$try_bindings"; then
-  AC_MSG_RESULT([none])
-else
-  AC_MSG_RESULT([$try_bindings])
-fi
-CVC4_UNSUPPORTED_LANGUAGE_BINDINGS=
-cvc4_save_CPPFLAGS="$CPPFLAGS"
-cvc4_save_CXXFLAGS="$CXXFLAGS"
-AC_LANG_PUSH([C++])
-for binding in $try_bindings; do
-  __cvc4_lang_supported=no
-  m4_foreach([__cvc4_supported_binding], [CVC4_SUPPORTED_BINDINGS],
-    [if test "$binding" = "__cvc4_supported_binding"; then __cvc4_lang_supported=yes; fi
-  ])dnl
-  if test $__cvc4_lang_supported = no; then
-    CVC4_UNSUPPORTED_LANGUAGE_BINDINGS="${CVC4_UNSUPPORTED_LANGUAGE_BINDINGS:+$CVC4_UNSUPPORTED_LANGUAGE_BINDINGS }$binding"
-  fi
-
-  binding_error=no
-  AC_MSG_CHECKING([for availability of $binding binding])
-  case "$binding" in
-    c++)
-      AC_MSG_RESULT([C++ is built by default]);;
-    c)
-      cvc4_build_c_bindings=yes
-      AC_MSG_RESULT([C support will be built]);;
-    java)
-      AC_MSG_RESULT([Java support will be built])
-      CVC4_NEED_SWIG_FOR_BINDING
-      AC_ARG_VAR(JAVA_CPPFLAGS, [flags to pass to compiler when building Java bindings])
-      CPPFLAGS="$CPPFLAGS $JAVA_CPPFLAGS"
-      AC_CHECK_HEADER([jni.h], [cvc4_build_java_bindings=yes], [binding_error=yes])
-      ;;
-    csharp)
-      AC_MSG_RESULT([[C# support will be built]])
-      CVC4_NEED_SWIG_FOR_BINDING
-      AC_ARG_VAR(CSHARP_CPPFLAGS, [flags to pass to compiler when building C# bindings])
-      CPPFLAGS="$CPPFLAGS $CSHARP_CPPFLAGS"
-      cvc4_build_csharp_bindings=yes
-      ;;
-    perl)
-      AC_MSG_RESULT([perl support will be built])
-      CVC4_NEED_SWIG_FOR_BINDING
-      AC_ARG_VAR(PERL_CPPFLAGS, [flags to pass to compiler when building perl bindings])
-      CPPFLAGS="$CPPFLAGS $PERL_CPPFLAGS"
-      AC_CHECK_HEADER([EXTERN.h], [cvc4_build_perl_bindings=yes], [binding_error=yes])
-      ;;
-    php)
-      AC_MSG_RESULT([php support will be built])
-      CVC4_NEED_SWIG_FOR_BINDING
-      AC_ARG_VAR(PHP_CPPFLAGS, [flags to pass to compiler when building PHP bindings])
-      CPPFLAGS="$CPPFLAGS $PHP_CPPFLAGS"
-      AC_CHECK_HEADER([zend.h], [cvc4_build_php_bindings=yes], [binding_error=yes])
-      ;;
-    python)
-      AC_MSG_RESULT([python support will be built])
-      CVC4_NEED_SWIG_FOR_BINDING
-      AM_PATH_PYTHON([2.5], [cvc4_build_python_bindings=yes], [binding_error=yes])
-      AC_ARG_VAR([PYTHON_INCLUDE], [Include flags for python, bypassing python-config])
-      AC_ARG_VAR([PYTHON_CONFIG], [Path to python-config])
-      AS_IF([test -z "$PYTHON_INCLUDE"], [
-        AS_IF([test -z "$PYTHON_CONFIG"], [
-          AC_PATH_PROGS([PYTHON_CONFIG],
-            [python$PYTHON_VERSION-config python-config],
-            [no]
-          )
-          AS_IF([test "$PYTHON_CONFIG" = no], [AC_MSG_ERROR([cannot find python-config for $PYTHON.])])
-         ])
-        AC_MSG_CHECKING([python include flags])
-        AC_SUBST(PYTHON_CXXFLAGS, `$PYTHON_CONFIG --includes`)
-        AC_MSG_RESULT([$PYTHON_CXXFLAGS])
-      ])
-      CPPFLAGS="$CPPFLAGS $PYTHON_CXXFLAGS"
-      AC_CHECK_HEADER([Python.h], [cvc4_build_python_bindings=yes], [binding_error=yes])     
-      ;;
-    ruby)
-      AC_MSG_RESULT([ruby support will be built])
-      CVC4_NEED_SWIG_FOR_BINDING
-      AC_ARG_VAR(RUBY_CPPFLAGS, [flags to pass to compiler when building ruby bindings])
-      CPPFLAGS="$CPPFLAGS $RUBY_CPPFLAGS"
-      AC_CHECK_HEADER([ruby.h], [cvc4_build_ruby_bindings=yes], [binding_error=yes])
-      ;;
-    tcl)
-      AC_MSG_RESULT([tcl support will be built])
-      CVC4_NEED_SWIG_FOR_BINDING
-      AC_ARG_VAR(TCL_CPPFLAGS, [flags to pass to compiler when building tcl bindings])
-      CPPFLAGS="$CPPFLAGS $TCL_CPPFLAGS"
-      AC_CHECK_HEADER([tcl.h], [cvc4_build_tcl_bindings=yes], [binding_error=yes])
-      ;;
-    ocaml)
-      AC_MSG_RESULT([OCaml support will be built])
-      CVC4_NEED_SWIG_FOR_BINDING
-      AC_ARG_VAR(TCL_CPPFLAGS, [flags to pass to compiler when building OCaml bindings])
-      CPPFLAGS="$CPPFLAGS $OCAML_CPPFLAGS"
-      AC_CHECK_HEADER([caml/misc.h], [cvc4_build_ocaml_bindings=yes], [binding_error=yes])
-      if test "$binding_error" = no; then
-        AC_ARG_VAR(OCAMLC, [OCaml compiler])
-        if test -z "$OCAMLC"; then
-          AC_CHECK_PROGS(OCAMLC, ocamlc, ocamlc, [])
-        else
-          AC_CHECK_PROG(OCAMLC, "$OCAMLC", "$OCAMLC", [])
-        fi
-        AC_ARG_VAR(OCAMLMKTOP, [OCaml runtime-maker])
-        if test -z "$OCAMLMKTOP"; then
-          AC_CHECK_PROGS(OCAMLMKTOP, ocamlmktop, ocamlmktop, [])
-        else
-          AC_CHECK_PROG(OCAMLMKTOP, "$OCAMLMKTOP", "$OCAMLMKTOP", [])
-        fi
-        AC_ARG_VAR(OCAMLFIND, [OCaml-find binary])
-        if test -z "$OCAMLFIND"; then
-          AC_CHECK_PROGS(OCAMLFIND, ocamlfind, ocamlfind, [])
-        else
-          AC_CHECK_PROG(OCAMLFIND, "$OCAMLFIND", "$OCAMLFIND", [])
-        fi
-        AC_ARG_VAR(CAMLP4O, [camlp4o binary])
-        if test -z "$CAMLP4O"; then
-          AC_CHECK_PROGS(CAMLP4O, camlp4o, camlp4o, [])
-        else
-          AC_CHECK_PROG(CAMLP4O, "$CAMLP4O", "$CAMLP4O", [])
-        fi
-      fi
-      ;;
-    *) AC_MSG_RESULT([unknown binding]); binding_error=yes;;
-  esac
-  if test "$binding_error" = yes; then
-    if test "$cvc4_check_for_bindings" = no; then
-      AC_MSG_ERROR([Language binding \`$binding' requested by user, but it cannot be built (the preceding few lines should give an indication why this is).])
-    else
-      AC_MSG_WARN([Language binding \`$binding' cannot be built (the preceding few lines should give an indication why this is).])
-    fi
-  else
-    CVC4_LANGUAGE_BINDINGS="${CVC4_LANGUAGE_BINDINGS:+$CVC4_LANGUAGE_BINDINGS }$binding"
-  fi
-  AC_LANG_POP([C++])
-  CXXFLAGS="$cvc4_save_CXXFLAGS"
-  CPPFLAGS="$cvc4_save_CPPFLAGS"
-done
-
-AM_CONDITIONAL([CVC4_HAS_SWIG], [test "$SWIG"])
-
-m4_foreach([lang], [CVC4_ALL_BINDINGS],
-[AM_CONDITIONAL([CVC4_LANGUAGE_BINDING_]m4_toupper(lang), [test "$cvc4_build_]lang[_bindings" = yes])
-])dnl
-
-AC_SUBST(SWIG)
-AC_SUBST(CVC4_LANGUAGE_BINDINGS)
-
-])# CVC4_CHECK_BINDINGS
diff --git a/config/boost.m4 b/config/boost.m4
deleted file mode 100644
index da49c5ebe..000000000
--- a/config/boost.m4
+++ /dev/null
@@ -1,1196 +0,0 @@
-# boost.m4: Locate Boost headers and libraries for autoconf-based projects.
-# Copyright (C) 2007, 2008, 2009, 2010, 2011  Benoit Sigoure <tsuna@lrde.epita.fr>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Additional permission under section 7 of the GNU General Public
-# License, version 3 ("GPLv3"):
-#
-# If you convey this file as part of a work that contains a
-# configuration script generated by Autoconf, you may do so under
-# terms of your choice.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# 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, see <http://www.gnu.org/licenses/>.
-
-m4_define([_BOOST_SERIAL], [m4_translit([
-# serial 16
-], [#
-], [])])
-
-# Original sources can be found at http://github.com/tsuna/boost.m4
-# You can fetch the latest version of the script by doing:
-#   wget http://github.com/tsuna/boost.m4/raw/master/build-aux/boost.m4
-
-# ------ #
-# README #
-# ------ #
-
-# This file provides several macros to use the various Boost libraries.
-# The first macro is BOOST_REQUIRE.  It will simply check if it's possible to
-# find the Boost headers of a given (optional) minimum version and it will
-# define BOOST_CPPFLAGS accordingly.  It will add an option --with-boost to
-# your configure so that users can specify non standard locations.
-# If the user's environment contains BOOST_ROOT and --with-boost was not
-# specified, --with-boost=$BOOST_ROOT is implicitly used.
-# For more README and documentation, go to http://github.com/tsuna/boost.m4
-# Note: THESE MACROS ASSUME THAT YOU USE LIBTOOL.  If you don't, don't worry,
-# simply read the README, it will show you what to do step by step.
-
-m4_pattern_forbid([^_?(BOOST|Boost)_])
-
-
-# _BOOST_SED_CPP(SED-PROGRAM, PROGRAM,
-#                [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-# --------------------------------------------------------
-# Same as AC_EGREP_CPP, but leave the result in conftest.i.
-#
-# SED-PROGRAM is *not* overquoted, as in AC_EGREP_CPP.  It is expanded
-# in double-quotes, so escape your double quotes.
-#
-# It could be useful to turn this into a macro which extracts the
-# value of any macro.
-m4_define([_BOOST_SED_CPP],
-[AC_LANG_PREPROC_REQUIRE()dnl
-AC_REQUIRE([AC_PROG_SED])dnl
-AC_LANG_CONFTEST([AC_LANG_SOURCE([[$2]])])
-AS_IF([dnl eval is necessary to expand ac_cpp.
-dnl Ultrix and Pyramid sh refuse to redirect output of eval, so use subshell.
-dnl Beware of Windows end-of-lines, for instance if we are running
-dnl some Windows programs under Wine.  In that case, boost/version.hpp
-dnl is certainly using "\r\n", but the regular Unix shell will only
-dnl strip `\n' with backquotes, not the `\r'.  This results in
-dnl boost_cv_lib_version='1_37\r' for instance, which breaks
-dnl everything else.
-dnl Cannot use 'dnl' after [$4] because a trailing dnl may break AC_CACHE_CHECK
-(eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
-  grep -v "^#" |
-  tr -d '\r\n ' |
-  $SED -n -e "$1" >conftest.i 2>&1],
-  [$3],
-  [$4])
-rm -rf conftest*
-])# AC_EGREP_CPP
-
-
-
-# BOOST_REQUIRE([VERSION], [ACTION-IF-NOT-FOUND])
-# -----------------------------------------------
-# Look for Boost.  If version is given, it must either be a literal of the form
-# "X.Y.Z" where X, Y and Z are integers (the ".Z" part being optional) or a
-# variable "$var".
-# Defines the value BOOST_CPPFLAGS.  This macro only checks for headers with
-# the required version, it does not check for any of the Boost libraries.
-# On # success, defines HAVE_BOOST.  On failure, calls the optional
-# ACTION-IF-NOT-FOUND action if one was supplied.
-# Otherwise aborts with an error message.
-AC_DEFUN([BOOST_REQUIRE],
-[AC_REQUIRE([AC_PROG_CXX])dnl
-AC_REQUIRE([AC_PROG_GREP])dnl
-echo "$as_me: this is boost.m4[]_BOOST_SERIAL" >&AS_MESSAGE_LOG_FD
-boost_save_IFS=$IFS
-boost_version_req=$1
-IFS=.
-set x $boost_version_req 0 0 0
-IFS=$boost_save_IFS
-shift
-boost_version_req=`expr "$[1]" '*' 100000 + "$[2]" '*' 100 + "$[3]"`
-boost_version_req_string=$[1].$[2].$[3]
-AC_ARG_WITH([boost],
-   [AS_HELP_STRING([--with-boost=DIR],
-                   [prefix of Boost $1 @<:@guess@:>@])])dnl
-AC_ARG_VAR([BOOST_ROOT],[Location of Boost installation])dnl
-# If BOOST_ROOT is set and the user has not provided a value to
-# --with-boost, then treat BOOST_ROOT as if it the user supplied it.
-if test x"$BOOST_ROOT" != x; then
-  if test x"$with_boost" = x; then
-    AC_MSG_NOTICE([Detected BOOST_ROOT; continuing with --with-boost=$BOOST_ROOT])
-    with_boost=$BOOST_ROOT
-  else
-    AC_MSG_NOTICE([Detected BOOST_ROOT=$BOOST_ROOT, but overridden by --with-boost=$with_boost])
-  fi
-fi
-AC_SUBST([DISTCHECK_CONFIGURE_FLAGS],
-         ["$DISTCHECK_CONFIGURE_FLAGS '--with-boost=$with_boost'"])dnl
-boost_save_CPPFLAGS=$CPPFLAGS
-  AC_CACHE_CHECK([for Boost headers version >= $boost_version_req_string],
-    [boost_cv_inc_path],
-    [boost_cv_inc_path=no
-AC_LANG_PUSH([C++])dnl
-m4_pattern_allow([^BOOST_VERSION$])dnl
-    AC_LANG_CONFTEST([AC_LANG_PROGRAM([[#include <boost/version.hpp>
-#if !defined BOOST_VERSION
-# error BOOST_VERSION is not defined
-#elif BOOST_VERSION < $boost_version_req
-# error Boost headers version < $boost_version_req
-#endif
-]])])
-    # If the user provided a value to --with-boost, use it and only it.
-    case $with_boost in #(
-      ''|yes) set x '' /opt/local/include /usr/local/include /opt/include \
-                 /usr/include C:/Boost/include;; #(
-      *)      set x "$with_boost/include" "$with_boost";;
-    esac
-    shift
-    for boost_dir
-    do
-    # Without --layout=system, Boost (or at least some versions) installs
-    # itself in <prefix>/include/boost-<version>.  This inner loop helps to
-    # find headers in such directories.
-    #
-    # Any ${boost_dir}/boost-x_xx directories are searched in reverse version
-    # order followed by ${boost_dir}.  The final '.' is a sentinel for
-    # searching $boost_dir" itself.  Entries are whitespace separated.
-    #
-    # I didn't indent this loop on purpose (to avoid over-indented code)
-    boost_layout_system_search_list=`cd "$boost_dir" 2>/dev/null \
-        && ls -1 | "${GREP}" '^boost-' | sort -rn -t- -k2 \
-        && echo .`
-    for boost_inc in $boost_layout_system_search_list
-    do
-      if test x"$boost_inc" != x.; then
-        boost_inc="$boost_dir/$boost_inc"
-      else
-        boost_inc="$boost_dir" # Uses sentinel in boost_layout_system_search_list
-      fi
-      if test x"$boost_inc" != x; then
-        # We are going to check whether the version of Boost installed
-        # in $boost_inc is usable by running a compilation that
-        # #includes it.  But if we pass a -I/some/path in which Boost
-        # is not installed, the compiler will just skip this -I and
-        # use other locations (either from CPPFLAGS, or from its list
-        # of system include directories).  As a result we would use
-        # header installed on the machine instead of the /some/path
-        # specified by the user.  So in that precise case (trying
-        # $boost_inc), make sure the version.hpp exists.
-        #
-        # Use test -e as there can be symlinks.
-        test -e "$boost_inc/boost/version.hpp" || continue
-        CPPFLAGS="$CPPFLAGS -I$boost_inc"
-      fi
-      AC_COMPILE_IFELSE([], [boost_cv_inc_path=yes], [boost_cv_version=no])
-      if test x"$boost_cv_inc_path" = xyes; then
-        if test x"$boost_inc" != x; then
-          boost_cv_inc_path=$boost_inc
-        fi
-        break 2
-      fi
-    done
-    done
-AC_LANG_POP([C++])dnl
-    ])
-    case $boost_cv_inc_path in #(
-      no)
-        boost_errmsg="cannot find Boost headers version >= $boost_version_req_string"
-        m4_if([$2], [],  [AC_MSG_ERROR([$boost_errmsg])],
-                        [AC_MSG_NOTICE([$boost_errmsg])])
-        $2
-        ;;#(
-      yes)
-        BOOST_CPPFLAGS=
-        ;;#(
-      *)
-        AC_SUBST([BOOST_CPPFLAGS], ["-I$boost_cv_inc_path"])dnl
-        ;;
-    esac
-  if test x"$boost_cv_inc_path" != xno; then
-  AC_DEFINE([HAVE_BOOST], [1],
-            [Defined if the requested minimum BOOST version is satisfied])
-  AC_CACHE_CHECK([for Boost's header version],
-    [boost_cv_lib_version],
-    [m4_pattern_allow([^BOOST_LIB_VERSION$])dnl
-     _BOOST_SED_CPP([/^boost-lib-version=/{s///;s/\"//g;p;q;}],
-                    [#include <boost/version.hpp>
-boost-lib-version = BOOST_LIB_VERSION],
-    [boost_cv_lib_version=`cat conftest.i`])])
-    # e.g. "134" for 1_34_1 or "135" for 1_35
-    boost_major_version=`echo "$boost_cv_lib_version" | sed 's/_//;s/_.*//'`
-    case $boost_major_version in #(
-      '' | *[[!0-9]]*)
-        AC_MSG_ERROR([invalid value: boost_major_version=$boost_major_version])
-        ;;
-    esac
-fi
-CPPFLAGS=$boost_save_CPPFLAGS
-])# BOOST_REQUIRE
-
-# BOOST_STATIC()
-# --------------
-# Add the "--enable-static-boost" configure argument. If this argument is given
-# on the command line, static versions of the libraries will be looked up.
-AC_DEFUN([BOOST_STATIC],
-  [AC_ARG_ENABLE([static-boost],
-     [AC_HELP_STRING([--enable-static-boost],
-               [Prefer the static boost libraries over the shared ones [no]])],
-     [enable_static_boost=yes],
-     [enable_static_boost=no])])# BOOST_STATIC
-
-# BOOST_FIND_HEADER([HEADER-NAME], [ACTION-IF-NOT-FOUND], [ACTION-IF-FOUND])
-# --------------------------------------------------------------------------
-# Wrapper around AC_CHECK_HEADER for Boost headers.  Useful to check for
-# some parts of the Boost library which are only made of headers and don't
-# require linking (such as Boost.Foreach).
-#
-# Default ACTION-IF-NOT-FOUND: Fail with a fatal error unless Boost couldn't be
-# found in the first place, in which case by default a notice is issued to the
-# user.  Presumably if we haven't died already it's because it's OK to not have
-# Boost, which is why only a notice is issued instead of a hard error.
-#
-# Default ACTION-IF-FOUND: define the preprocessor symbol HAVE_<HEADER-NAME> in
-# case of success # (where HEADER-NAME is written LIKE_THIS, e.g.,
-# HAVE_BOOST_FOREACH_HPP).
-AC_DEFUN([BOOST_FIND_HEADER],
-[AC_REQUIRE([BOOST_REQUIRE])dnl
-if test x"$boost_cv_inc_path" = xno; then
-  m4_default([$2], [AC_MSG_NOTICE([Boost not available, not searching for $1])])
-else
-AC_LANG_PUSH([C++])dnl
-boost_save_CPPFLAGS=$CPPFLAGS
-CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-AC_CHECK_HEADER([$1],
-  [m4_default([$3], [AC_DEFINE(AS_TR_CPP([HAVE_$1]), [1],
-                               [Define to 1 if you have <$1>])])],
-  [m4_default([$2], [AC_MSG_ERROR([cannot find $1])])])
-CPPFLAGS=$boost_save_CPPFLAGS
-AC_LANG_POP([C++])dnl
-fi
-])# BOOST_FIND_HEADER
-
-
-# BOOST_FIND_LIB([LIB-NAME], [PREFERRED-RT-OPT], [HEADER-NAME], [CXX-TEST],
-#                [CXX-PROLOGUE], [ACTION-IF-NOT-FOUND])
-# -------------------------------------------------------------------------
-# Look for the Boost library LIB-NAME (e.g., LIB-NAME = `thread', for
-# libboost_thread).  Check that HEADER-NAME works and check that
-# libboost_LIB-NAME can link with the code CXX-TEST.  The optional argument
-# CXX-PROLOGUE can be used to include some C++ code before the `main'
-# function.  If ACTION-IF-NOT-FOUND is given, errors are nonfatal (otherwise
-# they are fatal).
-#
-# Invokes BOOST_FIND_HEADER([HEADER-NAME]) (see above).
-#
-# Boost libraries typically come compiled with several flavors (with different
-# runtime options) so PREFERRED-RT-OPT is the preferred suffix.  A suffix is one
-# or more of the following letters: sgdpn (in that order).  s = static
-# runtime, d = debug build, g = debug/diagnostic runtime, p = STLPort build,
-# n = (unsure) STLPort build without iostreams from STLPort (it looks like `n'
-# must always be used along with `p').  Additionally, PREFERRED-RT-OPT can
-# start with `mt-' to indicate that there is a preference for multi-thread
-# builds.  Some sample values for PREFERRED-RT-OPT: (nothing), mt, d, mt-d, gdp
-# ...  If you want to make sure you have a specific version of Boost
-# (eg, >= 1.33) you *must* invoke BOOST_REQUIRE before this macro.
-AC_DEFUN([BOOST_FIND_LIB],
-[AC_REQUIRE([BOOST_REQUIRE])dnl
-AC_REQUIRE([_BOOST_FIND_COMPILER_TAG])dnl
-AC_REQUIRE([BOOST_STATIC])dnl
-AC_REQUIRE([_BOOST_GUESS_WHETHER_TO_USE_MT])dnl
-if test x"$boost_cv_inc_path" = xno; then
-  AC_MSG_NOTICE([Boost not available, not searching for the Boost $1 library])
-else
-dnl The else branch is huge and wasn't intended on purpose.
-AC_LANG_PUSH([C++])dnl
-AS_VAR_PUSHDEF([Boost_lib], [boost_cv_lib_$1])dnl
-AS_VAR_PUSHDEF([Boost_lib_LDFLAGS], [boost_cv_lib_$1_LDFLAGS])dnl
-AS_VAR_PUSHDEF([Boost_lib_LDPATH], [boost_cv_lib_$1_LDPATH])dnl
-AS_VAR_PUSHDEF([Boost_lib_LIBS], [boost_cv_lib_$1_LIBS])dnl
-BOOST_FIND_HEADER([$3], [$6])
-boost_save_CPPFLAGS=$CPPFLAGS
-CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-# Now let's try to find the library.  The algorithm is as follows: first look
-# for a given library name according to the user's PREFERRED-RT-OPT.  For each
-# library name, we prefer to use the ones that carry the tag (toolset name).
-# Each library is searched through the various standard paths were Boost is
-# usually installed.  If we can't find the standard variants, we try to
-# enforce -mt (for instance on MacOSX, libboost_threads.dylib doesn't exist
-# but there's -obviously- libboost_threads-mt.dylib).
-AC_CACHE_CHECK([for the Boost $1 library], [Boost_lib],
-  [Boost_lib=no
-  case "$2" in #(
-    mt | mt-) boost_mt=-mt; boost_rtopt=;; #(
-    mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X$2" : 'Xmt-*\(.*\)'`;; #(
-    *) boost_mt=; boost_rtopt=$2;;
-  esac
-  if test $enable_static_boost = yes; then
-    boost_rtopt="s$boost_rtopt"
-  fi
-  # Find the proper debug variant depending on what we've been asked to find.
-  case $boost_rtopt in #(
-    *d*) boost_rt_d=$boost_rtopt;; #(
-    *[[sgpn]]*) # Insert the `d' at the right place (in between `sg' and `pn')
-      boost_rt_d=`echo "$boost_rtopt" | sed 's/\(s*g*\)\(p*n*\)/\1\2/'`;; #(
-    *) boost_rt_d='-d';;
-  esac
-  # If the PREFERRED-RT-OPT are not empty, prepend a `-'.
-  test -n "$boost_rtopt" && boost_rtopt="-$boost_rtopt"
-  $boost_guess_use_mt && boost_mt=-mt
-  # Look for the abs path the static archive.
-  # $libext is computed by Libtool but let's make sure it's non empty.
-  test -z "$libext" &&
-    AC_MSG_ERROR([the libext variable is empty, did you invoke Libtool?])
-  boost_save_ac_objext=$ac_objext
-  # Generate the test file.
-  AC_LANG_CONFTEST([AC_LANG_PROGRAM([#include <$3>
-$5], [$4])])
-dnl Optimization hacks: compiling C++ is slow, especially with Boost.  What
-dnl we're trying to do here is guess the right combination of link flags
-dnl (LIBS / LDFLAGS) to use a given library.  This can take several
-dnl iterations before it succeeds and is thus *very* slow.  So what we do
-dnl instead is that we compile the code first (and thus get an object file,
-dnl typically conftest.o).  Then we try various combinations of link flags
-dnl until we succeed to link conftest.o in an executable.  The problem is
-dnl that the various TRY_LINK / COMPILE_IFELSE macros of Autoconf always
-dnl remove all the temporary files including conftest.o.  So the trick here
-dnl is to temporarily change the value of ac_objext so that conftest.o is
-dnl preserved accross tests.  This is obviously fragile and I will burn in
-dnl hell for not respecting Autoconf's documented interfaces, but in the
-dnl mean time, it optimizes the macro by a factor of 5 to 30.
-dnl Another small optimization: the first argument of AC_COMPILE_IFELSE left
-dnl empty because the test file is generated only once above (before we
-dnl start the for loops).
-  AC_COMPILE_IFELSE([],
-    [ac_objext=do_not_rm_me_plz],
-    [m4_if([$6], [],  [AC_MSG_ERROR([cannot compile a test that uses Boost $1])],
-                      [AC_MSG_NOTICE([cannot compile a test that uses Boost $1])])
-     $6])
-  ac_objext=$boost_save_ac_objext
-  boost_failed_libs=
-# Don't bother to ident the 6 nested for loops, only the 2 innermost ones
-# matter.
-for boost_tag_ in -$boost_cv_lib_tag ''; do
-for boost_ver_ in -$boost_cv_lib_version ''; do
-for boost_mt_ in $boost_mt -mt ''; do
-for boost_rtopt_ in $boost_rtopt '' -d; do
-  for boost_lib in \
-    boost_$1$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \
-    boost_$1$boost_tag_$boost_rtopt_$boost_ver_ \
-    boost_$1$boost_tag_$boost_mt_$boost_ver_ \
-    boost_$1$boost_tag_$boost_ver_
-  do
-    # Avoid testing twice the same lib
-    case $boost_failed_libs in #(
-      *@$boost_lib@*) continue;;
-    esac
-    # If with_boost is empty, we'll search in /lib first, which is not quite
-    # right so instead we'll try to a location based on where the headers are.
-    boost_tmp_lib=$with_boost
-    test x"$with_boost" = x && boost_tmp_lib=${boost_cv_inc_path%/include}
-    for boost_ldpath in "$boost_tmp_lib/lib" '' \
-             /opt/local/lib* /usr/local/lib* /opt/lib* /usr/lib* \
-             "$with_boost" C:/Boost/lib /lib*
-    do
-      test -e "$boost_ldpath" || continue
-      boost_save_LDFLAGS=$LDFLAGS
-      # Are we looking for a static library?
-      case $boost_ldpath:$boost_rtopt_ in #(
-        *?*:*s*) # Yes (Non empty boost_ldpath + s in rt opt)
-          Boost_lib_LIBS="$boost_ldpath/lib$boost_lib.$libext"
-          test -e "$Boost_lib_LIBS" || continue;; #(
-        *) # No: use -lboost_foo to find the shared library.
-          Boost_lib_LIBS="-l$boost_lib";;
-      esac
-      boost_save_LIBS=$LIBS
-      LIBS="$Boost_lib_LIBS $LIBS"
-      test x"$boost_ldpath" != x && LDFLAGS="$LDFLAGS -L$boost_ldpath"
-dnl First argument of AC_LINK_IFELSE left empty because the test file is
-dnl generated only once above (before we start the for loops).
-      _BOOST_AC_LINK_IFELSE([],
-                            [Boost_lib=yes], [Boost_lib=no])
-      ac_objext=$boost_save_ac_objext
-      LDFLAGS=$boost_save_LDFLAGS
-      LIBS=$boost_save_LIBS
-      if test x"$Boost_lib" = xyes; then
-        Boost_lib_LDFLAGS="-L$boost_ldpath -Wl,-rpath -Wl,$boost_ldpath"
-        Boost_lib_LDPATH="$boost_ldpath"
-        break 6
-      else
-        boost_failed_libs="$boost_failed_libs@$boost_lib@"
-      fi
-    done
-  done
-done
-done
-done
-done
-rm -f conftest.$ac_objext
-])
-case $Boost_lib in #((
-  no) _AC_MSG_LOG_CONFTEST
-    m4_if([$6], [], [AC_MSG_ERROR([cannot find the flags to link with Boost $1])],
-                    [AC_MSG_NOTICE([cannot find the flags to link with Boost $1])])
-    $6
-    ;;
-  *)
-    AC_SUBST(AS_TR_CPP([BOOST_$1_LDFLAGS]), [$Boost_lib_LDFLAGS])dnl
-    AC_SUBST(AS_TR_CPP([BOOST_$1_LDPATH]), [$Boost_lib_LDPATH])dnl
-    AC_SUBST([BOOST_LDPATH], [$Boost_lib_LDPATH])dnl
-    AC_SUBST(AS_TR_CPP([BOOST_$1_LIBS]), [$Boost_lib_LIBS])dnl
-    ;;
-esac
-CPPFLAGS=$boost_save_CPPFLAGS
-AS_VAR_POPDEF([Boost_lib])dnl
-AS_VAR_POPDEF([Boost_lib_LDFLAGS])dnl
-AS_VAR_POPDEF([Boost_lib_LDPATH])dnl
-AS_VAR_POPDEF([Boost_lib_LIBS])dnl
-AC_LANG_POP([C++])dnl
-fi
-])# BOOST_FIND_LIB
-
-
-# --------------------------------------- #
-# Checks for the various Boost libraries. #
-# --------------------------------------- #
-
-# List of boost libraries: http://www.boost.org/libs/libraries.htm
-# The page http://beta.boost.org/doc/libs is useful: it gives the first release
-# version of each library (among other things).
-
-# BOOST_DEFUN(LIBRARY, CODE)
-# --------------------------
-# Define BOOST_<LIBRARY-UPPERCASE> as a macro that runs CODE.
-#
-# Use indir to avoid the warning on underquoted macro name given to AC_DEFUN.
-m4_define([BOOST_DEFUN],
-[m4_indir([AC_DEFUN],
-          m4_toupper([BOOST_$1]),
-[m4_pushdef([BOOST_Library], [$1])dnl
-$2
-m4_popdef([BOOST_Library])dnl
-])
-])
-
-# BOOST_ARRAY()
-# -------------
-# Look for Boost.Array
-BOOST_DEFUN([Array],
-[BOOST_FIND_HEADER([boost/array.hpp])])
-
-
-# BOOST_ASIO()
-# ------------
-# Look for Boost.Asio (new in Boost 1.35).
-BOOST_DEFUN([Asio],
-[AC_REQUIRE([BOOST_SYSTEM])dnl
-BOOST_FIND_HEADER([boost/asio.hpp])])
-
-
-# BOOST_BIND()
-# ------------
-# Look for Boost.Bind
-BOOST_DEFUN([Bind],
-[BOOST_FIND_HEADER([boost/bind.hpp])])
-
-
-# BOOST_CHRONO()
-# ------------------
-# Look for Boost.Chrono
-BOOST_DEFUN([Chrono],
-[# Do we have to check for Boost.System?  This link-time dependency was
-# added as of 1.35.0.  If we have a version <1.35, we must not attempt to
-# find Boost.System as it didn't exist by then.
-if test $boost_major_version -ge 135; then
-BOOST_SYSTEM([$1])
-fi # end of the Boost.System check.
-boost_filesystem_save_LIBS=$LIBS
-boost_filesystem_save_LDFLAGS=$LDFLAGS
-m4_pattern_allow([^BOOST_SYSTEM_(LIBS|LDFLAGS)$])dnl
-LIBS="$LIBS $BOOST_SYSTEM_LIBS"
-LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS"
-BOOST_FIND_LIB([chrono], [$1],
-                [boost/chrono.hpp],
-                [boost::chrono::thread_clock d;])
-if test $enable_static_boost = yes && test $boost_major_version -ge 135; then
-    AC_SUBST([BOOST_FILESYSTEM_LIBS], ["$BOOST_FILESYSTEM_LIBS $BOOST_SYSTEM_LIBS"])
-fi
-LIBS=$boost_filesystem_save_LIBS
-LDFLAGS=$boost_filesystem_save_LDFLAGS
-
-])# BOOST_CHRONO
-
-
-# BOOST_CONVERSION()
-# ------------------
-# Look for Boost.Conversion (cast / lexical_cast)
-BOOST_DEFUN([Conversion],
-[BOOST_FIND_HEADER([boost/cast.hpp])
-BOOST_FIND_HEADER([boost/lexical_cast.hpp])
-])# BOOST_CONVERSION
-
-
-# BOOST_DATE_TIME([PREFERRED-RT-OPT])
-# -----------------------------------
-# Look for Boost.Date_Time.  For the documentation of PREFERRED-RT-OPT, see the
-# documentation of BOOST_FIND_LIB above.
-BOOST_DEFUN([Date_Time],
-[BOOST_FIND_LIB([date_time], [$1],
-                [boost/date_time/posix_time/posix_time.hpp],
-                [boost::posix_time::ptime t;])
-])# BOOST_DATE_TIME
-
-
-# BOOST_FILESYSTEM([PREFERRED-RT-OPT])
-# ------------------------------------
-# Look for Boost.Filesystem.  For the documentation of PREFERRED-RT-OPT, see
-# the documentation of BOOST_FIND_LIB above.
-# Do not check for boost/filesystem.hpp because this file was introduced in
-# 1.34.
-BOOST_DEFUN([Filesystem],
-[# Do we have to check for Boost.System?  This link-time dependency was
-# added as of 1.35.0.  If we have a version <1.35, we must not attempt to
-# find Boost.System as it didn't exist by then.
-if test $boost_major_version -ge 135; then
-BOOST_SYSTEM([$1])
-fi # end of the Boost.System check.
-boost_filesystem_save_LIBS=$LIBS
-boost_filesystem_save_LDFLAGS=$LDFLAGS
-m4_pattern_allow([^BOOST_SYSTEM_(LIBS|LDFLAGS)$])dnl
-LIBS="$LIBS $BOOST_SYSTEM_LIBS"
-LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS"
-BOOST_FIND_LIB([filesystem], [$1],
-                [boost/filesystem/path.hpp], [boost::filesystem::path p;])
-if test $enable_static_boost = yes && test $boost_major_version -ge 135; then
-    AC_SUBST([BOOST_FILESYSTEM_LIBS], ["$BOOST_FILESYSTEM_LIBS $BOOST_SYSTEM_LIBS"])
-fi
-LIBS=$boost_filesystem_save_LIBS
-LDFLAGS=$boost_filesystem_save_LDFLAGS
-])# BOOST_FILESYSTEM
-
-
-# BOOST_FOREACH()
-# ---------------
-# Look for Boost.Foreach
-BOOST_DEFUN([Foreach],
-[BOOST_FIND_HEADER([boost/foreach.hpp])])
-
-
-# BOOST_FORMAT()
-# --------------
-# Look for Boost.Format
-# Note: we can't check for boost/format/format_fwd.hpp because the header isn't
-# standalone.  It can't be compiled because it triggers the following error:
-# boost/format/detail/config_macros.hpp:88: error: 'locale' in namespace 'std'
-#                                                  does not name a type
-BOOST_DEFUN([Format],
-[BOOST_FIND_HEADER([boost/format.hpp])])
-
-
-# BOOST_FUNCTION()
-# ----------------
-# Look for Boost.Function
-BOOST_DEFUN([Function],
-[BOOST_FIND_HEADER([boost/function.hpp])])
-
-
-# BOOST_GRAPH([PREFERRED-RT-OPT])
-# -------------------------------
-# Look for Boost.Graphs.  For the documentation of PREFERRED-RT-OPT, see the
-# documentation of BOOST_FIND_LIB above.
-BOOST_DEFUN([Graph],
-[BOOST_FIND_LIB([graph], [$1],
-                [boost/graph/adjacency_list.hpp], [boost::adjacency_list<> g;])
-])# BOOST_GRAPH
-
-
-# BOOST_IOSTREAMS([PREFERRED-RT-OPT])
-# -----------------------------------
-# Look for Boost.IOStreams.  For the documentation of PREFERRED-RT-OPT, see the
-# documentation of BOOST_FIND_LIB above.
-BOOST_DEFUN([IOStreams],
-[BOOST_FIND_LIB([iostreams], [$1],
-                [boost/iostreams/device/file_descriptor.hpp],
-                [boost::iostreams::file_descriptor fd; fd.close();])
-])# BOOST_IOSTREAMS
-
-
-# BOOST_HASH()
-# ------------
-# Look for Boost.Functional/Hash
-BOOST_DEFUN([Hash],
-[BOOST_FIND_HEADER([boost/functional/hash.hpp])])
-
-
-# BOOST_LAMBDA()
-# --------------
-# Look for Boost.Lambda
-BOOST_DEFUN([Lambda],
-[BOOST_FIND_HEADER([boost/lambda/lambda.hpp])])
-
-
-# BOOST_LOG([PREFERRED-RT-OPT])
-# -----------------------------
-# Look for Boost.Log For the documentation of PREFERRED-RT-OPT, see the
-# documentation of BOOST_FIND_LIB above.
-BOOST_DEFUN([Log],
-[BOOST_FIND_LIB([log], [$1],
-    [boost/log/core/core.hpp],
-    [boost::log::attribute a; a.get_value();])
-])# BOOST_LOG
-
-
-# BOOST_LOG_SETUP([PREFERRED-RT-OPT])
-# -----------------------------------
-# Look for Boost.Log For the documentation of PREFERRED-RT-OPT, see the
-# documentation of BOOST_FIND_LIB above.
-BOOST_DEFUN([Log_Setup],
-[AC_REQUIRE([BOOST_LOG])dnl
-BOOST_FIND_LIB([log_setup], [$1],
-    [boost/log/utility/init/from_settings.hpp],
-    [boost::log::basic_settings<char> bs; bs.empty();])
-])# BOOST_LOG_SETUP
-
-
-# BOOST_MATH()
-# ------------
-# Look for Boost.Math
-# TODO: This library isn't header-only but it comes in multiple different
-# flavors that don't play well with BOOST_FIND_LIB (e.g, libboost_math_c99,
-# libboost_math_c99f, libboost_math_c99l, libboost_math_tr1,
-# libboost_math_tr1f, libboost_math_tr1l).  This macro must be fixed to do the
-# right thing anyway.
-BOOST_DEFUN([Math],
-[BOOST_FIND_HEADER([boost/math/special_functions.hpp])])
-
-
-# BOOST_MULTIARRAY()
-# ------------------
-# Look for Boost.MultiArray
-BOOST_DEFUN([MultiArray],
-[BOOST_FIND_HEADER([boost/multi_array.hpp])])
-
-
-# BOOST_NUMERIC_CONVERSION()
-# --------------------------
-# Look for Boost.NumericConversion (policy-based numeric conversion)
-BOOST_DEFUN([Numeric_Conversion],
-[BOOST_FIND_HEADER([boost/numeric/conversion/converter.hpp])
-])# BOOST_NUMERIC_CONVERSION
-
-
-# BOOST_OPTIONAL()
-# ----------------
-# Look for Boost.Optional
-BOOST_DEFUN([Optional],
-[BOOST_FIND_HEADER([boost/optional.hpp])])
-
-
-# BOOST_PREPROCESSOR()
-# --------------------
-# Look for Boost.Preprocessor
-BOOST_DEFUN([Preprocessor],
-[BOOST_FIND_HEADER([boost/preprocessor/repeat.hpp])])
-
-
-# BOOST_UNORDERED()
-# -----------------
-# Look for Boost.Unordered
-BOOST_DEFUN([Unordered],
-[BOOST_FIND_HEADER([boost/unordered_map.hpp])])
-
-
-# BOOST_UUID()
-# ------------
-# Look for Boost.Uuid
-BOOST_DEFUN([Uuid],
-[BOOST_FIND_HEADER([boost/uuid/uuid.hpp])])
-
-
-# BOOST_PROGRAM_OPTIONS([PREFERRED-RT-OPT])
-# -----------------------------------------
-# Look for Boost.Program_options.  For the documentation of PREFERRED-RT-OPT,
-# see the documentation of BOOST_FIND_LIB above.
-BOOST_DEFUN([Program_Options],
-[BOOST_FIND_LIB([program_options], [$1],
-                [boost/program_options.hpp],
-                [boost::program_options::options_description d("test");])
-])# BOOST_PROGRAM_OPTIONS
-
-
-
-# _BOOST_PYTHON_CONFIG(VARIABLE, FLAG)
-# ------------------------------------
-# Save VARIABLE, and define it via `python-config --FLAG`.
-# Substitute BOOST_PYTHON_VARIABLE.
-m4_define([_BOOST_PYTHON_CONFIG],
-[AC_SUBST([BOOST_PYTHON_$1],
-          [`python-config --$2 2>/dev/null`])dnl
-boost_python_save_$1=$$1
-$1="$$1 $BOOST_PYTHON_$1"])
-
-
-# BOOST_PYTHON([PREFERRED-RT-OPT])
-# --------------------------------
-# Look for Boost.Python.  For the documentation of PREFERRED-RT-OPT,
-# see the documentation of BOOST_FIND_LIB above.
-BOOST_DEFUN([Python],
-[_BOOST_PYTHON_CONFIG([CPPFLAGS], [includes])
-_BOOST_PYTHON_CONFIG([LDFLAGS],   [ldflags])
-_BOOST_PYTHON_CONFIG([LIBS],      [libs])
-m4_pattern_allow([^BOOST_PYTHON_MODULE$])dnl
-BOOST_FIND_LIB([python], [$1],
-               [boost/python.hpp],
-               [], [BOOST_PYTHON_MODULE(empty) {}])
-CPPFLAGS=$boost_python_save_CPPFLAGS
-LDFLAGS=$boost_python_save_LDFLAGS
-LIBS=$boost_python_save_LIBS
-])# BOOST_PYTHON
-
-
-# BOOST_REF()
-# -----------
-# Look for Boost.Ref
-BOOST_DEFUN([Ref],
-[BOOST_FIND_HEADER([boost/ref.hpp])])
-
-
-# BOOST_REGEX([PREFERRED-RT-OPT])
-# -------------------------------
-# Look for Boost.Regex.  For the documentation of PREFERRED-RT-OPT, see the
-# documentation of BOOST_FIND_LIB above.
-BOOST_DEFUN([Regex],
-[BOOST_FIND_LIB([regex], [$1],
-                [boost/regex.hpp],
-                [boost::regex exp("*"); boost::regex_match("foo", exp);])
-])# BOOST_REGEX
-
-
-# BOOST_SERIALIZATION([PREFERRED-RT-OPT])
-# ---------------------------------------
-# Look for Boost.Serialization.  For the documentation of PREFERRED-RT-OPT, see
-# the documentation of BOOST_FIND_LIB above.
-BOOST_DEFUN([Serialization],
-[BOOST_FIND_LIB([serialization], [$1],
-                [boost/archive/text_oarchive.hpp],
-                [std::ostream* o = 0; // Cheap way to get an ostream...
-                boost::archive::text_oarchive t(*o);])
-])# BOOST_SERIALIZATION
-
-
-# BOOST_SIGNALS([PREFERRED-RT-OPT])
-# ---------------------------------
-# Look for Boost.Signals.  For the documentation of PREFERRED-RT-OPT, see the
-# documentation of BOOST_FIND_LIB above.
-BOOST_DEFUN([Signals],
-[BOOST_FIND_LIB([signals], [$1],
-                [boost/signal.hpp],
-                [boost::signal<void ()> s;])
-])# BOOST_SIGNALS
-
-
-# BOOST_SMART_PTR()
-# -----------------
-# Look for Boost.SmartPtr
-BOOST_DEFUN([Smart_Ptr],
-[BOOST_FIND_HEADER([boost/scoped_ptr.hpp])
-BOOST_FIND_HEADER([boost/shared_ptr.hpp])
-])
-
-
-# BOOST_STATICASSERT()
-# --------------------
-# Look for Boost.StaticAssert
-BOOST_DEFUN([StaticAssert],
-[BOOST_FIND_HEADER([boost/static_assert.hpp])])
-
-
-# BOOST_STRING_ALGO()
-# -------------------
-# Look for Boost.StringAlgo
-BOOST_DEFUN([String_Algo],
-[BOOST_FIND_HEADER([boost/algorithm/string.hpp])
-])
-
-
-# BOOST_SYSTEM([PREFERRED-RT-OPT], [ACTION-IF-NOT-FOUND])
-# -------------------------------------------------------
-# Look for Boost.System.  For the documentation of PREFERRED-RT-OPT, see the
-# documentation of BOOST_FIND_LIB above.  This library was introduced in Boost
-# 1.35.0.
-BOOST_DEFUN([System],
-[BOOST_FIND_LIB([system], [$1],
-                [boost/system/error_code.hpp],
-                [boost::system::error_code e; e.clear();],
-                [], [$2])
-])# BOOST_SYSTEM
-
-
-# BOOST_TEST([PREFERRED-RT-OPT])
-# ------------------------------
-# Look for Boost.Test.  For the documentation of PREFERRED-RT-OPT, see the
-# documentation of BOOST_FIND_LIB above.
-BOOST_DEFUN([Test],
-[m4_pattern_allow([^BOOST_CHECK$])dnl
-BOOST_FIND_LIB([unit_test_framework], [$1],
-               [boost/test/unit_test.hpp], [BOOST_CHECK(2 == 2);],
-               [using boost::unit_test::test_suite;
-               test_suite* init_unit_test_suite(int argc, char ** argv)
-               { return NULL; }])
-])# BOOST_TEST
-
-
-# BOOST_THREADS([PREFERRED-RT-OPT], [ACTION-IF-NOT-FOUND])
-# --------------------------------------------------------
-# Look for Boost.Thread.  For the documentation of PREFERRED-RT-OPT, see the
-# documentation of BOOST_FIND_LIB above.  If ACTION-IF-NOT-FOUND is given,
-# errors are non-fatal; if it's absent, errors are fatal.
-# FIXME: Provide an alias "BOOST_THREAD".
-BOOST_DEFUN([Threads],
-[dnl Having the pthread flag is required at least on GCC3 where
-dnl boost/thread.hpp would complain if we try to compile without
-dnl -pthread on GNU/Linux.
-AC_REQUIRE([_BOOST_PTHREAD_FLAG])dnl
-boost_threads_save_LIBS=$LIBS
-boost_threads_save_LDFLAGS=$LDFLAGS
-boost_threads_save_CPPFLAGS=$CPPFLAGS
-# Link-time dependency from thread to system was added as of 1.49.0.
-if test $boost_major_version -ge 149; then
-BOOST_SYSTEM([$1], [AC_MSG_WARN([[Boost system library (libboost-system) not installed or unusable; this may lead to problems with using threads.  It is recommended that you install your distribution's libboost-system development package (probably named libboost-system###-dev, or boost-system-devel, or something like that).]])])
-fi # end of the Boost.System check.
-m4_pattern_allow([^BOOST_SYSTEM_(LIBS|LDFLAGS)$])dnl
-LIBS="$LIBS $BOOST_SYSTEM_LIBS $boost_cv_pthread_flag"
-LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS"
-# Yes, we *need* to put the -pthread thing in CPPFLAGS because with GCC3,
-# boost/thread.hpp will trigger a #error if -pthread isn't used:
-#   boost/config/requires_threads.hpp:47:5: #error "Compiler threading support
-#   is not turned on. Please set the correct command line options for
-#   threading: -pthread (Linux), -pthreads (Solaris) or -mthreads (Mingw32)"
-CPPFLAGS="$CPPFLAGS $boost_cv_pthread_flag"
-
-# When compiling for the Windows platform, the threads library is named
-# differently.
-case $host_os in
-  (*mingw*)
-    BOOST_FIND_LIB([thread_win32], [$1],
-                   [boost/thread.hpp], [boost::thread t; boost::mutex m;], [], [$2])
-    BOOST_THREAD_LDFLAGS=$BOOST_THREAD_WIN32_LDFLAGS
-    BOOST_THREAD_LDPATH=$BOOST_THREAD_WIN32_LDPATH
-    BOOST_THREAD_LIBS=$BOOST_THREAD_WIN32_LIBS
-  ;;
-  (*)
-    BOOST_FIND_LIB([thread], [$1],
-                   [boost/thread.hpp], [boost::thread t; boost::mutex m;], [], [$2])
-  ;;
-esac
-
-BOOST_THREAD_LIBS="$BOOST_THREAD_LIBS $BOOST_SYSTEM_LIBS $boost_cv_pthread_flag"
-BOOST_THREAD_LDFLAGS="$BOOST_SYSTEM_LDFLAGS"
-BOOST_CPPFLAGS="$BOOST_CPPFLAGS $boost_cv_pthread_flag"
-LIBS=$boost_threads_save_LIBS
-LDFLAGS=$boost_threads_save_LDFLAGS
-CPPFLAGS=$boost_threads_save_CPPFLAGS
-])# BOOST_THREADS
-
-
-# BOOST_TOKENIZER()
-# -----------------
-# Look for Boost.Tokenizer
-BOOST_DEFUN([Tokenizer],
-[BOOST_FIND_HEADER([boost/tokenizer.hpp])])
-
-
-# BOOST_TRIBOOL()
-# ---------------
-# Look for Boost.Tribool
-BOOST_DEFUN([Tribool],
-[BOOST_FIND_HEADER([boost/logic/tribool_fwd.hpp])
-BOOST_FIND_HEADER([boost/logic/tribool.hpp])
-])
-
-
-# BOOST_TUPLE()
-# -------------
-# Look for Boost.Tuple
-BOOST_DEFUN([Tuple],
-[BOOST_FIND_HEADER([boost/tuple/tuple.hpp])])
-
-
-# BOOST_TYPETRAITS()
-# --------------------
-# Look for Boost.TypeTraits
-BOOST_DEFUN([TypeTraits],
-[BOOST_FIND_HEADER([boost/type_traits.hpp])])
-
-
-# BOOST_UTILITY()
-# ---------------
-# Look for Boost.Utility (noncopyable, result_of, base-from-member idiom,
-# etc.)
-BOOST_DEFUN([Utility],
-[BOOST_FIND_HEADER([boost/utility.hpp])])
-
-
-# BOOST_VARIANT()
-# ---------------
-# Look for Boost.Variant.
-BOOST_DEFUN([Variant],
-[BOOST_FIND_HEADER([boost/variant/variant_fwd.hpp])
-BOOST_FIND_HEADER([boost/variant.hpp])])
-
-
-# BOOST_WAVE([PREFERRED-RT-OPT])
-# ------------------------------
-# NOTE: If you intend to use Wave/Spirit with thread support, make sure you
-# call BOOST_THREADS first.
-# Look for Boost.Wave.  For the documentation of PREFERRED-RT-OPT, see the
-# documentation of BOOST_FIND_LIB above.
-BOOST_DEFUN([Wave],
-[AC_REQUIRE([BOOST_FILESYSTEM])dnl
-AC_REQUIRE([BOOST_DATE_TIME])dnl
-boost_wave_save_LIBS=$LIBS
-boost_wave_save_LDFLAGS=$LDFLAGS
-m4_pattern_allow([^BOOST_((FILE)?SYSTEM|DATE_TIME|THREAD)_(LIBS|LDFLAGS)$])dnl
-LIBS="$LIBS $BOOST_SYSTEM_LIBS $BOOST_FILESYSTEM_LIBS $BOOST_DATE_TIME_LIBS \
-$BOOST_THREAD_LIBS"
-LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS $BOOST_FILESYSTEM_LDFLAGS \
-$BOOST_DATE_TIME_LDFLAGS $BOOST_THREAD_LDFLAGS"
-BOOST_FIND_LIB([wave], [$1],
-                [boost/wave.hpp],
-                [boost::wave::token_id id; get_token_name(id);])
-LIBS=$boost_wave_save_LIBS
-LDFLAGS=$boost_wave_save_LDFLAGS
-])# BOOST_WAVE
-
-
-# BOOST_XPRESSIVE()
-# -----------------
-# Look for Boost.Xpressive (new since 1.36.0).
-BOOST_DEFUN([Xpressive],
-[BOOST_FIND_HEADER([boost/xpressive/xpressive.hpp])])
-
-
-# ----------------- #
-# Internal helpers. #
-# ----------------- #
-
-
-# _BOOST_PTHREAD_FLAG()
-# ---------------------
-# Internal helper for BOOST_THREADS.  Based on ACX_PTHREAD:
-# http://autoconf-archive.cryp.to/acx_pthread.html
-AC_DEFUN([_BOOST_PTHREAD_FLAG],
-[AC_REQUIRE([AC_PROG_CXX])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_LANG_PUSH([C++])dnl
-AC_CACHE_CHECK([for the flags needed to use pthreads], [boost_cv_pthread_flag],
-[ boost_cv_pthread_flag=
-  # The ordering *is* (sometimes) important.  Some notes on the
-  # individual items follow:
-  # (none): in case threads are in libc; should be tried before -Kthread and
-  #       other compiler flags to prevent continual compiler warnings
-  # -lpthreads: AIX (must check this before -lpthread)
-  # -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
-  # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
-  # -llthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
-  # -pthread: GNU Linux/GCC (kernel threads), BSD/GCC (userland threads)
-  # -pthreads: Solaris/GCC
-  # -mthreads: MinGW32/GCC, Lynx/GCC
-  # -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
-  #      doesn't hurt to check since this sometimes defines pthreads too;
-  #      also defines -D_REENTRANT)
-  #      ... -mt is also the pthreads flag for HP/aCC
-  # -lpthread: GNU Linux, etc.
-  # --thread-safe: KAI C++
-  case $host_os in #(
-    *solaris*)
-      # On Solaris (at least, for some versions), libc contains stubbed
-      # (non-functional) versions of the pthreads routines, so link-based
-      # tests will erroneously succeed.  (We need to link with -pthreads/-mt/
-      # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
-      # a function called by this macro, so we could check for that, but
-      # who knows whether they'll stub that too in a future libc.)  So,
-      # we'll just look for -pthreads and -lpthread first:
-      boost_pthread_flags="-pthreads -lpthread -mt -pthread";; #(
-    *)
-      boost_pthread_flags="-lpthreads -Kthread -kthread -llthread -pthread \
-                           -pthreads -mthreads -lpthread --thread-safe -mt";;
-  esac
-  # Generate the test file.
-  AC_LANG_CONFTEST([AC_LANG_PROGRAM([#include <pthread.h>],
-    [pthread_t th; pthread_join(th, 0);
-    pthread_attr_init(0); pthread_cleanup_push(0, 0);
-    pthread_create(0,0,0,0); pthread_cleanup_pop(0);])])
-  for boost_pthread_flag in '' $boost_pthread_flags; do
-    boost_pthread_ok=false
-dnl Re-use the test file already generated.
-    boost_pthreads__save_LIBS=$LIBS
-    LIBS="$LIBS $boost_pthread_flag"
-    AC_LINK_IFELSE([],
-      [if grep ".*$boost_pthread_flag" conftest.err; then
-         echo "This flag seems to have triggered warnings" >&AS_MESSAGE_LOG_FD
-       else
-         boost_pthread_ok=:; boost_cv_pthread_flag=$boost_pthread_flag
-       fi])
-    LIBS=$boost_pthreads__save_LIBS
-    $boost_pthread_ok && break
-  done
-])
-AC_LANG_POP([C++])dnl
-])# _BOOST_PTHREAD_FLAG
-
-
-# _BOOST_gcc_test(MAJOR, MINOR)
-# -----------------------------
-# Internal helper for _BOOST_FIND_COMPILER_TAG.
-m4_define([_BOOST_gcc_test],
-["defined __GNUC__ && __GNUC__ == $1 && __GNUC_MINOR__ == $2 && !defined __ICC @ gcc$1$2"])dnl
-
-
-# _BOOST_FIND_COMPILER_TAG()
-# --------------------------
-# Internal.  When Boost is installed without --layout=system, each library
-# filename will hold a suffix that encodes the compiler used during the
-# build.  The Boost build system seems to call this a `tag'.
-AC_DEFUN([_BOOST_FIND_COMPILER_TAG],
-[AC_REQUIRE([AC_PROG_CXX])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_CACHE_CHECK([for the toolset name used by Boost for $CXX], [boost_cv_lib_tag],
-[boost_cv_lib_tag=unknown
-if test x$boost_cv_inc_path != xno; then
-  AC_LANG_PUSH([C++])dnl
-  # The following tests are mostly inspired by boost/config/auto_link.hpp
-  # The list is sorted to most recent/common to oldest compiler (in order
-  # to increase the likelihood of finding the right compiler with the
-  # least number of compilation attempt).
-  # Beware that some tests are sensible to the order (for instance, we must
-  # look for MinGW before looking for GCC3).
-  # I used one compilation test per compiler with a #error to recognize
-  # each compiler so that it works even when cross-compiling (let me know
-  # if you know a better approach).
-  # Known missing tags (known from Boost's tools/build/v2/tools/common.jam):
-  #   como, edg, kcc, bck, mp, sw, tru, xlc
-  # I'm not sure about my test for `il' (be careful: Intel's ICC pre-defines
-  # the same defines as GCC's).
-  for i in \
-    _BOOST_gcc_test(4, 8) \
-    _BOOST_gcc_test(4, 7) \
-    _BOOST_gcc_test(4, 6) \
-    _BOOST_gcc_test(4, 5) \
-    _BOOST_gcc_test(4, 4) \
-    _BOOST_gcc_test(4, 3) \
-    _BOOST_gcc_test(4, 2) \
-    _BOOST_gcc_test(4, 1) \
-    _BOOST_gcc_test(4, 0) \
-    "defined __GNUC__ && __GNUC__ == 3 && !defined __ICC \
-     && (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \
-         || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw" \
-    _BOOST_gcc_test(3, 4) \
-    _BOOST_gcc_test(3, 3) \
-    "defined _MSC_VER && _MSC_VER >= 1500 @ vc90" \
-    "defined _MSC_VER && _MSC_VER == 1400 @ vc80" \
-    _BOOST_gcc_test(3, 2) \
-    "defined _MSC_VER && _MSC_VER == 1310 @ vc71" \
-    _BOOST_gcc_test(3, 1) \
-    _BOOST_gcc_test(3, 0) \
-    "defined __BORLANDC__ @ bcb" \
-    "defined __ICC && (defined __unix || defined __unix__) @ il" \
-    "defined __ICL @ iw" \
-    "defined _MSC_VER && _MSC_VER == 1300 @ vc7" \
-    _BOOST_gcc_test(2, 95) \
-    "defined __MWERKS__ && __MWERKS__ <= 0x32FF @ cw9" \
-    "defined _MSC_VER && _MSC_VER < 1300 && !defined UNDER_CE @ vc6" \
-    "defined _MSC_VER && _MSC_VER < 1300 && defined UNDER_CE @ evc4" \
-    "defined __MWERKS__ && __MWERKS__ <= 0x31FF @ cw8"
-  do
-    boost_tag_test=`expr "X$i" : 'X\([[^@]]*\) @ '`
-    boost_tag=`expr "X$i" : 'X[[^@]]* @ \(.*\)'`
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#if $boost_tag_test
-/* OK */
-#else
-# error $boost_tag_test
-#endif
-]])], [boost_cv_lib_tag=$boost_tag; break], [])
-  done
-AC_LANG_POP([C++])dnl
-  case $boost_cv_lib_tag in #(
-    # Some newer (>= 1.35?) versions of Boost seem to only use "gcc" as opposed
-    # to "gcc41" for instance.
-    *-gcc | *'-gcc ') :;; #(  Don't re-add -gcc: it's already in there.
-    gcc*)
-      boost_tag_x=
-      case $host_os in #(
-        darwin*)
-          if test $boost_major_version -ge 136; then
-            # The `x' added in r46793 of Boost.
-            boost_tag_x=x
-          fi;;
-      esac
-      # We can specify multiple tags in this variable because it's used by
-      # BOOST_FIND_LIB that does a `for tag in -$boost_cv_lib_tag' ...
-      boost_cv_lib_tag="$boost_tag_x$boost_cv_lib_tag -${boost_tag_x}gcc"
-      ;; #(
-    unknown)
-      AC_MSG_WARN([[could not figure out which toolset name to use for $CXX]])
-      boost_cv_lib_tag=
-      ;;
-  esac
-fi])dnl end of AC_CACHE_CHECK
-])# _BOOST_FIND_COMPILER_TAG
-
-
-# _BOOST_GUESS_WHETHER_TO_USE_MT()
-# --------------------------------
-# Compile a small test to try to guess whether we should favor MT (Multi
-# Thread) flavors of Boost.  Sets boost_guess_use_mt accordingly.
-AC_DEFUN([_BOOST_GUESS_WHETHER_TO_USE_MT],
-[# Check whether we do better use `mt' even though we weren't ask to.
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#if defined _REENTRANT || defined _MT || defined __MT__
-/* use -mt */
-#else
-# error MT not needed
-#endif
-]])], [boost_guess_use_mt=:], [boost_guess_use_mt=false])
-])
-
-# _BOOST_AC_LINK_IFELSE(PROGRAM, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
-# -------------------------------------------------------------------
-# Fork of _AC_LINK_IFELSE that preserves conftest.o across calls.  Fragile,
-# will break when Autoconf changes its internals.  Requires that you manually
-# rm -f conftest.$ac_objext in between to really different tests, otherwise
-# you will try to link a conftest.o left behind by a previous test.
-# Used to aggressively optimize BOOST_FIND_LIB (see the big comment in this
-# macro).
-#
-# Don't use "break" in the actions, as it would short-circuit some code
-# this macro runs after the actions.
-m4_define([_BOOST_AC_LINK_IFELSE],
-[m4_ifvaln([$1], [AC_LANG_CONFTEST([$1])])dnl
-rm -f conftest$ac_exeext
-boost_save_ac_ext=$ac_ext
-boost_use_source=:
-# If we already have a .o, re-use it.  We change $ac_ext so that $ac_link
-# tries to link the existing object file instead of compiling from source.
-test -f conftest.$ac_objext && ac_ext=$ac_objext && boost_use_source=false &&
-  _AS_ECHO_LOG([re-using the existing conftest.$ac_objext])
-AS_IF([_AC_DO_STDERR($ac_link) && {
-	 test -z "$ac_[]_AC_LANG_ABBREV[]_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_executable_p conftest$ac_exeext
-dnl FIXME: use AS_TEST_X instead when 2.61 is widespread enough.
-       }],
-      [$2],
-      [if $boost_use_source; then
-         _AC_MSG_LOG_CONFTEST
-       fi
-       $3])
-ac_objext=$boost_save_ac_objext
-ac_ext=$boost_save_ac_ext
-dnl Delete also the IPA/IPO (Inter Procedural Analysis/Optimization)
-dnl information created by the PGI compiler (conftest_ipa8_conftest.oo),
-dnl as it would interfere with the next link command.
-rm -f core conftest.err conftest_ipa8_conftest.oo \
-      conftest$ac_exeext m4_ifval([$1], [conftest.$ac_ext])[]dnl
-])# _BOOST_AC_LINK_IFELSE
-
-# Local Variables:
-# mode: autoconf
-# End:
diff --git a/config/build-type b/config/build-type
deleted file mode 100755
index ae4e292f4..000000000
--- a/config/build-type
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/sh
-#
-# build-type
-# Morgan Deters <mdeters@cs.nyu.edu> for CVC4
-#
-# usage: build-type profile [ overrides... ]
-#
-# Returns a build string for the given profile and overrides.
-# For example, "build-type debug noassertions" returns the canonical
-# build string for a debug build with assertions turned off.
-#
-# The default build directory for CVC4 is then (assuming a standard
-# debug build):
-#
-#   builds/`config/config.guess`/`config/build-type debug`
-#
-# This script is used both in CVC4's configure script and in the
-# top-level Makefile when you build another profile than the
-# "current" build (to see if there already was a build of that type).
-#
-# The overrides are as follows:
-#
-#   staticbinary
-#   optimized
-#   proof
-#   debugsymbols
-#   assertions
-#   tracing
-#   muzzle
-#   coverage
-#   profiling
-#
-# Also you can specify "cln" or "gmp".  If "gmp", the build dir
-# contains the string "gmp".  (gmp is considered the default.)
-#
-# Also for glpk and abc.
-#
-
-if [ $# -eq 0 ]; then
-  echo "usage: build-type profile [ overrides... ]" >&2
-  exit
-fi
-
-build_type=$1
-shift
-
-while [ $# -gt 0 ]; do
-  case "$1" in
-    cln) cln=1 ;;
-    gmp) ;;
-    no*) eval `expr "$1" : 'no\(.*\)'`=0 ;;
-    *)   eval $1=1 ;;
-  esac
-  shift
-done
-
-build_type_suffix=
-for arg in cln glpk abc staticbinary optimized proof debugsymbols statistics replay assertions tracing muzzle coverage profiling; do
-  if eval [ -n '"${'$arg'+set}"' ]; then
-    if eval [ '"${'$arg'}"' -eq 0 ]; then
-      build_type_suffix=$build_type_suffix-no$arg
-    else
-      build_type_suffix=$build_type_suffix-$arg
-    fi
-  fi
-done
-
-echo $build_type$build_type_suffix
diff --git a/config/cadical.m4 b/config/cadical.m4
deleted file mode 100644
index 77625b036..000000000
--- a/config/cadical.m4
+++ /dev/null
@@ -1,90 +0,0 @@
-# CVC4_CHECK_FOR_CADICAL
-# ------------------
-# Look for CaDiCaL and link it in, but only if user requested.
-AC_DEFUN([CVC4_CHECK_FOR_CADICAL], [
-AC_MSG_CHECKING([whether user requested CaDiCaL support])
-
-have_libcadical=0
-CADICAL_LIBS=
-CADICAL_LDFLAGS=
-
-have_libcadical=0
-if test "$with_cadical" = no; then
-  AC_MSG_RESULT([no, CaDiCaL disabled by user])
-elif test -n "$with_cadical"; then
-  AC_MSG_RESULT([yes, CaDiCaL requested by user])
-  AC_ARG_VAR(CADICAL_HOME, [path to top level of CaDiCaL source tree])
-  AC_ARG_WITH(
-    [cadical-dir],
-    AS_HELP_STRING(
-      [--with-cadical-dir=PATH],
-      [path to top level of CaDiCaL source tree]
-    ),
-    CADICAL_HOME="$withval",
-    [ if test -z "$CADICAL_HOME" && ! test -e "$ac_abs_confdir/cadical/build/libcadical.a"; then
-        AC_MSG_FAILURE([must give --with-cadical-dir=PATH, define environment variable CADICAL_HOME, or use contrib/get-cadical to setup CaDiCaL for CVC4!])
-      fi
-    ]
-  )
-
-  # Check if CaDiCaL was installed via contrib/get-cadical
-  AC_MSG_CHECKING([whether CaDiCaL was already installed via contrib/get-cadical])
-  if test -z "$CADICAL_HOME" && test -e "$ac_abs_confdir/cadical/build/libcadical.a"; then
-    CADICAL_HOME="$ac_abs_confdir/cadical"
-    AC_MSG_RESULT([yes, $CADICAL_HOME])
-  else
-    AC_MSG_RESULT([no])
-  fi
-
-  if ! test -d "$CADICAL_HOME" || ! test -e "$CADICAL_HOME/build/libcadical.a" ; then
-    AC_MSG_FAILURE([either $CADICAL_HOME is not a CaDiCaL source tree or it's not yet built $CADICAL_HOME/build/libcadical.a])
-  fi
-
-  AC_MSG_CHECKING([how to link CaDiCaL])
-
-  CVC4_TRY_CADICAL
-
-  if test -z "$CADICAL_LIBS"; then
-    AC_MSG_FAILURE([cannot link against libcadical!])
-  else
-    AC_MSG_RESULT([$CADICAL_LIBS])
-    have_libcadical=1
-  fi
-
-  CADICAL_LDFLAGS="-L$CADICAL_HOME/build"
-
-else
-  AC_MSG_RESULT([no, user didn't request CaDiCaL])
-  with_cadical=no
-fi
-
-])# CVC4_CHECK_FOR_CADICAL
-
-# CVC4_TRY_CADICAL
-# ------------------------------
-# Try AC_CHECK_LIB(cadical) with the given linking libraries
-AC_DEFUN([CVC4_TRY_CADICAL], [
-if test -z "$CADICAL_LIBS"; then
-  AC_LANG_PUSH([C++])
-
-  cvc4_save_LIBS="$LIBS"
-  cvc4_save_LDFLAGS="$LDFLAGS"
-  cvc4_save_CPPFLAGS="$CPPFLAGS"
-
-  LDFLAGS="-L$CADICAL_HOME/build"
-  CPPFLAGS="$CPPFLAGS -I$CADICAL_HOME/src"
-  LIBS="-lcadical"
-
-  AC_LINK_IFELSE(
-    [AC_LANG_PROGRAM([[#include <cadical.hpp>]],
-      [[CaDiCaL::Solver test();]])], [CADICAL_LIBS="-lcadical"],
-    [CADICAL_LIBS=])
-
-  LDFLAGS="$cvc4_save_LDFLAGS"
-  CPPFLAGS="$cvc4_save_CPPFLAGS"
-  LIBS="$cvc4_save_LIBS"
-
-  AC_LANG_POP([C++])
-fi
-])# CVC4_TRY_CADICAL
-
diff --git a/config/cryptominisat.m4 b/config/cryptominisat.m4
deleted file mode 100644
index 8ad4d4a0f..000000000
--- a/config/cryptominisat.m4
+++ /dev/null
@@ -1,93 +0,0 @@
-# CVC4_CHECK_FOR_CRYPTOMINISAT
-# ------------------
-# Look for cryptominisat and link it in, but only if user requested.
-AC_DEFUN([CVC4_CHECK_FOR_CRYPTOMINISAT], [
-AC_MSG_CHECKING([whether user requested cryptominisat support])
-
-have_libcryptominisat=0
-CRYPTOMINISAT_LIBS=
-CRYPTOMINISAT_LDFLAGS=
-
-have_libcryptominisat=0
-if test "$with_cryptominisat" = no; then
-  AC_MSG_RESULT([no, cryptominisat disabled by user])
-elif test -n "$with_cryptominisat"; then
-  AC_MSG_RESULT([yes, cryptominisat requested by user])
-  AC_ARG_VAR(CRYPTOMINISAT_HOME, [path to top level of cryptominisat source tree])
-  AC_ARG_WITH(
-    [cryptominisat-dir],
-    AS_HELP_STRING(
-      [--with-cryptominisat-dir=PATH],
-      [path to top level of cryptominisat source tree]
-    ),
-    CRYPTOMINISAT_HOME="$withval",
-    [ if test -z "$CRYPTOMINISAT_HOME" && ! test -e "$ac_abs_confdir/cryptominisat5/install/bin/cryptominisat5_simple"; then
-        AC_MSG_FAILURE([must give --with-cryptominisat-dir=PATH, define environment variable CRYPTOMINISAT_HOME, or use contrib/get-cryptominisat to setup cryptominisat5 for CVC4!])
-      fi
-    ]
-  )
-
-  # Check if cryptominisat5 was installed via contrib/get-cryptominisat
-  AC_MSG_CHECKING([whether cryptominisat5 was already installed via contrib/get-cryptominisat])
-  if test -z "$CRYPTOMINISAT_HOME" && test -e "$ac_abs_confdir/cryptominisat5/install/bin/cryptominisat5_simple"; then
-    CRYPTOMINISAT_HOME="$ac_abs_confdir/cryptominisat5/install"
-    AC_MSG_RESULT([yes, $CRYPTOMINISAT_HOME])
-  else
-    AC_MSG_RESULT([no])
-  fi
-
-  if ! test -d "$CRYPTOMINISAT_HOME" || ! test -x "$CRYPTOMINISAT_HOME/bin/cryptominisat5_simple" ; then
-    AC_MSG_FAILURE([either $CRYPTOMINISAT_HOME is not an cryptominisat install tree or it's not yet built])
-  fi
-
-  AC_MSG_CHECKING([how to link cryptominisat])
-
-  dnl TODO FIXME:
-  dnl For some reason the CVC4_TRY_CRYPTOMINISAT is not working correctly
-  CVC4_TRY_CRYPTOMINISAT_WITH([-pthread])
-  CVC4_TRY_CRYPTOMINISAT_WITH([-pthread -lm4ri])
-
-  if test -z "$CRYPTOMINISAT_LIBS"; then
-    AC_MSG_FAILURE([cannot link against libcryptominisat!])
-  else
-    AC_MSG_RESULT([$CRYPTOMINISAT_LIBS])
-    have_libcryptominisat=1
-  fi
-
-  CRYPTOMINISAT_LDFLAGS="-L$CRYPTOMINISAT_HOME/lib"
-
-else
-  AC_MSG_RESULT([no, user didn't request cryptominisat])
-  with_cryptominisat=no
-fi
-
-])# CVC4_CHECK_FOR_CRYPTOMINISAT
-
-# CVC4_TRY_STATIC_CRYPTOMINISAT_WITH(LIBS)
-# ------------------------------
-# Try AC_CHECK_LIB(cryptominisat) with the given linking libraries
-AC_DEFUN([CVC4_TRY_CRYPTOMINISAT_WITH], [
-if test -z "$CRYPTOMINISAT_LIBS"; then
-  AC_LANG_PUSH([C++])
-
-  cvc4_save_LIBS="$LIBS"
-  cvc4_save_LDFLAGS="$LDFLAGS"
-  cvc4_save_CPPFLAGS="$CPPFLAGS"
-
-  LDFLAGS="-L$CRYPTOMINISAT_HOME/lib"
-  CPPFLAGS="$CPPFLAGS -I$CRYPTOMINISAT_HOME/include"
-  LIBS="-lcryptominisat5 $1"
-
-  AC_LINK_IFELSE(
-    [AC_LANG_PROGRAM([[#include <cryptominisat5/cryptominisat.h>]],
-      [[CMSat::SATSolver test()]])], [CRYPTOMINISAT_LIBS="-lcryptominisat5 $1"],
-    [CRYPTOMINISAT_LIBS=])
-
-  LDFLAGS="$cvc4_save_LDFLAGS"
-  CPPFLAGS="$cvc4_save_CPPFLAGS"
-  LIBS="$cvc4_save_LIBS"
-
-  AC_LANG_POP([C++])
-fi
-])# CVC4_TRY_CRYPTOMINISAT_WITH
-
diff --git a/config/cvc4.m4 b/config/cvc4.m4
deleted file mode 100644
index c6d19a3ea..000000000
--- a/config/cvc4.m4
+++ /dev/null
@@ -1,169 +0,0 @@
-# CVC4_AC_INIT
-# ------------
-# Do early initialization/diversion of autoconf things for CVC4 build process.
-AC_DEFUN([CVC4_AC_INIT],
-dnl _AS_ME_PREPARE
-[CVC4_REWRITE_ARGS_FOR_BUILD_PROFILE
-])# CVC4_AC_INIT
-
-
-# CVC4_REWRITE_ARGS_FOR_BUILD_PROFILE
-# -----------------------------------
-# Rewrite (e.g.) "./configure debug" to "./configure --with-build=debug"
-AC_DEFUN([CVC4_REWRITE_ARGS_FOR_BUILD_PROFILE],
-[m4_divert_push([PARSE_ARGS])dnl
-
-CVC4_BSD_LICENSED_CODE_ONLY=1
-
-m4_divert_once([HELP_ENABLE], [[
-Licensing and performance options:
-  --bsd                   disable all GPL dependences (default)
-  --enable-gpl            permit GPL dependences, if available
-  --best                  turn on dependences known to give best performance]])dnl
-
-handle_option() {
-  ac_option="$[]1"
-  case $ac_option in
-    --bsd|--disable-gpl|CVC4_BSD_LICENSED_CODE_ONLY=1)
-      if test "$CVC4_LICENSE_OPTION" = gpl; then AC_ERROR([cannot give both --bsd and --enable-gpl]); fi
-      CVC4_LICENSE_OPTION=bsd
-      ac_option="CVC4_BSD_LICENSED_CODE_ONLY=1"
-      eval $ac_option
-      ;;
-    --enable-gpl|--gpl|CVC4_BSD_LICENSED_CODE_ONLY=0)
-      if test "$CVC4_LICENSE_OPTION" = bsd; then AC_ERROR([cannot give both --bsd and --enable-gpl]); fi
-      CVC4_LICENSE_OPTION=gpl
-      ac_option="CVC4_BSD_LICENSED_CODE_ONLY=0"
-      eval $ac_option
-      ;;
-    --best)
-      # set the best configuration
-      handle_option --with-readline
-      handle_option --with-cln
-      handle_option --with-glpk
-      handle_option --with-abc
-      return
-      ;;
-    -enable-proofs|--enable-proofs)
-      ac_option='--enable-proof'
-      ;;
-    -*|*=*)
-      ;;
-    production|production-*|debug|debug-*|competition|competition-*|testing|testing-*)
-      # regexp `\?' not supported on Mac OS X
-      ac_option_build=`expr "$ac_option" : '\([[^-]]*\)-\{0,1\}'`
-      ac_cvc4_build_profile_set=yes
-      as_me=configure
-      AC_MSG_NOTICE([CVC4: building profile $ac_option_build])
-      for x in optimized proof statistics replay assertions tracing dumping muzzle coverage profiling; do
-        if expr "$ac_option" : '.*-no'$x'$' >/dev/null || expr "$ac_option" : '.*-no'$x'-' >/dev/null; then
-          eval 'ac_cvc4_rewritten_args="${ac_cvc4_rewritten_args+$ac_cvc4_rewritten_args }\"--disable-$x\""'
-        fi
-        if expr "$ac_option" : '.*-'$x'$' >/dev/null || expr "$ac_option" : '.*-'$x'-' >/dev/null; then
-          eval 'ac_cvc4_rewritten_args="${ac_cvc4_rewritten_args+$ac_cvc4_rewritten_args }\"--enable-$x\""'
-        fi
-      done
-      if expr "$ac_option" : '.*-nostaticbinary$' >/dev/null || expr "$ac_option" : '.*-nostaticbinary-' >/dev/null; then
-        eval 'ac_cvc4_rewritten_args="${ac_cvc4_rewritten_args+$ac_cvc4_rewritten_args }\"--disable-static-binary\""'
-      fi
-      if expr "$ac_option" : '.*-staticbinary$' >/dev/null || expr "$ac_option" : '.*-staticbinary-' >/dev/null; then
-        eval 'ac_cvc4_rewritten_args="${ac_cvc4_rewritten_args+$ac_cvc4_rewritten_args }\"--enable-static-binary\""'
-      fi
-      if expr "$ac_option" : '.*-nodebugsymbols$' >/dev/null || expr "$ac_option" : '.*-nodebugsymbols-' >/dev/null; then
-        eval 'ac_cvc4_rewritten_args="${ac_cvc4_rewritten_args+$ac_cvc4_rewritten_args }\"--disable-debug-symbols\""'
-      fi
-      if expr "$ac_option" : '.*-debugsymbols$' >/dev/null || expr "$ac_option" : '.*-debugsymbols-' >/dev/null; then
-        eval 'ac_cvc4_rewritten_args="${ac_cvc4_rewritten_args+$ac_cvc4_rewritten_args }\"--enable-debug-symbols\""'
-      fi
-      if expr "$ac_option" : '.*-noglpk' >/dev/null || expr "$ac_option" : '.*-noglpk-' >/dev/null; then
-        eval 'ac_cvc4_rewritten_args="${ac_cvc4_rewritten_args+$ac_cvc4_rewritten_args }\"--without-glpk\""'
-      fi
-      if expr "$ac_option" : '.*-glpk' >/dev/null || expr "$ac_option" : '.*-glpk-' >/dev/null; then
-        eval 'ac_cvc4_rewritten_args="${ac_cvc4_rewritten_args+$ac_cvc4_rewritten_args }\"--with-glpk\""'
-      fi
-      if expr "$ac_option" : '.*-noabc' >/dev/null || expr "$ac_option" : '.*-noabc-' >/dev/null; then
-        eval 'ac_cvc4_rewritten_args="${ac_cvc4_rewritten_args+$ac_cvc4_rewritten_args }\"--without-abc\""'
-      fi
-      if expr "$ac_option" : '.*-abc' >/dev/null || expr "$ac_option" : '.*-abc-' >/dev/null; then
-        eval 'ac_cvc4_rewritten_args="${ac_cvc4_rewritten_args+$ac_cvc4_rewritten_args }\"--with-abc\""'
-      fi
-      for x in cln gmp; do
-        if expr "$ac_option" : '.*-no'$x'$' >/dev/null || expr "$ac_option" : '.*-no'$x'-' >/dev/null; then
-          eval 'ac_cvc4_rewritten_args="${ac_cvc4_rewritten_args+$ac_cvc4_rewritten_args }\"--without-$x\""'
-        fi
-        if expr "$ac_option" : '.*-'$x'$' >/dev/null || expr "$ac_option" : '.*-'$x'-' >/dev/null; then
-          eval 'ac_cvc4_rewritten_args="${ac_cvc4_rewritten_args+$ac_cvc4_rewritten_args }\"--with-$x\""'
-        fi
-      done
-      ac_option="--with-build=$ac_option_build"
-  esac
-  eval 'ac_cvc4_rewritten_args="${ac_cvc4_rewritten_args+$ac_cvc4_rewritten_args }'\'\$ac_option\'\"
-}
-
-unset ac_cvc4_rewritten_args
-for ac_option
-do
-  handle_option "$ac_option"
-done
-eval set x $ac_cvc4_rewritten_args
-shift
-dnl echo "args are now:" "${@}"
-m4_divert_pop([PARSE_ARGS])dnl
-])# CVC4_REWRITE_ARGS_FOR_BUILD_PROFILE
-
-
-# CVC4_COPY_IF_CHANGED(FROM, TO)
-# ------------------------------
-# Copy file FROM to TO, if they have textual differences.
-AC_DEFUN([CVC4_COPY_IF_CHANGED], [
-if diff -q "$1" "$2" >/dev/null 2>&1; then
-  dnl they are the same
-  :
-else
-  dnl they are different
-  cp "$1" "$2"
-fi
-])# CVC4_COPY_IF_CHANGED
-
-
-# CVC4_CONFIG_FILE_ONLY_IF_CHANGED(FILE)
-# --------------------------------------
-# Run AC_CONFIG_FILES to generate file named in the argument, but if it
-# exists already, only replace it if it would be changed (this preserves
-# the old timestamp if no textual changes are to be made to the file).
-AC_DEFUN([CVC4_CONFIG_FILE_ONLY_IF_CHANGED], [
-AC_CONFIG_FILES([$1.tmp:$1.in],
-                CVC4_COPY_IF_CHANGED([$1.tmp],[$1]))
-])# CVC4_CONFIG_FILE_ONLY_IF_CHANGED
-
-# CVC4_CXX_OPTION(OPTION, VAR)
-# ----------------------------
-# Run $(CXX) $(CPPFLAGS) $(CXXFLAGS) OPTION and see if the compiler
-# likes it.  If so, add OPTION to shellvar VAR.
-AC_DEFUN([CVC4_CXX_OPTION], [
-AC_MSG_CHECKING([whether $CXX supports $1])
-cvc4_save_CXXFLAGS="$CXXFLAGS"
-CXXFLAGS="$CXXFLAGS $WERROR $1"
-AC_LANG_PUSH([C++])
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([int main() { return 0; }])],
-                  [AC_MSG_RESULT([yes]); $2='$1'],
-                  [AC_MSG_RESULT([no])])
-AC_LANG_POP([C++])
-CXXFLAGS="$cvc4_save_CXXFLAGS"
-])# CVC4_CXX_OPTION
-
-# CVC4_C_OPTION(OPTION, VAR)
-# --------------------------
-# Run $(CC) $(CPPFLAGS) $(CFLAGS) OPTION and see if the compiler
-# likes it.  If so, add OPTION to shellvar VAR.
-AC_DEFUN([CVC4_C_OPTION], [
-AC_MSG_CHECKING([whether $CC supports $1])
-cvc4_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $C_WERROR $1"
-AC_LANG_PUSH([C])
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([int main() { return 0; }])],
-                  [AC_MSG_RESULT([yes]); $2='$1'],
-                  [AC_MSG_RESULT([no])])
-AC_LANG_POP([C])
-CFLAGS="$cvc4_save_CFLAGS"
-])# CVC4_C_OPTION
diff --git a/config/doxygen.am b/config/doxygen.am
deleted file mode 100644
index c5cba66fe..000000000
--- a/config/doxygen.am
+++ /dev/null
@@ -1,188 +0,0 @@
-# Renamed doxygen.am from aminclude.am for inclusion in CVC4
-
-# Copyright (C) 2004 Oren Ben-Kiki
-# This file is distributed under the same terms as the Automake macro files.
-
-# Generate automatic documentation using Doxygen. Goals and variables values
-# are controlled by the various DX_COND_??? conditionals set by autoconf.
-#
-# The provided goals are:
-# doxygen-doc: Generate all doxygen documentation.
-# doxygen-run: Run doxygen, which will generate some of the documentation
-#              (HTML, CHM, CHI, MAN, RTF, XML) but will not do the post
-#              processing required for the rest of it (PS, PDF, and some MAN).
-# doxygen-man: Rename some doxygen generated man pages.
-# doxygen-ps: Generate doxygen PostScript documentation.
-# doxygen-pdf: Generate doxygen PDF documentation.
-#
-# Note that by default these are not integrated into the automake goals. If
-# doxygen is used to generate man pages, you can achieve this integration by
-# setting man3_MANS to the list of man pages generated and then adding the
-# dependency:
-#
-#   $(man3_MANS): doxygen-doc
-#
-# This will cause make to run doxygen and generate all the documentation.
-#
-# The following variable is intended for use in Makefile.am:
-#
-# DX_CLEANFILES = everything to clean.
-#
-# This is usually added to MOSTLYCLEANFILES.
-
-## --------------------------------- ##
-## Format-independent Doxygen rules. ##
-## --------------------------------- ##
-
-if DX_COND_doc
-
-## ------------------------------- ##
-## Rules specific for HTML output. ##
-## ------------------------------- ##
-
-if DX_COND_html
-
-DX_CLEAN_HTML = @DX_DOCDIR@/html
-
-endif DX_COND_html
-
-## ------------------------------ ##
-## Rules specific for CHM output. ##
-## ------------------------------ ##
-
-if DX_COND_chm
-
-DX_CLEAN_CHM = @DX_DOCDIR@/chm
-
-if DX_COND_chi
-
-DX_CLEAN_CHI = @DX_DOCDIR@/@PACKAGE@.chi
-
-endif DX_COND_chi
-
-endif DX_COND_chm
-
-## ------------------------------ ##
-## Rules specific for MAN output. ##
-## ------------------------------ ##
-
-if DX_COND_man
-
-DX_CLEAN_MAN = @DX_DOCDIR@/man
-
-endif DX_COND_man
-
-## ------------------------------ ##
-## Rules specific for RTF output. ##
-## ------------------------------ ##
-
-if DX_COND_rtf
-
-DX_CLEAN_RTF = @DX_DOCDIR@/rtf
-
-endif DX_COND_rtf
-
-## ------------------------------ ##
-## Rules specific for XML output. ##
-## ------------------------------ ##
-
-if DX_COND_xml
-
-DX_CLEAN_XML = @DX_DOCDIR@/xml
-
-endif DX_COND_xml
-
-## ----------------------------- ##
-## Rules specific for PS output. ##
-## ----------------------------- ##
-
-if DX_COND_ps
-
-DX_CLEAN_PS = @DX_DOCDIR@/@PACKAGE@.ps
-
-DX_PS_GOAL = doxygen-ps
-
-doxygen-ps: @DX_DOCDIR@/@PACKAGE@.ps
-
-@DX_DOCDIR@/@PACKAGE@.ps: @DX_DOCDIR@/@PACKAGE@.tag
-	cd @DX_DOCDIR@/latex; \
-	rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \
-	$(DX_LATEX) refman.tex; \
-	$(MAKEINDEX_PATH) refman.idx; \
-	$(DX_LATEX) refman.tex; \
-	countdown=5; \
-	while $(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \
-	                  refman.log > /dev/null 2>&1 \
-	   && test $$countdown -gt 0; do \
-	    $(DX_LATEX) refman.tex; \
-	    countdown=`expr $$countdown - 1`; \
-	done; \
-	$(DX_DVIPS) -o ../@PACKAGE@.ps refman.dvi
-
-endif DX_COND_ps
-
-## ------------------------------ ##
-## Rules specific for PDF output. ##
-## ------------------------------ ##
-
-if DX_COND_pdf
-
-DX_CLEAN_PDF = @DX_DOCDIR@/@PACKAGE@.pdf
-
-DX_PDF_GOAL = doxygen-pdf
-
-doxygen-pdf: @DX_DOCDIR@/@PACKAGE@.pdf
-
-@DX_DOCDIR@/@PACKAGE@.pdf: @DX_DOCDIR@/@PACKAGE@.tag
-	cd @DX_DOCDIR@/latex; \
-	rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \
-	$(DX_PDFLATEX) refman.tex; \
-	$(DX_MAKEINDEX) refman.idx; \
-	$(DX_PDFLATEX) refman.tex; \
-	countdown=5; \
-	while $(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \
-	                  refman.log > /dev/null 2>&1 \
-	   && test $$countdown -gt 0; do \
-	    $(DX_PDFLATEX) refman.tex; \
-	    countdown=`expr $$countdown - 1`; \
-	done; \
-	mv refman.pdf ../@PACKAGE@.pdf
-
-endif DX_COND_pdf
-
-## ------------------------------------------------- ##
-## Rules specific for LaTeX (shared for PS and PDF). ##
-## ------------------------------------------------- ##
-
-if DX_COND_latex
-
-DX_CLEAN_LATEX = @DX_DOCDIR@/latex
-
-endif DX_COND_latex
-
-.PHONY: doxygen-run doxygen-doc $(DX_PS_GOAL) $(DX_PDF_GOAL)
-
-.INTERMEDIATE: doxygen-run $(DX_PS_GOAL) $(DX_PDF_GOAL)
-
-doxygen-run: @DX_DOCDIR@/@PACKAGE@.tag
-
-doxygen-doc: doxygen-run $(DX_PS_GOAL) $(DX_PDF_GOAL)
-
-@DX_DOCDIR@/@PACKAGE@.tag: $(DX_CONFIG) $(pkginclude_HEADERS)
-	rm -rf @DX_DOCDIR@
-	$(DX_ENV) $(DX_DOXYGEN) $(srcdir)/$(DX_CONFIG)
-
-DX_CLEANFILES = \
-    @DX_DOCDIR@/@PACKAGE@.tag \
-    -r \
-    $(DX_CLEAN_HTML) \
-    $(DX_CLEAN_CHM) \
-    $(DX_CLEAN_CHI) \
-    $(DX_CLEAN_MAN) \
-    $(DX_CLEAN_RTF) \
-    $(DX_CLEAN_XML) \
-    $(DX_CLEAN_PS) \
-    $(DX_CLEAN_PDF) \
-    $(DX_CLEAN_LATEX)
-
-endif DX_COND_doc
diff --git a/config/doxygen.cfg b/config/doxygen.cfg
deleted file mode 100644
index b36196e2a..000000000
--- a/config/doxygen.cfg
+++ /dev/null
@@ -1,1523 +0,0 @@
-# Doxyfile 1.6.1
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
-#
-# All text after a hash (#) is considered a comment and will be ignored
-# The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all
-# text before the first occurrence of this tag. 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.
-
-DOXYFILE_ENCODING      = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
-# by quotes) that should identify the project.
-
-PROJECT_NAME           = $(PROJECT)-$(VERSION)
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
-# if some version control system is used.
-
-PROJECT_NUMBER         =
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
-# where doxygen was started. If left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       = $(DOCDIR)
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output
-# format and will distribute the generated files over these directories.
-# Enabling this option can be useful when feeding doxygen a huge amount of
-# source files, where putting all generated files in the same directory would
-# otherwise cause performance problems for the file system.
-
-CREATE_SUBDIRS         = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# The default language is English, other supported languages are:
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
-# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
-# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
-# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
-# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak,
-# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
-
-OUTPUT_LANGUAGE        = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in
-# the file and class documentation (similar to JavaDoc).
-# Set to NO to disable this.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-
-REPEAT_BRIEF           = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator
-# that is used to form the text in various listings. Each string
-# in this list, if found as the leading text of the brief description, will be
-# stripped from the text and the result after processing the whole list, is
-# used as the annotated text. Otherwise, the brief description is used as-is.
-# If left blank, the following values are used ("$name" is automatically
-# replaced with the name of the entity): "The $name class" "The $name widget"
-# "The $name file" "is" "provides" "specifies" "contains"
-# "represents" "a" "an" "the"
-
-ABBREVIATE_BRIEF       =
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# Doxygen will generate a detailed section even if there is only a brief
-# description.
-
-ALWAYS_DETAILED_SEC    = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-
-INLINE_INHERITED_MEMB  = YES
-
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-# path before files name in the file list and in the header files. If set
-# to NO the shortest path that makes the file name unique will be used.
-
-FULL_PATH_NAMES        = YES
-
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-# can be used to strip a user-defined part of the path. Stripping is
-# only done if one of the specified strings matches the left-hand part of
-# the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the
-# path to strip.
-
-STRIP_FROM_PATH        = $(SRCDIR)
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
-# the path mentioned in the documentation of a class, which tells
-# the reader which header file to include in order to use a class.
-# If left blank only the name of the header file containing the class
-# definition is used. Otherwise one should specify the include paths that
-# are normally passed to the compiler using the -I flag.
-
-STRIP_FROM_INC_PATH    =
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful is your file systems
-# doesn't support long names like on DOS, Mac, or CD-ROM.
-
-SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
-# will interpret the first line (until the first dot) of a JavaDoc-style
-# comment as the brief description. If set to NO, the JavaDoc
-# comments will behave just like regular Qt-style comments
-# (thus requiring an explicit @brief command for a brief description.)
-
-JAVADOC_AUTOBRIEF      = YES
-
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
-# interpret the first line (until the first dot) of a Qt-style
-# comment as the brief description. If set to NO, the comments
-# will behave just like regular Qt-style comments (thus requiring
-# an explicit \brief command for a brief description.)
-
-QT_AUTOBRIEF           = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
-# treat a multi-line C++ special comment block (i.e. a block of //! or ///
-# comments) as a brief description. This used to be the default behaviour.
-# The new default is to treat a multi-line C++ comment block as a detailed
-# description. Set this tag to YES if you prefer the old behaviour instead.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# member inherits the documentation from any documented member that it
-# re-implements.
-
-INHERIT_DOCS           = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
-# a new page for each member. If set to NO, the documentation of a member will
-# be part of the file/class/namespace that contains it.
-
-SEPARATE_MEMBER_PAGES  = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab.
-# Doxygen uses this value to replace tabs by spaces in code fragments.
-
-TAB_SIZE               = 4
-
-# This tag can be used to specify a number of aliases that acts
-# as commands in the documentation. An alias has the form "name=value".
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to
-# put the command \sideeffect (or @sideeffect) in the documentation, which
-# will result in a user-defined paragraph with heading "Side Effects:".
-# You can put \n's in the value part of an alias to insert newlines.
-
-ALIASES                =
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
-# sources only. Doxygen will then generate output that is more tailored for C.
-# For instance, some of the names that are used will be different. The list
-# of all members will be omitted, etc.
-
-OPTIMIZE_OUTPUT_FOR_C  = YES
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
-# sources only. Doxygen will then generate output that is more tailored for
-# Java. For instance, namespaces will be presented as packages, qualified
-# scopes will look different, etc.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources only. Doxygen will then generate output that is more tailored for
-# Fortran.
-
-OPTIMIZE_FOR_FORTRAN   = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for
-# VHDL.
-
-OPTIMIZE_OUTPUT_VHDL   = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it parses.
-# With this tag you can assign which parser to use for a given extension.
-# Doxygen has a built-in mapping, but you can override or extend it using this tag.
-# The format is ext=language, where ext is a file extension, and language is one of
-# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP,
-# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran),
-# use: inc=Fortran f=C. Note that for custom extensions you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
-
-EXTENSION_MAPPING      =
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should
-# set this tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
-# func(std::string) {}). This also make the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
-
-BUILTIN_STL_SUPPORT    = YES
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-
-CPP_CLI_SUPPORT        = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
-# Doxygen will parse them like normal C++ but will assume all classes use public
-# instead of private inheritance when no explicit protection keyword is present.
-
-SIP_SUPPORT            = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate getter
-# and setter methods for a property. Setting this option to YES (the default)
-# will make doxygen to replace the get and set methods by a property in the
-# documentation. This will only work if the methods are indeed getting or
-# setting a simple type. If this is not the case, or you want to show the
-# methods anyway, you should set this option to NO.
-
-IDL_PROPERTY_SUPPORT   = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
-# the same type (for instance a group of public functions) to be put as a
-# subgroup of that type (e.g. under the Public Functions section). Set it to
-# NO to prevent subgrouping. Alternatively, this can be done per class using
-# the \nosubgrouping command.
-
-SUBGROUPING            = YES
-
-# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
-# is documented as struct, union, or enum with the name of the typedef. So
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-# with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically
-# be useful for C code in case the coding convention dictates that all compound
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-
-TYPEDEF_HIDES_STRUCT   = NO
-
-# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
-# determine which symbols to keep in memory and which to flush to disk.
-# When the cache is full, less often used symbols will be written to disk.
-# For small to medium size projects (<1000 input files) the default value is
-# probably good enough. For larger projects a too small cache size can cause
-# doxygen to be busy swapping symbols to and from disk most of the time
-# causing a significant performance penality.
-# If the system has enough physical memory increasing the cache will improve the
-# performance by keeping more symbols in memory. Note that the value works on
-# a logarithmic scale so increasing the size by one will rougly double the
-# memory usage. The cache size is given by this formula:
-# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
-# corresponding to a cache size of 2^16 = 65536 symbols
-
-SYMBOL_CACHE_SIZE      = 0
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available.
-# Private class members and static file members will be hidden unless
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-
-EXTRACT_ALL            = YES
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
-# will be included in the documentation.
-
-EXTRACT_PRIVATE        = $(DOXYGEN_EXTRACT_PRIVATE)
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file
-# will be included in the documentation.
-
-EXTRACT_STATIC         = $(DOXYGEN_EXTRACT_STATIC)
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
-# defined locally in source files will be included in the documentation.
-# If set to NO only classes defined in header files are included.
-
-EXTRACT_LOCAL_CLASSES  = YES
-
-# This flag is only useful for Objective-C code. When set to YES local
-# methods, which are defined in the implementation section but not in
-# the interface are included in the documentation.
-# If set to NO (the default) only methods in the interface are included.
-
-EXTRACT_LOCAL_METHODS  = NO
-
-# If this flag is set to YES, the members of anonymous namespaces will be
-# extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base
-# name of the file that contains the anonymous namespace. By default
-# anonymous namespace are hidden.
-
-EXTRACT_ANON_NSPACES   = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
-# undocumented members of documented classes, files or namespaces.
-# If set to NO (the default) these members will be included in the
-# various overviews, but no documentation section is generated.
-# This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_MEMBERS     = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy.
-# If set to NO (the default) these classes will be included in the various
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_CLASSES     = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
-# friend (class|struct|union) declarations.
-# If set to NO (the default) these declarations will be included in the
-# documentation.
-
-HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
-# documentation blocks found inside the body of a function.
-# If set to NO (the default) these blocks will be appended to the
-# function's detailed documentation block.
-
-HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation
-# that is typed after a \internal command is included. If the tag is set
-# to NO (the default) then the documentation will be excluded.
-# Set it to YES to include the internal documentation.
-
-INTERNAL_DOCS          = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
-# file names in lower-case letters. If set to YES upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
-
-CASE_SENSE_NAMES       = YES
-
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
-# will show members with their full class and namespace scopes in the
-# documentation. If set to YES the scope will be hidden.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
-# will put a list of the files that are included by a file in the documentation
-# of that file.
-
-SHOW_INCLUDE_FILES     = YES
-
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
-# is inserted in the documentation for inline members.
-
-INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
-# will sort the (detailed) documentation of file and class members
-# alphabetically by member name. If set to NO the members will appear in
-# declaration order.
-
-SORT_MEMBER_DOCS       = YES
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
-# brief documentation of file, namespace and class members alphabetically
-# by member name. If set to NO (the default) the members will appear in
-# declaration order.
-
-SORT_BRIEF_DOCS        = NO
-
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the (brief and detailed) documentation of class members so that constructors and destructors are listed first. If set to NO (the default) the constructors will appear in the respective orders defined by SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
-
-SORT_MEMBERS_CTORS_1ST = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
-# hierarchy of group names into alphabetical order. If set to NO (the default)
-# the group names will appear in their defined order.
-
-SORT_GROUP_NAMES       = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
-# sorted by fully-qualified names, including namespaces. If set to
-# NO (the default), the class list will be sorted only by class name,
-# not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the
-# alphabetical list.
-
-SORT_BY_SCOPE_NAME     = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or
-# disable (NO) the todo list. This list is created by putting \todo
-# commands in the documentation.
-
-GENERATE_TODOLIST      = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or
-# disable (NO) the test list. This list is created by putting \test
-# commands in the documentation.
-
-GENERATE_TESTLIST      = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or
-# disable (NO) the bug list. This list is created by putting \bug
-# commands in the documentation.
-
-GENERATE_BUGLIST       = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
-# disable (NO) the deprecated list. This list is created by putting
-# \deprecated commands in the documentation.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional
-# documentation sections, marked by \if sectionname ... \endif.
-
-ENABLED_SECTIONS       =
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or define consists of for it to appear in
-# the documentation. If the initializer consists of more lines than specified
-# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and defines in the
-# documentation can be controlled using \showinitializer or \hideinitializer
-# command in the documentation regardless of this setting.
-
-MAX_INITIALIZER_LINES  = 0
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
-# at the bottom of the documentation of classes and structs. If set to YES the
-# list will mention the files that were used to generate the documentation.
-
-SHOW_USED_FILES        = YES
-
-# If the sources in your project are distributed over multiple directories
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
-# in the documentation. The default is NO.
-
-SHOW_DIRECTORIES       = NO
-
-# 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 <command> <input-file>, where <command> is the value of
-# the FILE_VERSION_FILTER tag, and <input-file> 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    =
-
-# 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
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
-
-QUIET                  = YES
-
-# 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
-# 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
-# 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
-# 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
-# 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
-# to stderr.
-
-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
-# with spaces.
-
-INPUT                  = $(SRCDIR)/doc/mainpage.md \
-                         $(CVC4_DOXYGEN_INPUT)
-
-# USE_MDFILE_AS_MAINPAGE = $(SRCDIR)/doc/mainpage.md
-
-# 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 *.f90
-
-FILE_PATTERNS          =
-
-# 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
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-
-EXCLUDE                =
-
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
-# directories that are symbolic links (a Unix filesystem 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
-# for example use the pattern */test/*
-
-EXCLUDE_PATTERNS       = */generated/* \
-			 *_template.cpp \
-			 *_template.h
-
-# 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        =
-
-# 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           = $(SRCDIR)
-
-# 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       =
-
-# 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 command).
-
-IMAGE_PATH             =
-
-# 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 <filter> <input-file>, where <filter>
-# is the value of the INPUT_FILTER tag, and <input-file> 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           =
-
-# 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.
-
-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
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
-
-FILTER_SOURCE_FILES    = NO
-
-#---------------------------------------------------------------------------
-# 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
-# VERBATIM_HEADERS is set to NO.
-
-SOURCE_BROWSER         = YES
-
-# 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
-# fragments. Normal C and C++ comments will always remain visible.
-
-STRIP_CODE_COMMENTS    = YES
-
-# 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
-# then for each documented function all documented entities
-# called/used by that function will be listed.
-
-REFERENCES_RELATION    = YES
-
-# 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 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
-# 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
-# which an include is specified. Set to NO to disable this.
-
-VERBATIM_HEADERS       = YES
-
-#---------------------------------------------------------------------------
-# 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
-# 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
-# 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
-# should be ignored while generating the index headers.
-
-IGNORE_PREFIX          =
-
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
-# generate HTML output.
-
-GENERATE_HTML          = $(GENERATE_HTML)
-
-# 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
-# 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.
-
-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
-# standard 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
-# stylesheet in the HTML output directory as well, or it will be erased!
-
-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
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS     = YES
-
-# 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
-
-# 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      = $(GENERATE_HTMLHELP)
-
-# 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               = ../$(PROJECT).chm
-
-# 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_PATH)
-
-# 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           = $(GENERATE_CHI)
-
-# 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
-# to the contents of the HTML help documentation and to the tree view.
-
-TOC_EXPAND             = YES
-
-# 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          =
-
-# 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
-# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
-
-QHP_CUST_FILTER_ATTRS  =
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's
-# filter section matches.
-# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.
-
-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           =
-
-# 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.
-
-ENUM_VALUES_PER_LINE   = 4
-
-# 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      = YES
-
-# 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
-
-# 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
-
-# When the SEARCHENGINE tag is enable 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) or Qt help (GENERATE_QHP)
-# there is already a search function so this one should typically
-# be disabled.
-
-SEARCHENGINE           = YES
-SERVER_BASED_SEARCH    = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
-# generate Latex output.
-
-GENERATE_LATEX         = $(GENERATE_LATEX)
-
-# 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
-# invoked. If left blank `latex' will be used as the default command name.
-
-LATEX_CMD_NAME         =
-
-# 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     =
-
-# 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          = YES
-
-# 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
-# executive. If left blank a4wide will be used.
-
-PAPER_TYPE             = $(PAPER_SIZE)
-
-# 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         =
-
-# 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           =
-
-# 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
-# higher quality PDF documentation.
-
-USE_PDFLATEX           = $(GENERATE_PDF)
-
-# 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        = YES
-
-# 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
-# other RTF readers or editors.
-
-GENERATE_RTF           = $(GENERATE_RTF)
-
-# 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
-# save some trees in general.
-
-COMPACT_RTF            = YES
-
-# 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
-# replacements, missing definitions are set to their default value.
-
-RTF_STYLESHEET_FILE    =
-
-# Set optional variables used in the generation of an rtf document.
-# Syntax is similar to doxygen's config 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
-# generate man pages
-
-GENERATE_MAN           = $(GENERATE_MAN)
-
-# 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 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
-# would be unable to find the correct page. The default is NO.
-
-MAN_LINKS              = NO
-
-#---------------------------------------------------------------------------
-# 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
-# the code including all documentation.
-
-GENERATE_XML           = $(GENERATE_XML)
-
-# 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
-# syntax of the XML files.
-
-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
-# syntax of the XML files.
-
-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
-# enabling this will significantly increase the size of the XML output.
-
-XML_PROGRAMLISTING     = YES
-
-#---------------------------------------------------------------------------
-# 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
-# and incomplete at the moment.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# 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
-# 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
-# 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
-# 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
-# Makefile don't overwrite each other's variables.
-
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# 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
-# 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
-# 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
-# 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.
-
-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 preprocessor.
-
-INCLUDE_PATH           = . $(SRCDIR)/src $(SRCDIR)/src/include
-
-# 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  =
-
-# 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             = _DOXYGEN \
-			 "CVC4_THREADLOCAL(x)=x" \
-			 "CVC4_PUBLIC=" \
-			 "CVC4_THERADLOCAL_PUBLIC(x)=x"
-
-# 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.
-
-EXPAND_AS_DEFINED      = 
-
-# 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.
-
-SKIP_FUNCTION_MACROS   = YES
-
-#---------------------------------------------------------------------------
-# 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
-# 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
-# is run, you must also specify the path to the tagfile here.
-
-TAGFILES               =
-
-# 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       = $(DOCDIR)/$(PROJECT).tag
-
-# 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
-# be listed.
-
-EXTERNAL_GROUPS        = YES
-
-# 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/false
-
-#---------------------------------------------------------------------------
-# 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.
-
-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.
-
-MSCGEN_PATH            =
-
-# 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
-# have no effect if this option is set to NO (the default)
-
-HAVE_DOT               = $(HAVE_DOT)
-
-# By default doxygen will write a font called FreeSans.ttf to the output
-# directory and reference it in all dot files that doxygen generates. This
-# font does not include all possible unicode characters however, so when you need
-# these (or just want a differently looking font) you can specify the font name
-# using DOT_FONTNAME. You need 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           = FreeSans
-
-# 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
-# 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
-# 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
-# Language.
-
-UML_LOOK               = NO
-
-# 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
-# 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
-# indirectly include this file.
-
-INCLUDED_BY_GRAPH      = YES
-
-# 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.
-
-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.
-
-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
-# 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
-# If left blank png will be used.
-
-DOT_IMAGE_FORMAT       = png
-
-# 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
-# \dotfile command).
-
-DOTFILE_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    = 50
-
-# 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)
-# support this, this feature is disabled by default.
-
-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
-# 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
-# the various graphs.
-
-DOT_CLEANUP            = YES
diff --git a/config/gcc_version.m4 b/config/gcc_version.m4
deleted file mode 100644
index acd051042..000000000
--- a/config/gcc_version.m4
+++ /dev/null
@@ -1,7 +0,0 @@
-# GCC version 4.5.1 builds Minisat incorrectly with -O2
-# and that gives incorrect answers!  Warn the user!
-AC_DEFUN([CVC4_GCC_VERSION], [
-  if expr "$($CC -dumpversion)" : '4\.5\.1' &>/dev/null; then
-    CVC4_INTEGRITY_WARNING="GCC 4.5.1's optimizer is known to make errors building Minisat (and by extension CVC4)"
-  fi
-])# CVC4_GCC_VERSION
diff --git a/config/glpk.m4 b/config/glpk.m4
deleted file mode 100644
index 8d16fceee..000000000
--- a/config/glpk.m4
+++ /dev/null
@@ -1,157 +0,0 @@
-# CVC4_CHECK_FOR_GLPK
-# -------------------
-# Look for glpk and link it in, but only if user requested.
-AC_DEFUN([CVC4_CHECK_FOR_GLPK], [
-AC_MSG_CHECKING([whether user requested glpk support])
-LIBGLPK=
-have_libglpk=0
-GLPK_LIBS=
-GLPK_LDFLAGS=
-if test "$with_glpk" = no; then
-  AC_MSG_RESULT([no, glpk disabled by user])
-elif test -n "$with_glpk"; then
-  AC_MSG_RESULT([yes, glpk requested by user])
-
-  # Get the location of all the GLPK stuff
-  AC_ARG_VAR(GLPK_HOME, [path to top level of glpk installation])
-  AC_ARG_WITH(
-    [glpk-dir],
-    AS_HELP_STRING(
-      [--with-glpk-dir=PATH],
-      [path to top level of glpk installation]
-    ),
-    [GLPK_HOME="$withval"],
-    [ if test -z "$GLPK_HOME"; then
-        AC_MSG_FAILURE([must give --with-glpk-dir=PATH or define environment variable GLPK_HOME!])
-      fi
-    ]
-  )
-
-  if test -n "$GLPK_HOME"; then
-    CVC4CPPFLAGS="${CVC4CPPFLAGS:+$CVC4CPPFLAGS }-I$GLPK_HOME/include"
-    GLPK_LDFLAGS="-L$GLPK_HOME/lib"
-  fi
-
-  dnl Try a bunch of combinations until something works :-/
-  GLPK_LIBS=
-  AC_LANG_PUSH([C++])
-  cvc4_save_CPPFLAGS="$CPPFLAGS"
-  CPPFLAGS="$CVC4CPPFLAGS $CPPFLAGS"
-  AC_CHECK_HEADER([glpk.h], [], [AC_MSG_FAILURE([cannot find glpk.h, the GLPK header!])])
-  CPPFLAGS="$cvc4_save_CPPFLAGS"
-  AC_LANG_POP([C++])
-
-  AC_MSG_CHECKING([how to link glpk])
-  CVC4_TRY_GLPK_WITH([])
-  CVC4_TRY_GLPK_WITH([-lgmp])
-  CVC4_TRY_GLPK_WITH([-lz])
-  CVC4_TRY_GLPK_WITH([-ldl])
-  CVC4_TRY_GLPK_WITH([-lltdl])
-  CVC4_TRY_GLPK_WITH([-lltdl -ldl])
-  CVC4_TRY_GLPK_WITH([-lz -ldl])
-  CVC4_TRY_GLPK_WITH([-lz -lltdl])
-  CVC4_TRY_GLPK_WITH([-lz -lltdl -ldl])
-  CVC4_TRY_GLPK_WITH([-lgmp -lz])
-  CVC4_TRY_GLPK_WITH([-lgmp -ldl])
-  CVC4_TRY_GLPK_WITH([-lgmp -lltdl])
-  CVC4_TRY_GLPK_WITH([-lgmp -lltdl -ldl])
-  CVC4_TRY_GLPK_WITH([-lgmp -lz -ldl])
-  CVC4_TRY_GLPK_WITH([-lgmp -lz -lltdl])
-  CVC4_TRY_GLPK_WITH([-lgmp -lz -lltdl -ldl])
-  if test -z "$GLPK_LIBS"; then
-    AC_MSG_FAILURE([cannot link against libglpk! (perhaps you have not switched to glpk-cut-log? see /INSTALL)])
-  else
-    AC_MSG_RESULT([$GLPK_LIBS])
-    # make sure it works in static builds, too
-    if test "$enable_static_binary" = yes; then
-      GLPK_LIBS=
-      AC_MSG_CHECKING([whether statically-linked glpk is functional])
-      CVC4_TRY_STATIC_GLPK_WITH([])
-      CVC4_TRY_STATIC_GLPK_WITH([-lgmp])
-      CVC4_TRY_STATIC_GLPK_WITH([-lz])
-      CVC4_TRY_STATIC_GLPK_WITH([-ldl])
-      CVC4_TRY_STATIC_GLPK_WITH([-lltdl])
-      CVC4_TRY_STATIC_GLPK_WITH([-lltdl -ldl])
-      CVC4_TRY_STATIC_GLPK_WITH([-lz -ldl])
-      CVC4_TRY_STATIC_GLPK_WITH([-lz -lltdl])
-      CVC4_TRY_STATIC_GLPK_WITH([-lz -lltdl -ldl])
-      CVC4_TRY_STATIC_GLPK_WITH([-lgmp -lz])
-      CVC4_TRY_STATIC_GLPK_WITH([-lgmp -ldl])
-      CVC4_TRY_STATIC_GLPK_WITH([-lgmp -lltdl])
-      CVC4_TRY_STATIC_GLPK_WITH([-lgmp -lltdl -ldl])
-      CVC4_TRY_STATIC_GLPK_WITH([-lgmp -lz -ldl])
-      CVC4_TRY_STATIC_GLPK_WITH([-lgmp -lz -lltdl])
-      CVC4_TRY_STATIC_GLPK_WITH([-lgmp -lz -lltdl -ldl])
-      if test -n "$GLPK_LIBS"; then
-        AC_MSG_RESULT([yes, it works])
-        with_glpk=yes
-      else
-        AC_MSG_RESULT([no])
-        AC_MSG_FAILURE([glpk installation appears incompatible with static-binary])
-      fi
-    else
-      with_glpk=yes
-    fi
-  fi
-  if test "$with_glpk" = yes; then
-    have_libglpk=1
-  else
-    with_glpk=no
-    have_libreadline=0
-    GLPK_LIBS=
-  fi
-else
-  AC_MSG_RESULT([no, user didn't request glpk])
-  with_glpk=no
-fi
-])# CVC4_CHECK_FOR_GLPK
-
-# CVC4_TRY_GLPK_WITH(LIBS)
-# ------------------------
-# Try AC_CHECK_LIB(glpk) with the given linking libraries
-AC_DEFUN([CVC4_TRY_GLPK_WITH], [
-if test -z "$GLPK_LIBS"; then
-  AC_LANG_PUSH([C++])
-  cvc4_save_LIBS="$LIBS"
-  cvc4_save_CPPFLAGS="$CPPFLAGS"
-  cvc4_save_LDFLAGS="$LDFLAGS"
-  CPPFLAGS="$CVC4CPPFLAGS $CPPFLAGS"
-  LDFLAGS="$GLPK_LDFLAGS $LDFLAGS"
-  LIBS="-lglpk $1"
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <glpk.h>],
-                                  [int i = glp_ios_get_cut(NULL, 0, NULL, NULL, NULL, NULL, NULL)])],
-    [GLPK_LIBS="-lglpk $1"],
-    [])
-  LIBS="$cvc4_save_LIBS"
-  CPPFLAGS="$cvc4_save_CPPFLAGS"
-  LDFLAGS="$cvc4_save_LDFLAGS"
-  AC_LANG_POP([C++])
-fi
-])# CVC4_TRY_GLPK_WITH
-
-# CVC4_TRY_STATIC_GLPK_WITH(LIBS)
-# -------------------------------
-# Try AC_CHECK_LIB(glpk) with the given linking libraries
-AC_DEFUN([CVC4_TRY_STATIC_GLPK_WITH], [
-if test -z "$GLPK_LIBS"; then
-  AC_LANG_PUSH([C++])
-  cvc4_save_LIBS="$LIBS"
-  cvc4_save_CPPFLAGS="$CPPFLAGS"
-  cvc4_save_LDFLAGS="$LDFLAGS"
-  CPPFLAGS="$CVC4CPPFLAGS $CPPFLAGS"
-  LDFLAGS="-static $GLPK_LDFLAGS $LDFLAGS"
-  LIBS="-lglpk-static $1"
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <glpk.h>],
-                                  [int i = glp_ios_get_cut(NULL, 0, NULL, NULL, NULL, NULL, NULL)])],
-    [GLPK_LIBS="-lglpk-static $1"],
-    [ LIBS="-lglpk $1"
-      AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <glpk.h>],
-                                      [int i = glp_ios_get_cut(NULL, 0, NULL, NULL, NULL, NULL, NULL)])],
-
-        [GLPK_LIBS="-lglpk $1"]) ])
-  LIBS="$cvc4_save_LIBS"
-  CPPFLAGS="$cvc4_save_CPPFLAGS"
-  LDFLAGS="$cvc4_save_LDFLAGS"
-  AC_LANG_POP([C++])
-fi
-])# CVC4_TRY_STATIC_GLPK_WITH
diff --git a/config/lfsc.m4 b/config/lfsc.m4
deleted file mode 100644
index 8f9ff0ee6..000000000
--- a/config/lfsc.m4
+++ /dev/null
@@ -1,84 +0,0 @@
-# CVC4_CHECK_FOR_LFSC
-# ------------------
-# Look for LFSC and link it in, but only if user requested.
-AC_DEFUN([CVC4_CHECK_FOR_LFSC], [
-AC_MSG_CHECKING([whether user requested LFSC support])
-
-have_liblfsc=0
-LFSC_LIBS=
-LFSC_LDFLAGS=
-
-if test "$with_lfsc" = no; then
-  AC_MSG_RESULT([no, LFSC disabled by user])
-elif test -n "$with_lfsc"; then
-  AC_MSG_RESULT([yes, LFSC requested by user])
-  AC_ARG_VAR(LFSC_HOME, [path to top level of LFSC source tree])
-  AC_ARG_WITH(
-    [lfsc-dir],
-    AS_HELP_STRING(
-      [--with-lfsc-dir=PATH],
-      [path to top level of lfsc source tree]
-    ),
-    [LFSC_HOME="$withval"],
-    []
-  )
-
-  if test -z "$LFSC_HOME" -a -e "$ac_abs_confdir/lfsc-checker"; then
-    AC_MSG_CHECKING([for LFSC checker library])
-    LFSC_HOME="$ac_abs_confdir/lfsc-checker/install"
-    AC_MSG_RESULT([found LFSC checker in $LFSC_HOME])
-  fi
-  
-  if test -z "$LFSC_HOME"; then
-    AC_MSG_FAILURE([must give --with-lfsc-dir=PATH or define environment variable LFSC_HOME!])
-  fi
-
-  if ! test -d "$LFSC_HOME" || ! test -x "$LFSC_HOME/bin/lfscc" ; then
-    AC_MSG_FAILURE([either $LFSC_HOME is not a LFSC install tree or it's not yet built])
-  fi
-
-  CPPFLAGS="$CPPFLAGS -I$LFSC_HOME/include"
-
-  AC_MSG_CHECKING([how to link LFSC])
-  CVC4_TRY_LFSC_LIB
-
-  if test -z "$LFSC_LIBS"; then
-    AC_MSG_FAILURE([cannot link against liblfscc!])
-  else
-    AC_MSG_RESULT([$LFSC_LIBS])
-    have_liblfsc=1
-  fi
-
-  LFSC_LDFLAGS="-L$LFSC_HOME/lib"
-
-else
-  AC_MSG_RESULT([no, user didn't request LFSC])
-  with_lfsc=no
-fi
-
-])# CVC4_CHECK_FOR_LFSC
-
-# CVC4_TRY_LFSC_LIB
-# ------------------------------
-# Try AC_CHECK_LIB(lfsc) with the given linking libraries
-AC_DEFUN([CVC4_TRY_LFSC_LIB], [
-  AC_LANG_PUSH([C++])
-
-  cvc4_save_LIBS="$LIBS"
-  cvc4_save_LDFLAGS="$LDFLAGS"
-  cvc4_save_CPPFLAGS="$CPPFLAGS"
-
-  LDFLAGS="-L$LFSC_HOME/lib"
-  LIBS="-llfscc -lgmp"
-
-  AC_LINK_IFELSE(
-    [AC_LANG_PROGRAM([[#include <lfscc.h>]], [[lfscc_init()]])],
-    [LFSC_LIBS="-llfscc -lgmp"],
-    [LFSC_LIBS=])
-
-  LDFLAGS="$cvc4_save_LDFLAGS"
-  CPPFLAGS="$cvc4_save_CPPFLAGS"
-  LIBS="$cvc4_save_LIBS"
-
-  AC_LANG_POP([C++])
-])# CVC4_TRY_LFSC_LIB
diff --git a/config/mkbuilddir b/config/mkbuilddir
deleted file mode 100755
index 87cd3460e..000000000
--- a/config/mkbuilddir
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-#
-# mkbuilddir
-# Morgan Deters <mdeters@cs.nyu.edu> for CVC4
-#
-# usage: mkbuilddir target build-type
-#
-# Sets up the builds/ directory for building build-type for target:
-# - removes configure detritus from top-level source directory
-# - makes builds/$target/$build_type directory if it's not already there
-# - links builds/Makefile to (possibly nonexistent) build Makefile
-# - creates the builds/current Makefile include snippet
-# - links builds/src and builds/test into build directory
-#
-
-if [ $# -ne 2 ]; then
-  echo 'usage: mkbuilddir target build_type' >&2
-  exit 1
-fi
-
-target=$1
-build_type=$2
-
-: ${as_me:=mkbuilddir}
-: ${as_echo:=echo}
-: ${RM:=rm -f}
-: ${MKDIR_P:=mkdir -p}
-: ${LN_S:=ln -s}
-
-$as_echo "$as_me: Setting up builds/$target/$build_type..."
-$RM config.log config.status confdefs.h builds/Makefile
-$MKDIR_P "builds/$target/$build_type"
-$LN_S "$target/$build_type/Makefile.builds" builds/Makefile
-
-$as_echo "$as_me: Creating builds/current..."
-(echo "# This is the most-recently-configured CVC4 build"; \
- echo "# 'make' in the top-level source directory applies to this build"; \
- echo "CURRENT_BUILD = $target/$build_type") > builds/current
-
-for dir in src test; do
-  $as_echo "$as_me: Linking builds/$dir..."
-  $RM "builds/$dir"
-  $LN_S "$target/$build_type/$dir" "builds/$dir"
-done
-
diff --git a/config/pkg.m4 b/config/pkg.m4
deleted file mode 100644
index 0048a3fa0..000000000
--- a/config/pkg.m4
+++ /dev/null
@@ -1,157 +0,0 @@
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# 
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_default([$1], [0.9.0])
-	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		PKG_CONFIG=""
-	fi
-		
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-#
-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-# this or PKG_CHECK_MODULES is called, or make sure to call
-# PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
-    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_ifval([$2], [$2], [:])
-m4_ifvaln([$3], [else
-  $3])dnl
-fi])
-
-
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-m4_define([_PKG_CONFIG],
-[if test -n "$PKG_CONFIG"; then
-    if test -n "$$1"; then
-        pkg_cv_[]$1="$$1"
-    else
-        PKG_CHECK_EXISTS([$3],
-                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-			 [pkg_failed=yes])
-    fi
-else
-	pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
-
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
-if test $pkg_failed = yes; then
-        _PKG_SHORT_ERRORS_SUPPORTED
-        if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
-        else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
-	ifelse([$4], , [AC_MSG_ERROR(dnl
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT
-])],
-		[AC_MSG_RESULT([no])
-                $4])
-elif test $pkg_failed = untried; then
-	ifelse([$4], , [AC_MSG_FAILURE(dnl
-[The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-_PKG_TEXT
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
-		[$4])
-else
-	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-        AC_MSG_RESULT([yes])
-	ifelse([$3], , :, [$3])
-fi[]dnl
-])# PKG_CHECK_MODULES
diff --git a/config/readline.m4 b/config/readline.m4
deleted file mode 100644
index e9ce921fb..000000000
--- a/config/readline.m4
+++ /dev/null
@@ -1,115 +0,0 @@
-# CVC4_CHECK_FOR_READLINE
-# -----------------------
-# Look for readline and link it in, but allow user to disable.
-AC_DEFUN([CVC4_CHECK_FOR_READLINE], [
-AC_MSG_CHECKING([whether user requested readline support])
-LIBREADLINE=
-have_libreadline=0
-readline_compentry_func_returns_charp=0
-READLINE_LIBS=
-if test "$with_readline" = no; then
-  AC_MSG_RESULT([no, readline disabled by user])
-elif test "$with_readline" = check -a "$CVC4_BSD_LICENSED_CODE_ONLY" = 1; then
-  AC_MSG_RESULT([no, using BSD-compatible dependences only])
-  with_readline=no
-else
-  if test "$with_readline" = check; then
-    AC_MSG_RESULT([no preference by user, will auto-detect])
-  else
-    AC_MSG_RESULT([yes, readline enabled by user])
-  fi
-  dnl Try a bunch of combinations until something works :-/
-  READLINE_LIBS=
-  CVC4_TRY_READLINE_WITH([])
-  CVC4_TRY_READLINE_WITH([-ltinfo])
-  CVC4_TRY_READLINE_WITH([-ltermcap])
-  CVC4_TRY_READLINE_WITH([-ltermcap -ltinfo])
-  CVC4_TRY_READLINE_WITH([-lncurses -ltermcap])
-  CVC4_TRY_READLINE_WITH([-lncurses -ltermcap -ltinfo])
-  CVC4_TRY_READLINE_WITH([-lcurses -ltermcap])
-  CVC4_TRY_READLINE_WITH([-lcurses -ltermcap -ltinfo])
-  if test -z "$READLINE_LIBS"; then
-    if test "$with_readline" != check; then
-      AC_MSG_FAILURE([cannot find libreadline! (or can't get it to work)])
-    fi
-    with_readline=no
-  else
-    # make sure it works in static builds, too
-    if test "$enable_static_binary" = yes; then
-      READLINE_LIBS=
-      AC_MSG_CHECKING([whether statically-linked readline is functional])
-      CVC4_TRY_STATIC_READLINE_WITH([])
-      CVC4_TRY_STATIC_READLINE_WITH([-ltinfo])
-      CVC4_TRY_STATIC_READLINE_WITH([-ltermcap])
-      CVC4_TRY_STATIC_READLINE_WITH([-ltermcap -ltinfo])
-      CVC4_TRY_STATIC_READLINE_WITH([-lncurses -ltermcap])
-      CVC4_TRY_STATIC_READLINE_WITH([-lncurses -ltermcap -ltinfo])
-      CVC4_TRY_STATIC_READLINE_WITH([-lcurses -ltermcap])
-      CVC4_TRY_STATIC_READLINE_WITH([-lcurses -ltermcap -ltinfo])
-      if test -n "$READLINE_LIBS"; then
-        AC_MSG_RESULT([yes, it works])
-        with_readline=yes
-      else
-        AC_MSG_RESULT([no])
-        if test "$with_readline" != check; then
-          AC_MSG_FAILURE([readline installation appears incompatible with static-binary])
-        fi
-        with_readline=no
-      fi
-    else
-      with_readline=yes
-    fi
-  fi
-  if test "$with_readline" = yes; then
-    have_libreadline=1
-    AC_MSG_CHECKING([for type of rl_completion_entry_function])
-    AC_LANG_PUSH([C++])
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
-#include <stdio.h>
-#include <readline/readline.h>
-char* foo(const char*, int) { return (char*)0; }],[
-rl_completion_entry_function = foo;])],
-      [AC_MSG_RESULT([char* (*)(const char*, int)])
-       readline_compentry_func_returns_charp=1],
-      [AC_MSG_RESULT([Function])])
-    AC_LANG_POP([C++])
-  else
-    have_libreadline=0
-    READLINE_LIBS=
-  fi
-fi
-])# CVC4_CHECK_FOR_READLINE
-
-# CVC4_TRY_READLINE_WITH(LIBS)
-# ----------------------------
-# Try AC_CHECK_LIB(readline) with the given linking libraries
-AC_DEFUN([CVC4_TRY_READLINE_WITH], [
-if test -z "$READLINE_LIBS"; then
-  unset ac_cv_lib_readline_readline
-  AC_CHECK_LIB([readline], [readline],
-               [AC_CHECK_HEADER([readline/readline.h],
-                  [READLINE_LIBS="-lreadline $1"],
-                  [])],
-               [], [$1])
-fi
-])# CVC4_TRY_READLINE_WITH
-
-# CVC4_TRY_STATIC_READLINE_WITH(LIBS)
-# -----------------------------------
-# Try AC_CHECK_LIB(readline) with the given linking libraries
-AC_DEFUN([CVC4_TRY_STATIC_READLINE_WITH], [
-if test -z "$READLINE_LIBS"; then
-  AC_LANG_PUSH([C++])
-  cvc4_save_LIBS="$LIBS"
-  cvc4_save_LDFLAGS="$LDFLAGS"
-  LDFLAGS="-static $LDFLAGS"
-  LIBS="-lreadline $1"
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <readline/readline.h>],
-                                  [readline("")])],
-    [READLINE_LIBS="-lreadline $1"],
-    [])
-  LIBS="$cvc4_save_LIBS"
-  LDFLAGS="$cvc4_save_LDFLAGS"
-  AC_LANG_POP([C++])
-fi
-])# CVC4_TRY_STATIC_READLINE_WITH
diff --git a/config/symfpu.m4 b/config/symfpu.m4
deleted file mode 100644
index 4e757685b..000000000
--- a/config/symfpu.m4
+++ /dev/null
@@ -1,40 +0,0 @@
-# CVC4_CHECK_FOR_SYMFPU
-# ------------------
-# Look for symfpu and link it in, but only if user requested.
-AC_DEFUN([CVC4_CHECK_FOR_SYMFPU], [
-AC_MSG_CHECKING([whether user requested symfpu support])
-
-have_symfpu_headers=0
-if test "$with_symfpu" = no; then
-  AC_MSG_RESULT([no, symfpu disabled by user])
-elif test -n "$with_symfpu"; then
-  AC_MSG_RESULT([yes, symfpu requested by user])
-  AC_ARG_VAR(SYMFPU_HOME, [path to top level of symfpu source tree])
-  AC_ARG_WITH(
-    [symfpu-dir],
-    AS_HELP_STRING(
-      [--with-symfpu-dir=PATH],
-      [path to top level of symfpu source tree]
-    ),
-    SYMFPU_HOME="$withval",
-    [ if test -z "$SYMFPU_HOME" && ! test -e "$ac_abs_confdir/symfpu-CVC4/symfpu/core"; then
-        AC_MSG_FAILURE([must give --with-symfpu-dir=PATH, define environment variable SYMFPU_HOME, or use contrib/get-symfpu to setup symfpu for CVC4!])
-      fi
-    ]
-  )
-
-  # Check if symfpu was installed via contrib/get-symfpu or SYMFPU_HOME or --with-symfpu-dir was set
-  AC_MSG_CHECKING([whether symfpu was installed via contrib/get-symfpu])
-  if test -z "$SYMFPU_HOME" && test -e "$ac_abs_confdir/symfpu-CVC4/symfpu/core"; then
-    SYMFPU_HOME="$ac_abs_confdir/symfpu-CVC4"
-    AC_MSG_RESULT([yes, $SYMFPU_HOME])
-    have_symfpu_headers=1
-  else
-    AC_MSG_RESULT([no])
-  fi
-else
-  AC_MSG_RESULT([no, user didn't request symfpu])
-  with_symfpu=no
-fi
-
-])# CVC4_CHECK_FOR_SYMFPU
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index 81fff6c93..000000000
--- a/configure.ac
+++ /dev/null
@@ -1,1611 +0,0 @@
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-m4_define(_CVC4_MAJOR,          1)       dnl version (major)
-m4_define(_CVC4_MINOR,          7)       dnl version (minor)
-m4_define(_CVC4_RELEASE,        0)       dnl version (alpha)
-m4_define(_CVC4_EXTRAVERSION,   [-prerelease])      dnl version (extra)
-m4_define(_CVC4_RELEASE_STRING, _CVC4_MAJOR[.]_CVC4_MINOR[]m4_if(_CVC4_RELEASE,[0],,[.]_CVC4_RELEASE)_CVC4_EXTRAVERSION) dnl version string
-
-dnl Preprocess CL args. Defined in config/cvc4.m4
-CVC4_AC_INIT
-
-AC_PREREQ([2.61])
-AC_INIT([cvc4], _CVC4_RELEASE_STRING, [cvc4-bugs@cs.stanford.edu])
-AC_CONFIG_SRCDIR([src/include/cvc4_public.h])
-AC_CONFIG_AUX_DIR([config])
-AC_REQUIRE_AUX_FILE([tap-driver.sh])
-AC_CONFIG_MACRO_DIR([config])
-AC_CONFIG_LIBOBJ_DIR([src/lib])
-
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
-
-CVC4_MAJOR=_CVC4_MAJOR
-CVC4_MINOR=_CVC4_MINOR
-CVC4_RELEASE=_CVC4_RELEASE
-CVC4_EXTRAVERSION=_CVC4_EXTRAVERSION
-CVC4_RELEASE_STRING=_CVC4_RELEASE_STRING
-
-# Libtool version numbers for libraries
-# Version numbers are in the form current:revision:age
-#
-# current -
-#   increment if interfaces have been added, removed or changed
-# revision -
-#   increment if source code has changed
-#   set to zero if current is incremented
-# age -
-#   increment if interfaces have been added
-#   set to zero if interfaces have been removed
-#   or changed
-#
-# For more information, see:
-# http://www.gnu.org/software/libtool/manual/libtool.html#Versioning
-# For guidance on when to change the version number, refer to the
-# developer's guide.
-
-m4_define([library_version], [m4_esyscmd([grep -F "$(grep -v '^#' library_versions | awk '{print$][1}' | sed 's,\\,\\\\\\,g' | (while read r; do if echo "]_CVC4_RELEASE_STRING[" | grep -q "^$r\$"; then echo "$r"; exit; fi; done; echo NO_MATCH_FOUND)) " library_versions | awk 'BEGIN {FS=":";OFS=":";RS=" "} /^$1:/ {print$][2,$][3,$][4}' | head -1])])
-
-m4_define(_CVC4_LIBRARY_VERSION, library_version([libcvc4]))dnl
-m4_define(_CVC4_PARSER_LIBRARY_VERSION, library_version([libcvc4parser]))dnl
-m4_define(_CVC4_BINDINGS_LIBRARY_VERSION, library_version([libcvc4bindings]))dnl
-
-m4_define([fatal_error], [m4_errprint(__program__:__file__:__line__[: fatal error: $*
-])m4_exit(1)])dnl
-
-m4_ifblank(_CVC4_LIBRARY_VERSION,[fatal_error([no CVC4_LIBRARY_VERSION defined for release version "]_CVC4_RELEASE_STRING[" in library_versions file])])dnl
-m4_ifblank(_CVC4_PARSER_LIBRARY_VERSION,[fatal_error([no CVC4_PARSER_LIBRARY_VERSION defined for release version "]_CVC4_RELEASE_STRING[" in library_versions file])])dnl
-m4_ifblank(_CVC4_BINDINGS_LIBRARY_VERSION,[fatal_error([no CVC4_BINDINGS_LIBRARY_VERSION defined for release version "]_CVC4_RELEASE_STRING[" in library_versions file])])dnl
-
-CVC4_LIBRARY_VERSION=_CVC4_LIBRARY_VERSION
-CVC4_PARSER_LIBRARY_VERSION=_CVC4_PARSER_LIBRARY_VERSION
-CVC4_BINDINGS_LIBRARY_VERSION=_CVC4_BINDINGS_LIBRARY_VERSION
-
-# Using AX_CXX_COMPILE_STDCXX_11 and the AC_CANONICAL_* macros destroy the
-# command line you get from $@, which we want later for determining the build
-# profile.  So we save it.
-# (We can't do our build profile stuff here, or it's not included in the
-# output... autoconf overrides us on the orderings of some things.)
-config_cmdline=("$@")
-cvc4_config_cmdline="${config_cmdline[[@]]}"
-
-# remember if the user set these explicitly (or whether autoconf does)
-user_specified_enable_or_disable_static=${enable_static+yes}
-user_specified_enable_or_disable_shared=${enable_shared+yes}
-
-if test -e src/include/cvc4_public.h; then
-  CVC4_CONFIGURE_AT_TOP_LEVEL=yes
-else
-  CVC4_CONFIGURE_AT_TOP_LEVEL=no
-fi
-
-# override autoconf: we don't want it giving us CFLAGS/CXXFLAGS, but we do
-# want to respect the user's flags
-if test -z "${CFLAGS+set}"; then CFLAGS=; fi
-if test -z "${CXXFLAGS+set}"; then CXXFLAGS=; fi
-
-# on by default
-AM_MAINTAINER_MODE([enable])
-
-# turn off static lib building by default
-AC_ENABLE_SHARED
-AC_DISABLE_STATIC
-
-AC_CANONICAL_BUILD
-AC_CANONICAL_HOST
-AC_CANONICAL_TARGET
-
-# C++11 support in the compiler is now mandatory. Check for support and add
-# switches if necessary.
-AX_CXX_COMPILE_STDCXX_11([ext], [mandatory])
-
-as_me=configure
-
-if test "$enable_shared" = no -a "$user_specified_enable_or_disable_shared" = yes; then
-  enable_static=yes
-fi
-
-# Features requested by the user
-AC_MSG_CHECKING([for requested build profile])
-AC_ARG_WITH([build],
-  [AS_HELP_STRING([--with-build=profile],
-     [for profile in {production,debug,competition,testing}])])
-
-if test -z "${with_build+set}"; then
-  with_build=production
-fi
-if test -z "${enable_optimized+set}" -a \
-        -z "${enable_debug_symbols+set}" -a \
-        -z "${enable_assertions+set}" -a \
-        -z "${enable_tracing+set}" -a \
-        -z "${enable_dumping+set}" -a \
-        -z "${enable_muzzle+set}" -a \
-        -z "${enable_coverage+set}" -a \
-        -z "${enable_profiling+set}" -a \
-        -z "${enable_statistics+set}" -a \
-        -z "${enable_replay+set}" -a \
-        -z "${with_gmp+set}" -a \
-        -z "${with_cln+set}" -a \
-        -z "${with_glpk+set}" -a \
-        -z "${with_abc+set}" -a \
-        -z "${with_cadical+set}" -a \
-        -z "${with_cryptominisat+set}" -a \
-        -z "${with_lfsc+set}" -a \
-        -z "${with_symfpu+set}"; then
-  custom_build_profile=no
-else
-  custom_build_profile=yes
-fi
-btargs=
-if test -n "${enable_optimized+set}"; then
-  if test "$enable_optimized" = yes; then
-    btargs="$btargs optimized"
-  else
-    btargs="$btargs nooptimized"
-  fi
-fi
-# --enable-staticbinary is an alias for --enable-static-binary
-if test -n "${enable_staticbinary+set}"; then
-  enable_static_binary="$enable_staticbinary"
-fi
-if test -n "${enable_static_binary+set}"; then
-  if test "$enable_static_binary" = yes; then
-    btargs="$btargs staticbinary"
-  else
-    btargs="$btargs nostaticbinary"
-  fi
-fi
-if test -n "${enable_debug_symbols+set}"; then
-  if test "$enable_debug_symbols" = yes; then
-    btargs="$btargs debugsymbols"
-  else
-    btargs="$btargs nodebugsymbols"
-  fi
-fi
-if test -n "${enable_assertions+set}"; then
-  if test "$enable_assertions" = yes; then
-    btargs="$btargs assertions"
-  else
-    btargs="$btargs noassertions"
-  fi
-fi
-if test -n "${enable_proof+set}"; then
-  if test "$enable_proof" = yes; then
-    btargs="$btargs proof"
-  else
-    btargs="$btargs noproof"
-  fi
-fi
-if test -n "${enable_tracing+set}"; then
-  if test "$enable_tracing" = yes; then
-    btargs="$btargs tracing"
-  else
-    btargs="$btargs notracing"
-  fi
-fi
-if test -n "${enable_dumping+set}"; then
-  if test "$enable_dumping" = yes; then
-    btargs="$btargs dumping"
-  else
-    btargs="$btargs nodumping"
-  fi
-fi
-if test -n "${enable_muzzle+set}"; then
-  if test "$enable_muzzle" = yes; then
-    btargs="$btargs muzzle"
-  else
-    btargs="$btargs nomuzzle"
-  fi
-fi
-if test -n "${enable_coverage+set}"; then
-  if test "$enable_coverage" = yes; then
-    btargs="$btargs coverage"
-  else
-    btargs="$btargs nocoverage"
-  fi
-fi
-if test -n "${enable_profiling+set}"; then
-  if test "$enable_profiling" = yes; then
-    btargs="$btargs profiling"
-  else
-    btargs="$btargs noprofiling"
-  fi
-fi
-if test -n "${enable_statistics+set}"; then
-  if test "$enable_statistics" = yes; then
-    btargs="$btargs statistics"
-  else
-    btargs="$btargs nostatistics"
-  fi
-fi
-if test -n "${enable_replay+set}"; then
-  if test "$enable_replay" = yes; then
-    btargs="$btargs replay"
-  else
-    btargs="$btargs noreplay"
-  fi
-fi
-if test -n "${with_glpk+set}"; then
-  if test "$with_glpk" = yes; then
-    btargs="$btargs glpk"
-  fi
-fi
-if test -n "${with_abc+set}"; then
-  if test "$with_abc" = yes; then
-    btargs="$btargs abc"
-  fi
-fi
-if test -n "${with_cadical+set}"; then
-  if test "$with_cadical" = yes; then
-    btargs="$btargs cadical"
-  fi
-fi
-if test -n "${with_cryptominisat+set}"; then
-  if test "$with_cryptominisat" = yes; then
-    btargs="$btargs cryptominisat"
-  fi
-fi
-if test -n "${with_lfsc+set}"; then
-  if test "$with_lfsc" = yes; then
-    enable_proof=yes
-    btargs="$btargs lfsc"
-  fi
-fi
-if test -n "${with_symfpu+set}"; then
-  if test "$with_symfpu" = yes; then
-    btargs="$btargs symfpu"
-  fi
-fi
-
-AC_MSG_RESULT([$with_build])
-
-AM_INIT_AUTOMAKE([1.11 no-define tar-pax parallel-tests color-tests subdir-objects])
-AC_CONFIG_HEADERS([cvc4autoconfig.h])
-
-# automake 1.12 changes the test driver mechanism in a way that is
-# completely incompatible with 1.11.  We figure out here which version
-# we're using in order to set up test makefiles correctly.
-# See http://lists.gnu.org/archive/html/automake/2012-04/msg00060.html
-if test -z "$am__api_version"; then
-  AC_MSG_ERROR([Cannot determine automake API version ?!])
-fi
-case "$am__api_version" in
-  1.11*) automake111=true ;;
-  *) automake111=false ;;
-esac
-AM_CONDITIONAL([AUTOMAKE_1_11], [$automake111])
-
-# Initialize libtool's configuration options.
-# we're not DLL-clean yet (i.e., don't properly use dllexport and dllimport)
-# _LT_SET_OPTION([LT_INIT],[win32-dll])
-LT_INIT
-
-# Checks for programs.
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_INSTALL
-
-CVC4_GCC_VERSION
-
-if test $cross_compiling = "no"; then
-  AC_MSG_CHECKING([whether C++ exceptions work])
-  AC_LANG_PUSH([C++])
-  AC_RUN_IFELSE(
-    AC_LANG_PROGRAM([#include <exception>], [[
-      int result = 1;
-      try {
-        throw std::exception();
-      } catch (...) {
-        result = 0;
-      }
-      return result;
-    ]]),
-    [AC_MSG_RESULT([yes])],
-    [AC_MSG_ERROR([C++ exceptions do not work.])]
-  )
-  AC_LANG_POP([C++])
-else
-  AC_MSG_WARN([Cross compiling, cannot check whether exceptions work])
-fi
-
-cvc4_use_gmp=2
-cvc4_use_cln=2
-
-AC_ARG_WITH(
-  [cln],
-  AS_HELP_STRING(
-    [--with-cln],
-    [use CLN instead of GMP]
-  ),
-  [case "$withval" in
-   y|ye|yes|Y|YE|YES) cvc4_use_cln=1 ;;
-   n|no|N|NO) cvc4_use_cln=0 ;;
-   esac
-  ]
-)
-
-AC_ARG_WITH(
-  [gmp],
-  AS_HELP_STRING(
-    [--with-gmp],
-    [use GMP instead of CLN]
-  ),
-  [case "$withval" in
-   y|ye|yes|Y|YE|YES) cvc4_use_gmp=1 ;;
-   n|no|N|NO) cvc4_use_gmp=0 ;;
-   esac
-  ]
-)
-
-if test $cvc4_use_cln = 1 -a $cvc4_use_gmp = 1 || test $cvc4_use_cln = 0 -a $cvc4_use_gmp = 0; then
-  AC_MSG_ERROR([You must use either CLN and GMP.  Please pick one.])
-fi
-if test $cvc4_use_gmp = 1; then
-  cvc4_use_cln=0
-elif test $cvc4_use_gmp = 0; then
-  cvc4_use_cln=1
-elif test $cvc4_use_cln = 1; then
-  cvc4_use_gmp=0
-elif test $cvc4_use_cln = 0; then
-  cvc4_use_gmp=1
-fi
-
-# try GMP, fail if not found; GMP is required for both CLN and for GMP
-# versions of CVC4
-AC_CHECK_LIB(gmp, __gmpz_init, , [AC_MSG_ERROR([GNU MP (libgmp) not found, see http://gmplib.org/])])
-
-if test $cvc4_use_cln = 2; then
-  if test "$CVC4_BSD_LICENSED_CODE_ONLY" = 1 -o "$with_portfolio" = yes; then
-    cvc4_use_cln=0
-    cvc4_use_gmp=1
-  fi
-fi
-
-if test $cvc4_use_cln != 0; then
-  # [mdeters] The PKG_CHECK_MODULES macro isn't customizable and doesn't fail
-  # gracefully.  You can only specify it once for a given library name.  That
-  # is, even on separate if/else branches, you can't put
-  # PKG_CHECK_MODULES([CLN], ...).  That's why things are so convoluted here,
-  # we have to have PKG_CHECK_MODULES _exactly_ once in configure.ac !
-  PKG_CHECK_MODULES([CLN], [cln >= 1.2.2],
-    [AC_LANG_PUSH([C++])
-     save_LIBS="$LIBS"
-     save_CXXFLAGS="$CXXFLAGS"
-     LIBS="$CLN_LIBS $LIBS"
-     CXXFLAGS="$CLN_CFLAGS $CXXFLAGS"
-     AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <cln/cln.h>]], [[cln::cl_F pi = "3.1415926";]])], [
-       cvc4_use_cln=1
-     ], [
-       if test $cvc4_use_cln = 1; then
-         # fail
-         AC_MSG_ERROR([CLN installation missing, too old, or not functional for this architecture])
-       else
-         # fall back to GMP
-         AC_MSG_NOTICE([CLN installation missing, too old, or not functional for this architecture, will use gmp instead])
-         cvc4_use_cln=0
-         cvc4_use_gmp=1
-       fi
-     ])
-     CXXFLAGS="$save_CXXFLAGS"
-     LIBS="$save_LIBS"
-     AC_LANG_POP([C++])
-    ],
-    [if test $cvc4_use_cln = 1; then
-       # fail
-       AC_MSG_ERROR([CLN not installed (or too old) or pkgconfig missing])
-     else
-       # fall back to GMP
-       AC_MSG_NOTICE([CLN not installed (or too old) or pkgconfig missing, will use gmp])
-       cvc4_use_cln=0
-       cvc4_use_gmp=1
-     fi
-    ]
-  )
-fi
-if test $cvc4_use_cln = 0; then
-  # try GMPXX, fail if not found; don't need to link against it, only need its header
-  AC_LANG_PUSH([C++])
-  AC_CHECK_HEADER([gmpxx.h], , [AC_MSG_ERROR([GNU MP C++ library header (gmpxx.h) required but not found, see http://gmplib.org/])])
-  AC_LANG_POP([C++])
-  cvc4_cln_or_gmp=gmp
-else
-  CVC4CPPFLAGS="${CVC4CPPFLAGS:+$CVC4CPPFLAGS }$CLN_CFLAGS"
-  CVC4CXXFLAGS="${CVC4CXXFLAGS:+$CVC4CXXFLAGS }$CLN_CFLAGS"
-  CVC4CFLAGS="${CVC4CFLAGS:+$CVC4CFLAGS }$CLN_CFLAGS"
-  LIBS="$CLN_LIBS${LIBS:+ $LIBS}"
-  cvc4_cln_or_gmp=cln
-fi
-
-if test $cvc4_cln_or_gmp = cln; then
-  AC_DEFINE_UNQUOTED(CVC4_CLN_IMP, [], [Defined if using the CLN multi-precision arithmetic library.])
-else
-  AC_DEFINE_UNQUOTED(CVC4_GMP_IMP, [], [Defined if using the GMP multi-precision arithmetic library.])
-fi
-AM_CONDITIONAL([CVC4_CLN_IMP], [test $cvc4_cln_or_gmp = cln])
-AM_CONDITIONAL([CVC4_GMP_IMP], [test $cvc4_cln_or_gmp = gmp])
-
-# Dumping cannot be used in a portfolio build. Disable dumping by default when
-# a portfolio build has been requested, throw an error if dumping has been
-# explicitly requested with a portfolio build.
-if test "$with_portfolio" = yes; then
-  if test "$enable_dumping" = yes; then
-    AC_MSG_ERROR([Dumping is not supported with a portfolio build])
-  fi
-  enable_dumping=no
-fi
-
-# construct the build string
-AC_MSG_CHECKING([for appropriate build string])
-if test -z "$ac_confdir"; then
-  ac_confdir="$srcdir"
-fi
-build_type=`$ac_confdir/config/build-type $with_build $btargs $cvc4_cln_or_gmp`
-AC_MSG_RESULT($build_type)
-
-# Require building in target and build-specific build directory:
-#
-# If the configure script is invoked from the top-level source
-# directory, it creates a suitable build directory (based on the build
-# architecture and build profile from $build_type), changes into it,
-# and reinvokes itself.  CVC4_CONFIGURE_IN_BUILDS is an envariable
-# that breaks any possibility of infinite recursion in this process.
-AC_MSG_CHECKING([what dir to configure])
-if test "$CVC4_CONFIGURE_IN_BUILDS" = yes; then
-  AC_MSG_RESULT([this one (in builds/)])
-elif test "$CVC4_CONFIGURE_AT_TOP_LEVEL" = yes; then
-  AC_MSG_RESULT([builds/$target/$build_type])
-  $as_echo
-  if test -z "$ac_srcdir"; then
-    mkbuilddir=./config/mkbuilddir
-  else
-    mkbuilddir=$ac_srcdir/config/mkbuilddir
-  fi
-  $as_echo "$mkbuilddir $target $build_type"
-  source $mkbuilddir "$target" "$build_type"
-  $as_echo "cd builds/$target/$build_type"
-  cd "builds/$target/$build_type"
-  CVC4_CONFIGURE_IN_BUILDS=yes; export CVC4_CONFIGURE_IN_BUILDS
-  # Runs the single recursive configure invocation using a relative path.
-  # See https://lists.gnu.org/archive/html/autoconf/2011-04/msg00060.html
-  echo "$SHELL ../../../configure ${config_cmdline[[@]]}"
-  "$SHELL" "../../../configure" "${config_cmdline[[@]]}"
-  exitval=$?
-  cd ../../..
-  if test $exitval -eq 0; then
-    cat >config.reconfig <<EOF
-[#!/bin/bash
-# Generated by configure, `date`
-# This script is part of CVC4.
-
-cd "\`dirname \\"\$0\\"\`"
-
-if test -d builds; then :; else echo 'No builds/ directory!' >&2; exit; fi
-
-current=(\`grep '^CURRENT_BUILD' builds/current | sed 's,^CURRENT_BUILD *= *\([^/]*\\)/\\(.*\\),\\1 \\2,'\`)
-arch=\${current[0]}
-build=\${current[1]}
-
-echo "reconfiguring in builds/\$arch/\$build..."
-cd "builds/\$arch/\$build"
-echo ./config.status "\$@"
-./config.status "\$@"]
-EOF
-    chmod +x config.reconfig
-  fi
-  ln -sf "$target/$build_type/config.log" "builds/config.log"
-  exit $exitval
-else
-  AC_MSG_RESULT([this one (user-specified)])
-fi
-
-as_me=configure
-
-# Unpack standard build types. Any particular options can be overriden with
-# --enable/disable-X options
-# Tim: This needs to keep CVC4CPPFLAGS, CVC4CXXFLAGS, etc. set by earlier checks
-case "$with_build" in
-  production) # highly optimized, no assertions, no tracing, dumping
-    CVC4CPPFLAGS="${CVC4CPPFLAGS:+$CVC4CPPFLAGS }"
-    CVC4CXXFLAGS="${CVC4CXXFLAGS:+$CVC4CXXFLAGS }"
-    CVC4CFLAGS="${CVC4CFLAGS:+$CVC4CFLAGS }"
-    CVC4LDFLAGS="${CVC4LDFLAGS:+$CVC4LDFLAGS }"
-    FLAG_VISIBILITY_HIDDEN='-fvisibility=hidden'
-    if test -z "${OPTLEVEL+set}"            ; then OPTLEVEL=3                       ; fi
-    if test -z "${enable_optimized+set}"    ; then enable_optimized=yes             ; fi
-    if test -z "${enable_debug_symbols+set}"; then enable_debug_symbols=no          ; fi
-    if test -z "${enable_statistics+set}"   ; then enable_statistics=yes            ; fi
-    if test -z "${enable_replay+set}"       ; then enable_replay=no                 ; fi
-    if test -z "${enable_assertions+set}"   ; then enable_assertions=no             ; fi
-    if test -z "${enable_proof+set}"        ; then enable_proof=yes                 ; fi
-    if test -z "${enable_tracing+set}"      ; then enable_tracing=no                ; fi
-    if test -z "${enable_dumping+set}"      ; then enable_dumping=yes               ; fi
-    if test -z "${enable_muzzle+set}"       ; then enable_muzzle=no                 ; fi
-    if test -z "${enable_valgrind+set}"     ; then enable_valgrind=no               ; fi
-    ;;
-  debug) # unoptimized, debug symbols, assertions, tracing, dumping
-    CVC4CPPFLAGS="${CVC4CPPFLAGS:+$CVC4CPPFLAGS }-DCVC4_DEBUG"
-    CVC4CXXFLAGS="${CVC4CXXFLAGS:+$CVC4CXXFLAGS }-fno-inline"
-    CVC4CFLAGS="${CVC4CFLAGS:+$CVC4CFLAGS }-fno-inline"
-    CVC4LDFLAGS="${CVC4LDFLAGS:+$CVC4LDFLAGS }"
-    FLAG_VISIBILITY_HIDDEN=
-    if test -z "${enable_optimized+set}"    ; then enable_optimized=no              ; fi
-    if test -z "${enable_debug_symbols+set}"; then enable_debug_symbols=yes         ; fi
-    if test -z "${enable_statistics+set}"   ; then enable_statistics=yes            ; fi
-    if test -z "${enable_replay+set}"       ; then enable_replay=yes                ; fi
-    if test -z "${enable_assertions+set}"   ; then enable_assertions=yes            ; fi
-    if test -z "${enable_proof+set}"        ; then enable_proof=yes                 ; fi
-    if test -z "${enable_tracing+set}"      ; then enable_tracing=yes               ; fi
-    if test -z "${enable_dumping+set}"      ; then enable_dumping=yes               ; fi
-    if test -z "${enable_muzzle+set}"       ; then enable_muzzle=no                 ; fi
-    if test -z "${enable_valgrind+set}"     ; then enable_valgrind=optional         ; fi
-    ;;
-  testing) # moderately optimized, assertions, tracing, dumping
-    CVC4CPPFLAGS="${CVC4CPPFLAGS:+$CVC4CPPFLAGS }"
-    CVC4CXXFLAGS="${CVC4CXXFLAGS:+$CVC4CXXFLAGS }"
-    CVC4CFLAGS="${CVC4CFLAGS:+$CVC4CFLAGS }"
-    CVC4LDFLAGS="${CVC4LDFLAGS:+$CVC4LDFLAGS }"
-    FLAG_VISIBILITY_HIDDEN='-fvisibility=hidden'
-    if test -z "${OPTLEVEL+set}"            ; then OPTLEVEL=2                       ; fi
-    if test -z "${enable_optimized+set}"    ; then enable_optimized=yes             ; fi
-    if test -z "${enable_debug_symbols+set}"; then enable_debug_symbols=yes         ; fi
-    if test -z "${enable_statistics+set}"   ; then enable_statistics=yes            ; fi
-    if test -z "${enable_replay+set}"       ; then enable_replay=yes                ; fi
-    if test -z "${enable_assertions+set}"   ; then enable_assertions=yes            ; fi
-    if test -z "${enable_proof+set}"        ; then enable_proof=yes                 ; fi
-    if test -z "${enable_tracing+set}"      ; then enable_tracing=yes               ; fi
-    if test -z "${enable_dumping+set}"      ; then enable_dumping=yes               ; fi
-    if test -z "${enable_muzzle+set}"       ; then enable_muzzle=no                 ; fi
-    if test -z "${enable_valgrind+set}"     ; then enable_valgrind=no               ; fi
-    ;;
-  competition) # maximally optimized, no assertions, no tracing, no dumping, muzzled
-    CVC4CPPFLAGS="${CVC4CPPFLAGS:+$CVC4CPPFLAGS }-DCVC4_COMPETITION_MODE"
-    CVC4CXXFLAGS="${CVC4CXXFLAGS:+$CVC4CXXFLAGS }-funroll-all-loops -fexpensive-optimizations -fno-enforce-eh-specs"
-    CVC4CFLAGS="${CVC4CFLAGS:+$CVC4CFLAGS }-funroll-all-loops -fexpensive-optimizations -fno-enforce-eh-specs"
-    CVC4LDFLAGS="${CVC4LDFLAGS:+$CVC4LDFLAGS }"
-    FLAG_VISIBILITY_HIDDEN='-fvisibility=hidden'
-    if test -z "${OPTLEVEL+set}"            ; then OPTLEVEL=9                       ; fi
-    if test -z "${enable_optimized+set}"    ; then enable_optimized=yes             ; fi
-    if test -z "${enable_debug_symbols+set}"; then enable_debug_symbols=no          ; fi
-    if test -z "${enable_statistics+set}"   ; then enable_statistics=no             ; fi
-    if test -z "${enable_replay+set}"       ; then enable_replay=no                 ; fi
-    if test -z "${enable_assertions+set}"   ; then enable_assertions=no             ; fi
-    if test -z "${enable_proof+set}"        ; then enable_proof=no                  ; fi
-    if test -z "${enable_tracing+set}"      ; then enable_tracing=no                ; fi
-    if test -z "${enable_dumping+set}"      ; then enable_dumping=no                ; fi
-    if test -z "${enable_muzzle+set}"       ; then enable_muzzle=yes                ; fi
-    if test -z "${enable_valgrind+set}"     ; then enable_valgrind=no               ; fi
-    if test -z "${user_specified_enable_or_disable_shared}"; then enable_shared=no; fi
-    if test -z "${user_specified_enable_or_disable_static}"; then enable_static=yes; fi
-    if test -z "${enable_static_binary+set}"; then enable_static_binary=yes         ; fi
-    ;;
-  *)
-    AC_MSG_FAILURE([unknown build profile: $with_build])
-    ;;
-esac
-if test -z "${OPTLEVEL+set}"; then OPTLEVEL=3; fi
-
-AM_CONDITIONAL([CVC4_BUILD_PROFILE_PRODUCTION],  [test "$with_build" = production])
-AM_CONDITIONAL([CVC4_BUILD_PROFILE_DEBUG],       [test "$with_build" = debug])
-AM_CONDITIONAL([CVC4_BUILD_PROFILE_COMPETITION], [test "$with_build" = competition])
-AM_CONDITIONAL([CVC4_BUILD_PROFILE_TESTING],     [test "$with_build" = testing])
-
-# permit a static binary
-AC_MSG_CHECKING([whether to build a static binary])
-AC_ARG_ENABLE([static-binary],
-     [AS_HELP_STRING([--enable-static-binary],
-                     [build a fully statically-linked binary [default=no]])])
-if test -z "${enable_static_binary+set}"; then
-  enable_static_binary=no
-fi
-AC_MSG_RESULT([$enable_static_binary])
-if test "$enable_static_binary" = yes; then
-  if test "$target_vendor" = apple; then
-    if test -z "$MAC_STATIC_BINARY_MANUAL_OVERRIDE"; then
-      AC_MSG_ERROR([[Statically-linked binaries are not supported on macOS.  See  https://developer.apple.com/library/content/qa/qa1118/_index.html .  (If you ABSOLUTELY insist on this going forward and you know what you are doing, set MAC_STATIC_BINARY_MANUAL_OVERRIDE=1)]])
-    else
-      AC_MSG_WARN([MAC_STATIC_BINARY_MANUAL_OVERRIDE was set!])
-      AC_MSG_WARN([Will make a static binary during this build.  Note that it may fail!])
-    fi
-  fi
-  if test "$enable_static" != yes; then
-    enable_static=yes
-    AC_MSG_WARN([forcing static-library building, --enable-static-binary given])
-  fi
-fi
-
-AC_MSG_CHECKING([whether to support proofs in libcvc4])
-
-AC_ARG_ENABLE([proof],
-  [AS_HELP_STRING([--disable-proof],
-     [do not support proof generation])])
-if test -z "${enable_proof+set}"; then
-  enable_proof=yes
-fi
-AC_MSG_RESULT([$enable_proof])
-
-if test "$enable_proof" = yes; then
-  CVC4CPPFLAGS="${CVC4CPPFLAGS:+$CVC4CPPFLAGS }-DCVC4_PROOF"
-fi
-AM_CONDITIONAL([CVC4_PROOF], [test "$enable_proof" = yes])
-
-AC_MSG_CHECKING([whether to optimize libcvc4])
-
-AC_ARG_ENABLE([optimized],
-  [AS_HELP_STRING([--enable-optimized],
-     [optimize the build])])
-
-if test -z "${enable_optimized+set}"; then
-  enable_optimized=no
-fi
-
-AC_MSG_RESULT([$enable_optimized])
-
-if test "$enable_optimized" = yes; then
-  CVC4CXXFLAGS="${CVC4CXXFLAGS:+$CVC4CXXFLAGS }-O$OPTLEVEL"
-  CVC4CFLAGS="${CVC4CFLAGS:+$CVC4CFLAGS }-O$OPTLEVEL"
-else
-  # Use -Og if available (optimizations that do not interfere with debugging),
-  # -O0 otherwise
-  debug_optimization_level="-O0"
-  CVC4_CXX_OPTION([-Og], [debug_optimization_level])
-  CVC4CXXFLAGS="${CVC4CXXFLAGS:+$CVC4CXXFLAGS }${debug_optimization_level}"
-  CVC4CFLAGS="${CVC4CFLAGS:+$CVC4CFLAGS }${debug_optimization_level}"
-fi
-
-AC_MSG_CHECKING([whether to include debugging symbols in libcvc4])
-
-AC_ARG_ENABLE([debug-symbols],
-  [AS_HELP_STRING([--disable-debug-symbols],
-     [do not include debug symbols in libcvc4])])
-
-if test -z "${enable_debug_symbols+set}"; then
-  enable_debug_symbols=yes
-fi
-
-AC_MSG_RESULT([$enable_debug_symbols])
-
-if test "$enable_debug_symbols" = yes; then
-  CVC4CXXFLAGS="${CVC4CXXFLAGS:+$CVC4CXXFLAGS }-ggdb3"
-  CVC4CFLAGS="${CVC4CFLAGS:+$CVC4CFLAGS }-ggdb3"
-fi
-
-AC_MSG_CHECKING([whether to enable Valgrind instrumentation])
-
-AC_ARG_ENABLE([valgrind],
-  [AS_HELP_STRING([--enable-valgrind],
-     [enable Valgrind instrumentation])])
-
-if test -z "${enable_valgrind+set}"; then
-  enable_valgrind=no
-fi
-
-AC_MSG_RESULT([$enable_valgrind])
-
-if test "$enable_valgrind" != no; then
-  # Valgrind instrumentation is either explicitly enabled (enable_valgrind=yes)
-  # or enabled if available (enable_valgrind=optional)
-  AC_CHECK_HEADER([valgrind/memcheck.h],
-                  [CVC4CPPFLAGS="${CVC4CPPFLAGS:+$CVC4CPPFLAGS }-DCVC4_VALGRIND"],
-                  [if test "$enable_valgrind" = yes; then
-                    AC_MSG_ERROR([Need valgrind/memcheck.h to enable Valgrind instrumentation])
-                   else
-                    AC_MSG_NOTICE([valgrind/memcheck.h missing, Valgrind instrumentation disabled])
-                   fi
-                  ])
-fi
-
-AC_MSG_CHECKING([whether to use the debug context memory manager])
-
-AC_ARG_ENABLE([debug-context-memory-manager],
-  [AS_HELP_STRING([--enable-debug-context-memory-manager],
-     [use the debug context memory manager])])
-
-if test -z "${enable_debug_context_memory_manager+set}"; then
-  enable_debug_context_memory_manager=no
-fi
-
-AC_MSG_RESULT([$enable_debug_context_memory_manager])
-
-if test "$enable_debug_context_memory_manager" = yes; then
-  CVC4CPPFLAGS="${CVC4CPPFLAGS:+$CVC4CPPFLAGS }-DCVC4_DEBUG_CONTEXT_MEMORY_MANAGER"
-fi
-
-AC_MSG_CHECKING([whether to include statistics are turned on in libcvc4])
-
-AC_ARG_ENABLE([statistics],
-  [AS_HELP_STRING([--disable-statistics],
-     [do not include statistics in libcvc4])])
-
-if test -z "${enable_statistics+set}"; then
-  enable_statistics=yes
-fi
-
-AC_MSG_RESULT([$enable_statistics])
-
-if test "$enable_statistics" = yes; then
-  CVC4CPPFLAGS="${CVC4CPPFLAGS:+$CVC4CPPFLAGS }-DCVC4_STATISTICS_ON"
-fi
-
-AC_MSG_CHECKING([whether the replay feature should be turned on in libcvc4])
-
-AC_ARG_ENABLE([replay],
-  [AS_HELP_STRING([--disable-replay],
-     [turn off the replay feature in libcvc4])])
-
-if test -z "${enable_replay+set}"; then
-  enable_replay=yes
-fi
-
-AC_MSG_RESULT([$enable_replay])
-
-if test "$enable_replay" = yes; then
-  CVC4CPPFLAGS="${CVC4CPPFLAGS:+$CVC4CPPFLAGS }-DCVC4_REPLAY"
-fi
-
-AC_MSG_CHECKING([whether to include assertions in build])
-
-AC_ARG_ENABLE([assertions],
-  [AS_HELP_STRING([--disable-assertions],
-     [turn off assertions in build])])
-
-if test -z "${enable_assertions+set}"; then
-  enable_assertions=yes
-fi
-
-AC_MSG_RESULT([$enable_assertions])
-
-if test "$enable_assertions" = yes; then
-  CVC4CPPFLAGS="${CVC4CPPFLAGS:+$CVC4CPPFLAGS }-DCVC4_ASSERTIONS"
-else
-  # turn off regular C assert() also
-  CVC4CPPFLAGS="${CVC4CPPFLAGS:+$CVC4CPPFLAGS }-DNDEBUG"
-fi
-
-AC_MSG_CHECKING([whether to do a traceable build of CVC4])
-AC_ARG_ENABLE([tracing],
-  [AS_HELP_STRING([--disable-tracing],
-     [remove all tracing code from CVC4])])
-
-if test -z "${enable_tracing+set}"; then
-  enable_tracing=yes
-fi
-
-AC_MSG_RESULT([$enable_tracing])
-
-if test "$enable_tracing" = yes; then
-  CVC4CPPFLAGS="${CVC4CPPFLAGS:+$CVC4CPPFLAGS }-DCVC4_TRACING"
-fi
-
-AC_MSG_CHECKING([whether to do a dump-capable build of CVC4])
-AC_ARG_ENABLE([dumping],
-  [AS_HELP_STRING([--disable-dumping],
-     [remove all dumping code from CVC4])])
-
-if test -z "${enable_dumping+set}"; then
-  enable_dumping=yes
-fi
-
-AC_MSG_RESULT([$enable_dumping])
-
-if test "$enable_dumping" = yes; then
-  CVC4CPPFLAGS="${CVC4CPPFLAGS:+$CVC4CPPFLAGS }-DCVC4_DUMPING"
-fi
-
-AC_MSG_CHECKING([whether to do a muzzled build of CVC4])
-AC_ARG_ENABLE([muzzle],
-  [AS_HELP_STRING([--enable-muzzle],
-     [completely silence CVC4; remove ALL non-result output from build])])
-
-if test -z "${enable_muzzle+set}"; then
-  enable_muzzle=no
-fi
-
-AC_MSG_RESULT([$enable_muzzle])
-
-if test "$enable_muzzle" = yes; then
-  CVC4CPPFLAGS="${CVC4CPPFLAGS:+$CVC4CPPFLAGS }-DCVC4_MUZZLE"
-fi
-
-AC_MSG_CHECKING([whether to do a gcov-enabled build of CVC4])
-AC_ARG_ENABLE([coverage],
-  [AS_HELP_STRING([--enable-coverage],
-     [build with support for gcov coverage testing])])
-
-if test -z "${enable_coverage+set}"; then
-  enable_coverage=no
-  # make COVERAGE_ON the empty string for makefile conditional function
-  # $(if $(COVERAGE_ON), action1, action2)
-  COVERAGE_ON=
-fi
-
-AC_MSG_RESULT([$enable_coverage])
-
-if test "$enable_coverage" = yes; then
-  # For coverage testing, we prefer:
-  #     --enable-static --disable-shared --disable-static-binary
-  # If the user didn't specify these, we force them here.  If the
-  # user specified them in opposite phase, give warnings that they
-  # shouldn't do that, or bomb out.
-  COVERAGE_ON=yes
-  if test "$user_specified_enable_or_disable_shared" != yes; then
-    enable_shared=no
-    AC_MSG_WARN([turning off shared library building due to --enable-coverage])
-  elif test "$enable_shared" = yes; then
-    AC_MSG_WARN([])
-    AC_MSG_WARN([It is not recommended to configure with --enable-coverage --enable-shared])
-    AC_MSG_WARN([gcov does not support shared libraries, so only your static libraries will be coverage-testable.])
-    AC_MSG_WARN([Your cvc4 driver and testing binaries will not be coverage-testable.])
-    AC_MSG_WARN([])
-  fi
-  if test "${enable_static_binary+set}" = set -a "$enable_static_binary" = yes; then
-    AC_MSG_WARN([])
-    AC_MSG_WARN([It is not recommended to configure with --enable-coverage --enable-static-binary])
-    AC_MSG_WARN([Your cvc4 driver and testing binaries will be fully-statically linked and may not be coverage-testable.])
-    AC_MSG_WARN([])
-  fi
-  if test "$user_specified_enable_or_disable_static" != yes; then
-    enable_static=yes
-    AC_MSG_WARN([turning on static library building due to --enable-coverage])
-  elif test "$enable_static" != yes; then
-    AC_MSG_ERROR([--enable-coverage and --disable-static are incompatible; gcov only supports static libraries.])
-  fi
-
-  CVC4CPPFLAGS="${CVC4CPPFLAGS:+$CVC4CPPFLAGS }-DCVC4_COVERAGE"
-  CVC4CXXFLAGS="${CVC4CXXFLAGS:+$CVC4CXXFLAGS }--coverage"
-  CVC4CFLAGS="${CVC4CFLAGS:+$CVC4CFLAGS }--coverage"
-  CVC4LDFLAGS="${CVC4LDFLAGS:+$CVC4LDFLAGS }--coverage"
-fi
-
-AC_MSG_CHECKING([whether to do a profiling-enabled build of CVC4])
-
-AC_ARG_ENABLE([profiling],
-  [AS_HELP_STRING([--enable-profiling],
-     [build with support for gprof profiling])])
-
-if test -z "${enable_profiling+set}"; then
-  enable_profiling=no
-fi
-
-AC_MSG_RESULT([$enable_profiling])
-
-if test "$enable_profiling" = yes; then
-  CVC4CPPFLAGS="${CVC4CPPFLAGS:+$CVC4CPPFLAGS }-DCVC4_PROFILING"
-  CVC4CXXFLAGS="${CVC4CXXFLAGS:+$CVC4CXXFLAGS }-pg"
-  CVC4CFLAGS="${CVC4CFLAGS:+$CVC4CFLAGS }-pg"
-  CVC4LDFLAGS="${CVC4LDFLAGS:+$CVC4LDFLAGS }-pg"
-fi
-
-# Check for libglpk (defined in config/glpk.m4)
-AC_ARG_WITH([glpk],
-  [AS_HELP_STRING([--with-glpk],
-     [use GLPK simplex solver])], [], [with_glpk=])
-CVC4_CHECK_FOR_GLPK
-if test $have_libglpk -eq 1; then
-  CVC4CPPFLAGS="${CVC4CPPFLAGS:+$CVC4CPPFLAGS }-DCVC4_USE_GLPK"
-fi
-AM_CONDITIONAL([CVC4_USE_GLPK], [test $have_libglpk -eq 1])
-AC_SUBST([GLPK_LDFLAGS])
-AC_SUBST([GLPK_LIBS])
-
-# Build with libabc (defined in config/abc.m4)
-AC_ARG_WITH([abc],
-  [AS_HELP_STRING([--with-abc],
-     [use the ABC AIG library])], [], [with_abc=])
-CVC4_CHECK_FOR_ABC
-if test $have_libabc -eq 1; then
-  CVC4CPPFLAGS="${CVC4CPPFLAGS:+$CVC4CPPFLAGS }-DCVC4_USE_ABC"
-fi
-AM_CONDITIONAL([CVC4_USE_ABC], [test $have_libabc -eq 1])
-AC_SUBST([ABC_LDFLAGS])
-AC_SUBST([ABC_LIBS])
-
-
-# Build with libcadical
-AC_ARG_WITH([cadical],
-  [AS_HELP_STRING([--with-cadical],
-     [use the CaDiCaL SAT solver])], [], [with_cadical=])
-CVC4_CHECK_FOR_CADICAL
-if test $have_libcadical -eq 1; then
-  CVC4CPPFLAGS="${CVC4CPPFLAGS:+$CVC4CPPFLAGS }-DCVC4_USE_CADICAL"
-  CVC4CPPFLAGS="${CVC4CPPFLAGS:+$CVC4CPPFLAGS }-I$CADICAL_HOME/src"
-fi
-AM_CONDITIONAL([CVC4_USE_CADICAL], [test $have_libcadical -eq 1])
-AC_SUBST([CADICAL_LDFLAGS])
-AC_SUBST([CADICAL_LIBS])
-
-# Build with libcryptominisat
-AC_ARG_WITH([cryptominisat],
-  [AS_HELP_STRING([--with-cryptominisat],
-     [use the CRYPTOMINISAT sat solver])], [], [with_cryptominisat=])
-CVC4_CHECK_FOR_CRYPTOMINISAT
-if test $have_libcryptominisat -eq 1; then
-  CVC4CPPFLAGS="${CVC4CPPFLAGS:+$CVC4CPPFLAGS }-DCVC4_USE_CRYPTOMINISAT"
-  CVC4CPPFLAGS="${CVC4CPPFLAGS:+$CVC4CPPFLAGS }-I$CRYPTOMINISAT_HOME/include"
-fi
-AM_CONDITIONAL([CVC4_USE_CRYPTOMINISAT], [test $have_libcryptominisat -eq 1])
-AC_SUBST([CRYPTOMINISAT_LDFLAGS])
-AC_SUBST([CRYPTOMINISAT_LIBS])
-
-# Build with LFSC
-AC_ARG_WITH([lfsc],
-  [AS_HELP_STRING([--with-lfsc],
-     [use the LFSC proof checker])], [], [with_lfsc=])
-CVC4_CHECK_FOR_LFSC
-if test $have_liblfsc -eq 1; then
-  CVC4CPPFLAGS="${CVC4CPPFLAGS:+$CVC4CPPFLAGS }-DCVC4_USE_LFSC"
-fi
-AM_CONDITIONAL([CVC4_USE_LFSC], [test $have_liblfsc -eq 1])
-AC_SUBST([LFSC_LDFLAGS])
-AC_SUBST([LFSC_LIBS])
-
-# Build with symfpu
-AC_ARG_WITH([symfpu],
-  [AS_HELP_STRING([--with-symfpu],
-     [use symfpu for floating point solver])], [], [with_symfpu=])
-CVC4_CHECK_FOR_SYMFPU
-if test $have_symfpu_headers -eq 1; then
-  CVC4CPPFLAGS="${CVC4CPPFLAGS:+$CVC4CPPFLAGS }-DCVC4_USE_SYMFPU"
-  CVC4CPPFLAGS="${CVC4CPPFLAGS:+$CVC4CPPFLAGS }-I$SYMFPU_HOME"
-fi
-AM_CONDITIONAL([CVC4_USE_SYMFPU], [test $have_symfpu_headers -eq 1])
-AC_SUBST([CVC4_USE_SYMFPU], [$have_symfpu_headers])
-
-# Check to see if this version/architecture of GNU C++ explicitly
-# instantiates std::hash<uint64_t> or not.  Some do, some don't.
-# See src/util/hash.h.
-AC_MSG_CHECKING([whether std::hash<uint64_t> is already specialized])
-AC_LANG_PUSH([C++])
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-#include <cstdint>
-#include <functional>
-namespace std { template<> struct hash<uint64_t> {}; }])],
-                  [AC_MSG_RESULT([no]); CVC4CPPFLAGS="${CVC4CPPFLAGS:+$CVC4CPPFLAGS }-DCVC4_NEED_HASH_UINT64_T"],
-                  [AC_MSG_RESULT([yes])])
-AC_LANG_POP([C++])
-
-# Check whether "long" and "int64_t" are distinct types w.r.t. overloading.
-# Even if they have the same size, they can be distinct, and some platforms
-# can have problems with ambiguous function calls when auto-converting
-# int64_t to long, and others will complain if you overload a function
-# that takes an int64_t with one that takes a long (giving a redefinition
-# error).  So we have to keep both happy.  Probably the same underlying
-# issue as the hash specialization above, but let's check separately
-# for flexibility.
-AC_MSG_CHECKING([for the relationship between long and int64_t])
-AC_LANG_PUSH([C++])
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-#include <stdint.h>
-void foo(long) {}
-void foo(int64_t) {}])],
-                  [AC_MSG_RESULT([no relationship detected]); CVC4_NEED_INT64_T_OVERLOADS=1],
-                  [AC_MSG_RESULT([typedef or similar]); CVC4_NEED_INT64_T_OVERLOADS=0])
-AC_LANG_POP([C++])
-AC_SUBST([CVC4_NEED_INT64_T_OVERLOADS])
-
-# Check for ANTLR runantlr script (defined in config/antlr.m4)
-AC_PROG_ANTLR
-
-CVC4_CXX_OPTION([-Werror], [WERROR])
-CVC4_C_OPTION([-Werror], [C_WERROR])
-CVC4_CXX_OPTION([-Wno-deprecated], [WNO_DEPRECATED])
-CVC4_C_OPTION([-Wno-deprecated], [C_WNO_DEPRECATED])
-CVC4_CXX_OPTION([-Wno-conversion-null], [WNO_CONVERSION_NULL])
-CVC4_CXX_OPTION([-Wno-tautological-compare], [WNO_TAUTOLOGICAL_COMPARE])
-CVC4_CXX_OPTION([-Wno-parentheses], [WNO_PARENTHESES])
-CVC4_CXX_OPTION([-Wno-uninitialized], [WNO_UNINITIALIZED])
-CVC4_CXX_OPTION([-Wno-unused-variable], [WNO_UNUSED_VARIABLE])
-CVC4_CXX_OPTION([-Wsuggest-override], [W_SUGGEST_OVERRIDE])
-CVC4_CXX_OPTION([-Wnon-virtual-dtor], [W_NON_VIRTUAL_DTOR])
-CVC4_CXX_OPTION([-fno-strict-aliasing], [FNO_STRICT_ALIASING])
-AC_SUBST([WERROR])
-AC_SUBST([WNO_CONVERSION_NULL])
-AC_SUBST([WNO_TAUTOLOGICAL_COMPARE])
-AC_SUBST([WNO_PARENTHESES])
-AC_SUBST([WNO_UNINITIALIZED])
-AC_SUBST([WNO_UNUSED_VARIABLE])
-AC_SUBST([W_SUGGEST_OVERRIDE])
-AC_SUBST([W_NON_VIRTUAL_DTOR])
-AC_SUBST([FNO_STRICT_ALIASING])
-
-CVC4CXXFLAGS="${CVC4CXXFLAGS:+$CVC4CXXFLAGS }${W_SUGGEST_OVERRIDE}"
-CVC4CXXFLAGS="${CVC4CXXFLAGS:+$CVC4CXXFLAGS }${W_NON_VIRTUAL_DTOR}"
-
-# On Mac, we have to fix the visibility of standard library symbols.
-# Otherwise, exported template instantiations---even though explicitly
-# CVC4_PUBLIC, can be generated as symbols with internal-only linkage.
-# Presumably, Apple is distributing a libstdc++ that is built *without*
-# --enable-libstdcxx-visibility (?)
-if test "$target_vendor" = apple; then
-  CVC4CPPFLAGS="${CVC4CPPFLAGS:+$CVC4CPPFLAGS }-D_GLIBCXX_VISIBILITY_DEFAULT=\"__attribute__((__visibility__(\\\"default\\\")))\""
-fi
-
-# Doxygen configuration
-AC_ARG_ENABLE([internals-documentation],
-  [AS_HELP_STRING([--enable-internals-documentation],
-     [build Doxygen documentation for static and private member functions])])
-if test "$enable_internals_documentation" = yes; then
-  DOXYGEN_EXTRACT_PRIVATE=YES
-  DOXYGEN_EXTRACT_STATIC=YES
-else
-  DOXYGEN_EXTRACT_PRIVATE=NO
-  DOXYGEN_EXTRACT_STATIC=NO
-fi
-AC_SUBST([DOXYGEN_EXTRACT_PRIVATE])
-AC_SUBST([DOXYGEN_EXTRACT_STATIC])
-
-DX_MAN_FEATURE(OFF)
-DX_PDF_FEATURE(OFF)
-DX_PS_FEATURE(OFF)
-DX_DOT_FEATURE(OFF)
-DX_INIT_DOXYGEN($PACKAGE_NAME, config/doxygen.cfg, $srcdir/doc/doxygen)
-
-AC_ARG_ENABLE([unit-testing], AS_HELP_STRING([--disable-unit-testing], [do not build support for unit testing, even if available]), , [enable_unit_testing=check])
-AC_ARG_VAR(CXXTEST, [path to CxxTest installation])
-AC_ARG_WITH([cxxtest-dir],
-  [AS_HELP_STRING([--with-cxxtest-dir=DIR], [path to CxxTest installation])],
-  [CXXTEST="$withval"])
-
-TESTS_ENVIRONMENT=
-RUN_REGRESSION_ARGS=
-if test "$with_lfsc" = yes; then
-  RUN_REGRESSION_ARGS="${RUN_REGRESSION_ARGS:+$RUN_REGRESSION_ARGS }--with-lfsc"
-fi
-if test "$enable_proof" = yes; then
-  RUN_REGRESSION_ARGS="${RUN_REGRESSION_ARGS:+$RUN_REGRESSION_ARGS }--enable-proof"
-fi
-AC_SUBST([TESTS_ENVIRONMENT])
-AC_SUBST([RUN_REGRESSION_ARGS])
-
-AC_ARG_VAR(TEST_CPPFLAGS, [CPPFLAGS to use when testing (default=$CPPFLAGS)])
-AC_ARG_VAR(TEST_CXXFLAGS, [CXXFLAGS to use when testing (default=$CXXFLAGS)])
-AC_ARG_VAR(TEST_LDFLAGS,  [LDFLAGS to use when testing (default=$LDFLAGS)])
-
-CXXTESTGEN=
-if test "$enable_unit_testing" = "no"; then
-  AC_MSG_NOTICE([unit tests disabled by user request.])
-  CXXTEST=
-else
-  # The latest version of cxxtest distributed from the git repository places
-  # cxxtest under <cxxtest-root>/bin/cxxtest
-  AC_PATH_PROGS(CXXTESTGEN,
-                cxxtestgen.pl cxxtestgen.py cxxtestgen,
-                [],
-                [$CXXTEST:$CXXTEST/bin:$PATH])
-
-  if test -n "$CXXTESTGEN"; then
-    if "`basename $CXXTESTGEN`" = "cxxtestgen.pl"; then
-      if test -z "$PERL"; then
-        AC_CHECK_PROGS(PERL, perl, perl, [])
-      else
-        AC_CHECK_PROG(PERL, "$PERL", "$PERL", [])
-      fi
-
-      if test -z "$PERL"; then
-        AC_MSG_WARN([unit tests disabled, perl not found.])
-        CXXTESTGEN=
-        CXXTEST=
-      fi
-    fi
-  else
-    AC_MSG_NOTICE([unit tests disabled, could not find cxxtestgen.pl or cxxtestgen.py or cxxtestgen])
-    CXXTEST=
-  fi
-
-  # check if CxxTest headers exist and set include paths accordingly
-  if test -n "$CXXTESTGEN"; then
-    AC_MSG_CHECKING([for location of CxxTest headers])
-    if test -n "$CXXTEST"; then
-      if test -e "$CXXTEST/cxxtest/TestRunner.h"; then
-        AC_MSG_RESULT([$CXXTEST])
-        TEST_CPPFLAGS="${TEST_CPPFLAGS} -I$CXXTEST"
-        TEST_CXXFLAGS="${TEST_CXXFLAGS} -I$CXXTEST"
-      else
-        AC_MSG_RESULT([not found])
-        AC_MSG_WARN([unit tests disabled, CxxTest headers not found at $CXXTEST.])
-        CXXTESTGEN=
-        CXXTEST=
-      fi
-    # TODO: use more generic way to find cxxtest/TestRunner.h in system headers
-    elif test -e "/usr/include/cxxtest/TestRunner.h"; then
-      CXXTEST=/usr/include
-      AC_MSG_RESULT([$CXXTEST])
-    else
-      CXXTEST=`dirname "$CXXTESTGEN"`
-      if test -e "$CXXTEST/cxxtest/TestRunner.h"; then
-        AC_MSG_RESULT([$CXXTEST])
-        TEST_CPPFLAGS="${TEST_CPPFLAGS} -I$CXXTEST"
-        TEST_CXXFLAGS="${TEST_CXXFLAGS} -I$CXXTEST"
-      else
-        AC_MSG_RESULT([not found])
-        AC_MSG_WARN([unit tests disabled, CxxTest headers not found.])
-        CXXTESTGEN=
-        CXXTEST=
-      fi
-    fi
-  fi
-fi
-
-if test "$enable_unit_testing" = yes -a -z "$CXXTESTGEN"; then
-  AC_MSG_ERROR([--enable-unit-testing given but cxxtest not found.])
-fi
-
-AM_CONDITIONAL([HAVE_CXXTESTGEN], [test -n "$CXXTESTGEN"])
-
-AC_ARG_VAR(PERL, [PERL interpreter (used when testing)])
-
-# Python is now a required dependency for generating options code
-AM_PATH_PYTHON([2.7],, [
-  AC_MSG_ERROR([Python not found.])
-])
-
-# Checks for libraries.
-
-AC_SEARCH_LIBS([clock_gettime], [rt pthread],
-               [AC_DEFINE([HAVE_CLOCK_GETTIME], [1],
-                          [Defined to 1 if clock_gettime() is supported by the platform.])],
-               [AC_LIBOBJ([clock_gettime])])
-AC_CHECK_FUNC([strtok_r], [AC_DEFINE([HAVE_STRTOK_R], [1],
-                                     [Defined to 1 if strtok_r() is supported by the platform.])])
-AC_CHECK_FUNC([ffs], [AC_DEFINE([HAVE_FFS], [1],
-                                [Defined to 1 if ffs() is supported by the platform.])])
-
-AC_LIBOBJ([strtok_r ffs])
-
-# Check for sigaltstack (missing in emscripten and mingw)
-AC_CHECK_FUNC([sigaltstack], [AC_DEFINE([HAVE_SIGALTSTACK], [1],
-                                        [Defined to 1 if sigaltstack() is supported by the platform.])])
-
-# Check for antlr C++ runtime (defined in config/antlr.m4)
-AC_LIB_ANTLR
-
-# Check for user preferences for language bindings to build, and for
-# build support.  The arg list is the default set if unspecified by
-# the user (the actual built set is the subset that appears to be
-# supported by the build host).
-CVC4_CHECK_BINDINGS([c java])dnl csharp perl php python ruby tcl ocaml])
-
-# Checks for header files and their contents.
-AC_CHECK_HEADERS([getopt.h unistd.h ext/stdio_filebuf.h])
-
-# Checks for typedefs, structures, and compiler characteristics.
-#AC_HEADER_STDBOOL
-# these are bad macros, they clash with system header <stdint.h> !!
-#AC_TYPE_UINT16_T
-#AC_TYPE_UINT32_T
-#AC_TYPE_UINT64_T
-#AC_TYPE_SIZE_T
-
-# guard against double-inclusion of the autoheader
-AH_TOP([#ifndef __CVC4__CVC4AUTOCONFIG_H
-#define __CVC4__CVC4AUTOCONFIG_H])
-AH_BOTTOM([#endif /* __CVC4__CVC4AUTOCONFIG_H */])
-
-AC_CHECK_DECLS([optreset], [], [], [#include <getopt.h>])
-
-# check with which standard strerror_r() complies
-AC_FUNC_STRERROR_R
-
-# require boost library
-BOOST_REQUIRE()
-
-# look for boost threading library
-AC_ARG_WITH([portfolio],
-    AS_HELP_STRING([--with-portfolio], [build the multithreaded portfolio version of CVC4 (pcvc4)]))
-cvc4_save_LDFLAGS="$LDFLAGS"
-if test "$enable_static_binary" = yes; then
-  LDFLAGS="-static $LDFLAGS"
-fi
-cvc4_has_threads=yes
-AC_ARG_ENABLE([thread-support],
-    AS_HELP_STRING([--disable-thread-support], [do not support multithreaded-capable library]))
-if test "$enable_thread_support" = no; then
-  cvc4_has_threads=no
-  if test "$with_portfolio" = yes; then
-    AC_MSG_ERROR([user gave both --with-portfolio and --disable-thread-support, which are contradictory])
-  fi
-else
-  BOOST_THREADS([], [AC_MSG_WARN([disabling multithreaded support])
-                     cvc4_has_threads=no])
-fi
-LDFLAGS="$cvc4_save_LDFLAGS"
-if test $cvc4_has_threads = no; then
-  if test "$enable_thread_support" = yes; then
-    AC_MSG_ERROR([user gave --enable-thread-support but could not build with threads; maybe boost threading library is missing?])
-  fi
-  if test "$with_portfolio" = yes; then
-    AC_MSG_ERROR([user gave --with-portfolio but could not build with threads; maybe boost threading library is missing?])
-  fi
-  with_portfolio=no
-fi
-if test "$with_portfolio" != yes; then
-  with_portfolio=no
-fi
-AM_CONDITIONAL([CVC4_BUILD_PCVC4], [test "$with_portfolio" = yes])
-if test "$with_portfolio" = yes; then
-  CVC4CPPFLAGS="${CVC4CPPFLAGS:+$CVC4CPPFLAGS }-DCVC4_PORTFOLIO"
-
-  # see if Boost has thread attributes (should be any version >= 1.50.0)
-  # non-fatal error if not, but we won't support --thread-stack option
-  AC_MSG_CHECKING([whether Boost threads support thread attrs])
-  AC_LANG_PUSH([C++])
-  cvc4_save_CPPFLAGS="$CPPFLAGS"
-  cvc4_save_LIBS="$LIBS"
-  cvc4_save_LDFLAGS="$LDFLAGS"
-  CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-  LIBS="$LIBS $BOOST_THREAD_LIBS"
-  LDFLAGS="$LDFLAGS $BOOST_THREAD_LDFLAGS"
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <boost/thread.hpp>],
-         [boost::thread::attributes attrs; attrs.set_stack_size(10 * 1024 * 1024);])],
-    [cvc4_boost_has_thread_attr=1;
-     AC_MSG_RESULT([yes])],
-    [cvc4_boost_has_thread_attr=0;
-     AC_MSG_RESULT([no])])
-  CPPFLAGS="$cvc4_save_CPPFLAGS"
-  LIBS="$cvc4_save_LIBS"
-  LDFLAGS="$cvc4_save_LDFLAGS"
-  AC_LANG_POP([C++])
-else
-  cvc4_boost_has_thread_attr=0
-fi
-AC_DEFINE_UNQUOTED([BOOST_HAS_THREAD_ATTR], $cvc4_boost_has_thread_attr, [Define to 1 if Boost threading library has support for thread attributes])
-
-# Check for libreadline (defined in config/readline.m4)
-AC_ARG_WITH([readline], [AS_HELP_STRING([--with-readline], [support the readline library])], [], [with_readline=check])
-# make the flags as close as possible to the final flags, because the Boost
-# flags can bring in a different, incompatible readline library than we'd
-# get otherwise (e.g. on Mac, where there are commonly two different readlines,
-# one in /usr and one in /opt/local)
-cvc4_rlcheck_save_CPPFLAGS="$CPPFLAGS"
-cvc4_rlcheck_save_CXXFLAGS="$CXXFLAGS"
-cvc4_rlcheck_save_CFLAGS="$CFLAGS"
-cvc4_rlcheck_save_LDFLAGS="$LDFLAGS"
-CPPFLAGS="${CPPFLAGS:+$CPPFLAGS }${BOOST_CPPFLAGS:+$BOOST_CPPFLAGS }$CVC4CPPFLAGS"
-CXXFLAGS="${CXXFLAGS:+$CXXFLAGS }$CVC4CXXFLAGS $WNO_DEPRECATED"
-CFLAGS="${CFLAGS:+$CFLAGS }$CVC4CFLAGS $C_WNO_DEPRECATED -fexceptions"
-LDFLAGS="${LDFLAGS:+$LDFLAGS }$CVC4LDFLAGS"
-CVC4_CHECK_FOR_READLINE
-CPPFLAGS="$cvc4_rlcheck_save_CPPFLAGS"
-CXXFLAGS="$cvc4_rlcheck_save_CXXFLAGS"
-CFLAGS="$cvc4_rlcheck_save_CFLAGS"
-LDFLAGS="$cvc4_rlcheck_save_LDFLAGS"
-AC_DEFINE_UNQUOTED([HAVE_LIBREADLINE], $have_libreadline, [Define to 1 to use libreadline])
-AC_DEFINE_UNQUOTED([READLINE_COMPENTRY_FUNC_RETURNS_CHARP], $readline_compentry_func_returns_charp, [Define to 1 if rl_completion_entry_function is declared to return pointer to char])
-AC_SUBST([READLINE_LIBS])
-
-# Whether to compile with google profiling tools
-cvc4_use_google_perftools=0
-AC_ARG_WITH(
-    [google_perftools],
-    AS_HELP_STRING(
-        [--with-google-perftools],
-        [use Google Performance Tools]
-    ),
-    [if test "$withval" != no; then
-        cvc4_use_google_perftools=1
-     fi
-    ]
-)
-AC_MSG_CHECKING([whether to link in google perftools libraries])
-if test $cvc4_use_google_perftools = 1; then
-  AC_MSG_RESULT([yes])
-  AC_CHECK_LIB([tcmalloc], [MallocExtension_GetAllocatedSize], , [AC_MSG_ERROR([cannot link google-perftools test program with -ltcmalloc])], [-lpthread])
-  AC_CHECK_LIB([profiler], [ProfilerStart], , [AC_MSG_ERROR([cannot link google-perftools test program with -lprofiler])], [-lpthread])
-else
-  AC_MSG_RESULT([no (user didn't request it)])
-fi
-
-# Java
-AC_ARG_VAR(JAVA, [Java interpreter (used when testing Java interface)])
-AC_ARG_VAR(JAVAC, [Java compiler (used when building and testing Java interface)])
-AC_ARG_VAR(JAVAH, [Java compiler (used when building and testing Java interface)])
-AC_ARG_VAR(JAR, [Jar archiver (used when building Java interface)])
-if test "$cvc4_build_java_bindings"; then
-  dnl AM_PROG_GCJ
-  if test -z "$JAVA"; then
-    AC_CHECK_PROGS(JAVA, java, java, [])
-  else
-    AC_CHECK_PROG(JAVA, "$JAVA", "$JAVA", [])
-  fi
-  if test -z "$JAVAC"; then
-    AC_CHECK_PROGS(JAVAC, javac gcj, javac, [])
-    if test "$JAVAC" = gcj; then JAVAC='gcj -C'; fi
-  else
-    AC_CHECK_PROG(JAVAC, "$JAVAC", "$JAVAC", [])
-  fi
-  if test -z "$JAVAH"; then
-    AC_CHECK_PROGS(JAVAH, javah gcjh, javah, [])
-  else
-    AC_CHECK_PROG(JAVAH, "$JAVAH", "$JAVAH", [])
-  fi
-  if test -z "$JAR"; then
-    AC_CHECK_PROGS(JAR, jar, jar, [])
-  else
-    AC_CHECK_PROG(JAR, "$JAR", "$JAR", [])
-  fi
-fi
-
-# on Mac OS X, Java doesn't like the .so module extension; it wants .dylib
-module=no eval CVC4_JAVA_MODULE_EXT="$shrext_cmds"
-if test -z "$CVC4_JAVA_MODULE_EXT"; then
-  CVC4_JAVA_MODULE_EXT=.so
-fi
-AC_SUBST([CVC4_JAVA_MODULE_EXT])
-
-# Prepare configure output
-
-if test "$enable_shared" = yes; then BUILDING_SHARED=1; else BUILDING_SHARED=0; fi
-if test "$enable_static" = yes; then BUILDING_STATIC=1; else BUILDING_STATIC=0; fi
-if test "$enable_static_binary" = yes; then STATIC_BINARY=1; else STATIC_BINARY=0; fi
-AC_SUBST(BUILDING_SHARED)
-AC_SUBST(BUILDING_STATIC)
-AC_SUBST(STATIC_BINARY)
-AM_CONDITIONAL([STATIC_BINARY], [test "$enable_static_binary" = yes])
-AM_CONDITIONAL([COVERAGE_ENABLED], [test "$enable_coverage" = yes])
-AC_SUBST([COVERAGE_ON])
-
-AM_CONDITIONAL([CVC4_DEBUG], [test "$with_build" = debug])
-AM_CONDITIONAL([CVC4_TRACING], [test "$enable_tracing" = yes])
-
-AC_SUBST(CVC4_LIBRARY_VERSION)
-AC_SUBST(CVC4_PARSER_LIBRARY_VERSION)
-AC_SUBST(CVC4_BINDINGS_LIBRARY_VERSION)
-
-AC_DEFINE_UNQUOTED(CVC4_MAJOR, ${CVC4_MAJOR}, [Major component of the version of CVC4.])
-AC_DEFINE_UNQUOTED(CVC4_MINOR, ${CVC4_MINOR}, [Minor component of the version of CVC4.])
-AC_DEFINE_UNQUOTED(CVC4_RELEASE, ${CVC4_RELEASE}, [Release component of the version of CVC4.])
-AC_DEFINE_UNQUOTED(CVC4_EXTRAVERSION, ["${CVC4_EXTRAVERSION}"], [Extraversion component of the version of CVC4.])
-AC_DEFINE_UNQUOTED(CVC4_RELEASE_STRING, ["${CVC4_RELEASE_STRING}"], [Full release string for CVC4.])
-
-CPPFLAGS="${CPPFLAGS:+$CPPFLAGS }${BOOST_CPPFLAGS:+$BOOST_CPPFLAGS }$CVC4CPPFLAGS"
-CXXFLAGS="${CXXFLAGS:+$CXXFLAGS }$CVC4CXXFLAGS -Wno-deprecated"
-CFLAGS="${CFLAGS:+$CFLAGS }$CVC4CFLAGS -Wno-deprecated -fexceptions"
-LDFLAGS="${LDFLAGS:+$LDFLAGS }$CVC4LDFLAGS"
-
-# visibility flag not supported for Windows builds
-# also increase default stack size for Windows binaries
-windows_build=no
-case $host_os in
-  (*mingw*) FLAG_VISIBILITY_HIDDEN=
-            cvc4_LDFLAGS=-Wl,--stack,134217728
-            pcvc4_LDFLAGS=-Wl,--stack,134217728
-            windows_build=yes
-esac
-
-AM_CONDITIONAL([CVC4_WINDOWS_BUILD], [test "$windows_build" = "yes"])
-
-AC_SUBST(FLAG_VISIBILITY_HIDDEN)
-AC_SUBST(cvc4_LDFLAGS)
-AC_SUBST(pcvc4_LDFLAGS)
-
-AM_CONDITIONAL(WHITE_AND_BLACK_TESTS, [test -z "$FLAG_VISIBILITY_HIDDEN"])
-
-# remember the command line used for configure
-AC_SUBST(cvc4_config_cmdline)
-
-# mk_include
-#
-# When automake scans Makefiles, it complains about non-standard make
-# features (including GNU extensions), and breaks GNU Make's
-# "if/endif" construct, replacing the "if" with AM_CONDITIONAL if
-# constructs.  automake even follows "include" and messes with
-# included Makefiles.
-#
-# CVC4 assumes GNU Make and we want to use GNU Make if/endifs, so we
-# have to hide some included Makefiles with GNU extensions.  We do
-# this by defining mk_include as an autoconf substitution and then
-# using "@mk_include@ other_makefile" in Makefile.am to include
-# makefiles with GNU extensions; this hides them from automake.
-mk_include=include
-AC_SUBST(mk_include)
-# Similar trickery for "if"
-mk_if=if
-AC_SUBST(mk_if)
-mk_empty=
-AC_SUBST(mk_empty)
-
-# CVC4_FALSE
-#
-# This is used to _always_ comment out rules in automake makefiles, but
-# still trigger certain automake behavior; see test/unit/Makefile.am.
-AM_CONDITIONAL([CVC4_FALSE], [false])
-
-# set up substitutions for src/util/{rational,integer}.h.in
-if test $cvc4_cln_or_gmp = cln; then
-  CVC4_USE_CLN_IMP=1
-  CVC4_USE_GMP_IMP=0
-else
-  CVC4_USE_CLN_IMP=0
-  CVC4_USE_GMP_IMP=1
-fi
-AC_SUBST(CVC4_USE_CLN_IMP)
-AC_SUBST(CVC4_USE_GMP_IMP)
-
-# month/year for man pages
-MAN_DATE=`date '+%B %Y'`
-AC_SUBST(MAN_DATE)
-
-AC_CONFIG_FILES([
-  Makefile.builds
-  Makefile
-  proofs/signatures/Makefile]
-  m4_esyscmd([find contrib src test examples -name Makefile.am | grep -v '^contrib/theoryskel/' | grep -v '^contrib/alttheoryskel/' | sort | sed 's,\.am$,,'])
-)
-
-if test $cvc4_has_threads = yes; then
-  support_multithreaded='with boost threading library'
-  AM_CONDITIONAL([CVC4_HAS_THREADS], [true])
-  AC_SUBST([CVC4_HAS_THREADS], 1)
-else
-  support_multithreaded='no'
-  AM_CONDITIONAL([CVC4_HAS_THREADS], [false])
-  AC_SUBST([CVC4_HAS_THREADS], 0)
-fi
-
-# Final information to the user
-gpl=no
-licensewarn=
-
-if test "$custom_build_profile" = yes; then
-  with_build="$with_build (customized)"
-fi
-
-support_unit_tests='cxxtest not found; unit tests not supported'
-if test -n "$CXXTEST"; then
-  support_unit_tests='unit testing infrastructure enabled in build directory'
-elif test "$enable_unit_testing" = no; then
-  support_unit_tests='unit testing disabled by user'
-fi
-
-if test "$enable_optimized" = yes; then
-  optimized="yes, at level $OPTLEVEL"
-else
-  optimized="no"
-fi
-
-if test $have_libglpk -eq 1; then
-  gpl=yes
-  gpllibs="${gpllibs} glpk"
-fi
-
-if test $have_libreadline -eq 1; then
-  gpl=yes
-  gpllibs="${gpllibs} readline"
-fi
-
-if test $cvc4_cln_or_gmp = cln; then
-  mplibrary='cln (GPL)'
-  gpl=yes
-  gpllibs="${gpllibs} cln"
-  if test $with_portfolio = yes; then
-    AC_ERROR([Bad configuration detected: cannot build portfolio with CLN.
-Please specify only one of --with-portfolio and --with-cln.])
-  fi
-else
-  mplibrary='gmp'
-fi
-
-if test "$gpl" = yes; then
-  if test "$CVC4_BSD_LICENSED_CODE_ONLY" = 1; then
-    AC_ERROR([Bad configuration detected: BSD-licensed code only, but also requested GPLed libraries:$gpllibs
-To permit GPL'ed dependences, use the configure flag --enable-gpl])
-  fi
-
-  licensewarn="${licensewarn}"'****************************************************************************
-Please note that CVC4 will be built against the following GPLed libraries:
- '"$gpllibs"'
-As these libraries are covered under the GPLv3, so is this build of CVC4.
-CVC4 is also available to you under the terms of the (modified) BSD license.
-If you prefer to license CVC4 under those terms, please configure with the
-option "--bsd", which will disable all optional GPLed library dependences.
-****************************************************************************
-
-'
-  license="GPLv3 (due to optional libraries; see below)"
-else
-  licensewarn="${licensewarn}Please note that this configuration is NOT built against any GPL'ed
-libraries, so it is covered by the (modified) BSD license.  This is,
-however, not the best-performing configuration of CVC4.  To build
-against GPL'ed libraries which improve CVC4's performance, re-configure
-with '--best --enable-gpl'.
-
-"
-  license="modified BSD"
-fi
-
-if test "$gpl" = yes; then isgpl=1; else isgpl=0; fi
-AC_DEFINE_UNQUOTED(CVC4_GPL_DEPS, $isgpl, [Whether CVC4 is built with the (optional) GPLed library dependences.])
-
-CVC4_BINDINGS_LIBRARY_VERSION_or_nobuild="$CVC4_BINDINGS_LIBRARY_VERSION"
-if test -z "$CVC4_LANGUAGE_BINDINGS"; then
-  CVC4_BINDINGS_LIBRARY_VERSION_or_nobuild="N/A"
-fi
-
-bindings_to_be_built=none
-if test -n "$CVC4_LANGUAGE_BINDINGS"; then
-  bindings_to_be_built="$CVC4_LANGUAGE_BINDINGS"
-fi
-
-CVC4_CONFIG_FILE_ONLY_IF_CHANGED([src/util/floatingpoint.h])
-CVC4_CONFIG_FILE_ONLY_IF_CHANGED([src/util/integer.h])
-CVC4_CONFIG_FILE_ONLY_IF_CHANGED([src/util/rational.h])
-
-CVC4_CONFIG_FILE_ONLY_IF_CHANGED([doc/cvc4.1_template])
-CVC4_CONFIG_FILE_ONLY_IF_CHANGED([doc/cvc4.5])
-CVC4_CONFIG_FILE_ONLY_IF_CHANGED([doc/libcvc4.3])
-CVC4_CONFIG_FILE_ONLY_IF_CHANGED([doc/SmtEngine.3cvc_template])
-CVC4_CONFIG_FILE_ONLY_IF_CHANGED([doc/options.3cvc_template])
-CVC4_CONFIG_FILE_ONLY_IF_CHANGED([doc/libcvc4parser.3])
-
-AC_OUTPUT
-
-cat <<EOF
-
-CVC4 $VERSION
-
-Build profile: $with_build
-Build ID     : $build_type
-Optimized    : $optimized
-Debug symbols: $enable_debug_symbols
-Proofs       : $enable_proof
-Statistics   : $enable_statistics
-Replay       : $enable_replay
-Assertions   : $enable_assertions
-Tracing      : $enable_tracing
-Dumping      : $enable_dumping
-Muzzle       : $enable_muzzle
-
-Unit tests   : $support_unit_tests
-gcov support : $enable_coverage
-gprof support: $enable_profiling
-
-Static libs  : $enable_static
-Shared libs  : $enable_shared
-Static binary: $enable_static_binary
-Bindings     : $bindings_to_be_built
-
-Multithreaded: $support_multithreaded
-Portfolio    : $with_portfolio
-
-ABC          : $with_abc
-CaDiCaL      : $with_cadical
-Cryptominisat: $with_cryptominisat
-GLPK         : $with_glpk
-LFSC         : $with_lfsc
-MP library   : $mplibrary
-Readline     : $with_readline
-SymFPU       : $with_symfpu
-
-CPPFLAGS     : $CPPFLAGS
-CXXFLAGS     : $CXXFLAGS
-CFLAGS       : $CFLAGS
-LIBS         : $LIBS
-LDFLAGS      : $LDFLAGS
-
-libcvc4 version        : $CVC4_LIBRARY_VERSION
-libcvc4parser version  : $CVC4_PARSER_LIBRARY_VERSION
-libcvc4bindings version: $CVC4_BINDINGS_LIBRARY_VERSION_or_nobuild
-
-Install into : $prefix
-
-CVC4 license : $license
-
-${licensewarn}Now just type make, followed by make check or make install, as you like.
-
-EOF
-
-if test -n "$CVC4_UNSUPPORTED_LANGUAGE_BINDINGS"; then
-  AC_MSG_WARN([])
-  AC_MSG_WARN([You are electing to build unsupported language binding(s):])
-  AC_MSG_WARN([    $CVC4_UNSUPPORTED_LANGUAGE_BINDINGS])
-  AC_MSG_WARN([Please be aware that these bindings may not compile, or])
-  AC_MSG_WARN([work, and the interface to CVC4 via these bindings may])
-  AC_MSG_WARN([change drastically in upcoming releases of CVC4.])
-  AC_MSG_WARN([])
-fi
-
-if test -n "$CVC4_INTEGRITY_WARNING"; then
-  AC_MSG_WARN([])
-  AC_MSG_WARN($CVC4_INTEGRITY_WARNING)
-  AC_MSG_WARN([Please run "make check" after building to ensure integrity of the binary and library])
-  AC_MSG_WARN([])
-fi
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
deleted file mode 100644
index 4d61e88f4..000000000
--- a/contrib/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-EXTRA_DIST = \
-	README \
-	cvc-devel.el \
-	dimacs_to_smt.pl \
-	switch-config \
-	cvc-mode.el \
-	editing-with-emacs \
-	luby.c \
-	addsourcedir \
-	new-theory \
-	configure-in-place \
-	depgraph \
-	get-abc \
-	get-antlr-3.4 \
-	get-cadical \
-	get-cryptominisat \
-	get-glpk-cut-log \
-	get-lfsc-checker \
-	get-script-header.sh \
-	get-symfpu \
-	get-win-dependencies \
-	mac-build \
-	run-script-smtcomp2014 \
-	run-script-cascj7-fnt \
-	run-script-cascj7-fof \
-	run-script-cascj7-tff \
-	theoryskel/kinds \
-	theoryskel/README.WHATS-NEXT \
-	theoryskel/theory_DIR.cpp \
-	theoryskel/theory_DIR.h \
-	theoryskel/theory_DIR_rewriter.h \
-	theoryskel/theory_DIR_type_rules.h
-	alttheoryskel/kinds \
-	alttheoryskel/README.WHATS-NEXT \
-	alttheoryskel/theory_DIR.cpp \
-	alttheoryskel/theory_DIR.h
diff --git a/contrib/addsourcedir b/contrib/addsourcedir
deleted file mode 100755
index 431ec1d90..000000000
--- a/contrib/addsourcedir
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/bin/sh
-#
-# addsourcedir
-# Morgan Deters <mdeters@cs.nyu.edu> for the CVC4 project
-# Copyright (c) 2010, 2011  The CVC4 Project
-#
-# usage: addsourcedir paths...
-#
-
-progname=`basename "$0"`
-cd `dirname "$0"`/..
-
-if [ $# -lt 1 ]; then
-  echo >&2
-  echo "usage: $progname paths..." >&2
-  echo >&2
-  echo "Each path should be relative to the top-level source directory, e.g.:" >&2
-  echo >&2
-  echo "  $progname src/expr" >&2
-  echo >&2
-  exit 1
-fi
-
-while [ $# -gt 0 ]; do
-  srcdir="$1"; shift
-
-  # remove trailing slashes, if any
-  srcdir=`expr "$srcdir" : '\(.*[^/]\)/*$'`
-  # remove redundant slashes, if any
-  srcdir=`echo "$srcdir" | sed 's,//*,/,g'`
-
-  if expr "$srcdir" : src/ >/dev/null; then :; else
-    echo "$progname: error: Directories must be under src/" >&2
-    echo "$progname: error: and \`$srcdir' isn't!" >&2
-    echo "$progname: error: Make sure you provide source paths" >&2
-    echo "$progname: error: relative to the top level, e.g. \`src/expr'." >&2
-    exit 1
-  fi
-
-  if [ -d "$srcdir" ]; then :; else
-    echo "creating directory \`$srcdir'..."
-    mkdir -p "$srcdir"
-  fi
-
-  # enough dotdots to get us back to the top-level directory
-  # (e.g. "src/foo" yields "../.." here), used for $(topdir) in Makefile
-  topdir=`echo "$srcdir" | sed 's,[^/][^/]*,..,g'`
-  # one less, used for the include path in Makefile.am
-  topsrcdir=`echo "$topdir" | sed 's,\.\./,,'`
-
-  if [ -e "$srcdir/Makefile" ]; then
-    echo "$progname: warning: not replacing extant \`$srcdir/Makefile'." >&2
-  else
-    echo "generating \`$srcdir/Makefile'..."
-    cat >"$srcdir/Makefile" <<EOF
-topdir = $topdir
-srcdir = $srcdir
-
-include \$(topdir)/Makefile.subdir
-EOF
-  fi
-
-  if [ -e "$srcdir/Makefile.am" ]; then
-    echo "$progname: warning: not replacing extant \`$srcdir/Makefile.am'." >&2
-  else
-    echo "generating \`$srcdir/Makefile.am'..."
-    clibbase=`expr "$srcdir" : '.*/\([^/][^/]*\)$'`
-    if expr "$srcdir" : src/parser >/dev/null; then
-      definitions="	-D__BUILDING_CVC4PARSERLIB \\
-"
-      visibility=' $(FLAG_VISIBILITY_HIDDEN)'
-    elif expr "$srcdir" : src/main >/dev/null; then
-      definitions=
-      visibility=
-    else
-      definitions="	-D__BUILDING_CVC4LIB \\
-"
-      visibility=' $(FLAG_VISIBILITY_HIDDEN)'
-    fi
-    clibname="lib${clibbase}.la"
-    clibtarget="lib${clibbase}_la"
-    cat >"$srcdir/Makefile.am" <<EOF
-AM_CPPFLAGS = \\
-$definitions	-I@srcdir@/$topsrcdir/include -I@srcdir@/$topsrcdir -I@builddir@/$topsrcdir
-AM_CXXFLAGS = -Wall$visibility
-
-noinst_LTLIBRARIES = $clibname
-
-${clibtarget}_SOURCES = \\
-	SOURCEFILE.cpp
-EOF
-  fi
-done
-
diff --git a/contrib/code-checker b/contrib/code-checker
deleted file mode 100755
index a40dc61af..000000000
--- a/contrib/code-checker
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-
-while($#ARGV >= 0) {
-  my %FP;
-  my $file = shift @ARGV;
-
-  local $/ = undef;
-
-  open(FP, $file) || die "can't read $file";
-  print "checking $file...\n";
-  binmode FP;
-  my $buf = <FP>;
-  close FP;
-
-  print "file named incorrectly; use *.h: $file\n" if $file =~ /\.(hpp|H|hh)$/;
-  print "file named incorrectly; use *.cpp: $file\n" if $file =~ /\.(C|cc)$/;
-  if($file =~ /\.(h|hpp|H)$/) {
-    check_as_header($buf);
-  } elsif($file =~ /\.(h|cpp|C)$/) {
-    check_as_source($buf);
-  } else {
-    die "$file not checked (unknown type of file)";
-  }
-  open(FP, "cpp -nostdinc \"$file\" 2>/dev/null |") || die "can't cpp $file";
-  binmode FP;
-  $buf = <FP>;
-  close FP;
-
-  if($file =~ /\.(h|hpp|H)$/) {
-    check_as_header_cpp($buf);
-  } elsif($file =~ /\.(h|cpp|C)$/) {
-    check_as_source_cpp($buf);
-  } else {
-    die "$file not checked (unknown type of file)";
-  }
-}
-
-sub check_as_any {
-  my($buf) = @_;
-
-  print "no file head comment\n" unless $buf =~ m,^/*\*\*\*,;
-}
-
-sub check_as_header {
-  my($buf) = @_;
-  check_as_any($buf);
-}
-
-sub check_as_source {
-  my($buf) = @_;
-  check_as_any($buf);
-}
-
-sub check_as_any_cpp {
-  my($buf) = @_;
-
-  print "need space between tokens ) and {\n" if $buf =~ /\)\{/;
-  print "need space between tokens 'const' and {\n" if $buf =~ /\bconst\{/;
-  print "need space between tokens ) and 'const'\n" if $buf =~ /\)const\b/;
-  print "need space between tokens 'template' and <\n" if $buf =~ /\btemplate</;
-  print "need space between tokens } and 'else'\n" if $buf =~ /\}else\b/;
-  print "need space between tokens 'else' and {\n" if $buf =~ /\belse\{/;
-  print "need space between tokens 'do' and {\n" if $buf =~ /\bdo\{/;
-  print "need space between tokens } and 'while'\n" if $buf =~ /\}while\b/;
-
-  print "no space permitted before ;\n" if $buf =~ /\s+;/;
-  print "no space permitted between tokens 'if' and (\n" if $buf =~ /\bif\s\(/;
-  print "no space permitted between tokens 'while' and (\n" if $buf =~ /\bwhile\s\(/;
-  print "no space permitted between tokens 'for' and (\n" if $buf =~ /\bfor\s\(/;
-
-  my $code = $buf;
-  $code =~ s,\\.,.,g;
-  $code =~ s,"[^"]*","",g;
-
-  #print "'if' blocks must be braced, '{' should be last character on block opening line\n" if $code =~ /\bif\b.*[^{]\s*$/m;
-  #print "'while' blocks must be braced, '{' should be last character on block opening line\n" if $code =~ /\bwhile\b.*[^{]\s*$/m;
-  #print "'for' blocks must be braced, '{' should be last character on block opening line\n" if $code =~ /\bfor\b.*[^{]\s*$/m;
-  print "'else' cannot start a line (should follow preceding '}')\n" if $code =~ /^\s+else\b/m;
-}
-
-sub check_as_header_cpp {
-  my($buf) = @_;
-  check_as_any_cpp($buf);
-}
-
-sub check_as_source_cpp {
-  my($buf) = @_;
-  check_as_any_cpp($buf);
-}
-
-## Local Variables:
-## perl-indent-level: 2
-## perl-brace-offset: 0
-## End:
diff --git a/contrib/configure-in-place b/contrib/configure-in-place
deleted file mode 100755
index cc0e9e387..000000000
--- a/contrib/configure-in-place
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash -ex
-#
-# configure-in-place
-# Morgan Deters <mdeters@cs.nyu.edu> for CVC4
-# Copyright (c) 2010-2014  The CVC4 Project
-#
-# usage: configure-in-place [ arguments... ]
-#
-# This script configures CVC4 in the source directory (from where it
-# should be invoked).
-#
-
-if [ -e .git ] && ! [ x"$1" = x-f ]; then
-  echo
-  echo "DO NOT USE THIS IN GIT WORKING DIRECTORIES!"
-  echo
-  echo "You might accidentally commit Makefiles in the source directories"
-  echo "improperly, since they exist in the source directory for"
-  echo "another purpose."
-  echo
-  exit 1
-fi
-
-if [ x"$1" = x-f ]; then
-  shift
-fi
-
-./configure "$@"
-CURRENT_BUILD="$(grep '^CURRENT_BUILD *= *' builds/current | awk 'BEGIN {FS=" *= *"} {print$2}')"
-builds/$CURRENT_BUILD/config.status
diff --git a/contrib/editing-with-emacs b/contrib/editing-with-emacs
deleted file mode 100644
index 529e4fadc..000000000
--- a/contrib/editing-with-emacs
+++ /dev/null
@@ -1,18 +0,0 @@
-To match the CVC4 coding style, drop the following in your ~/.emacs,
-replacing "/home/mdeters/cvc4.*" in the last line with a regexp
-describing your usual cvc4 editing location(s):
-
-
-; CVC4 mode
-(defun cvc4-c++-editing-mode ()
-  "C++ mode with adjusted defaults for use with editing CVC4 code."
-  (interactive)
-  (message "CVC4 variant of C++ mode activated.")
-  (c++-mode)
-  (setq c-basic-offset 2)
-  (c-set-offset 'innamespace 0)
-  (setq indent-tabs-mode nil))
-(setq auto-mode-alist (cons '("/home/mdeters/cvc4.*/.*\\.\\(cc\\|cpp\\|h\\|hh\\|hpp\\|y\\|yy\\|ypp\\|lex\\|l\\|ll\\|lpp\\)\\(\\.in\\)?$" . cvc4-c++-editing-mode) auto-mode-alist))
-
-
--- Morgan Deters <mdeters@cs.nyu.edu>  Mon, 27 Sep 2010 17:35:38 -0400
diff --git a/contrib/extract-strings-and-comments b/contrib/extract-strings-and-comments
deleted file mode 100755
index a6670c1e9..000000000
--- a/contrib/extract-strings-and-comments
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/perl -0777
-
-my $debug = 0;
-
-$_ = <>;
-my $comments = "";
-my $code = "";
-
-# ignore strings and comments appearing in preprocessor directives
-s/^#.*//mg;
-
-for(;;) {
-  s,^([^"/]+),,;
-  $code .= "$1\n";
-
-  if(m,^([^"]*)"",) {
-    s,^([^"]*)"",,s;
-    $code .= "$1\n";
-    next;
-  }
-  if(m,^([^"]*)"([^"]*)",) {
-    s,^([^"]*)"(([^\\"]*?([^\\"]|(\\.)))+)",,s;
-    print STDERR "quote: $2\n" if $debug;
-    $code .= "$1\n";
-    $comments .= "$2\n";
-    next;
-  }
-  if(m,/\*.*?\*/,) {
-    s,/\*(.*?)\*/,,s;
-    print STDERR "c-style comment: $1\n" if $debug;
-    $comments .= "$1\n";
-    print STDERR "REMAINDER:\n===========================\n$_\n=========================\n" if $debug;
-    next;
-  }
-  if(m,//,) {
-    s,//([^\n]*),,s;
-    print STDERR "c++-style comment: $1\n" if $debug;
-    $comments .= "$1\n";
-    print STDERR "REMAINDER:\n===========================\n$_\n=========================\n" if $debug;
-    next;
-  }
-  last;
-}
-
-$code .= "$_\n";
-$code =~ s,\W+,\n,g;
-$code =~ s,^,@,gm;
-print "$code\n";
-
-$comments =~ s,^,^,gm;
-print "$comments\n";
-
diff --git a/contrib/get-abc b/contrib/get-abc
index 217cbfdf8..fa90f240f 100755
--- a/contrib/get-abc
+++ b/contrib/get-abc
@@ -33,4 +33,4 @@ make -j$(nproc) libabc.a OPTFLAGS='-O -fPIC' ABC_USE_NO_READLINE=1 ABC_USE_NO_PT
 
 echo
 echo ===================== Now configure CVC4 with =====================
-echo ./configure --with-abc --with-abc-dir=`pwd`
+echo ./configure.sh --abc
diff --git a/contrib/get-antlr-3.4 b/contrib/get-antlr-3.4
index 16adf9108..b2b722ebb 100755
--- a/contrib/get-antlr-3.4
+++ b/contrib/get-antlr-3.4
@@ -1,18 +1,21 @@
 #!/bin/bash
 #
 source "$(dirname "$0")/get-script-header.sh"
+ANTLR_HOME_DIR=antlr-3.4
 
 if [ -z "${BUILD_TYPE}" ]; then
   BUILD_TYPE="--disable-shared --enable-static"
 fi
 
 if [ -z "${MACHINE_TYPE}" ]; then
-  if ! [ -e config/config.guess ]; then
+  CONFIG_GUESS_SCRIPT=$ANTLR_HOME_DIR/config.guess
+  if ! [ -e ${CONFIG_GUESS_SCRIPT} ]; then
+    mkdir -p $ANTLR_HOME_DIR
     # Attempt to download once
-    webget 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD' config/config.guess
-   if [ -e config/config.guess ]; then
-     chmod +x config/config.guess
-        else
+    webget 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD' $CONFIG_GUESS_SCRIPT
+    if [ -e $CONFIG_GUESS_SCRIPT ]; then
+     chmod +x $CONFIG_GUESS_SCRIPT
+   else
      echo "$(basename $0): I need the file config/config.guess to tell MACHINE_TYPE" >&2
      echo "Try running ./autogen.sh, or set the MACHINE_TYPE environment variable" >&2
      echo "(e.g., \"export MACHINE_TYPE=x86_64\")." >&2
@@ -20,14 +23,14 @@ if [ -z "${MACHINE_TYPE}" ]; then
     fi
   fi
   # get first nibble from config.guess (x86_64, i686, ...)
-  MACHINE_TYPE=`config/config.guess | sed 's,-.*,,'`
+  MACHINE_TYPE=$(${CONFIG_GUESS_SCRIPT} | sed 's,-.*,,')
 fi
 
 set -x
-mkdir -p antlr-3.4/share/java
-mkdir -p antlr-3.4/bin
-mkdir -p antlr-3.4/src
-cd antlr-3.4
+mkdir -p $ANTLR_HOME_DIR/share/java
+mkdir -p $ANTLR_HOME_DIR/bin
+mkdir -p $ANTLR_HOME_DIR/src
+cd $ANTLR_HOME_DIR || exit 1
 webget http://www.antlr3.org/download/antlr-3.4-complete.jar share/java/antlr-3.4-complete.jar 
 webget http://www.antlr3.org/download/C/libantlr3c-3.4.tar.gz src/libantlr3c-3.4.tar.gz
 tee bin/antlr3 <<EOF
@@ -111,4 +114,4 @@ fi
 
 echo
 echo ===================== Now configure CVC4 with =====================
-echo ./configure
+echo ./configure.sh
diff --git a/contrib/get-cadical b/contrib/get-cadical
index a4be17d51..359afaaa7 100755
--- a/contrib/get-cadical
+++ b/contrib/get-cadical
@@ -19,4 +19,4 @@ echo
 echo "Using CaDiCaL commit $commit"
 echo
 echo ===================== Now configure CVC4 with =====================
-echo ./configure --with-cadical
+echo ./configure.sh --cadical
diff --git a/contrib/get-cryptominisat b/contrib/get-cryptominisat
index ff4bff81c..39fc22044 100755
--- a/contrib/get-cryptominisat
+++ b/contrib/get-cryptominisat
@@ -33,4 +33,4 @@ cd ../
 
 echo
 echo ===================== Now configure CVC4 with =====================
-echo ./configure --with-cryptominisat
+echo ./configure.sh --cryptominisat
diff --git a/contrib/get-glpk-cut-log b/contrib/get-glpk-cut-log
index 419fdba90..dcd5aac00 100755
--- a/contrib/get-glpk-cut-log
+++ b/contrib/get-glpk-cut-log
@@ -31,4 +31,4 @@ cd ..
 
 echo
 echo ===================== Now configure CVC4 with =====================
-echo ./configure --enable-gpl --with-glpk --with-glpk-dir=`pwd`
+echo ./configure.sh --gpl --glpk
diff --git a/contrib/get-lfsc-checker b/contrib/get-lfsc-checker
index f4c79de2a..2fc191707 100755
--- a/contrib/get-lfsc-checker
+++ b/contrib/get-lfsc-checker
@@ -35,4 +35,4 @@ cd ..
 
 echo
 echo ===================== Now configure CVC4 with =====================
-echo ./configure --with-lfsc
+echo ./configure.sh --lfsc
diff --git a/contrib/get-symfpu b/contrib/get-symfpu
index ed49e3638..705e9d873 100755
--- a/contrib/get-symfpu
+++ b/contrib/get-symfpu
@@ -21,4 +21,4 @@ echo
 echo "Using symfpu commit $commit"
 echo
 echo ===================== Now configure CVC4 with =====================
-echo ./configure --with-symfpu
+echo ./configure.sh --symfpu
diff --git a/contrib/indent-settings b/contrib/indent-settings
deleted file mode 100644
index 41637fd42..000000000
--- a/contrib/indent-settings
+++ /dev/null
@@ -1 +0,0 @@
-indent -l 80 -lc 80 -lps -bli 2 -bbo -nbbb -bap -bad -br -brf -brs -cbi 1 -ce -cdw -cli 0 -hnl -i 2 -il 0 -lp -ci 0 -nut -ss -npro -npcs -nprs -npsl -nsaf -nsai -nsaw -sc -cd0 -dj0
diff --git a/contrib/mac-build b/contrib/mac-build
deleted file mode 100755
index e45cd0fad..000000000
--- a/contrib/mac-build
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/bash
-#
-# mac-build script
-# Morgan Deters <mdeters@cs.nyu.edu>
-# Tue, 25 Sep 2012 15:44:27 -0400
-#
-
-macports_prereq="autoconf automake boost gmp gtime libtool readline"
-
-export PATH="/opt/local/bin:$PATH"
-
-if [ $# -ne 0 ]; then
-  echo "usage: `basename $0`" >&2
-  echo >&2
-  echo "This script attempts to set up the build requirements for CVC4 for Mac OS X." >&2
-  echo "MacPorts must be installed (but this script installs prerequisite port" >&2
-  echo "packages for CVC4).  If this script is successful, it prints a configure" >&2
-  echo "line that you can use to configure CVC4." >&2
-  exit 1
-fi
-
-function reporterror {
-  echo
-  echo =============================================================================
-  echo
-  echo "There was an error setting up the prerequisites.  Look above for details."
-  echo
-  exit 1
-}
-
-echo =============================================================================
-echo
-echo "running: sudo port install $macports_prereq"
-if which port &>/dev/null; then
-  echo "You may be asked for your password to install these packages."
-  echo
-  sudo port install $macports_prereq || reporterror
-else
-  echo
-  echo "ERROR: You must have MacPorts installed for Mac builds of CVC4."
-  echo "ERROR: See http://www.macports.org/"
-  reporterror
-fi
-echo
-echo =============================================================================
-echo
-contrib/get-antlr-3.4 | grep -v 'Now configure CVC4 with' | grep -v '\./configure --with-antlr-dir='
-[ ${PIPESTATUS[0]} -eq 0 ] || reporterror
-echo
-echo =============================================================================
-echo
-echo 'Now just run:'
-echo '  ./configure LDFLAGS=-L/opt/local/lib CPPFLAGS=-I/opt/local/include --with-antlr-dir=`pwd`/antlr-3.4 ANTLR=`pwd`/antlr-3.4/bin/antlr3'
-echo '  make'
-echo
-echo =============================================================================
diff --git a/contrib/make_devel_video.sh b/contrib/make_devel_video.sh
deleted file mode 100755
index 00eb9094c..000000000
--- a/contrib/make_devel_video.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# get the svn log
-svn log -r 1:HEAD --xml --verbose --quiet > cvc4-log.xml
-
-# run gource into ffmeg (first pass)
-gource --key --max-file-lag -1 -i 0 --max-files 0 --hide progress -1280x720 --user-scale 1.5 --camera-mode track --title "cvc4 trunk" -s 0.5 -r 25 --date-format "%B %d, %Y" cvc4-log.xml -o - | ffmpeg -y -r 25 -f image2pipe -vcodec ppm -i - -vcodec libx264 -vpre ultrafast_firstpass -crf 1 -threads 0 -bf 0 -s 640x360 cvc4-640x360.mp4
-
-# run gource into ffmeg (second pass)
-gource --key --max-file-lag -1 -i 0 --max-files 0 --hide progress -1280x720 --user-scale 1.5 --camera-mode track --title "cvc4 trunk" -s 0.5 -r 25 --date-format "%B %d, %Y" cvc4-log.xml -o - | ffmpeg -y -r 25 -f image2pipe -vcodec ppm -i - -vcodec libx264 -vpre ultrafast -crf 1 -threads 0 -bf 0 -s 640x360 cvc4-640x360.mp4
diff --git a/contrib/my-configure b/contrib/my-configure
deleted file mode 100755
index 65a64895d..000000000
--- a/contrib/my-configure
+++ /dev/null
@@ -1,12 +0,0 @@
-# Includes the contents of the file .cvc4_config, if it exists, 
-# on the ./configure command line
-
-#! /bin/bash
-
-CONFIG_OPTIONS=
-
-if [ -e .cvc4_config ]; then
-  CONFIG_OPTIONS=`cat .cvc4_config`
-fi
-
-./configure $CONFIG_OPTIONS $*
diff --git a/contrib/switch-config b/contrib/switch-config
deleted file mode 100755
index 98ed10329..000000000
--- a/contrib/switch-config
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/bash
-#
-# usage: switch-config [configuration]
-#        switch-config -l
-#
-# Script to switch the "current" configuration of the CVC4 builds directory
-# to another one.  Without an argument, it switches to the next alphabetically.
-# With an argument, it switches to that configuration.  With -l, it lists the
-# available configurations.
-#
-# Only configurations in the "current" architecture (that for which the build directory is currently
-# configured) are considered.
-#
-# This script is useful because it's faster that re-configuring.
-#
-# Script assumes it lives under contrib/ in the root of the CVC4 source
-# tree.
-
-function usage {
-  echo "usage: `basename \"$0\"` [configuration]"
-  echo "       `basename \"$0\"` -l"
-}
-
-if [ $# -gt 1 ]; then
-  usage
-  exit 1
-fi
-
-cd `dirname "$0"`/..
-
-if ! [ -d builds ]; then
-  echo "No configurations are available (no builds/ directory)."
-  exit
-fi
-
-if ! [ -e builds/current ]; then
-  echo "Cannot get current configuration."
-  exit 1
-fi
-
-current=(`grep '^CURRENT_BUILD' builds/current | sed 's,^CURRENT_BUILD *= *\([^/]*\)/\(.*\),\1 \2,'`)
-arch=${current[0]}
-build=${current[1]}
-
-builds=(`ls "builds/$arch/"`)
-
-if ! [ -d "builds/$arch" ] || ! [ -d "builds/$arch/$build" ] || [ ${#builds[@]} -eq 0 ]; then
-  echo "builds/ directory in malformed state."
-  echo "You might want to blow it away and start from scratch."
-  exit 1
-fi
-
-function switchto {
-  config/mkbuilddir "$arch" "$1" >/dev/null
-  #perl -pi -e 's,^CURRENT_BUILD *= *.*,CURRENT_BUILD = '$arch/$1',' builds/current
-  echo "Current build switched to \`$1'."
-}
-
-if [ $# -eq 0 ]; then
-  first=
-  last=
-  setbuild=
-  for d in `ls "builds/$arch/"`; do
-    if [ -z "$first" ]; then first=$d; fi
-    if [ "$last" = "$build" ]; then setbuild=$d; break; fi
-    last=$d
-  done
-  if [ -z "$setbuild" ]; then setbuild=$first; fi
-  if [ "$setbuild" = "$build" ]; then
-    echo "There is only one build profile (\`$build'), and it is current."
-  else
-    switchto "$setbuild"
-  fi
-else
-  case $1 in
-    -l) for config in `ls -1 "builds/$arch/"`; do
-          if [ "$config" = "$build" ]; then
-            echo "$config" '*'
-          else
-            echo "$config"
-          fi
-        done ;;
-    -*) usage; exit 1 ;;
-    *)  if ! [ -d "builds/$arch/$1" ]; then
-          echo "Build \`$1' does not exist."
-          exit 1
-        else
-          if [ "$1" = "$build" ]; then
-            echo "Build \`$1' is already the current build profile."
-          else
-            switchto "$1"
-          fi
-        fi ;;
-  esac
-fi
-
diff --git a/cvc4autoconfig.new.h.in b/cvc4autoconfig.h.in
index ce8aeb5da..ce8aeb5da 100644
--- a/cvc4autoconfig.new.h.in
+++ b/cvc4autoconfig.h.in
diff --git a/examples/Makefile b/examples/Makefile
deleted file mode 100644
index 3db5bc0ac..000000000
--- a/examples/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-topdir = ..
-srcdir = examples
-
-include $(topdir)/Makefile.subdir
diff --git a/examples/Makefile.am b/examples/Makefile.am
deleted file mode 100644
index a39a51382..000000000
--- a/examples/Makefile.am
+++ /dev/null
@@ -1,61 +0,0 @@
-SUBDIRS = nra-translate sets-translate hashsmt api .
-
-AM_CPPFLAGS = \
-	-I@srcdir@/../src/include -I@srcdir@/../src -I@builddir@/../src $(ANTLR_INCLUDES)
-AM_CXXFLAGS = -Wall
-AM_CFLAGS = -Wall
-
-
-noinst_PROGRAMS = \
-	simple_vc_cxx \
-	translator
-
-noinst_DATA =
-
-if CVC4_LANGUAGE_BINDING_JAVA
-noinst_DATA += \
-	SimpleVC.class
-endif
-
-
-simple_vc_cxx_SOURCES = \
-	simple_vc_cxx.cpp
-simple_vc_cxx_LDADD = \
-	@builddir@/../src/parser/libcvc4parser.la \
-	@builddir@/../src/libcvc4.la
-
-translator_SOURCES = \
-	translator.cpp
-translator_LDADD = \
-	@builddir@/../src/parser/libcvc4parser.la \
-	@builddir@/../src/libcvc4.la
-
-SimpleVC.class: SimpleVC.java
-	$(AM_V_JAVAC)$(JAVAC) -classpath "@builddir@/../src/bindings/CVC4.jar" -d "@builddir@" $<
-
-EXTRA_DIST = \
-	SimpleVC.java \
-	SimpleVC.ml \
-	SimpleVC.php \
-	SimpleVC.pl \
-	SimpleVC.py \
-	SimpleVC.rb \
-	SimpleVC.tcl \
-	README
-
-if STATIC_BINARY
-simple_vc_cxx_LINK = $(CXXLINK) -all-static
-else
-simple_vc_cxx_LINK = $(CXXLINK)
-endif
-
-# for installation
-examplesdir = $(docdir)/$(subdir)
-examples_DATA = $(DIST_SOURCES) $(EXTRA_DIST)
-
-MOSTLYCLEANFILES = $(noinst_DATA)
-
-# for silent automake rules
-AM_V_JAVAC = $(am__v_JAVAC_$(V))
-am__v_JAVAC_ = $(am__v_JAVAC_$(AM_DEFAULT_VERBOSITY))
-am__v_JAVAC_0 = @echo "  JAVAC " $@;
diff --git a/examples/api/Makefile b/examples/api/Makefile
deleted file mode 100644
index 8e5dcfd21..000000000
--- a/examples/api/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-topdir = ../..
-srcdir = examples/api
-
-include $(topdir)/Makefile.subdir
diff --git a/examples/api/Makefile.am b/examples/api/Makefile.am
deleted file mode 100644
index a36819e5c..000000000
--- a/examples/api/Makefile.am
+++ /dev/null
@@ -1,113 +0,0 @@
-SUBDIRS = . java
-
-AM_CPPFLAGS = \
-	-I@srcdir@/../../src/include -I@srcdir@/../../src -I@builddir@/../../src $(ANTLR_INCLUDES)
-AM_CXXFLAGS = -Wall
-AM_CFLAGS = -Wall
-
-noinst_PROGRAMS = \
-	bitvectors \
-	bitvectors-new \
-	bitvectors_and_arrays \
-	bitvectors_and_arrays-new \
-	combination \
-	combination-new \
-	datatypes \
-	datatypes-new \
-	extract \
-	extract-new \
-	helloworld \
-	helloworld-new \
-	linear_arith \
-	linear_arith-new \
-	sets \
-	sets-new \
-	strings \
-	strings-new
-
-noinst_DATA =
-
-bitvectors_SOURCES = \
-	bitvectors.cpp
-bitvectors_LDADD = \
-	@builddir@/../../src/libcvc4.la
-bitvectors_new_SOURCES = \
-	bitvectors-new.cpp
-bitvectors_new_LDADD = \
-	@builddir@/../../src/libcvc4.la
-
-bitvectors_and_arrays_SOURCES = \
-	bitvectors_and_arrays.cpp
-bitvectors_and_arrays_LDADD = \
-	@builddir@/../../src/libcvc4.la
-bitvectors_and_arrays_new_SOURCES = \
-	bitvectors_and_arrays-new.cpp
-bitvectors_and_arrays_new_LDADD = \
-	@builddir@/../../src/libcvc4.la
-
-combination_SOURCES = \
-	combination.cpp
-combination_LDADD = \
-	@builddir@/../../src/libcvc4.la
-combination_new_SOURCES = \
-	combination-new.cpp
-combination_new_LDADD = \
-	@builddir@/../../src/libcvc4.la
-
-datatypes_SOURCES = \
-	datatypes.cpp
-datatypes_LDADD = \
-	@builddir@/../../src/libcvc4.la
-datatypes_new_SOURCES = \
-	datatypes-new.cpp
-datatypes_new_LDADD = \
-	@builddir@/../../src/libcvc4.la
-
-extract_SOURCES = \
-	extract.cpp
-extract_LDADD = \
-	@builddir@/../../src/libcvc4.la
-extract_new_SOURCES = \
-	extract-new.cpp
-extract_new_LDADD = \
-	@builddir@/../../src/libcvc4.la
-
-helloworld_SOURCES = \
-	helloworld.cpp
-helloworld_LDADD = \
-	@builddir@/../../src/libcvc4.la
-helloworld_new_SOURCES = \
-	helloworld-new.cpp
-helloworld_new_LDADD = \
-	@builddir@/../../src/libcvc4.la
-
-linear_arith_SOURCES = \
-	linear_arith.cpp
-linear_arith_LDADD = \
-	@builddir@/../../src/libcvc4.la
-linear_arith_new_SOURCES = \
-	linear_arith-new.cpp
-linear_arith_new_LDADD = \
-	@builddir@/../../src/libcvc4.la
-
-sets_SOURCES = \
-	sets.cpp
-sets_LDADD = \
-	@builddir@/../../src/libcvc4.la
-sets_new_SOURCES = \
-	sets-new.cpp
-sets_new_LDADD = \
-	@builddir@/../../src/libcvc4.la
-
-strings_SOURCES = \
-	strings.cpp
-strings_LDADD = \
-	@builddir@/../../src/libcvc4.la
-strings_new_SOURCES = \
-	strings-new.cpp
-strings_new_LDADD = \
-	@builddir@/../../src/libcvc4.la
-
-# for installation
-examplesdir = $(docdir)/$(subdir)
-examples_DATA = $(DIST_SOURCES) $(EXTRA_DIST)
diff --git a/examples/api/java/Makefile b/examples/api/java/Makefile
deleted file mode 100644
index 10a950e1c..000000000
--- a/examples/api/java/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-topdir = ../../..
-srcdir = examples/api/java
-
-include $(topdir)/Makefile.subdir
diff --git a/examples/api/java/Makefile.am b/examples/api/java/Makefile.am
deleted file mode 100644
index 6ce35b300..000000000
--- a/examples/api/java/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-noinst_DATA =
-
-if CVC4_LANGUAGE_BINDING_JAVA
-noinst_DATA += \
-	#CVC4Streams.class \  ## disabled until bindings for the new API are in place (issue #2284)
-	BitVectors.class \
-	BitVectorsAndArrays.class \
-	Combination.class \
-	HelloWorld.class \
-	LinearArith.class \
-	Datatypes.class \
-	PipedInput.class \
-	Strings.class
-endif
-
-%.class: %.java
-	$(AM_V_JAVAC)$(JAVAC) -classpath "@builddir@/../../../src/bindings/CVC4.jar" -d "@builddir@" $<
-
-EXTRA_DIST = \
-	CVC4Streams.java \
-	BitVectors.java \
-	BitVectorsAndArrays.java \
-	Combination.java \
-	HelloWorld.java \
-	LinearArith.java \
-	Datatypes.java \
-	PipedInput.java \
-	Strings.java
-
-# for installation
-examplesdir = $(docdir)/$(subdir)
-examples_DATA = $(DIST_SOURCES) $(EXTRA_DIST)
-
-MOSTLYCLEANFILES = $(noinst_DATA)
-
-# for silent automake rules
-AM_V_JAVAC = $(am__v_JAVAC_$(V))
-am__v_JAVAC_ = $(am__v_JAVAC_$(AM_DEFAULT_VERBOSITY))
-am__v_JAVAC_0 = @echo "  JAVAC " $@;
diff --git a/examples/hashsmt/Makefile b/examples/hashsmt/Makefile
deleted file mode 100644
index 7bb553677..000000000
--- a/examples/hashsmt/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-topdir = ../..
-srcdir = examples/hashsmt
-
-include $(topdir)/Makefile.subdir
diff --git a/examples/hashsmt/Makefile.am b/examples/hashsmt/Makefile.am
deleted file mode 100644
index 950a06af8..000000000
--- a/examples/hashsmt/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-AM_CPPFLAGS = \
-	-I@srcdir@/../../src/include -I@srcdir@/../../src -I@builddir@/../../src $(ANTLR_INCLUDES)
-AM_CXXFLAGS = -Wall
-AM_CFLAGS = -Wall
-
-noinst_PROGRAMS = \
-	sha1_inversion \
-	sha1_collision
-
-noinst_DATA =
-
-sha1_inversion_SOURCES = \
-	sha1_inversion.cpp \
-	word.h \
-	word.cpp \
-	sha1.hpp
-sha1_inversion_LDADD = \
-	@builddir@/../../src/libcvc4.la
-
-sha1_collision_SOURCES = \
-	sha1_collision.cpp \
-	word.h \
-	word.cpp \
-	sha1.hpp
-sha1_collision_LDADD = \
-	@builddir@/../../src/libcvc4.la
-
-
-# for installation
-examplesdir = $(docdir)/$(subdir)
-examples_DATA = \
-	sha1_inversion.cpp \
-	sha1_collision.cpp \
-	word.h \
-	word.cpp \
-	sha1.hpp
diff --git a/examples/nra-translate/Makefile b/examples/nra-translate/Makefile
deleted file mode 100644
index 85400a5c7..000000000
--- a/examples/nra-translate/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-topdir = ../..
-srcdir = examples/nra-translate
-
-include $(topdir)/Makefile.subdir
diff --git a/examples/nra-translate/Makefile.am b/examples/nra-translate/Makefile.am
deleted file mode 100644
index 081ada412..000000000
--- a/examples/nra-translate/Makefile.am
+++ /dev/null
@@ -1,61 +0,0 @@
-AM_CPPFLAGS = \
-	-I@srcdir@/../../src/include -I@srcdir@/../../src -I@builddir@/../../src $(ANTLR_INCLUDES)
-AM_CXXFLAGS = -Wall
-AM_CFLAGS = -Wall
-
-noinst_PROGRAMS = \
-	smt2toqepcad \
-	smt2tomathematica \
-	smt2toisat \
-	smt2toredlog \
-	smt2todreal \
-	normalize \
-	smt2info	
-
-noinst_DATA =
-
-smt2toqepcad_SOURCES = \
-	smt2toqepcad.cpp
-smt2toqepcad_LDADD = \
-	@builddir@/../../src/parser/libcvc4parser.la \
-	@builddir@/../../src/libcvc4.la
-
-smt2tomathematica_SOURCES = \
-	smt2tomathematica.cpp
-smt2tomathematica_LDADD = \
-	@builddir@/../../src/parser/libcvc4parser.la \
-	@builddir@/../../src/libcvc4.la
-
-smt2toisat_SOURCES = \
-	smt2toisat.cpp
-smt2toisat_LDADD = \
-	@builddir@/../../src/parser/libcvc4parser.la \
-	@builddir@/../../src/libcvc4.la
-
-smt2toredlog_SOURCES = \
-	smt2toredlog.cpp
-smt2toredlog_LDADD = \
-	@builddir@/../../src/parser/libcvc4parser.la \
-	@builddir@/../../src/libcvc4.la
-
-smt2todreal_SOURCES = \
-	smt2todreal.cpp
-smt2todreal_LDADD = \
-	@builddir@/../../src/parser/libcvc4parser.la \
-	@builddir@/../../src/libcvc4.la
-
-smt2info_SOURCES = \
-	smt2info.cpp
-smt2info_LDADD = \
-	@builddir@/../../src/parser/libcvc4parser.la \
-	@builddir@/../../src/libcvc4.la
-
-normalize_SOURCES = \
-	normalize.cpp
-normalize_LDADD = \
-	@builddir@/../../src/parser/libcvc4parser.la \
-	@builddir@/../../src/libcvc4.la
-
-# for installation
-examplesdir = $(docdir)/$(subdir)
-examples_DATA = $(DIST_SOURCES) $(EXTRA_DIST)
diff --git a/examples/sets-translate/Makefile b/examples/sets-translate/Makefile
deleted file mode 100644
index 8efe0c48e..000000000
--- a/examples/sets-translate/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-topdir = ../..
-srcdir = examples/sets-translate
-
-include $(topdir)/Makefile.subdir
diff --git a/examples/sets-translate/Makefile.am b/examples/sets-translate/Makefile.am
deleted file mode 100644
index 1c5dc392b..000000000
--- a/examples/sets-translate/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-AM_CPPFLAGS = \
-	-I@srcdir@/../../src/include -I@srcdir@/../../src -I@builddir@/../../src $(ANTLR_INCLUDES)
-AM_CXXFLAGS = -Wall
-AM_CFLAGS = -Wall
-
-noinst_PROGRAMS = \
-	sets2arrays \
-	sets2axioms
-
-noinst_DATA =
-
-sets2arrays_SOURCES = \
-	sets_translate.cpp
-sets2arrays_LDADD = \
-	@builddir@/../../src/parser/libcvc4parser.la \
-	@builddir@/../../src/libcvc4.la
-
-# give nodist_: only distribute/install once
-nodist_sets2axioms_SOURCES = \
-	sets_translate.cpp
-sets2axioms_LDADD = \
-	@builddir@/../../src/parser/libcvc4parser.la \
-	@builddir@/../../src/libcvc4.la
-sets2axioms_CXXFLAGS = \
-	-DENABLE_AXIOMS
-
-# for installation
-examplesdir = $(docdir)/$(subdir)
-examples_DATA = $(DIST_SOURCES) $(EXTRA_DIST)
diff --git a/library_versions b/library_versions
deleted file mode 100644
index a513fe428..000000000
--- a/library_versions
+++ /dev/null
@@ -1,62 +0,0 @@
-# library_versions
-#
-# Format is:
-#   CVC4-RELEASE-VERSION-REGEXP (LIBRARY:VERSION)*
-#
-# This file contains library version release information.
-# Lines are matched while processing configure.ac (and generating
-# the configure script) using the CVC4_RELEASE_STRING.  Lines are
-# matched on the regexp in the first column, with only the first
-# matching line counting.  The library versions following, one per
-# column, are then used.  If there are no matching lines, an error
-# is raised and the configure script is not generated.
-#
-# The library version numbers are in the form current:revision:age
-# and are passed to libtool with -version-info
-#
-#   current -
-#     increment if interfaces have been added, removed or changed
-#   revision -
-#     increment if source code has changed
-#     set to zero if current is incremented
-#   age -
-#     increment if interfaces have been added
-#     set to zero if interfaces have been removed
-#     or changed
-#
-# A good description of what all this means is here:
-# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-#
-# When a new CVC4 release is cut, this library_versions file should
-# be extended to provide library version information for that
-# release.  PLEASE DON'T REMOVE LINES (or edit historical lines)
-# from this file unless they are truly in error and the release
-# wasn't made with that erroneous information; this file should
-# ultimately provide a nice historical log of the mapping between
-# CVC4 release numbers and the corresponding interface version
-# information of libraries.
-#
-# For now, libcvc4bindings' version info is used for all language bindings
-# libraries.  This may need to be split out in future, if some bindings change
-# more(/less) frequently than the others.
-#
-0\..* libcvc4:0:0:0 libcvc4parser:0:0:0 libcvc4compat:0:0:0 libcvc4bindings:0:0:0
-1\.0 libcvc4:0:0:0 libcvc4parser:0:0:0 libcvc4compat:0:0:0 libcvc4bindings:0:0:0
-1\.0\.1-prerelease libcvc4:0:0:0 libcvc4parser:0:0:0 libcvc4compat:0:0:0 libcvc4bindings:0:0:0
-1\.1-prerelease libcvc4:0:0:0 libcvc4parser:0:0:0 libcvc4compat:0:0:0 libcvc4bindings:0:0:0
-1\.1 libcvc4:1:0:0 libcvc4parser:1:0:0 libcvc4compat:1:0:0 libcvc4bindings:1:0:0
-1\.1\.1-prerelease libcvc4:1:0:0 libcvc4parser:1:0:0 libcvc4compat:1:0:0 libcvc4bindings:1:0:0
-1\.2-prerelease libcvc4:1:0:0 libcvc4parser:1:0:0 libcvc4compat:1:0:0 libcvc4bindings:1:0:0
-1\.2 libcvc4:1:1:1 libcvc4parser:1:1:0 libcvc4compat:1:0:0 libcvc4bindings:1:0:0
-1\.2\.1-prerelease libcvc4:1:1:1 libcvc4parser:1:1:0 libcvc4compat:1:0:0 libcvc4bindings:1:0:0
-1\.3-prerelease libcvc4:2:0:0 libcvc4parser:2:0:0 libcvc4compat:2:0:0 libcvc4bindings:2:0:0
-1\.3 libcvc4:2:0:0 libcvc4parser:2:0:0 libcvc4compat:2:0:0 libcvc4bindings:2:0:0
-1\.3\.1-prerelease libcvc4:2:0:0 libcvc4parser:2:0:0 libcvc4compat:2:0:0 libcvc4bindings:2:0:0
-1\.4-prerelease libcvc4:2:0:0 libcvc4parser:2:0:0 libcvc4compat:2:0:0 libcvc4bindings:2:0:0
-1\.4 libcvc4:3:0:0 libcvc4parser:3:0:0 libcvc4compat:3:0:0 libcvc4bindings:3:0:0
-1\.4\.1-prerelease libcvc4:3:0:0 libcvc4parser:3:0:0 libcvc4compat:3:0:0 libcvc4bindings:3:0:0
-1\.5-prerelease libcvc4:3:0:0 libcvc4parser:3:0:0 libcvc4compat:3:0:0 libcvc4bindings:3:0:0
-1\.5 libcvc4:4:0:0 libcvc4parser:4:0:0 libcvc4compat:4:0:0 libcvc4bindings:4:0:0
-1\.6-prerelease libcvc4:4:0:0 libcvc4parser:4:0:0 libcvc4compat:4:0:0 libcvc4bindings:4:0:0
-1\.6 libcvc4:5:0:0 libcvc4parser:5:0:0 libcvc4compat:5:0:0 libcvc4bindings:5:0:0
-1\.7-prerelease libcvc4:5:0:0 libcvc4parser:5:0:0 libcvc4bindings:5:0:0
diff --git a/proofs/signatures/Makefile.am b/proofs/signatures/Makefile.am
deleted file mode 100644
index 75d9f3c5a..000000000
--- a/proofs/signatures/Makefile.am
+++ /dev/null
@@ -1,38 +0,0 @@
-# These CORE_PLFs are combined to give a "master signature" against
-# which proofs are checked internally when using --check-proofs.  To
-# add support for more theories, just list them here in the same order
-# you would to the LFSC proof-checker binary.
-#
-CORE_PLFS = sat.plf smt.plf th_base.plf th_arrays.plf th_bv.plf th_bv_bitblast.plf th_bv_rewrites.plf th_real.plf th_int.plf
-
-noinst_LTLIBRARIES = libsignatures.la
-
-dist_pkgdata_DATA = \
-	$(CORE_PLFS)
-
-libsignatures_la_SOURCES = \
-	signatures.cpp
-
-BUILT_SOURCES = \
-	signatures.cpp
-
-signatures.cpp: $(CORE_PLFS)
-	$(AM_V_GEN)( \
-	  echo "namespace CVC4 {"; \
-	  echo "namespace proof {"; \
-	  echo; \
-	  echo "extern const char *const plf_signatures;"; \
-	  echo "const char *const plf_signatures = \"\\"; \
-	  cat $+ | sed 's,\\,\\\\,g;s,",\\",g;s,$$,\\n\\,g'; \
-	  echo "\";"; \
-	  echo; \
-	  echo "} /* CVC4::proof namespace */"; \
-	  echo "} /* CVC4 namespace */"; \
-	) > $@
-
-EXTRA_DIST = \
-	example.plf \
-	example-arrays.plf \
-	example-quant.plf \
-	ex-mem.plf \
-	th_quant.plf
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4cf8412f0..10db1dc86 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -522,6 +522,8 @@ libcvc4_add_sources(
   theory/quantifiers/single_inv_partition.h
   theory/quantifiers/skolemize.cpp
   theory/quantifiers/skolemize.h
+  theory/quantifiers/solution_filter.cpp
+  theory/quantifiers/solution_filter.h
   theory/quantifiers/sygus/ce_guided_single_inv.cpp
   theory/quantifiers/sygus/ce_guided_single_inv.h
   theory/quantifiers/sygus/ce_guided_single_inv_sol.cpp
diff --git a/src/Makefile b/src/Makefile
deleted file mode 100644
index dc23e2272..000000000
--- a/src/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-topdir = ..
-srcdir = src
-
-include $(topdir)/Makefile.subdir
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index d29dcd172..000000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,864 +0,0 @@
-# LIBCVC4_VERSION (-version-info) is in the form current:revision:age
-#
-# current -
-#   increment if interfaces have been added, removed or changed
-# revision -
-#   increment if source code has changed
-#   set to zero if current is incremented
-# age -
-#   increment if interfaces have been added
-#   set to zero if interfaces have been removed
-#   or changed
-#
-LIBCVC4_VERSION = @CVC4_LIBRARY_VERSION@
-
-AM_CPPFLAGS = \
-	-D__BUILDING_CVC4LIB \
-	-D __STDC_LIMIT_MACROS \
-	-D __STDC_FORMAT_MACROS \
-	-I@builddir@ -I@srcdir@/include -I@srcdir@
-AM_CXXFLAGS = -Wall -Wno-unknown-pragmas -Wno-parentheses $(FLAG_VISIBILITY_HIDDEN)
-
-SUBDIRS = lib base options util expr smt_util prop/minisat prop/bvminisat . parser bindings main
-# The THEORIES list has been moved to Makefile.theories
-include @top_srcdir@/src/Makefile.theories
-
-lib_LTLIBRARIES = libcvc4.la
-
-libcvc4_la_LDFLAGS = \
-	-no-undefined \
-	-version-info $(LIBCVC4_VERSION)
-
-# This "tricks" automake into linking us as a C++ library (rather than
-# as a C library, which messes up exception handling support)
-nodist_EXTRA_libcvc4_la_SOURCES = dummy.cpp
-libcvc4_la_SOURCES = \
-	git_versioninfo.cpp \
-	api/cvc4cpp.h \
-	api/cvc4cppkind.h \
-	api/cvc4cpp.cpp \
-	context/backtrackable.h \
-	context/cddense_set.h \
-	context/cdhashmap.h \
-	context/cdhashmap_forward.h \
-	context/cdhashset.h \
-	context/cdhashset_forward.h \
-	context/cdinsert_hashmap.h \
-	context/cdinsert_hashmap_forward.h \
-	context/cdlist.h \
-	context/cdlist_forward.h \
-	context/cdmaybe.h \
-	context/cdo.h \
-	context/cdqueue.h \
-	context/cdtrail_queue.h \
-	context/context.cpp \
-	context/context.h \
-	context/context_mm.cpp \
-	context/context_mm.h \
-	decision/decision_attributes.h \
-	decision/decision_engine.cpp \
-	decision/decision_engine.h \
-	decision/decision_strategy.h \
-	decision/justification_heuristic.cpp \
-	decision/justification_heuristic.h \
-	preprocessing/assertion_pipeline.cpp \
-	preprocessing/assertion_pipeline.h \
-	preprocessing/passes/apply_substs.cpp \
-	preprocessing/passes/apply_substs.h \
-	preprocessing/passes/apply_to_const.cpp \
-	preprocessing/passes/apply_to_const.h \
-	preprocessing/passes/bool_to_bv.cpp \
-	preprocessing/passes/bool_to_bv.h \
-	preprocessing/passes/bv_abstraction.cpp \
-	preprocessing/passes/bv_abstraction.h \
-	preprocessing/passes/bv_ackermann.cpp \
-	preprocessing/passes/bv_ackermann.h \
-	preprocessing/passes/bv_eager_atoms.cpp \
-	preprocessing/passes/bv_eager_atoms.h \
-	preprocessing/passes/bv_gauss.cpp \
-	preprocessing/passes/bv_gauss.h \
-	preprocessing/passes/bv_intro_pow2.cpp \
-	preprocessing/passes/bv_intro_pow2.h \
-	preprocessing/passes/bv_to_bool.cpp \
-	preprocessing/passes/bv_to_bool.h \
-	preprocessing/passes/extended_rewriter_pass.cpp \
-	preprocessing/passes/extended_rewriter_pass.h \
-	preprocessing/passes/global_negate.cpp \
-	preprocessing/passes/global_negate.h \
-	preprocessing/passes/int_to_bv.cpp \
-	preprocessing/passes/int_to_bv.h \
-	preprocessing/passes/ite_removal.cpp \
-	preprocessing/passes/ite_removal.h \
-	preprocessing/passes/ite_simp.cpp \
-	preprocessing/passes/ite_simp.h \
-	preprocessing/passes/non_clausal_simp.cpp \
-	preprocessing/passes/non_clausal_simp.h \
-	preprocessing/passes/nl_ext_purify.cpp \
-	preprocessing/passes/nl_ext_purify.h \
-	preprocessing/passes/pseudo_boolean_processor.cpp \
-	preprocessing/passes/pseudo_boolean_processor.h \
-	preprocessing/passes/miplib_trick.cpp \
-	preprocessing/passes/miplib_trick.h \
-	preprocessing/passes/quantifier_macros.cpp \
-	preprocessing/passes/quantifier_macros.h \
-	preprocessing/passes/quantifiers_preprocess.cpp \
-	preprocessing/passes/quantifiers_preprocess.h \
-	preprocessing/passes/real_to_int.cpp \
-	preprocessing/passes/real_to_int.h \
-	preprocessing/passes/rewrite.cpp \
-	preprocessing/passes/rewrite.h \
-	preprocessing/passes/sep_skolem_emp.cpp \
-	preprocessing/passes/sep_skolem_emp.h \
-	preprocessing/passes/sort_infer.cpp \
-	preprocessing/passes/sort_infer.h \
-	preprocessing/passes/static_learning.cpp \
-	preprocessing/passes/static_learning.h \
-	preprocessing/passes/sygus_inference.cpp \
-	preprocessing/passes/sygus_inference.h \
-	preprocessing/passes/symmetry_breaker.cpp \
-	preprocessing/passes/symmetry_breaker.h \
-	preprocessing/passes/symmetry_detect.cpp \
-	preprocessing/passes/symmetry_detect.h \
-	preprocessing/passes/synth_rew_rules.cpp \
-	preprocessing/passes/synth_rew_rules.h \
-	preprocessing/passes/theory_preprocess.cpp \
-	preprocessing/passes/theory_preprocess.h \
-	preprocessing/passes/unconstrained_simplifier.cpp \
-	preprocessing/passes/unconstrained_simplifier.h \
-	preprocessing/preprocessing_pass.cpp \
-	preprocessing/preprocessing_pass.h \
-	preprocessing/preprocessing_pass_context.cpp \
-	preprocessing/preprocessing_pass_context.h \
-	preprocessing/preprocessing_pass_registry.cpp \
-	preprocessing/preprocessing_pass_registry.h \
-	preprocessing/util/ite_utilities.cpp \
-	preprocessing/util/ite_utilities.h \
-	printer/dagification_visitor.cpp \
-	printer/dagification_visitor.h \
-	printer/printer.cpp \
-	printer/printer.h \
-	printer/sygus_print_callback.cpp \
-	printer/sygus_print_callback.h \
-	printer/ast/ast_printer.cpp \
-	printer/ast/ast_printer.h \
-	printer/cvc/cvc_printer.cpp \
-	printer/cvc/cvc_printer.h \
-	printer/smt2/smt2_printer.cpp \
-	printer/smt2/smt2_printer.h \
-	printer/tptp/tptp_printer.cpp \
-	printer/tptp/tptp_printer.h \
-	proof/arith_proof.cpp \
-	proof/arith_proof.h \
-	proof/array_proof.cpp \
-	proof/array_proof.h \
-	proof/bitvector_proof.cpp \
-	proof/bitvector_proof.h \
-	proof/clause_id.h \
-	proof/cnf_proof.cpp \
-	proof/cnf_proof.h \
-	proof/lemma_proof.cpp \
-	proof/lemma_proof.h \
-	proof/lfsc_proof_printer.cpp \
-	proof/lfsc_proof_printer.h \
-	proof/proof.h \
-	proof/proof_manager.cpp \
-	proof/proof_manager.h \
-	proof/proof_output_channel.cpp \
-	proof/proof_output_channel.h \
-	proof/proof_utils.cpp \
-	proof/proof_utils.h \
-	proof/sat_proof.h \
-	proof/sat_proof_implementation.h \
-	proof/simplify_boolean_node.cpp \
-	proof/simplify_boolean_node.h \
-	proof/skolemization_manager.cpp \
-	proof/skolemization_manager.h \
-	proof/theory_proof.cpp \
-	proof/theory_proof.h \
-	proof/uf_proof.cpp \
-	proof/uf_proof.h \
-	proof/unsat_core.cpp \
-	proof/unsat_core.h \
-	prop/cadical.cpp \
-	prop/cadical.h \
-	prop/cnf_stream.cpp \
-	prop/cnf_stream.h \
-	prop/cryptominisat.cpp \
-	prop/cryptominisat.h \
-	prop/prop_engine.cpp \
-	prop/prop_engine.h \
-	prop/registrar.h \
-	prop/sat_solver.h \
-	prop/sat_solver_factory.cpp \
-	prop/sat_solver_factory.h \
-	prop/sat_solver_types.h \
-	prop/theory_proxy.cpp \
-	prop/theory_proxy.h \
-	smt/command.cpp \
-	smt/command.h \
-	smt/command_list.cpp \
-	smt/command_list.h \
-	smt/dump.cpp \
-	smt/dump.h \
-	smt/logic_exception.h \
-	smt/logic_request.cpp \
-	smt/logic_request.h \
-	smt/managed_ostreams.cpp \
-	smt/managed_ostreams.h \
-	smt/model.cpp \
-	smt/model.h \
-	smt/model_core_builder.cpp \
-	smt/model_core_builder.h \
-	smt/smt_engine.cpp \
-	smt/smt_engine.h \
-	smt/smt_engine_check_proof.cpp \
-	smt/smt_engine_scope.cpp \
-	smt/smt_engine_scope.h \
-	smt/smt_statistics_registry.cpp \
-	smt/smt_statistics_registry.h \
-	smt/term_formula_removal.cpp \
-	smt/term_formula_removal.h \
-	smt/update_ostream.h \
-	theory/assertion.cpp \
-	theory/assertion.h \
-	theory/atom_requests.cpp \
-	theory/atom_requests.h \
-	theory/care_graph.h \
-	theory/evaluator.cpp \
-	theory/evaluator.h \
-	theory/interrupted.h \
-	theory/logic_info.cpp \
-	theory/logic_info.h \
-	theory/output_channel.h \
-	theory/quantifiers_engine.cpp \
-	theory/quantifiers_engine.h \
-	theory/rep_set.cpp \
-	theory/rep_set.h \
-	theory/rewriter.cpp \
-	theory/rewriter.h \
-	theory/rewriter_attributes.h \
-	theory/shared_terms_database.cpp \
-	theory/shared_terms_database.h \
-	theory/sort_inference.cpp \
-	theory/sort_inference.h \
-	theory/substitutions.cpp \
-	theory/substitutions.h \
-	theory/subs_minimize.cpp \
-	theory/subs_minimize.h \
-	theory/term_registration_visitor.cpp \
-	theory/term_registration_visitor.h \
-	theory/theory.cpp \
-	theory/theory.h \
-	theory/theory_engine.cpp \
-	theory/theory_engine.h \
-	theory/theory_model.cpp \
-	theory/theory_model.h \
-	theory/theory_model_builder.cpp \
-	theory/theory_model_builder.h \
-	theory/theory_registrar.h \
-	theory/theory_test_utils.h \
-	theory/type_enumerator.h \
-	theory/type_set.cpp \
-	theory/type_set.h \
-	theory/valuation.cpp \
-	theory/valuation.h \
-	theory/arith/approx_simplex.cpp \
-	theory/arith/approx_simplex.h \
-	theory/arith/arith_ite_utils.cpp \
-	theory/arith/arith_ite_utils.h \
-	theory/arith/arith_msum.cpp \
-	theory/arith/arith_msum.h \
-	theory/arith/arith_rewriter.cpp \
-	theory/arith/arith_rewriter.h \
-	theory/arith/arith_static_learner.cpp \
-	theory/arith/arith_static_learner.h \
-	theory/arith/arith_utilities.h \
-	theory/arith/arithvar.cpp \
-	theory/arith/arithvar.h \
-	theory/arith/attempt_solution_simplex.cpp \
-	theory/arith/attempt_solution_simplex.h \
-	theory/arith/bound_counts.h \
-	theory/arith/callbacks.cpp \
-	theory/arith/callbacks.h \
-	theory/arith/congruence_manager.cpp \
-	theory/arith/congruence_manager.h \
-	theory/arith/constraint.cpp \
-	theory/arith/constraint.h \
-	theory/arith/constraint_forward.h \
-	theory/arith/cut_log.cpp \
-	theory/arith/cut_log.h \
-	theory/arith/delta_rational.cpp \
-	theory/arith/delta_rational.h \
-	theory/arith/dio_solver.cpp \
-	theory/arith/dio_solver.h \
-	theory/arith/dual_simplex.cpp \
-	theory/arith/dual_simplex.h \
-	theory/arith/error_set.cpp \
-	theory/arith/error_set.h \
-	theory/arith/fc_simplex.cpp \
-	theory/arith/fc_simplex.h \
-	theory/arith/infer_bounds.cpp \
-	theory/arith/infer_bounds.h \
-	theory/arith/linear_equality.cpp \
-	theory/arith/linear_equality.h \
-	theory/arith/matrix.cpp \
-	theory/arith/matrix.h \
-	theory/arith/nonlinear_extension.h \
-	theory/arith/nonlinear_extension.cpp \
-	theory/arith/normal_form.cpp \
-	theory/arith/normal_form.h\
-	theory/arith/partial_model.cpp \
-	theory/arith/partial_model.h \
-	theory/arith/simplex.cpp \
-	theory/arith/simplex.h \
-	theory/arith/simplex_update.cpp \
-	theory/arith/simplex_update.h \
-	theory/arith/soi_simplex.cpp \
-	theory/arith/soi_simplex.h \
-	theory/arith/tableau.cpp \
-	theory/arith/tableau.h \
-	theory/arith/tableau_sizes.cpp \
-	theory/arith/tableau_sizes.h \
-	theory/arith/theory_arith.cpp \
-	theory/arith/theory_arith.h \
-	theory/arith/theory_arith_private.cpp \
-	theory/arith/theory_arith_private.h \
-	theory/arith/theory_arith_private_forward.h \
-	theory/arith/theory_arith_type_rules.h \
-	theory/arith/type_enumerator.h \
-	theory/arrays/array_info.cpp \
-	theory/arrays/array_info.h \
-	theory/arrays/array_proof_reconstruction.cpp \
-	theory/arrays/array_proof_reconstruction.h \
-	theory/arrays/static_fact_manager.cpp \
-	theory/arrays/static_fact_manager.h \
-	theory/arrays/theory_arrays.cpp \
-	theory/arrays/theory_arrays.h \
-	theory/arrays/theory_arrays_rewriter.cpp \
-	theory/arrays/theory_arrays_rewriter.h \
-	theory/arrays/theory_arrays_type_rules.h \
-	theory/arrays/type_enumerator.h \
-	theory/arrays/union_find.cpp \
-	theory/arrays/union_find.h \
-	theory/booleans/circuit_propagator.cpp \
-	theory/booleans/circuit_propagator.h \
-	theory/booleans/theory_bool.cpp \
-	theory/booleans/theory_bool.h \
-	theory/booleans/theory_bool_rewriter.cpp \
-	theory/booleans/theory_bool_rewriter.h \
-	theory/booleans/theory_bool_type_rules.h \
-	theory/booleans/type_enumerator.h \
-	theory/builtin/theory_builtin.cpp \
-	theory/builtin/theory_builtin.h \
-	theory/builtin/theory_builtin_rewriter.cpp \
-	theory/builtin/theory_builtin_rewriter.h \
-	theory/builtin/theory_builtin_type_rules.h \
-	theory/builtin/type_enumerator.cpp \
-	theory/builtin/type_enumerator.h \
-	theory/bv/abstraction.cpp \
-	theory/bv/abstraction.h \
-	theory/bv/bitblast/aig_bitblaster.cpp \
-	theory/bv/bitblast/aig_bitblaster.h \
-	theory/bv/bitblast/bitblast_strategies_template.h \
-	theory/bv/bitblast/bitblast_utils.h \
-	theory/bv/bitblast/bitblaster.h \
-	theory/bv/bitblast/eager_bitblaster.cpp \
-	theory/bv/bitblast/eager_bitblaster.h \
-	theory/bv/bitblast/lazy_bitblaster.cpp \
-	theory/bv/bitblast/lazy_bitblaster.h \
-	theory/bv/bv_eager_solver.cpp \
-	theory/bv/bv_eager_solver.h \
-	theory/bv/bv_inequality_graph.cpp \
-	theory/bv/bv_inequality_graph.h \
-	theory/bv/bv_quick_check.cpp \
-	theory/bv/bv_quick_check.h \
-	theory/bv/bv_subtheory.h \
-	theory/bv/bv_subtheory_algebraic.cpp \
-	theory/bv/bv_subtheory_algebraic.h \
-	theory/bv/bv_subtheory_bitblast.cpp \
-	theory/bv/bv_subtheory_bitblast.h \
-	theory/bv/bv_subtheory_core.cpp \
-	theory/bv/bv_subtheory_core.h \
-	theory/bv/bv_subtheory_inequality.cpp \
-	theory/bv/bv_subtheory_inequality.h \
-	theory/bv/slicer.cpp \
-	theory/bv/slicer.h \
-	theory/bv/theory_bv.cpp \
-	theory/bv/theory_bv.h \
-	theory/bv/theory_bv_rewrite_rules.h \
-	theory/bv/theory_bv_rewrite_rules_constant_evaluation.h \
-	theory/bv/theory_bv_rewrite_rules_core.h \
-	theory/bv/theory_bv_rewrite_rules_normalization.h \
-	theory/bv/theory_bv_rewrite_rules_operator_elimination.h \
-	theory/bv/theory_bv_rewrite_rules_simplification.h \
-	theory/bv/theory_bv_rewriter.cpp \
-	theory/bv/theory_bv_rewriter.h \
-	theory/bv/theory_bv_type_rules.h \
-	theory/bv/theory_bv_utils.cpp \
-	theory/bv/theory_bv_utils.h \
-	theory/bv/type_enumerator.h \
-	theory/datatypes/datatypes_rewriter.cpp \
-	theory/datatypes/datatypes_rewriter.h \
-	theory/datatypes/datatypes_sygus.cpp \
-	theory/datatypes/datatypes_sygus.h \
-	theory/datatypes/theory_datatypes.cpp \
-	theory/datatypes/theory_datatypes.h \
-	theory/datatypes/theory_datatypes_type_rules.h \
-	theory/datatypes/type_enumerator.cpp \
-	theory/datatypes/type_enumerator.h \
-	theory/datatypes/sygus_simple_sym.cpp \
-	theory/datatypes/sygus_simple_sym.h \
-	theory/decision_manager.cpp \
-	theory/decision_manager.h \
-	theory/decision_strategy.cpp \
-	theory/decision_strategy.h \
-	theory/ext_theory.cpp \
-	theory/ext_theory.h \
-	theory/fp/theory_fp.cpp \
-	theory/fp/theory_fp.h \
-	theory/fp/theory_fp_rewriter.cpp \
-	theory/fp/theory_fp_rewriter.h \
-	theory/fp/theory_fp_type_rules.h \
-	theory/fp/type_enumerator.h \
-	theory/fp/fp_converter.h \
-	theory/fp/fp_converter.cpp \
-	theory/idl/idl_assertion.cpp \
-	theory/idl/idl_assertion.h \
-	theory/idl/idl_assertion_db.cpp \
-	theory/idl/idl_assertion_db.h \
-	theory/idl/idl_model.cpp \
-	theory/idl/idl_model.h \
-	theory/idl/theory_idl.cpp \
-	theory/idl/theory_idl.h \
-	theory/quantifiers/alpha_equivalence.cpp \
-	theory/quantifiers/alpha_equivalence.h \
-	theory/quantifiers/anti_skolem.cpp \
-	theory/quantifiers/anti_skolem.h \
-	theory/quantifiers/bv_inverter.cpp \
-	theory/quantifiers/bv_inverter.h \
-	theory/quantifiers/bv_inverter_utils.cpp \
-	theory/quantifiers/bv_inverter_utils.h \
-	theory/quantifiers/candidate_rewrite_database.cpp \
-	theory/quantifiers/candidate_rewrite_database.h \
-	theory/quantifiers/candidate_rewrite_filter.cpp \
-	theory/quantifiers/candidate_rewrite_filter.h \
-	theory/quantifiers/cegqi/ceg_instantiator.cpp \
-	theory/quantifiers/cegqi/ceg_instantiator.h \
-	theory/quantifiers/cegqi/ceg_arith_instantiator.cpp \
-	theory/quantifiers/cegqi/ceg_arith_instantiator.h \
-	theory/quantifiers/cegqi/ceg_bv_instantiator.cpp \
-	theory/quantifiers/cegqi/ceg_bv_instantiator.h \
-	theory/quantifiers/cegqi/ceg_bv_instantiator_utils.cpp \
-	theory/quantifiers/cegqi/ceg_bv_instantiator_utils.h \
-	theory/quantifiers/cegqi/ceg_dt_instantiator.cpp \
-	theory/quantifiers/cegqi/ceg_dt_instantiator.h \
-	theory/quantifiers/cegqi/ceg_epr_instantiator.cpp \
-	theory/quantifiers/cegqi/ceg_epr_instantiator.h \
-	theory/quantifiers/cegqi/inst_strategy_cegqi.cpp \
-	theory/quantifiers/cegqi/inst_strategy_cegqi.h \
-	theory/quantifiers/conjecture_generator.cpp \
-	theory/quantifiers/conjecture_generator.h \
-	theory/quantifiers/dynamic_rewrite.cpp \
-	theory/quantifiers/dynamic_rewrite.h \
-	theory/quantifiers/ematching/candidate_generator.cpp \
-	theory/quantifiers/ematching/candidate_generator.h \
-	theory/quantifiers/ematching/ho_trigger.cpp \
-	theory/quantifiers/ematching/ho_trigger.h \
-	theory/quantifiers/ematching/inst_match_generator.cpp \
-	theory/quantifiers/ematching/inst_match_generator.h \
-	theory/quantifiers/ematching/inst_strategy_e_matching.cpp \
-	theory/quantifiers/ematching/inst_strategy_e_matching.h \
-	theory/quantifiers/ematching/instantiation_engine.cpp \
-	theory/quantifiers/ematching/instantiation_engine.h \
-	theory/quantifiers/ematching/trigger.cpp \
-	theory/quantifiers/ematching/trigger.h \
-	theory/quantifiers/equality_query.cpp \
-	theory/quantifiers/equality_query.h \
-	theory/quantifiers/equality_infer.cpp \
-	theory/quantifiers/equality_infer.h \
-	theory/quantifiers/expr_miner.cpp \
-	theory/quantifiers/expr_miner.h \
-	theory/quantifiers/expr_miner_manager.cpp \
-	theory/quantifiers/expr_miner_manager.h \
-	theory/quantifiers/extended_rewrite.cpp \
-	theory/quantifiers/extended_rewrite.h \
-	theory/quantifiers/first_order_model.cpp \
-	theory/quantifiers/first_order_model.h \
-	theory/quantifiers/fmf/ambqi_builder.cpp \
-	theory/quantifiers/fmf/ambqi_builder.h \
-	theory/quantifiers/fmf/bounded_integers.cpp \
-	theory/quantifiers/fmf/bounded_integers.h \
-	theory/quantifiers/fmf/full_model_check.cpp \
-	theory/quantifiers/fmf/full_model_check.h \
-	theory/quantifiers/fmf/model_builder.cpp \
-	theory/quantifiers/fmf/model_builder.h \
-	theory/quantifiers/fmf/model_engine.cpp \
-	theory/quantifiers/fmf/model_engine.h \
-	theory/quantifiers/fun_def_process.cpp \
-	theory/quantifiers/fun_def_process.h \
-	theory/quantifiers/instantiate.cpp \
-	theory/quantifiers/instantiate.h \
-	theory/quantifiers/inst_match.cpp \
-	theory/quantifiers/inst_match.h \
-	theory/quantifiers/inst_match_trie.cpp \
-	theory/quantifiers/inst_match_trie.h \
-	theory/quantifiers/inst_propagator.cpp \
-	theory/quantifiers/inst_propagator.h \
-	theory/quantifiers/inst_strategy_enumerative.cpp \
-	theory/quantifiers/inst_strategy_enumerative.h \
-	theory/quantifiers/lazy_trie.cpp \
-	theory/quantifiers/lazy_trie.h \
-	theory/quantifiers/local_theory_ext.cpp \
-	theory/quantifiers/local_theory_ext.h \
-	theory/quantifiers/quant_conflict_find.cpp \
-	theory/quantifiers/quant_conflict_find.h \
-	theory/quantifiers/quant_epr.cpp \
-	theory/quantifiers/quant_epr.h \
-	theory/quantifiers/quant_relevance.cpp \
-	theory/quantifiers/quant_relevance.h \
-	theory/quantifiers/quant_split.cpp \
-	theory/quantifiers/quant_split.h \
-	theory/quantifiers/quant_util.cpp \
-	theory/quantifiers/quant_util.h \
-	theory/quantifiers/quantifiers_attributes.cpp \
-	theory/quantifiers/quantifiers_attributes.h \
-	theory/quantifiers/quantifiers_rewriter.cpp \
-	theory/quantifiers/quantifiers_rewriter.h \
-	theory/quantifiers/query_generator.cpp \
-	theory/quantifiers/query_generator.h \
-	theory/quantifiers/relevant_domain.cpp \
-	theory/quantifiers/relevant_domain.h \
-	theory/quantifiers/rewrite_engine.cpp \
-	theory/quantifiers/rewrite_engine.h \
-	theory/quantifiers/single_inv_partition.cpp \
-	theory/quantifiers/single_inv_partition.h \
-	theory/quantifiers/skolemize.cpp \
-	theory/quantifiers/skolemize.h \
-	theory/quantifiers/sygus/cegis.cpp \
-	theory/quantifiers/sygus/cegis.h \
-	theory/quantifiers/sygus/cegis_unif.cpp \
-	theory/quantifiers/sygus/cegis_unif.h \
-	theory/quantifiers/sygus/ce_guided_single_inv.cpp \
-	theory/quantifiers/sygus/ce_guided_single_inv.h \
-	theory/quantifiers/sygus/enum_stream_substitution.cpp \
-	theory/quantifiers/sygus/enum_stream_substitution.h \
-	theory/quantifiers/sygus/sygus_pbe.cpp \
-	theory/quantifiers/sygus/sygus_pbe.h \
-	theory/quantifiers/sygus/ce_guided_single_inv_sol.cpp \
-	theory/quantifiers/sygus/ce_guided_single_inv_sol.h \
-	theory/quantifiers/sygus/sygus_eval_unfold.cpp \
-	theory/quantifiers/sygus/sygus_eval_unfold.h \
-	theory/quantifiers/sygus/sygus_explain.cpp \
-	theory/quantifiers/sygus/sygus_explain.h \
-	theory/quantifiers/sygus/sygus_invariance.cpp \
-	theory/quantifiers/sygus/sygus_invariance.h \
-	theory/quantifiers/sygus/sygus_grammar_cons.cpp \
-	theory/quantifiers/sygus/sygus_grammar_cons.h \
-	theory/quantifiers/sygus/sygus_grammar_norm.cpp \
-	theory/quantifiers/sygus/sygus_grammar_norm.h \
-	theory/quantifiers/sygus/sygus_grammar_red.cpp \
-	theory/quantifiers/sygus/sygus_grammar_red.h \
-	theory/quantifiers/sygus/sygus_module.cpp \
-	theory/quantifiers/sygus/sygus_module.h \
-	theory/quantifiers/sygus/sygus_process_conj.cpp \
-	theory/quantifiers/sygus/sygus_process_conj.h \
-	theory/quantifiers/sygus/sygus_repair_const.cpp \
-	theory/quantifiers/sygus/sygus_repair_const.h \
-	theory/quantifiers/sygus/sygus_unif.cpp \
-	theory/quantifiers/sygus/sygus_unif.h \
-	theory/quantifiers/sygus/sygus_unif_io.cpp \
-	theory/quantifiers/sygus/sygus_unif_io.h \
-	theory/quantifiers/sygus/sygus_unif_rl.cpp \
-	theory/quantifiers/sygus/sygus_unif_rl.h \
-	theory/quantifiers/sygus/sygus_unif_strat.cpp \
-	theory/quantifiers/sygus/sygus_unif_strat.h \
-	theory/quantifiers/sygus/synth_conjecture.cpp \
-	theory/quantifiers/sygus/synth_conjecture.h \
-	theory/quantifiers/sygus/synth_engine.cpp \
-	theory/quantifiers/sygus/synth_engine.h \
-	theory/quantifiers/sygus/term_database_sygus.cpp \
-	theory/quantifiers/sygus/term_database_sygus.h \
-	theory/quantifiers/sygus_sampler.cpp \
-	theory/quantifiers/sygus_sampler.h \
-	theory/quantifiers/term_canonize.cpp \
-	theory/quantifiers/term_canonize.h \
-	theory/quantifiers/term_database.cpp \
-	theory/quantifiers/term_database.h \
-	theory/quantifiers/term_enumeration.cpp \
-	theory/quantifiers/term_enumeration.h \
-	theory/quantifiers/term_util.cpp \
-	theory/quantifiers/term_util.h \
-	theory/quantifiers/theory_quantifiers.cpp \
-	theory/quantifiers/theory_quantifiers.h \
-	theory/quantifiers/theory_quantifiers_type_rules.h \
-	theory/sep/theory_sep.cpp \
-	theory/sep/theory_sep.h \
-	theory/sep/theory_sep_rewriter.cpp \
-	theory/sep/theory_sep_rewriter.h \
-	theory/sep/theory_sep_type_rules.h \
-	theory/sets/normal_form.h \
-	theory/sets/rels_utils.h \
-	theory/sets/theory_sets.cpp \
-	theory/sets/theory_sets.h \
-	theory/sets/theory_sets_private.cpp \
-	theory/sets/theory_sets_private.h \
-	theory/sets/theory_sets_rels.cpp \
-	theory/sets/theory_sets_rels.h \
-	theory/sets/theory_sets_rewriter.cpp \
-	theory/sets/theory_sets_rewriter.h \
-	theory/sets/theory_sets_type_enumerator.h \
-	theory/sets/theory_sets_type_rules.h \
-	theory/strings/regexp_elim.cpp \
-	theory/strings/regexp_elim.h \
-	theory/strings/regexp_operation.cpp \
-	theory/strings/regexp_operation.h \
-	theory/strings/skolem_cache.cpp \
-	theory/strings/skolem_cache.h \
-	theory/strings/theory_strings.cpp \
-	theory/strings/theory_strings.h \
-	theory/strings/theory_strings_preprocess.cpp \
-	theory/strings/theory_strings_preprocess.h \
-	theory/strings/theory_strings_rewriter.cpp \
-	theory/strings/theory_strings_rewriter.h \
-	theory/strings/theory_strings_type_rules.h \
-	theory/strings/type_enumerator.h \
-	theory/uf/equality_engine.cpp \
-	theory/uf/equality_engine.h \
-	theory/uf/equality_engine_types.h \
-	theory/uf/symmetry_breaker.cpp \
-	theory/uf/symmetry_breaker.h \
-	theory/uf/theory_uf.cpp \
-	theory/uf/theory_uf.h \
-	theory/uf/theory_uf_model.cpp \
-	theory/uf/theory_uf_model.h \
-	theory/uf/theory_uf_rewriter.h \
-	theory/uf/theory_uf_strong_solver.cpp \
-	theory/uf/theory_uf_strong_solver.h \
-	theory/uf/theory_uf_type_rules.h
-
-nodist_libcvc4_la_SOURCES = \
-	theory/rewriter_tables.h \
-	theory/theory_traits.h \
-	theory/type_enumerator.cpp
-
-libcvc4_la_LIBADD = \
-	@builddir@/base/libbase.la \
-	@builddir@/options/liboptions.la \
-	@builddir@/util/libutil.la \
-	@builddir@/expr/libexpr.la \
-	@builddir@/smt_util/libsmtutil.la \
-	@builddir@/prop/minisat/libminisat.la \
-	@builddir@/prop/bvminisat/libbvminisat.la
-if CVC4_PROOF
-libcvc4_la_LIBADD += \
-	@top_builddir@/proofs/signatures/libsignatures.la
-endif
-
-libcvc4_la_LIBADD += \
-	@builddir@/lib/libreplacements.la
-
-if CVC4_USE_GLPK
-libcvc4_la_LIBADD += $(GLPK_LIBS)
-libcvc4_la_LDFLAGS += $(GLPK_LDFLAGS)
-endif
-
-if CVC4_USE_ABC
-libcvc4_la_LIBADD += $(ABC_LIBS)
-libcvc4_la_LDFLAGS += $(ABC_LDFLAGS)
-endif
-
-if CVC4_USE_CADICAL
-libcvc4_la_LIBADD += $(CADICAL_LIBS)
-libcvc4_la_LDFLAGS += $(CADICAL_LDFLAGS)
-endif
-
-if CVC4_USE_CRYPTOMINISAT
-libcvc4_la_LIBADD += $(CRYPTOMINISAT_LIBS)
-libcvc4_la_LDFLAGS += $(CRYPTOMINISAT_LDFLAGS)
-endif
-
-if CVC4_USE_LFSC
-libcvc4_la_LIBADD += $(LFSC_LIBS)
-libcvc4_la_LDFLAGS += $(LFSC_LDFLAGS)
-endif
-
-
-
-BUILT_SOURCES = \
-	theory/rewriter_tables.h \
-	theory/theory_traits.h \
-	theory/type_enumerator.cpp \
-	$(top_builddir)/src/.subdirs
-
-CLEANFILES = \
-	git_versioninfo.cpp \
-	gitinfo.tmp \
-	gitinfo \
-	theory/rewriter_tables.h \
-	theory/theory_traits.h \
-	theory/type_enumerator.cpp \
-	$(top_builddir)/src/.subdirs
-
-EXTRA_DIST = \
-	Makefile.theories \
-	cvc4.i \
-	include/cvc4.h \
-	include/cvc4_private.h \
-	include/cvc4_private_library.h \
-	include/cvc4_public.h \
-	include/cvc4parser_private.h \
-	include/cvc4parser_public.h \
-	mksubdirs \
-	smt/command.i \
-	smt/logic_exception.i \
-	smt/smt_engine.i \
-	proof/unsat_core.i \
-	theory/arith/kinds \
-	theory/arrays/kinds \
-	theory/booleans/kinds \
-	theory/builtin/kinds \
-	theory/bv/kinds \
-	theory/datatypes/kinds \
-	theory/example/ecdata.cpp \
-	theory/example/ecdata.h \
-	theory/example/theory_uf_tim.cpp \
-	theory/example/theory_uf_tim.h \
-	theory/fp/kinds \
-	theory/idl/kinds \
-	theory/logic_info.i \
-	theory/mkrewriter \
-	theory/mktheorytraits \
-	theory/quantifiers/kinds \
-	theory/rewriter_tables_template.h \
-	theory/sep/kinds \
-	theory/sets/kinds \
-	theory/strings/kinds \
-	theory/theory_traits_template.h \
-	theory/type_enumerator_template.cpp \
-	theory/uf/kinds
-
-git_versioninfo.cpp: gitinfo
-	$(AM_V_GEN)( \
-	  if test -s gitinfo; then \
-	    isgit=true; \
-	    branch=`head -1 gitinfo`; \
-	    rev=`head -2 gitinfo | tail -1 | awk '{print$$1}'`; \
-	    mods=`grep '^Modifications: ' gitinfo | awk '{print$$2} END { if(!NR) print "false" }'`; \
-	  else \
-	    isgit=false; \
-	    branch=unknown; \
-	    rev=unknown; \
-	    mods=false; \
-	  fi; \
-	  echo "#include \"base/configuration.h\""; \
-	  echo "const bool ::CVC4::Configuration::IS_GIT_BUILD = $$isgit;"; \
-	  echo "const char* const ::CVC4::Configuration::GIT_BRANCH_NAME = \"$$branch\";"; \
-	  echo "const char* const ::CVC4::Configuration::GIT_COMMIT = \"$$rev\";"; \
-	  echo "const bool ::CVC4::Configuration::GIT_HAS_MODIFICATIONS = $$mods;"; \
-	) >"$@"
-# This .tmp business is to keep from having to re-compile options.cpp
-# (and then re-link the libraries) if nothing has changed.
-gitinfo: gitinfo.tmp
-	$(AM_V_GEN)if diff -q gitinfo.tmp gitinfo &>/dev/null; then rm -f gitinfo.tmp; else mv gitinfo.tmp gitinfo; fi || true
-# .PHONY ensures the .tmp version is always rebuilt (to check for any changes)
-.PHONY: gitinfo.tmp
-gitinfo.tmp:
-	$(AM_V_GEN)(cd "$(top_srcdir)"; if test -e .git/HEAD; then if ! grep -q '^ref: refs/heads/' .git/HEAD; then echo; fi; sed 's,^ref: refs/heads/,,' .git/HEAD; git show-ref refs/heads/`sed 's,^ref: refs/heads/,,' .git/HEAD`; echo "Modifications: `test -z \"\`git status -s -uno\`\" && echo false || echo true`"; fi) >"$@" 2>/dev/null || true
-
-install-data-local:
-	(echo include/cvc4.h; \
-	 echo include/cvc4_public.h; \
-	 echo include/cvc4parser_public.h; \
-	 echo util/floatingpoint.h; \
-	 echo util/integer.h; \
-	 echo util/rational.h; \
-	 find * -name '*.h' | \
-		xargs grep -l '^# *include  *"cvc4.*_public\.h"'; \
-	(cd "$(srcdir)" && find * -name '*.h' | \
-		xargs grep -l '^# *include  *"cvc4.*_public\.h"')) | \
-	while read f; do \
-		if expr "$$f" : ".*_\(template\|private\|private_library\|test_utils\)\.h$$" &>/dev/null; then \
-			continue; \
-		fi; \
-		d="$$(echo "$$f" | sed 's,^include/,,')"; \
-		$(mkinstalldirs) "$$(dirname "$(DESTDIR)$(includedir)/cvc4/$$d")"; \
-		if [ -e "$$f" ]; then \
-			path="$$f"; \
-		else \
-			path="$(srcdir)/$$f"; \
-		fi; \
-		fixpath="$(top_builddir)/header_install.fix"; \
-		sed 's,^\([ \t]*#[ \t]*include[ \t*]\)"\(.*\)"\([ \t]*\)$$,\1<cvc4/\2>\3,' "$$path" > "$$fixpath" || exit 1; \
-		echo $(INSTALL_DATA) "$$fixpath" "$(DESTDIR)$(includedir)/cvc4/$$d"; \
-		if $(INSTALL_DATA) "$$fixpath" "$(DESTDIR)$(includedir)/cvc4/$$d"; then \
-			rm -f "$$fixpath"; \
-		else \
-			rm -f "$$fixpath"; \
-			exit 1; \
-		fi; \
-	done
-
-uninstall-local:
-	-(echo include/cvc4.h; \
-	  echo include/cvc4_public.h; \
-	  echo include/cvc4parser_public.h; \
-	  echo util/floatingpoint.h; \
-	  echo util/integer.h; \
-	  echo util/rational.h; \
-	  find * -name '*.h' | \
-		xargs grep -l '^# *include  *"cvc4.*_public\.h"'; \
-	(cd "$(srcdir)" && find * -name '*.h' | \
-		xargs grep -l '^# *include  *"cvc4.*_public\.h"')) | \
-	while read f; do \
-		if expr "$$f" : ".*_\(template\|private\|private_library\|test_utils\)\.h$$" &>/dev/null; then \
-			continue; \
-		fi; \
-		d="$$(echo "$$f" | sed 's,^include/,,')"; \
-		rm -f "$(DESTDIR)$(includedir)/cvc4/$$d"; \
-	done
-	-rmdir "$(DESTDIR)$(includedir)/cvc4/bindings"
-	-rmdir "$(DESTDIR)$(includedir)/cvc4"
-	-rmdir "$(DESTDIR)$(libdir)/ocaml/cvc4"
-
-# This rule is ugly.  It's needed to ensure that automake's dependence
-# includes are available during distclean, even though they come from
-# directories that are cleaned first.  Without this rule, "distclean"
-# fails.
-%.Plo:; $(MKDIR_P) "$(dir $@)" && : > "$@"
-
-#include @top_srcdir@/src/theory/Makefile.subdirs
-$(top_builddir)/src/.subdirs: $(top_srcdir)/src/Makefile.theories  @top_srcdir@/src/mksubdirs
-	$(AM_V_at)test -d $(top_builddir)/src || mkdir $(top_builddir)/src
-	$(AM_V_at)chmod +x @top_srcdir@/src/mksubdirs
-	$(AM_V_at)( @top_srcdir@/src/mksubdirs "$(top_srcdir)" ) > $(top_builddir)/src/.subdirs.tmp
-	@if ! diff -q $(top_builddir)/src/.subdirs $(top_builddir)/src/.subdirs.tmp &>/dev/null; then \
-		echo "  GEN   " $@; \
-		$(am__mv) $(top_builddir)/src/.subdirs.tmp $(top_builddir)/src/.subdirs; \
-	fi
-
-theory/rewriter_tables.h: theory/rewriter_tables_template.h theory/mkrewriter @top_builddir@/src/.subdirs @top_srcdir@/src/theory/*/kinds
-	$(AM_V_at)test -d $(top_builddir)/src/theory || mkdir -p @top_builddir@/src/theory
-	$(AM_V_at)chmod +x @srcdir@/theory/mkrewriter
-	$(AM_V_at)$(am__mv) $@ $@~ 2>/dev/null || true
-	$(AM_V_GEN)(@srcdir@/theory/mkrewriter \
-		$< \
-		`cat @top_builddir@/src/.subdirs` \
-	> $@) || (rm -f $@ && exit 1)
-
-theory/theory_traits.h: theory/theory_traits_template.h theory/mktheorytraits @top_builddir@/src/.subdirs @top_srcdir@/src/theory/*/kinds
-	$(AM_V_at)test -d $(top_builddir)/src/theory || mkdir -p @top_builddir@/src/theory
-	$(AM_V_at)chmod +x @srcdir@/theory/mktheorytraits
-	$(AM_V_at)$(am__mv) $@ $@~ 2>/dev/null || true
-	$(AM_V_GEN)(@srcdir@/theory/mktheorytraits \
-		$< \
-		`cat @top_builddir@/src/.subdirs` \
-	> $@) || (rm -f $@ && exit 1)
-
-theory/type_enumerator.cpp: theory/type_enumerator_template.cpp theory/mktheorytraits @top_builddir@/src/.subdirs @top_srcdir@/src/theory/*/kinds
-	$(AM_V_at)test -d $(top_builddir)/src/theory || mkdir -p @top_builddir@/src/theory
-	$(AM_V_at)chmod +x @srcdir@/theory/mktheorytraits
-	$(AM_V_at)$(am__mv) $@ $@~ 2>/dev/null || true
-	$(AM_V_GEN)(@srcdir@/theory/mktheorytraits \
-		$< \
-		`cat @top_builddir@/src/.subdirs` \
-	> $@) || (rm -f $@ && exit 1)
diff --git a/src/Makefile.theories b/src/Makefile.theories
deleted file mode 100644
index 276663cc5..000000000
--- a/src/Makefile.theories
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-THEORIES = builtin booleans uf arith bv fp arrays datatypes sep sets strings quantifiers idl
diff --git a/src/base/Makefile.am b/src/base/Makefile.am
deleted file mode 100644
index 3706f57a3..000000000
--- a/src/base/Makefile.am
+++ /dev/null
@@ -1,77 +0,0 @@
-AM_CPPFLAGS = \
-	-D__BUILDING_CVC4LIB \
-	-I@builddir@/.. -I@srcdir@/../include -I@srcdir@/..
-AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN)
-
-noinst_LTLIBRARIES = libbase.la
-
-# Do not list built sources here!
-# Rather, list them under BUILT_SOURCES, and their .in versions under
-# EXTRA_DIST.  Otherwise, they're packaged up in the tarball, which is
-# no good---they belong in the configured builds/ directory.  If they
-# end up in the source directory, they build the cvc4 that was
-# configured at the time of the "make dist", which (1) may not be the
-# configuration that the user wants, and (2) might cause link errors.
-libbase_la_SOURCES = \
-	Makefile.am \
-	Makefile.in \
-	configuration.cpp \
-	configuration.h \
-	configuration_private.h \
-	cvc4_assert.cpp \
-	cvc4_assert.h \
-	cvc4_check.cpp \
-	cvc4_check.h \
-	exception.cpp \
-	exception.h \
-	listener.cpp \
-	listener.h \
-	map_util.h \
-	modal_exception.h \
-	output.cpp \
-	output.h
-
-# listing {Debug,Trace}_tags too ensures that make doesn't auto-remove it
-# after building (if it does, we don't get the "cached" effect with
-# the .tmp files below, and we have to re-compile and re-link each
-# time, even when there are no changes).
-BUILT_SOURCES = \
-	Debug_tags.h \
-	Debug_tags \
-	Trace_tags.h \
-	Trace_tags
-
-MOSTLYCLEANFILES = \
-	Debug_tags \
-	Trace_tags \
-	Debug_tags.tmp \
-	Trace_tags.tmp \
-	Debug_tags.h \
-	Trace_tags.h
-
-EXTRA_DIST = \
-	configuration.i \
-	exception.i \
-	mktagheaders \
-	mktags \
-	modal_exception.i
-
-%_tags.h: %_tags mktagheaders
-	$(AM_V_at)chmod +x @srcdir@/mktagheaders
-	$(AM_V_GEN)( @srcdir@/mktagheaders "$<" "$<" ) >"$@"
-
-# This .tmp business is to keep from having to re-compile options.cpp
-# (and then re-link the libraries) if nothing has changed.
-%_tags: %_tags.tmp
-	$(AM_V_GEN)\
-	diff -q "$^" "$@" &>/dev/null || mv "$^" "$@" || true
-# .PHONY ensures the .tmp version is always rebuilt (to check for any changes)
-.PHONY: Debug_tags.tmp Trace_tags.tmp
-# The "sed" invocation below is particularly obnoxious, but it works around
-# inconsistencies in REs on different platforms, using only a basic regular
-# expression (no |, no \<, ...).
-Debug_tags.tmp Trace_tags.tmp: mktags
-	$(AM_V_at)chmod +x @srcdir@/mktags
-	$(AM_V_GEN)(@srcdir@/mktags \
-    '$(@:_tags.tmp=)' \
-    "$$(find @srcdir@/../ -name '*.cpp' -o -name '*.h' -o -name '*.cc' -o -name '*.g')") >"$@"
diff --git a/src/bindings/Makefile b/src/bindings/Makefile
deleted file mode 100644
index 419d3a1b4..000000000
--- a/src/bindings/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-topdir = ../..
-srcdir = src/bindings
-
-include $(topdir)/Makefile.subdir
diff --git a/src/bindings/Makefile.am b/src/bindings/Makefile.am
deleted file mode 100644
index 9de484d1c..000000000
--- a/src/bindings/Makefile.am
+++ /dev/null
@@ -1,237 +0,0 @@
-# LIBCVC4BINDINGS_VERSION (-version-info) is in the form current:revision:age
-#
-# current -
-#   increment if interfaces have been added, removed or changed
-# revision -
-#   increment if source code has changed
-#   set to zero if current is incremented
-# age -
-#   increment if interfaces have been added
-#   set to zero if interfaces have been removed
-#   or changed
-#
-LIBCVC4BINDINGS_VERSION = @CVC4_BINDINGS_LIBRARY_VERSION@
-
-AUTOMAKE_OPTIONS = subdir-objects
-
-AM_CPPFLAGS = \
-	-D__BUILDING_CVC4BINDINGSLIB \
-	-I@builddir@/.. -I@srcdir@/../include -I@srcdir@/..
-AM_CXXFLAGS = -Wall
-
-# any binding-specific flags to pass to swig
-java_cpp_SWIGFLAGS = -package edu.nyu.acsys.CVC4
-
-lib_LTLIBRARIES =
-bin_PROGRAMS =
-javadatadir = $(datadir)/java
-javalibdir = $(libdir)/jni
-ocamldatadir = $(libdir)/ocaml/cvc4
-ocamllibdir = $(libdir)/ocaml/cvc4
-perldatadir = $(datadir)/perl5
-perllibdir = $(libdir)/perl5
-phpdatadir = $(datadir)/php
-phplibdir = $(libdir)/php
-pythondatadir = $(datadir)/pyshared
-pythonlibdir = $(libdir)/pyshared
-csharpdatadir = $(datadir)/csharp
-csharplibdir = $(libdir)/csharp
-rubylibdir = $(libdir)/ruby
-tcllibdir = $(libdir)/tcltk
-javadata_DATA =
-javalib_LTLIBRARIES=
-ocamldata_DATA =
-ocamllib_LTLIBRARIES=
-perldata_DATA =
-perllib_LTLIBRARIES =
-phpdata_DATA =
-phplib_LTLIBRARIES =
-pythondata_DATA =
-pythonlib_LTLIBRARIES =
-csharpdata_DATA =
-csharplib_LTLIBRARIES =
-rubylib_LTLIBRARIES =
-tcllib_LTLIBRARIES =
-if CVC4_HAS_SWIG
-if CVC4_LANGUAGE_BINDING_JAVA 
-javalib_LTLIBRARIES += java/libcvc4jni.la
-javadata_DATA += CVC4.jar
-java_libcvc4jni_la_LDFLAGS = \
-	-no-undefined \
-	-module \
-	-shrext $(CVC4_JAVA_MODULE_EXT) \
-	-version-info $(LIBCVC4BINDINGS_VERSION)
-java_libcvc4jni_la_LIBADD = \
-	@builddir@/../libcvc4.la \
-	@builddir@/../parser/libcvc4parser.la
-endif
-if CVC4_LANGUAGE_BINDING_CSHARP
-csharplib_LTLIBRARIES += csharp/CVC4.la
-csharp_CVC4_la_LDFLAGS = \
-	-module \
-	-version-info $(LIBCVC4BINDINGS_VERSION)
-csharp_CVC4_la_LIBADD = \
-	@builddir@/../libcvc4.la \
-	@builddir@/../parser/libcvc4parser.la
-endif
-if CVC4_LANGUAGE_BINDING_PERL
-perllib_LTLIBRARIES += perl/CVC4.la
-perl_CVC4_la_LDFLAGS = \
-	-module \
-	-version-info $(LIBCVC4BINDINGS_VERSION)
-perl_CVC4_la_LIBADD = \
-	@builddir@/../libcvc4.la \
-	@builddir@/../parser/libcvc4parser.la
-perldata_DATA += perl/CVC4.pm
-endif
-if CVC4_LANGUAGE_BINDING_PHP
-phplib_LTLIBRARIES += php/CVC4.la
-php_CVC4_la_LDFLAGS = \
-	-module \
-	-version-info $(LIBCVC4BINDINGS_VERSION)
-php_CVC4_la_LIBADD = \
-	@builddir@/../libcvc4.la \
-	@builddir@/../parser/libcvc4parser.la
-phpdata_DATA += php/CVC4.php
-endif
-if CVC4_LANGUAGE_BINDING_PYTHON
-pythonlib_LTLIBRARIES += python/CVC4.la
-python_CVC4_la_CXXFLAGS = $(PYTHON_CXXFLAGS)
-python_CVC4_la_LDFLAGS = \
-	-module \
-	-version-info $(LIBCVC4BINDINGS_VERSION)
-python_CVC4_la_LIBADD = \
-	@builddir@/../libcvc4.la \
-	@builddir@/../parser/libcvc4parser.la
-pythondata_DATA += python/CVC4.py
-endif
-if CVC4_LANGUAGE_BINDING_OCAML
-ocamllib_LTLIBRARIES += ocaml/CVC4.la
-bin_PROGRAMS += cvc4_ocaml_top
-# We provide a make rule below, but we have to tell automake to lay off, too,
-# otherwise it tries (and fails) to package the nonexistent cvc4_ocaml_top.c!
-cvc4_ocaml_top_SOURCES =
-ocamldata_DATA += ocaml/swig.cmo ocaml/swig.cmi ocaml/swigp4.cmo ocaml/swigp4.cmi ocaml/CVC4.cmo ocaml/CVC4.cmi
-ocaml_CVC4_la_LDFLAGS = \
-	-module \
-	-version-info $(LIBCVC4BINDINGS_VERSION)
-ocaml_CVC4_la_LIBADD = \
-	@builddir@/../libcvc4.la \
-	@builddir@/../parser/libcvc4parser.la
-endif
-if CVC4_LANGUAGE_BINDING_RUBY
-rubylib_LTLIBRARIES += ruby/CVC4.la
-ruby_CVC4_la_LDFLAGS = \
-	-module \
-	-version-info $(LIBCVC4BINDINGS_VERSION)
-ruby_CVC4_la_LIBADD = \
-	@builddir@/../libcvc4.la \
-	@builddir@/../parser/libcvc4parser.la
-endif
-if CVC4_LANGUAGE_BINDING_TCL
-tcllib_LTLIBRARIES += tcl/CVC4.la
-tcl_CVC4_la_LDFLAGS = \
-	-module \
-	-version-info $(LIBCVC4BINDINGS_VERSION)
-tcl_CVC4_la_LIBADD = \
-	@builddir@/../libcvc4.la \
-	@builddir@/../parser/libcvc4parser.la
-endif
-# this endif matches the "if CVC4_HAS_SWIG" above
-endif
-
-nodist_java_libcvc4jni_la_SOURCES = java.cpp
-java_libcvc4jni_la_CXXFLAGS = -Wno-all @FNO_STRICT_ALIASING@ @WNO_UNUSED_VARIABLE@ @WNO_UNINITIALIZED@
-nodist_csharp_CVC4_la_SOURCES = csharp.cpp
-nodist_perl_CVC4_la_SOURCES = perl.cpp
-nodist_php_CVC4_la_SOURCES = php.cpp
-nodist_python_CVC4_la_SOURCES = python.cpp
-nodist_ocaml_CVC4_la_SOURCES = ocaml.cpp
-nodist_ruby_CVC4_la_SOURCES = ruby.cpp
-nodist_tcl_CVC4_la_SOURCES = tcl.cpp
-
-CLEANFILES = \
-	java.cpp \
-	csharp.cpp \
-	perl.cpp \
-	php.cpp \
-	python.cpp \
-	ocaml.cpp \
-	ruby.cpp \
-	tcl.cpp
-
-EXTRA_DIST = \
-	swig.h \
-	java_iterator_adapter.h \
-	java_stream_adapters.h
-
-MOSTLYCLEANFILES = \
-        .swig_deps \
-	$(patsubst %,%.d,$(filter-out c c++,$(CVC4_LANGUAGE_BINDINGS))) \
-	CVC4.jar
-
-java_libcvc4jni_la-java.lo: java.cpp
-	$(AM_V_CXX)$(LTCXXCOMPILE) -c $(JAVA_CPPFLAGS) $(java_libcvc4jni_la_CXXFLAGS) -o $@ $<
-java.lo: java.cpp
-	$(AM_V_CXX)$(LTCXXCOMPILE) -c $(JAVA_CPPFLAGS) $(java_libcvc4jni_la_CXXFLAGS) -o $@ $<
-CVC4.jar: java.cpp
-	$(AM_V_GEN) \
-	(cd java && \
-	rm -fr classes && \
-	mkdir -p classes && \
-	$(JAVAC) -source 1.6 -target 1.6 -classpath . -d classes `find . -name '*.java'` && \
-	cd classes) && \
-	$(JAR) cf $@ -C java/classes .
-#java.cpp:;
-csharp.lo: csharp.cpp
-	$(AM_V_CXX)$(LTCXXCOMPILE) -c $(CSHARP_CPPFLAGS) -o $@ $<
-#csharp.cpp:;
-perl.lo: perl.cpp
-	$(AM_V_CXX)$(LTCXXCOMPILE) -c $(PERL_CPPFLAGS) -o $@ $<
-#perl.cpp:;
-perl/CVC4.pm: perl.cpp
-php.lo: php.cpp
-	$(AM_V_CXX)$(LTCXXCOMPILE) -c $(PHP_CPPFLAGS) -Iphp -o $@ $<
-#php.cpp:;
-python.lo: python.cpp
-	$(AM_V_CXX)$(LTCXXCOMPILE) -c $(PYTHON_CPPFLAGS) -o $@ $<
-ocaml.lo: ocaml.cpp
-	$(AM_V_CXX)$(LTCXXCOMPILE) -c $(OCAML_CPPFLAGS) -o $@ $<
-ocaml/swig.cmo: ocaml/swig.ml ocaml/swig.cmi; $(AM_V_GEN)$(OCAMLC) -I ocaml -c -o $@ $<
-ocaml/swig.cmi: ocaml/swig.mli; $(AM_V_GEN)$(OCAMLC) -I ocaml -c -o $@ $<
-ocaml/CVC4.cmo: ocaml/CVC4.ml ocaml/CVC4.cmi; $(AM_V_GEN)$(OCAMLC) -I ocaml -c -o $@ $<
-ocaml/CVC4.cmi: ocaml/CVC4.mli; $(AM_V_GEN)$(OCAMLC) -I ocaml -c -o $@ $<
-ocaml/swigp4.cmo: ocaml/swigp4.ml; $(AM_V_GEN)$(OCAMLFIND) ocamlc -package camlp4 -pp "$(CAMLP4O) pa_extend.cmo q_MLast.cmo" -o $@ -c $<
-ocaml/swig.ml:; $(AM_V_GEN)cd ocaml && $(SWIG) -ocaml -co swig.ml
-ocaml/swig.mli:; $(AM_V_GEN)cd ocaml && $(SWIG) -ocaml -co swig.mli
-ocaml/swigp4.ml:; $(AM_V_GEN)cd ocaml && $(SWIG) -ocaml -co swigp4.ml
-#ocaml.cpp:;
-cvc4_ocaml_top$(EXEEXT): ocaml/CVC4.la ocaml/swig.cmo ocaml/swig.cmi ocaml/swigp4.cmo ocaml/CVC4.cmo ocaml/CVC4.cmi
-	$(AM_V_GEN)\
-	$(OCAMLFIND) ocamlmktop -I $(ocamldatadir) -custom -o cvc4_ocaml_top$(EXEEXT) -package camlp4 dynlink.cma camlp4o.cma ocaml/swig.cmo ocaml/swigp4.cmo ocaml/CVC4.cmo -cclib ocaml/.libs/CVC4.so -cclib -lstdc++
-ruby.lo: ruby.cpp
-	$(AM_V_CXX)$(LTCXXCOMPILE) -c $(RUBY_CPPFLAGS) -o $@ $<
-tcl.lo: tcl.cpp
-	$(AM_V_CXX)$(LTCXXCOMPILE) -c $(TCL_CPPFLAGS) -o $@ $<
-#tcl.cpp:;
-
-if CVC4_HAS_SWIG
-
-$(patsubst %,%.cpp,$(filter-out c c++,$(CVC4_LANGUAGE_BINDINGS))): %.cpp: @srcdir@/../cvc4.i
-	$(AM_V_at)mkdir -p $(patsubst %.cpp,%,$@)
-	$(AM_V_GEN)$(SWIG) -Wall -I@builddir@/.. -I@srcdir@/../include -I@srcdir@/.. -c++ -$(patsubst %.cpp,%,$@) -outdir $(patsubst %.cpp,%,$@) $($(subst .,_,$@)_SWIGFLAGS) -o $@ $<
-
-# Automake 1.16 is executing this target at configuration time. Because some
-# generated source files do not exist at that time, we use the -ignoremissing
-# option to not have SWIG complain about those missing files.
-$(patsubst %,%.d,$(filter-out c c++,$(CVC4_LANGUAGE_BINDINGS))): %.d: @srcdir@/../cvc4.i
-	$(AM_V_GEN)$(SWIG) -I@builddir@/.. -I@srcdir@/../include -I@srcdir@/.. -c++ -$(patsubst %.d,%,$@) -ignoremissing -MM -o $(patsubst %.d,%.cpp,$@) $<
-# .PHONY so they get rebuilt each time
-.PHONY: .swig_deps $(patsubst %,%.d,$(filter-out c c++,$(CVC4_LANGUAGE_BINDINGS)))
-.swig_deps: $(patsubst %,%.d,$(filter-out c c++,$(CVC4_LANGUAGE_BINDINGS)))
-	$(AM_V_GEN)cat $+ </dev/null >$@
-@mk_include@ .swig_deps
-
-endif
-
-clean-local:; rm -fr $(patsubst %.cpp,%,$(filter-out c c++,$(CVC4_LANGUAGE_BINDINGS)))
diff --git a/src/expr/.gitignore b/src/expr/.gitignore
deleted file mode 100644
index 238db3ad3..000000000
--- a/src/expr/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/kind.h
-/metakind.h
-/expr.cpp
-/expr.h
-/expr_manager.cpp
-/expr_manager.h
diff --git a/src/expr/Makefile b/src/expr/Makefile
deleted file mode 100644
index eff3b332e..000000000
--- a/src/expr/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-topdir = ../..
-srcdir = src/expr
-
-include $(topdir)/Makefile.subdir
diff --git a/src/expr/Makefile.am b/src/expr/Makefile.am
deleted file mode 100644
index f8f9dbd11..000000000
--- a/src/expr/Makefile.am
+++ /dev/null
@@ -1,228 +0,0 @@
-# if coverage is enabled:
-# COVERAGE_ON = yes from configure.ac
-# Using an inline conditional function to choose between absolute and
-# relative paths for options files
-# lcov does not support relative paths and src/options and src/expr
-# in particular were breaking it
-# Building with coverage will cause portability issues in some cases
-
-VPATH = $(if $(COVERAGE_ON), $(realpath @srcdir@), @srcdir@)
-
-AM_CPPFLAGS = \
-	-D__BUILDING_CVC4LIB \
-	$(if $(COVERAGE_ON), -I@abs_builddir@/.. -I@abs_srcdir@/../include -I@abs_srcdir@/.., \
-	-I@builddir@/.. -I@srcdir@/../include -I@srcdir@/..)
-AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN)
-
-noinst_LTLIBRARIES = libexpr.la
-
-# For some reason statistics were in libutil. No idea why though.
-libexpr_la_SOURCES = \
-	array.h \
-	array_store_all.cpp \
-	array_store_all.h \
-	ascription_type.h \
-	attribute.h \
-	attribute.cpp \
-	attribute_internals.h \
-	attribute_unique_id.h \
-	chain.h \
-	emptyset.cpp \
-	emptyset.h \
-	expr_iomanip.cpp \
-	expr_iomanip.h \
-	expr_manager_scope.h \
-	expr_stream.h \
-	kind_map.h \
-	matcher.h \
-	node.cpp \
-	node.h \
-	node_algorithm.cpp \
-	node_algorithm.h \
-	node_builder.h \
-	node_manager.cpp \
-	node_manager.h \
-	node_manager_attributes.h \
-	node_manager_listeners.cpp \
-	node_manager_listeners.h \
-	node_self_iterator.h \
-	node_value.cpp \
-	node_value.h \
-	pickle_data.cpp \
-	pickle_data.h \
-	pickler.cpp \
-	pickler.h \
-	symbol_table.cpp \
-	symbol_table.h \
-	type.cpp \
-	type.h \
-	type_checker.h \
-	type_node.cpp \
-	type_node.h \
-	variable_type_map.h \
-	datatype.h \
-	datatype.cpp \
-	record.cpp \
-	record.h \
-	uninterpreted_constant.cpp \
-	uninterpreted_constant.h
-
-nodist_libexpr_la_SOURCES = \
-	kind.h \
-	kind.cpp \
-	metakind.h \
-	metakind.cpp \
-	type_properties.h \
-	expr.h \
-	expr.cpp \
-	expr_manager.h \
-	expr_manager.cpp \
-	type_checker.cpp
-
-EXTRA_DIST = \
-	array.i \
-	chain.i \
-	array_store_all.i \
-	ascription_type.i \
-	datatype.i \
-	emptyset.i \
-	kind_template.h \
-	kind_template.cpp \
-	metakind_template.h \
-	metakind_template.cpp \
-	type_properties_template.h \
-	expr_manager_template.h \
-	expr_manager_template.cpp \
-	expr_template.h \
-	expr_template.cpp \
-	type_checker_template.cpp \
-	mkkind \
-	mkmetakind \
-	mkexpr \
-	expr_stream.i \
-	expr_manager.i \
-	symbol_table.i \
-	type.i \
-	kind.i \
-	expr.i \
-	record.i \
-	variable_type_map.i \
-	uninterpreted_constant.i
-
-BUILT_SOURCES = \
-	kind.h \
-	kind.cpp \
-	metakind.h \
-	metakind.cpp \
-	type_properties.h \
-	expr.h \
-	expr.cpp \
-	expr_manager.h \
-	expr_manager.cpp \
-	type_checker.cpp \
-	$(top_builddir)/src/expr/.subdirs
-
-CLEANFILES = \
-	kind.h \
-	kind.cpp \
-	metakind.h \
-	metakind.cpp \
-	expr.h \
-	expr.cpp \
-	expr_manager.h \
-	expr_manager.cpp \
-	type_checker.cpp \
-	type_properties.h \
-	$(top_builddir)/src/expr/.subdirs
-
-$(top_builddir)/src/expr/.subdirs: $(top_srcdir)/src/Makefile.theories  @top_srcdir@/src/mksubdirs
-	$(AM_V_at)test -d $(top_builddir)/src/expr || mkdir $(top_builddir)/src/expr
-	$(AM_V_at)chmod +x @top_srcdir@/src/mksubdirs
-	$(AM_V_at)( @top_srcdir@/src/mksubdirs $(if $(COVERAGE_ON), "$(abs_top_srcdir)", "$(top_srcdir)")) > $(top_builddir)/src/expr/.subdirs.tmp
-	@if ! diff -q $(top_builddir)/src/expr/.subdirs $(top_builddir)/src/expr/.subdirs.tmp &>/dev/null; then \
-		echo "  GEN   " $@; \
-		$(am__mv) $(top_builddir)/src/expr/.subdirs.tmp $(top_builddir)/src/expr/.subdirs; \
-	fi
-
-kind.h: kind_template.h mkkind @top_builddir@/src/expr/.subdirs $(if $(COVERAGE_ON), @abs_top_srcdir@, @top_srcdir@)/src/theory/*/kinds
-	$(AM_V_at)chmod +x @srcdir@/mkkind
-	$(AM_V_at)$(am__mv) $@ $@~ 2>/dev/null || true
-	$(AM_V_GEN)(@srcdir@/mkkind \
-		$< \
-		`cat @top_builddir@/src/expr/.subdirs` \
-	> $@) || (rm -f $@ && exit 1)
-
-kind.cpp: kind_template.cpp mkkind @top_builddir@/src/expr/.subdirs $(if $(COVERAGE_ON), @abs_top_srcdir@, @top_srcdir@)/src/theory/*/kinds
-	$(AM_V_at)chmod +x @srcdir@/mkkind
-	$(AM_V_at)$(am__mv) $@ $@~ 2>/dev/null || true
-	$(AM_V_GEN)(@srcdir@/mkkind \
-		$< \
-		`cat @top_builddir@/src/expr/.subdirs` \
-	> $@) || (rm -f $@ && exit 1)
-
-metakind.h: metakind_template.h mkmetakind @top_builddir@/src/expr/.subdirs $(if $(COVERAGE_ON), @abs_top_srcdir@, @top_srcdir@)/src/theory/*/kinds
-	$(AM_V_at)chmod +x @srcdir@/mkmetakind
-	$(AM_V_at)$(am__mv) $@ $@~ 2>/dev/null || true
-	$(AM_V_GEN)(@srcdir@/mkmetakind \
-		$< \
-		`cat @top_builddir@/src/expr/.subdirs` \
-	> $@) || (rm -f $@ && exit 1)
-
-metakind.cpp: metakind_template.cpp mkmetakind @top_builddir@/src/expr/.subdirs $(if $(COVERAGE_ON), @abs_top_srcdir@, @top_srcdir@)/src/theory/*/kinds
-	$(AM_V_at)chmod +x @srcdir@/mkmetakind
-	$(AM_V_at)$(am__mv) $@ $@~ 2>/dev/null || true
-	$(AM_V_GEN)(@srcdir@/mkmetakind \
-		$< \
-		`cat @top_builddir@/src/expr/.subdirs` \
-	> $@) || (rm -f $@ && exit 1)
-
-type_properties.h: type_properties_template.h mkkind @top_builddir@/src/expr/.subdirs $(if $(COVERAGE_ON), @abs_top_srcdir@, @top_srcdir@)/src/theory/*/kinds
-	$(AM_V_at)chmod +x @srcdir@/mkkind
-	$(AM_V_at)$(am__mv) $@ $@~ 2>/dev/null || true
-	$(AM_V_GEN)(@srcdir@/mkkind \
-		$< \
-		`cat @top_builddir@/src/expr/.subdirs` \
-	> $@) || (rm -f $@ && exit 1)
-
-expr.h: expr_template.h mkexpr @top_builddir@/src/expr/.subdirs $(if $(COVERAGE_ON), @abs_top_srcdir@, @top_srcdir@)/src/theory/*/kinds
-	$(AM_V_at)chmod +x @srcdir@/mkexpr
-	$(AM_V_at)$(am__mv) $@ $@~ 2>/dev/null || true
-	$(AM_V_GEN)(@srcdir@/mkexpr \
-		$< \
-		`cat @top_builddir@/src/expr/.subdirs` \
-	> $@) || (rm -f $@ && exit 1)
-
-expr.cpp: expr_template.cpp mkexpr @top_builddir@/src/expr/.subdirs $(if $(COVERAGE_ON), @abs_top_srcdir@, @top_srcdir@)/src/theory/*/kinds
-	$(AM_V_at)chmod +x @srcdir@/mkexpr
-	$(AM_V_at)$(am__mv) $@ $@~ 2>/dev/null || true
-	$(AM_V_GEN)(@srcdir@/mkexpr \
-		$< \
-		`cat @top_builddir@/src/expr/.subdirs` \
-	> $@) || (rm -f $@ && exit 1)
-
-expr_manager.h: expr_manager_template.h mkexpr @top_builddir@/src/expr/.subdirs $(if $(COVERAGE_ON), @abs_top_srcdir@, @top_srcdir@)/src/theory/*/kinds
-	$(AM_V_at)chmod +x @srcdir@/mkexpr
-	$(AM_V_at)$(am__mv) $@ $@~ 2>/dev/null || true
-	$(AM_V_GEN)(@srcdir@/mkexpr \
-		$< \
-		`cat @top_builddir@/src/expr/.subdirs` \
-	> $@) || (rm -f $@ && exit 1)
-
-expr_manager.cpp: expr_manager_template.cpp mkexpr @top_builddir@/src/expr/.subdirs $(if $(COVERAGE_ON), @abs_top_srcdir@, @top_srcdir@)/src/theory/*/kinds
-	$(AM_V_at)chmod +x @srcdir@/mkexpr
-	$(AM_V_at)$(am__mv) $@ $@~ 2>/dev/null || true
-	$(AM_V_GEN)(@srcdir@/mkexpr \
-		$< \
-		`cat @top_builddir@/src/expr/.subdirs` \
-	> $@) || (rm -f $@ && exit 1)
-
-type_checker.cpp: type_checker_template.cpp mkexpr @top_builddir@/src/expr/.subdirs $(if $(COVERAGE_ON), @abs_top_srcdir@, @top_srcdir@)/src/theory/*/kinds
-	$(AM_V_at)chmod +x @srcdir@/mkexpr
-	$(AM_V_at)$(am__mv) $@ $@~ 2>/dev/null || true
-	$(AM_V_GEN)(@srcdir@/mkexpr \
-		$< \
-		`cat @top_builddir@/src/expr/.subdirs` \
-	> $@) || (rm -f $@ && exit 1)
-
-.PHONY: builts
-builts: $(BUILT_SOURCES)
diff --git a/src/include/.gitignore b/src/include/.gitignore
deleted file mode 100644
index 274bc504a..000000000
--- a/src/include/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/Makefile
-
diff --git a/src/lib/Makefile b/src/lib/Makefile
deleted file mode 100644
index 9811fec4f..000000000
--- a/src/lib/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-topdir = ../..
-srcdir = src/lib
-
-include $(topdir)/Makefile.subdir
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
deleted file mode 100644
index aec9fa634..000000000
--- a/src/lib/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-AM_CPPFLAGS = \
-	-D__BUILDING_CVC4LIB \
-	-I@builddir@/.. -I@srcdir@/../include -I@srcdir@/..
-AM_CFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN)
-AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN)
-# This is a workaround for now to fix some warnings related to unsupported
-# compiler flags since we are compiling C code here. CXXFLAGS is set via
-# configure, however, we should actually set AM_CXXFLAGS.
-CXXFLAGS = $(AM_CXXFLAGS)
-
-noinst_LTLIBRARIES = libreplacements.la
-
-libreplacements_la_SOURCES =
-
-libreplacements_la_LIBADD = \
-	$(LTLIBOBJS)
-
-EXTRA_DIST = \
-	replacements.h \
-	clock_gettime.c \
-	clock_gettime.h \
-	strtok_r.c \
-	strtok_r.h \
-	ffs.c \
-	ffs.h
diff --git a/src/main/Makefile b/src/main/Makefile
deleted file mode 100644
index 5e936ee06..000000000
--- a/src/main/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-topdir = ../..
-srcdir = src/main
-
-include $(topdir)/Makefile.subdir
diff --git a/src/main/Makefile.am b/src/main/Makefile.am
deleted file mode 100644
index 372e817f6..000000000
--- a/src/main/Makefile.am
+++ /dev/null
@@ -1,85 +0,0 @@
-AM_CPPFLAGS = \
-	-D__BUILDING_CVC4DRIVER \
-	-I@builddir@/.. $(ANTLR_INCLUDES) -I@srcdir@/../include -I@srcdir@/..
-AM_CXXFLAGS = -Wall -Wno-unknown-pragmas
-
-bin_PROGRAMS = cvc4
-
-noinst_LIBRARIES = libmain.a
-
-libmain_a_SOURCES = \
-	interactive_shell.h \
-	interactive_shell.cpp \
-	main.h \
-	util.cpp
-
-if CVC4_BUILD_PCVC4
-bin_PROGRAMS += pcvc4
-pcvc4_SOURCES = \
-	main.cpp \
-	portfolio.cpp \
-	portfolio.h \
-	portfolio_util.cpp \
-	portfolio_util.h \
-	command_executor.cpp \
-	command_executor_portfolio.cpp \
-	command_executor.h \
-	command_executor_portfolio.h \
-	driver_unified.cpp
-pcvc4_LDADD = \
-	libmain.a \
-	@builddir@/../parser/libcvc4parser.la \
-	@builddir@/../libcvc4.la \
-	$(READLINE_LIBS) \
-	@builddir@/../lib/libreplacements.la
-
-pcvc4_CPPFLAGS = $(AM_CPPFLAGS) $(BOOST_CPPFLAGS) -DPORTFOLIO_BUILD
-pcvc4_LDADD += $(BOOST_THREAD_LIBS)
-pcvc4_LDADD += $(BOOST_THREAD_LDFLAGS)
-
-if STATIC_BINARY
-pcvc4_LINK = $(CXXLINK) -all-static $(pcvc4_LDFLAGS)
-else
-pcvc4_LINK = $(CXXLINK) $(pcvc4_LDFLAGS)
-endif
-endif
-
-cvc4_SOURCES = \
-	main.cpp \
-	command_executor.cpp \
-	driver_unified.cpp
-cvc4_LDADD = \
-	libmain.a \
-	@builddir@/../parser/libcvc4parser.la \
-	@builddir@/../libcvc4.la \
-	$(READLINE_LIBS) \
-	@builddir@/../lib/libreplacements.la
-
-BUILT_SOURCES = \
-	$(TOKENS_FILES)
-
-TOKENS_FILES = \
-	cvc_tokens.h \
-	smt1_tokens.h \
-	smt2_tokens.h \
-	tptp_tokens.h
-
-cvc_tokens.h: @srcdir@/../parser/cvc/Cvc.g
-	$(AM_V_GEN)grep "'[a-zA-Z][a-zA-Z0-9_-][a-zA-Z0-9_-]*'" $^ | sed 's/.*'\''\([a-zA-Z0-9_-]*\)'\''.*/"\1",/' | sort -u >$@
-smt1_tokens.h: @srcdir@/../parser/smt1/Smt1.g
-	$(AM_V_GEN)grep "'[a-zA-Z][a-zA-Z0-9_-][a-zA-Z0-9_-]*'" $^ | sed 's/.*'\''\([a-zA-Z0-9_-]*\)'\''.*/"\1",/' | sort -u >$@
-smt2_tokens.h: @srcdir@/../parser/smt2/Smt2.g
-	$(AM_V_GEN)grep "'[a-zA-Z][a-zA-Z0-9_-][a-zA-Z0-9_-]*'" $^ | sed 's/.*'\''\([a-zA-Z0-9_-]*\)'\''.*/"\1",/' | sort -u >$@
-tptp_tokens.h: @srcdir@/../parser/tptp/Tptp.g
-	$(AM_V_GEN)grep "'[a-zA-Z][a-zA-Z0-9_-][a-zA-Z0-9_-]*'" $^ | sed 's/.*'\''\([a-zA-Z0-9_-]*\)'\''.*/"\1",/' | sort -u >$@
-
-
-clean-local:
-	rm -f $(BUILT_SOURCES)
-
-if STATIC_BINARY
-cvc4_LINK = $(CXXLINK) -all-static $(cvc4_LDFLAGS)
-else
-cvc4_LINK = $(CXXLINK) $(cvc4_LDFLAGS)
-endif
-
diff --git a/src/mksubdirs b/src/mksubdirs
deleted file mode 100755
index c96437caa..000000000
--- a/src/mksubdirs
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-#
-# The purpose of this file is to generate a .subdirs file in the build process.
-# This file contains a file of relative paths to all of the theories relative
-# to the current directory. Each Makefile.am should thus build its own .subdirs file.
-# This assumes it is passed the equivalent of the $top_srcdir configure variable.
-#
-# Invocation:
-#
-#    mksubdirs <top_srcdir>
-
-TOP_SRCDIR=$1
-
-grep '^THEORIES = ' $TOP_SRCDIR/src/Makefile.theories | \
-  cut -d' ' -f3- | tr ' ' "\n" | \
-  xargs -I__D__ echo "$TOP_SRCDIR/src/theory/__D__/kinds"
diff --git a/src/options/Makefile b/src/options/Makefile
deleted file mode 100644
index 54a46191d..000000000
--- a/src/options/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-topdir = ../..
-srcdir = src/options
-
-include $(topdir)/Makefile.subdir
diff --git a/src/options/Makefile.am b/src/options/Makefile.am
deleted file mode 100644
index 498989c80..000000000
--- a/src/options/Makefile.am
+++ /dev/null
@@ -1,159 +0,0 @@
-# if coverage is enabled:
-# COVERAGE_ON = yes from configure.ac
-# Using an inline conditional function to choose between absolute and
-# relative paths for options files
-# lcov does not support relative paths and src/options and src/expr
-# in particular were breaking it
-# Building with coverage will cause portability issues in some cases
-
-VPATH = $(if $(COVERAGE_ON), $(realpath @srcdir@), @srcdir@)
-
-OPTIONS_CONFIG_FILES = \
-	arith_options.toml \
-	arrays_options.toml \
-	base_options.toml \
-	booleans_options.toml \
-	builtin_options.toml \
-	bv_options.toml \
-	datatypes_options.toml \
-	decision_options.toml \
-	expr_options.toml \
-	fp_options.toml \
-	idl_options.toml \
-	main_options.toml \
-	parser_options.toml \
-	printer_options.toml \
-	proof_options.toml \
-	prop_options.toml \
-	quantifiers_options.toml \
-	sep_options.toml \
-	sets_options.toml \
-	smt_options.toml \
-	strings_options.toml \
-	theory_options.toml \
-	uf_options.toml
-
-OPTIONS_GEN_H = $(OPTIONS_CONFIG_FILES:.toml=.h)
-
-OPTIONS_GEN_CPP = $(OPTIONS_CONFIG_FILES:.toml=.cpp)
-
-CPP_TEMPLATE_FILES = \
-	module_template.h \
-	module_template.cpp \
-	options_holder_template.h \
-	options_template.cpp
-
-DOCUMENTATION_FILES = \
-	../../doc/cvc4.1 \
-	../../doc/SmtEngine.3cvc \
-	../../doc/options.3cvc
-
-DOCUMENTATION_TEMPLATE_FILES = \
-	../../doc/cvc4.1_template \
-	../../doc/SmtEngine.3cvc_template \
-	../../doc/options.3cvc_template
-
-
-AM_CPPFLAGS = \
-	-D__BUILDING_CVC4LIB \
-	$(if $(COVERAGE_ON), -I@abs_builddir@/.. -I@abs_srcdir@/../include -I@abs_srcdir@/.., \
-	-I@builddir@/.. -I@srcdir@/../include -I@srcdir@/..)
-AM_CXXFLAGS = -Wall $(FLAG_VISIBILITY_HIDDEN)
-
-noinst_LTLIBRARIES = liboptions.la
-
-liboptions_la_SOURCES = \
-	arith_heuristic_pivot_rule.cpp \
-	arith_heuristic_pivot_rule.h \
-	arith_propagation_mode.cpp \
-	arith_propagation_mode.h \
-	arith_unate_lemma_mode.cpp \
-	arith_unate_lemma_mode.h \
-	argument_extender_implementation.cpp \
-	argument_extender_implementation.h \
-	argument_extender.h \
-	base_handlers.h \
-	bv_bitblast_mode.cpp \
-	bv_bitblast_mode.h \
-	datatypes_modes.h \
-	decision_mode.cpp \
-	decision_mode.h \
-	decision_weight.h \
-	didyoumean.cpp \
-	didyoumean.h \
-	language.cpp \
-	language.h \
-	open_ostream.cpp \
-	open_ostream.h \
-	option_exception.cpp \
-	option_exception.h \
-	options.h \
-	options_handler.cpp \
-	options_handler.h \
-	options_public_functions.cpp \
-	printer_modes.cpp \
-	printer_modes.h \
-	quantifiers_modes.cpp \
-	quantifiers_modes.h \
-	set_language.cpp \
-	set_language.h \
-	smt_modes.cpp \
-	smt_modes.h \
-	sygus_out_mode.h \
-	theoryof_mode.cpp \
-	theoryof_mode.h \
-	ufss_mode.h
-
-
-nodist_liboptions_la_SOURCES = \
-	options.cpp \
-	options_holder.h \
-	$(OPTIONS_GEN_H) \
-	$(OPTIONS_GEN_CPP)
-
-
-BUILT_SOURCES = \
-	options.cpp
-
-
-CLEANFILES = \
-	$(BUILT_SOURCES) \
-	$(OPTIONS_GEN_H) \
-	$(OPTIONS_GEN_CPP) \
-	$(DOCUMENTATION_FILES) \
-	options_holder.h
-
-
-EXTRA_DIST = \
-	options.cpp \
-	options_holder.h \
-	$(OPTIONS_GEN_CPP) \
-	$(OPTIONS_GEN_H) \
-	$(OPTIONS_CONFIG_FILES) \
-	$(CPP_TEMPLATE_FILES) \
-	$(DOCUMENTATION_FILES) \
-	mkoptions.py \
-	language.i \
-	option_exception.i \
-	options.i
-
-
-
-# Make sure the implicit rules never mistake a _template.cpp or _template.h
-# file for source file.
-$(CPP_TEMPLATE_FILES):;
-
-# All source/doc files are generated in one pass with rule options.cpp. Note
-# that this is done incrementally since mkoptions.py checks if a generated file
-# changed before writing to the file. No global re-compilation of all generated
-# files happens if only individual files were modified.
-$(OPTIONS_GEN_CPP) $(OPTIONS_GEN_H) options_holder.h $(DOCUMENTATION_FILES): options.cpp
-
-options.cpp: mkoptions.py $(CPP_TEMPLATE_FILES) $(OPTIONS_CONFIG_FILES) $(DOCUMENTATION_TEMPLATE_FILES)
-	$(PYTHON) @srcdir@/mkoptions.py @abs_srcdir@ ../../doc . $(addprefix @abs_srcdir@/, $(OPTIONS_CONFIG_FILES))
-
-# This rule is ugly.  It's needed to ensure that automake's dependence
-# includes are available during distclean, even though they come from
-# directories that are cleaned first.  Without this rule, "distclean"
-# fails.
-%.Plo:; $(MKDIR_P) "$(dir $@)" && : > "$@"
diff --git a/src/options/quantifiers_options.toml b/src/options/quantifiers_options.toml
index 1c2405449..0762622f0 100644
--- a/src/options/quantifiers_options.toml
+++ b/src/options/quantifiers_options.toml
@@ -1094,7 +1094,6 @@ header = "options/quantifiers_options.h"
   default    = "CVC4::theory::quantifiers::SYGUS_INV_TEMPL_MODE_POST"
   handler    = "stringToSygusInvTemplMode"
   includes   = ["options/quantifiers_modes.h"]
-  read_only  = true
   help       = "template mode for sygus invariant synthesis (weaken pre-condition, strengthen post-condition, or none)"
 
 [[option]]
@@ -1396,6 +1395,14 @@ header = "options/quantifiers_options.h"
   help       = "dump external files corresponding to interesting satisfiability queries with sygus-query-gen"
 
 [[option]]
+  name       = "sygusSolFilterImplied"
+  category   = "regular"
+  long       = "sygus-sol-filter-implied"
+  type       = "bool"
+  default    = "false"
+  help       = "use sygus to enumerate interesting satisfiability queries"
+
+[[option]]
   name       = "sygusExprMinerCheckUseExport"
   category   = "expert"
   long       = "sygus-expr-miner-check-use-export"
diff --git a/src/parser/Makefile b/src/parser/Makefile
deleted file mode 100644
index cef81750e..000000000
--- a/src/parser/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-topdir = ../..
-srcdir = src/parser
-
-include $(topdir)/Makefile.subdir
diff --git a/src/parser/Makefile.am b/src/parser/Makefile.am
deleted file mode 100644
index 98b98ccaf..000000000
--- a/src/parser/Makefile.am
+++ /dev/null
@@ -1,76 +0,0 @@
-# LIBCVC4PARSER_VERSION (-version-info) is in the form current:revision:age
-#
-# current -
-#   increment if interfaces have been added, removed or changed
-# revision -
-#   increment if source code has changed
-#   set to zero if current is incremented
-# age -
-#   increment if interfaces have been added
-#   set to zero if interfaces have been removed
-#   or changed
-#
-LIBCVC4PARSER_VERSION = @CVC4_PARSER_LIBRARY_VERSION@
-
-AM_CPPFLAGS = \
-	-D__BUILDING_CVC4PARSERLIB \
-	-I@builddir@/.. $(ANTLR_INCLUDES) -I@srcdir@/../include -I@srcdir@/..
-AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN)
-
-SUBDIRS = smt1 smt2 cvc tptp
-
-lib_LTLIBRARIES = libcvc4parser.la
-
-libcvc4parser_la_LDFLAGS = \
-	$(ANTLR_LDFLAGS) \
-	-no-undefined \
-	-version-info $(LIBCVC4PARSER_VERSION)
-
-if CVC4_WINDOWS_BUILD
-# -Wl,--export-all-symbols makes sure that all symbols are exported when
-# building a DLL. This option is on by default but gets disabled for the parser
-# library because the generated lexer/parser files define some functions as
-# __declspec(dllexport), which leads to lots of unresolved symbols when linking
-# against libcvc4parser.
-libcvc4parser_la_LDFLAGS += -Wl,--export-all-symbols
-endif
-
-libcvc4parser_la_LIBADD = \
-	@builddir@/smt1/libparsersmt1.la \
-	@builddir@/smt2/libparsersmt2.la \
-	@builddir@/tptp/libparsertptp.la \
-	@builddir@/cvc/libparsercvc.la \
-	@builddir@/../libcvc4.la \
-	@builddir@/../lib/libreplacements.la
-
-libcvc4parser_la_SOURCES = \
-	antlr_input.cpp \
-	antlr_input.h \
-	antlr_input_imports.cpp \
-	antlr_line_buffered_input.cpp \
-	antlr_line_buffered_input.h \
-	antlr_tracing.h \
-	antlr_undefines.h \
-	bounded_token_buffer.cpp \
-	bounded_token_buffer.h \
-	bounded_token_factory.cpp \
-	bounded_token_factory.h \
-	input.cpp \
-	input.h \
-	line_buffer.cpp \
-	line_buffer.h \
-	memory_mapped_input_buffer.cpp \
-	memory_mapped_input_buffer.h \
-	parser.cpp \
-	parser.h \
-	parser_builder.cpp \
-	parser_builder.h \
-	parser_exception.h
-
-EXTRA_DIST = \
-	Makefile.antlr_tracing \
-	cvc4parser.i \
-	input.i \
-	parser_builder.i \
-	parser_exception.i \
-	parser.i
diff --git a/src/parser/Makefile.antlr_tracing b/src/parser/Makefile.antlr_tracing
deleted file mode 100644
index fa79337b4..000000000
--- a/src/parser/Makefile.antlr_tracing
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*-makefile-*-
-#
-# This makefile is included from parser directories in order to
-# do antlr tracing.  THIS IS VERY MUCH A HACK, and is only enabled
-# if CVC4_TRACE_ANTLR is defined (and not 0).  In ANTLR 3.2, we
-# have to #define "println" and "System," etc., because the
-# generator erroneously puts Java in C output!
-#
-
-ifeq ($(CVC4_TRACE_ANTLR),)
-else
-
-ifeq ($(CVC4_TRACE_ANTLR),0)
-else
-
-AM_CPPFLAGS += -DCVC4_TRACE_ANTLR
-ANTLR_OPTS += -trace
-
-endif
-
-endif
-
diff --git a/src/parser/cvc/Makefile b/src/parser/cvc/Makefile
deleted file mode 100644
index cbcc0a493..000000000
--- a/src/parser/cvc/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-topdir = ../../..
-srcdir = src/parser/cvc
-
-include $(topdir)/Makefile.subdir
diff --git a/src/parser/cvc/Makefile.am b/src/parser/cvc/Makefile.am
deleted file mode 100644
index ff3308d89..000000000
--- a/src/parser/cvc/Makefile.am
+++ /dev/null
@@ -1,68 +0,0 @@
-AM_CPPFLAGS = \
-	-D__BUILDING_CVC4PARSERLIB \
-	-I@builddir@/../.. -I@srcdir@/../../include -I@srcdir@/../.. $(ANTLR_INCLUDES)
-AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) $(WNO_PARENTHESES) $(WNO_TAUTOLOGICAL_COMPARE) -Wno-unused-function -Wno-unused-variable $(WNO_UNINITIALIZED) $(WNO_CONVERSION_NULL)
-
-# Compile generated C files using C++ compiler
-AM_CFLAGS = $(AM_CXXFLAGS)
-CFLAGS=$(CXXFLAGS)
-CC=$(CXX)
-
-ANTLR_OPTS =
-
-# hide this included makefile from automake
-@mk_include@ @srcdir@/../Makefile.antlr_tracing
-
-noinst_LTLIBRARIES = libparsercvc.la
-
-ANTLR_TOKEN_STUFF = \
-	@builddir@/Cvc.tokens
-ANTLR_LEXER_STUFF = \
-	@builddir@/CvcLexer.h \
-	@builddir@/CvcLexer.c \
-	$(ANTLR_TOKEN_STUFF)
-ANTLR_PARSER_STUFF = \
-	@builddir@/CvcParser.h \
-	@builddir@/CvcParser.c
-ANTLR_STUFF = \
-	$(ANTLR_LEXER_STUFF) \
-	$(ANTLR_PARSER_STUFF)
-
-libparsercvc_la_SOURCES = \
-	Cvc.g \
-	cvc_input.h \
-	cvc_input.cpp \
-	$(ANTLR_STUFF)
-
-BUILT_SOURCES = \
-	@builddir@/Cvc.tokens \
-	@builddir@/CvcLexer.h \
-	@builddir@/CvcLexer.c \
-	@builddir@/CvcParser.h \
-	@builddir@/CvcParser.c \
-	stamp-generated
-
-EXTRA_DIST = \
-	README \
-	stamp-generated
-
-DISTCLEANFILES = $(ANTLR_STUFF)
-distclean-local:
-	-$(AM_V_at)rmdir generated
-	-$(AM_V_at)rm -f stamp-generated
-
-stamp-generated:
-	$(AM_V_at)mkdir -p generated
-	$(AM_V_at)touch stamp-generated
-
-# antlr doesn't overwrite output files, it just leaves them.  So we have to delete them first.
-@builddir@/CvcLexer.h: Cvc.g stamp-generated
-	-$(AM_V_at)rm -f $(ANTLR_STUFF)
-	@if test -z "$(ANTLR)"; then echo "ERROR: antlr parser generator cannot be found, cannot generate the parser" >&2; exit 1; fi
-	$(AM_V_GEN)$(ANTLR) $(ANTLR_OPTS) -fo "@builddir@" "@srcdir@/Cvc.g"
-
-# These don't actually depend on CvcLexer.h, but if we're doing parallel
-# make and the lexer needs to be rebuilt, we have to keep the rules
-# from running in parallel (since the token files will be deleted &
-# recreated)
-@builddir@/CvcLexer.c @builddir@/CvcParser.h @builddir@/CvcParser.c $(ANTLR_TOKEN_STUFF): @builddir@/CvcLexer.h
diff --git a/src/parser/smt1/Makefile b/src/parser/smt1/Makefile
deleted file mode 100644
index 7e97ed357..000000000
--- a/src/parser/smt1/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-topdir = ../../..
-srcdir = src/parser/smt
-
-include $(topdir)/Makefile.subdir
diff --git a/src/parser/smt1/Makefile.am b/src/parser/smt1/Makefile.am
deleted file mode 100644
index f5320002d..000000000
--- a/src/parser/smt1/Makefile.am
+++ /dev/null
@@ -1,69 +0,0 @@
-AM_CPPFLAGS = \
-	-D__BUILDING_CVC4PARSERLIB \
-	-I@builddir@/../.. -I@srcdir@/../../include -I@srcdir@/../.. $(ANTLR_INCLUDES)
-AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) $(WNO_PARENTHESES) $(WNO_TAUTOLOGICAL_COMPARE) -Wno-unused-function -Wno-unused-variable
-
-# Compile generated C files using C++ compiler
-AM_CFLAGS = $(AM_CXXFLAGS)
-CFLAGS=$(CXXFLAGS)
-CC=$(CXX)
-
-ANTLR_OPTS =
-
-# hide this included makefile from automake
-@mk_include@ @srcdir@/../Makefile.antlr_tracing
-
-noinst_LTLIBRARIES = libparsersmt1.la
-
-ANTLR_TOKEN_STUFF = \
-	@builddir@/Smt1.tokens
-ANTLR_LEXER_STUFF = \
-	@builddir@/Smt1Lexer.h \
-	@builddir@/Smt1Lexer.c \
-	$(ANTLR_TOKEN_STUFF)
-ANTLR_PARSER_STUFF = \
-	@builddir@/Smt1Parser.h \
-	@builddir@/Smt1Parser.c
-ANTLR_STUFF = \
-	$(ANTLR_LEXER_STUFF) \
-	$(ANTLR_PARSER_STUFF)
-
-libparsersmt1_la_SOURCES = \
-	Smt1.g \
-        smt1.h \
-        smt1.cpp \
-	smt1_input.h \
-	smt1_input.cpp \
-	$(ANTLR_STUFF)
-
-BUILT_SOURCES = \
-	@builddir@/Smt1.tokens \
-	@builddir@/Smt1Lexer.h \
-	@builddir@/Smt1Lexer.c \
-	@builddir@/Smt1Parser.h \
-	@builddir@/Smt1Parser.c \
-	stamp-generated
-
-EXTRA_DIST = \
-	stamp-generated
-
-DISTCLEANFILES = $(ANTLR_STUFF)
-distclean-local:
-	-$(AM_V_at)rmdir generated
-	-$(AM_V_at)rm -f stamp-generated
-
-stamp-generated:
-	$(AM_V_at)mkdir -p generated
-	$(AM_V_at)touch stamp-generated
-
-# antlr doesn't overwrite output files, it just leaves them.  So we have to delete them first.
-@builddir@/Smt1Lexer.h: Smt1.g stamp-generated
-	-$(AM_V_at)rm -f $(ANTLR_STUFF)
-	@if test -z "$(ANTLR)"; then echo "ERROR: antlr parser generator cannot be found, cannot generate the parser" >&2; exit 1; fi
-	$(AM_V_GEN)$(ANTLR) $(ANTLR_OPTS) -fo "@builddir@" "@srcdir@/Smt1.g"
-
-# These don't actually depend on Smt1Lexer.h, but if we're doing parallel
-# make and the lexer needs to be rebuilt, we have to keep the rules
-# from running in parallel (since the token files will be deleted &
-# recreated)
-@builddir@/Smt1Lexer.c @builddir@/Smt1Parser.h @builddir@/Smt1Parser.c $(ANTLR_TOKEN_STUFF): @builddir@/Smt1Lexer.h
diff --git a/src/parser/smt2/Makefile b/src/parser/smt2/Makefile
deleted file mode 100644
index fc9cc6db2..000000000
--- a/src/parser/smt2/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-topdir = ../../..
-srcdir = src/parser/smt2
-
-include $(topdir)/Makefile.subdir
diff --git a/src/parser/smt2/Makefile.am b/src/parser/smt2/Makefile.am
deleted file mode 100644
index 995e442e6..000000000
--- a/src/parser/smt2/Makefile.am
+++ /dev/null
@@ -1,71 +0,0 @@
-AM_CPPFLAGS = \
-	-D__BUILDING_CVC4PARSERLIB \
-	-I@builddir@/../.. -I@srcdir@/../../include -I@srcdir@/../.. $(ANTLR_INCLUDES)
-AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) $(WNO_PARENTHESES) $(WNO_TAUTOLOGICAL_COMPARE) -Wno-unused-function -Wno-unused-variable
-
-# Compile generated C files using C++ compiler
-AM_CFLAGS = $(AM_CXXFLAGS)
-CFLAGS=$(CXXFLAGS)
-CC=$(CXX)
-
-ANTLR_OPTS =
-
-# hide this included makefile from automake
-@mk_include@ @srcdir@/../Makefile.antlr_tracing
-
-noinst_LTLIBRARIES = libparsersmt2.la
-
-ANTLR_TOKEN_STUFF = \
-	@builddir@/Smt2.tokens
-ANTLR_LEXER_STUFF = \
-	@builddir@/Smt2Lexer.h \
-	@builddir@/Smt2Lexer.c \
-	$(ANTLR_TOKEN_STUFF)
-ANTLR_PARSER_STUFF = \
-	@builddir@/Smt2Parser.h \
-	@builddir@/Smt2Parser.c
-ANTLR_STUFF = \
-	$(ANTLR_LEXER_STUFF) \
-	$(ANTLR_PARSER_STUFF)
-
-libparsersmt2_la_SOURCES = \
-	Smt2.g \
-	smt2.h \
-	smt2.cpp \
-	smt2_input.h \
-	smt2_input.cpp \
-	sygus_input.h \
-	sygus_input.cpp \
-	$(ANTLR_STUFF)
-
-BUILT_SOURCES = \
-	@builddir@/Smt2.tokens \
-	@builddir@/Smt2Lexer.h \
-	@builddir@/Smt2Lexer.c \
-	@builddir@/Smt2Parser.h \
-	@builddir@/Smt2Parser.c \
-	stamp-generated
-
-EXTRA_DIST = \
-	stamp-generated
-
-DISTCLEANFILES = $(ANTLR_STUFF)
-distclean-local:
-	-$(AM_V_at)rmdir generated
-	-$(AM_V_at)rm -f stamp-generated
-
-stamp-generated:
-	$(AM_V_at)mkdir -p generated
-	$(AM_V_at)touch stamp-generated
-
-# antlr doesn't overwrite output files, it just leaves them.  So we have to delete them first.
-@builddir@/Smt2Lexer.h: Smt2.g stamp-generated
-	-$(AM_V_at)rm -f $(ANTLR_STUFF)
-	@if test -z "$(ANTLR)"; then echo "ERROR: antlr parser generator cannot be found, cannot generate the parser" >&2; exit 1; fi
-	$(AM_V_GEN)$(ANTLR) $(ANTLR_OPTS) -fo "@builddir@" "@srcdir@/Smt2.g"
-
-# These don't actually depend on SmtLexer.h, but if we're doing parallel
-# make and the lexer needs to be rebuilt, we have to keep the rules
-# from running in parallel (since the token files will be deleted &
-# recreated)
-@builddir@/Smt2Lexer.c @builddir@/Smt2Parser.h @builddir@/Smt2Parser.c $(ANTLR_TOKEN_STUFF): @builddir@/Smt2Lexer.h
diff --git a/src/parser/tptp/Makefile b/src/parser/tptp/Makefile
deleted file mode 100644
index 45cde5821..000000000
--- a/src/parser/tptp/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-topdir = ../../..
-srcdir = src/parser/tptp
-
-include $(topdir)/Makefile.subdir
diff --git a/src/parser/tptp/Makefile.am b/src/parser/tptp/Makefile.am
deleted file mode 100644
index 43bbc595d..000000000
--- a/src/parser/tptp/Makefile.am
+++ /dev/null
@@ -1,69 +0,0 @@
-AM_CPPFLAGS = \
-	-D__BUILDING_CVC4PARSERLIB \
-	-I@builddir@/../.. -I@srcdir@/../../include -I@srcdir@/../.. $(ANTLR_INCLUDES)
-AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) $(WNO_PARENTHESES) $(WNO_TAUTOLOGICAL_COMPARE) -Wno-unused-function -Wno-unused-variable
-
-# Compile generated C files using C++ compiler
-AM_CFLAGS = $(AM_CXXFLAGS)
-CFLAGS=$(CXXFLAGS)
-CC=$(CXX)
-
-ANTLR_OPTS =
-
-# hide this included makefile from automake
-@mk_include@ @srcdir@/../Makefile.antlr_tracing
-
-noinst_LTLIBRARIES = libparsertptp.la
-
-ANTLR_TOKEN_STUFF = \
-	@builddir@/Tptp.tokens
-ANTLR_LEXER_STUFF = \
-	@builddir@/TptpLexer.h \
-	@builddir@/TptpLexer.c \
-	$(ANTLR_TOKEN_STUFF)
-ANTLR_PARSER_STUFF = \
-	@builddir@/TptpParser.h \
-	@builddir@/TptpParser.c
-ANTLR_STUFF = \
-	$(ANTLR_LEXER_STUFF) \
-	$(ANTLR_PARSER_STUFF)
-
-libparsertptp_la_SOURCES = \
-	Tptp.g \
-	tptp.h \
-	tptp.cpp \
-	tptp_input.h \
-	tptp_input.cpp \
-	$(ANTLR_STUFF)
-
-BUILT_SOURCES = \
-	@builddir@/Tptp.tokens \
-	@builddir@/TptpLexer.h \
-	@builddir@/TptpLexer.c \
-	@builddir@/TptpParser.h \
-	@builddir@/TptpParser.c \
-	stamp-generated
-
-EXTRA_DIST = \
-	stamp-generated
-
-DISTCLEANFILES = $(ANTLR_STUFF)
-distclean-local:
-	-$(AM_V_at)rmdir generated
-	-$(AM_V_at)rm -f stamp-generated
-
-stamp-generated:
-	$(AM_V_at)mkdir -p generated
-	$(AM_V_at)touch stamp-generated
-
-# antlr doesn't overwrite output files, it just leaves them.  So we have to delete them first.
-@builddir@/TptpLexer.h: Tptp.g stamp-generated
-	-$(AM_V_at)rm -f $(ANTLR_STUFF)
-	@if test -z "$(ANTLR)"; then echo "ERROR: antlr parser generator cannot be found, cannot generate the parser" >&2; exit 1; fi
-	$(AM_V_GEN)$(ANTLR) $(ANTLR_OPTS) -fo "@builddir@" "@srcdir@/Tptp.g"
-
-# These don't actually depend on TptpLexer.h, but if we're doing parallel
-# make and the lexer needs to be rebuilt, we have to keep the rules
-# from running in parallel (since the token files will be deleted &
-# recreated)
-@builddir@/TptpLexer.c @builddir@/TptpParser.h @builddir@/TptpParser.c $(ANTLR_TOKEN_STUFF): @builddir@/TptpLexer.h
diff --git a/src/prop/bvminisat/Makefile.am b/src/prop/bvminisat/Makefile.am
deleted file mode 100644
index d34a4c12c..000000000
--- a/src/prop/bvminisat/Makefile.am
+++ /dev/null
@@ -1,44 +0,0 @@
-AM_CPPFLAGS = \
-	-D__BUILDING_CVC4LIB \
-	-D __STDC_LIMIT_MACROS \
-	-D __STDC_FORMAT_MACROS \
-	-I@builddir@/../.. -I@srcdir@/../../include -I@srcdir@/ -I@srcdir@/../..
-AM_CXXFLAGS = -Wall -Wno-parentheses -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN)
-
-noinst_LTLIBRARIES = libbvminisat.la
-libbvminisat_la_SOURCES = \
-	core/Dimacs.h \
-	core/Solver.cc \
-	core/Solver.h \
-	core/SolverTypes.h \
-	simp/SimpSolver.cc \
-	simp/SimpSolver.h \
-	mtl/Alg.h \
-	mtl/Alloc.h \
-	mtl/Heap.h \
-	mtl/IntTypes.h \
-	mtl/Map.h \
-	mtl/Queue.h \
-	mtl/Sort.h \
-	mtl/Vec.h \
-	mtl/XAlloc.h \
-	utils/Options.h \
-	bvminisat.h \
-	bvminisat.cpp
-
-EXTRA_DIST = \
-	core/Main.cc \
-	core/Makefile \
-	doc/ReleaseNotes-2.2.0.txt \
-	simp/Main.cc \
-	simp/Makefile \
-	README \
-	LICENSE \
-	mtl/config.mk \
-	mtl/template.mk \
-	utils/Options.cc \
-	utils/ParseUtils.h \
-	utils/System.h \
-	utils/System.cc \
-	Makefile
-
diff --git a/src/prop/bvminisat/core/Makefile b/src/prop/bvminisat/core/Makefile
deleted file mode 100644
index 5de1f7295..000000000
--- a/src/prop/bvminisat/core/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-EXEC      = minisat
-DEPDIR    = mtl utils
-
-include $(MROOT)/mtl/template.mk
diff --git a/src/prop/bvminisat/simp/Makefile b/src/prop/bvminisat/simp/Makefile
deleted file mode 100644
index 27b45f493..000000000
--- a/src/prop/bvminisat/simp/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-EXEC      = minisat
-DEPDIR    = mtl utils core
-
-include $(MROOT)/mtl/template.mk
diff --git a/src/prop/bvminisat/utils/Makefile b/src/prop/bvminisat/utils/Makefile
deleted file mode 100644
index 204cea541..000000000
--- a/src/prop/bvminisat/utils/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-EXEC      = system_test
-DEPDIR    = mtl
-
-include $(MROOT)/mtl/template.mk
diff --git a/src/prop/minisat/Makefile.am b/src/prop/minisat/Makefile.am
deleted file mode 100644
index 4c110980d..000000000
--- a/src/prop/minisat/Makefile.am
+++ /dev/null
@@ -1,44 +0,0 @@
-AM_CPPFLAGS = \
-	-D__BUILDING_CVC4LIB \
-	-D __STDC_LIMIT_MACROS \
-	-D __STDC_FORMAT_MACROS \
-	-I@builddir@/../.. -I@srcdir@/../../include -I@srcdir@/ -I@srcdir@/../..
-AM_CXXFLAGS = -Wall -Wno-parentheses -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN)
-
-noinst_LTLIBRARIES = libminisat.la
-libminisat_la_SOURCES = \
-	core/Dimacs.h \
-	core/Solver.cc \
-	core/Solver.h \
-	core/SolverTypes.h \
-	simp/SimpSolver.cc \
-	simp/SimpSolver.h \
-	mtl/Alg.h \
-	mtl/Alloc.h \
-	mtl/Heap.h \
-	mtl/IntTypes.h \
-	mtl/Map.h \
-	mtl/Queue.h \
-	mtl/Sort.h \
-	mtl/Vec.h \
-	mtl/XAlloc.h \
-	utils/Options.h \
-	minisat.cpp \
-	minisat.h
-
-EXTRA_DIST = \
-	core/Main.cc \
-	core/Makefile \
-	doc/ReleaseNotes-2.2.0.txt \
-	simp/Main.cc \
-	simp/Makefile \
-	README \
-	LICENSE \
-	mtl/config.mk \
-	mtl/template.mk \
-	utils/Options.cc \
-	utils/ParseUtils.h \
-	utils/System.h \
-	utils/System.cc \
-	Makefile
-
diff --git a/src/prop/minisat/core/Makefile b/src/prop/minisat/core/Makefile
deleted file mode 100644
index 5de1f7295..000000000
--- a/src/prop/minisat/core/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-EXEC      = minisat
-DEPDIR    = mtl utils
-
-include $(MROOT)/mtl/template.mk
diff --git a/src/prop/minisat/simp/Makefile b/src/prop/minisat/simp/Makefile
deleted file mode 100644
index 27b45f493..000000000
--- a/src/prop/minisat/simp/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-EXEC      = minisat
-DEPDIR    = mtl utils core
-
-include $(MROOT)/mtl/template.mk
diff --git a/src/prop/minisat/utils/Makefile b/src/prop/minisat/utils/Makefile
deleted file mode 100644
index 204cea541..000000000
--- a/src/prop/minisat/utils/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-EXEC      = system_test
-DEPDIR    = mtl
-
-include $(MROOT)/mtl/template.mk
diff --git a/src/smt/smt_engine.cpp b/src/smt/smt_engine.cpp
index e5db42a22..149d8bb35 100644
--- a/src/smt/smt_engine.cpp
+++ b/src/smt/smt_engine.cpp
@@ -1927,7 +1927,9 @@ void SmtEngine::setDefaults() {
     }
     if (options::sygusStream())
     {
-      // PBE and streaming modes are incompatible
+      // Streaming is incompatible with techniques that focus the search towards
+      // finding a single solution. This currently includes the PBE solver and
+      // static template inference for invariant synthesis.
       if (!options::sygusSymBreakPbe.wasSetByUser())
       {
         options::sygusSymBreakPbe.set(false);
@@ -1936,6 +1938,10 @@ void SmtEngine::setDefaults() {
       {
         options::sygusUnifPbe.set(false);
       }
+      if (!options::sygusInvTemplMode.wasSetByUser())
+      {
+        options::sygusInvTemplMode.set(quantifiers::SYGUS_INV_TEMPL_MODE_NONE);
+      }
     }
     //do not allow partial functions
     if( !options::bitvectorDivByZeroConst.wasSetByUser() ){
diff --git a/src/smt_util/Makefile.am b/src/smt_util/Makefile.am
deleted file mode 100644
index 46f6493a9..000000000
--- a/src/smt_util/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-AM_CPPFLAGS = \
-	-D__BUILDING_CVC4LIB \
-	-I@builddir@/.. -I@srcdir@/../include -I@srcdir@/..
-AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN)
-
-noinst_LTLIBRARIES = libsmtutil.la
-
-libsmtutil_la_SOURCES = \
-	Makefile.am \
-	Makefile.in \
-	boolean_simplification.cpp \
-	boolean_simplification.h \
-	lemma_channels.cpp \
-	lemma_channels.h \
-	lemma_input_channel.h \
-	lemma_output_channel.h \
-	nary_builder.cpp \
-	nary_builder.h \
-	node_visitor.h
-
diff --git a/src/theory/.gitignore b/src/theory/.gitignore
deleted file mode 100644
index 4d15f70c0..000000000
--- a/src/theory/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/theoryof_table.h
diff --git a/src/theory/bv/theory_bv_rewrite_rules.h b/src/theory/bv/theory_bv_rewrite_rules.h
index b52cb91a4..c6cd9eb1c 100644
--- a/src/theory/bv/theory_bv_rewrite_rules.h
+++ b/src/theory/bv/theory_bv_rewrite_rules.h
@@ -119,7 +119,7 @@ enum RewriteRuleId
   BitwiseIdemp,
   AndZero,
   AndOne,
-  AndOrConcatPullUp,
+  AndOrXorConcatPullUp,
   OrZero,
   OrOne,
   XorDuplicate,
@@ -201,7 +201,7 @@ inline std::ostream& operator << (std::ostream& out, RewriteRuleId ruleId) {
   case ConcatFlatten:       out << "ConcatFlatten";       return out;
   case ConcatExtractMerge:  out << "ConcatExtractMerge";  return out;
   case ConcatConstantMerge: out << "ConcatConstantMerge"; return out;
-  case AndOrConcatPullUp:   out << "AndOrConcatPullUp";   return out;
+  case AndOrXorConcatPullUp:out << "AndOrXorConcatPullUp";return out;
   case ExtractExtract:      out << "ExtractExtract";      return out;
   case ExtractWhole:        out << "ExtractWhole";        return out;
   case ExtractConcat:       out << "ExtractConcat";       return out;
@@ -581,7 +581,7 @@ struct AllRewriteRules {
   RewriteRule<BvIteMergeElseIf>               rule136;
   RewriteRule<BvIteMergeThenElse>             rule137;
   RewriteRule<BvIteMergeElseElse>             rule138;
-  RewriteRule<AndOrConcatPullUp>              rule139;
+  RewriteRule<AndOrXorConcatPullUp>           rule139;
 };
 
 template<> inline
diff --git a/src/theory/bv/theory_bv_rewrite_rules_simplification.h b/src/theory/bv/theory_bv_rewrite_rules_simplification.h
index 5e9d2b349..7efdc2c81 100644
--- a/src/theory/bv/theory_bv_rewrite_rules_simplification.h
+++ b/src/theory/bv/theory_bv_rewrite_rules_simplification.h
@@ -489,48 +489,22 @@ Node RewriteRule<AndOne>::apply(TNode node) {
 /* -------------------------------------------------------------------------- */
 
 /**
- * AndOrConcatPullUp
+ * AndOrXorConcatPullUp
  *
- * And:
- * ----------------------------------------------------------------
- *   Match:       x_m & concat(y_my, 0_n, z_mz)
- *   Rewrites to: concat(x[m-1:m-my] & y, 0_n, x[mz-1:0] & z)
+ * Match:       x_m <op> concat(y_my, <const>_n, z_mz)
+ *              <const>_n in { 0_n, 1_n, ~0_n }
  *
- *   Match:       x_m & concat(y_my, 1_n, z_mz)
- *   Rewrites to: concat(x[m-1:m-my] & y,
- *                       0_[n-1],
- *                       x[mz:mz],
- *                       x[mz-1:0] & z)
- *
- *   Match:       x_m & concat(y_my, ~0_n, z_mz)
- *   Rewrites to: concat(x[m-1:m-my] & y,
- *                     x[m-my-1:mz],
- *                     x[mz-1:0] & z)
- *
- * Or:
- * ----------------------------------------------------------------
- *   Match:       x_m | concat(y_my, 0_n, z_mz)
- *   Rewrites to: concat(x[m-1:m-my] | y,
- *                       x[m-my-1:mz],
- *                       x[mz-1:0] | z)
- *
- *   Match:       x_m | concat(y_my, 1_n, z_mz)
- *   Rewrites to: concat(x[m-1:m-my] | y,
- *                       x[m-my-1:mz+1],
- *                       1_1,
- *                       x[mz-1:0] | z)
- *
- *   Match:       x_m | concat(y_my, ~0_n, z_mz)
- *   Rewrites to: concat(x[m-1:m-my] | y,
- *                       ~0_n,
- *                       x[mz-1:0] | z)
+ * Rewrites to: concat(x[m-1:m-my]  <op> y,
+ *                     x[m-my-1:mz] <op> <const>_n,
+ *                     x[mz-1:0]    <op> z)
  */
 
 template <>
-inline bool RewriteRule<AndOrConcatPullUp>::applies(TNode node)
+inline bool RewriteRule<AndOrXorConcatPullUp>::applies(TNode node)
 {
   if (node.getKind() != kind::BITVECTOR_AND
-      && node.getKind() != kind::BITVECTOR_OR)
+      && node.getKind() != kind::BITVECTOR_OR
+      && node.getKind() != kind::BITVECTOR_XOR)
   {
     return false;
   }
@@ -557,11 +531,10 @@ inline bool RewriteRule<AndOrConcatPullUp>::applies(TNode node)
 }
 
 template <>
-inline Node RewriteRule<AndOrConcatPullUp>::apply(TNode node)
+inline Node RewriteRule<AndOrXorConcatPullUp>::apply(TNode node)
 {
-  Debug("bv-rewrite") << "RewriteRule<AndOrConcatPullUp>(" << node << ")"
+  Debug("bv-rewrite") << "RewriteRule<AndOrXorConcatPullUp>(" << node << ")"
                       << std::endl;
-  int32_t is_const;
   uint32_t m, my, mz, n;
   size_t nc;
   Kind kind = node.getKind();
@@ -586,24 +559,12 @@ inline Node RewriteRule<AndOrConcatPullUp>::apply(TNode node)
   }
   x = xb.getNumChildren() > 1 ? xb.constructNode() : xb[0];
 
-  is_const = -2;
   for (const TNode& child : concat)
   {
     if (c.isNull())
     {
-      if (utils::isZero(child))
-      {
-        is_const = 0;
-        c = child;
-      }
-      else if (utils::isOne(child))
-      {
-        is_const = 1;
-        c = child;
-      }
-      else if (utils::isOnes(child))
+      if (utils::isZero(child) || utils::isOne(child) || utils::isOnes(child))
       {
-        is_const = -1;
         c = child;
       }
       else
@@ -638,49 +599,14 @@ inline Node RewriteRule<AndOrConcatPullUp>::apply(TNode node)
   {
     res << nm->mkNode(kind, utils::mkExtract(x, m - 1, m - my), y);
   }
-  if (is_const == 0)
-  {
-    if (kind == kind::BITVECTOR_AND)
-    {
-      res << c;
-    }
-    else
-    {
-      Assert(kind == kind::BITVECTOR_OR);
-      res << utils::mkExtract(x, m - my - 1, mz);
-    }
-  }
-  else if (is_const == 1)
-  {
-    if (kind == kind::BITVECTOR_AND)
-    {
-      if (n > 1) res << utils::mkZero(n - 1);
-      res << utils::mkExtract(x, mz, mz);
-    }
-    else
-    {
-      Assert(kind == kind::BITVECTOR_OR);
-      if (n > 1) res << utils::mkExtract(x, m - my - 1, mz + 1);
-      res << utils::mkOne(1);
-    }
-  }
-  else
-  {
-    Assert(is_const == -1);
-    if (kind == kind::BITVECTOR_AND)
-    {
-      res << utils::mkExtract(x, m - my - 1, mz);
-    }
-    else
-    {
-      Assert(kind == kind::BITVECTOR_OR);
-      res << c;
-    }
-  }
+
+  res << nm->mkNode(kind, utils::mkExtract(x, m - my - 1, mz), c);
+
   if (mz)
   {
     res << nm->mkNode(kind, utils::mkExtract(x, mz - 1, 0), z);
   }
+
   return res;
 }
 
diff --git a/src/theory/bv/theory_bv_rewriter.cpp b/src/theory/bv/theory_bv_rewriter.cpp
index 3f018f800..0c6f1d37a 100644
--- a/src/theory/bv/theory_bv_rewriter.cpp
+++ b/src/theory/bv/theory_bv_rewriter.cpp
@@ -253,7 +253,7 @@ RewriteResponse TheoryBVRewriter::RewriteAnd(TNode node, bool prerewrite)
   resultNode =
       LinearRewriteStrategy<RewriteRule<FlattenAssocCommutNoDuplicates>,
                             RewriteRule<AndSimplify>,
-                            RewriteRule<AndOrConcatPullUp>>::apply(node);
+                            RewriteRule<AndOrXorConcatPullUp>>::apply(node);
   if (!prerewrite)
   {
     resultNode =
@@ -274,7 +274,7 @@ RewriteResponse TheoryBVRewriter::RewriteOr(TNode node, bool prerewrite)
   resultNode =
       LinearRewriteStrategy<RewriteRule<FlattenAssocCommutNoDuplicates>,
                             RewriteRule<OrSimplify>,
-                            RewriteRule<AndOrConcatPullUp>>::apply(node);
+                            RewriteRule<AndOrXorConcatPullUp>>::apply(node);
 
   if (!prerewrite)
   {
@@ -290,27 +290,30 @@ RewriteResponse TheoryBVRewriter::RewriteOr(TNode node, bool prerewrite)
   return RewriteResponse(REWRITE_DONE, resultNode);
 }
 
-RewriteResponse TheoryBVRewriter::RewriteXor(TNode node, bool prerewrite) {
+RewriteResponse TheoryBVRewriter::RewriteXor(TNode node, bool prerewrite)
+{
   Node resultNode = node;
-  resultNode = LinearRewriteStrategy
-    < RewriteRule<FlattenAssocCommut>, // flatten the expression 
-      RewriteRule<XorSimplify>,        // simplify duplicates and constants
-      RewriteRule<XorZero>,            // checks if the constant part is zero and eliminates it
-      RewriteRule<BitwiseSlicing>
-      >::apply(node);
+  resultNode = LinearRewriteStrategy<
+      RewriteRule<FlattenAssocCommut>,  // flatten the expression
+      RewriteRule<XorSimplify>,         // simplify duplicates and constants
+      RewriteRule<XorZero>,  // checks if the constant part is zero and
+                             // eliminates it
+      RewriteRule<AndOrXorConcatPullUp>,
+      RewriteRule<BitwiseSlicing>>::apply(node);
 
-  if (!prerewrite) {
-    resultNode = LinearRewriteStrategy
-      < RewriteRule<XorOne>, 
-      RewriteRule <BitwiseSlicing>
-        >::apply(resultNode);
-    
-    if (resultNode.getKind() != node.getKind()) {
-      return RewriteResponse(REWRITE_AGAIN_FULL, resultNode); 
+  if (!prerewrite)
+  {
+    resultNode =
+        LinearRewriteStrategy<RewriteRule<XorOne>,
+                              RewriteRule<BitwiseSlicing>>::apply(resultNode);
+
+    if (resultNode.getKind() != node.getKind())
+    {
+      return RewriteResponse(REWRITE_AGAIN_FULL, resultNode);
     }
   }
 
-  return RewriteResponse(REWRITE_DONE, resultNode); 
+  return RewriteResponse(REWRITE_DONE, resultNode);
 }
 
 RewriteResponse TheoryBVRewriter::RewriteXnor(TNode node, bool prerewrite) {
diff --git a/src/theory/quantifiers/expr_miner_manager.cpp b/src/theory/quantifiers/expr_miner_manager.cpp
index 010b5a4ab..cc97888e3 100644
--- a/src/theory/quantifiers/expr_miner_manager.cpp
+++ b/src/theory/quantifiers/expr_miner_manager.cpp
@@ -22,6 +22,7 @@ namespace quantifiers {
 ExpressionMinerManager::ExpressionMinerManager()
     : d_doRewSynth(false),
       d_doQueryGen(false),
+      d_doFilterImplied(false),
       d_use_sygus_type(false),
       d_qe(nullptr),
       d_tds(nullptr)
@@ -35,6 +36,7 @@ void ExpressionMinerManager::initialize(const std::vector<Node>& vars,
 {
   d_doRewSynth = false;
   d_doQueryGen = false;
+  d_doFilterImplied = false;
   d_sygus_fun = Node::null();
   d_use_sygus_type = false;
   d_qe = nullptr;
@@ -50,6 +52,7 @@ void ExpressionMinerManager::initializeSygus(QuantifiersEngine* qe,
 {
   d_doRewSynth = false;
   d_doQueryGen = false;
+  d_doFilterImplied = false;
   d_sygus_fun = f;
   d_use_sygus_type = useSygusType;
   d_qe = qe;
@@ -104,22 +107,43 @@ void ExpressionMinerManager::enableQueryGeneration(unsigned deqThresh)
   d_qg.setThreshold(deqThresh);
 }
 
+void ExpressionMinerManager::enableFilterImpliedSolutions()
+{
+  d_doFilterImplied = true;
+  std::vector<Node> vars;
+  d_sampler.getVariables(vars);
+  d_solf.initialize(vars, &d_sampler);
+}
+
 bool ExpressionMinerManager::addTerm(Node sol,
                                      std::ostream& out,
                                      bool& rew_print)
 {
-  bool ret = d_crd.addTerm(sol, out, rew_print);
+  // set the builtin version
+  Node solb = sol;
+  if (d_use_sygus_type)
+  {
+    solb = d_tds->sygusToBuiltin(sol);
+  }
+
+  // add to the candidate rewrite rule database
+  bool ret = true;
+  if (d_doRewSynth)
+  {
+    ret = d_crd.addTerm(sol, out, rew_print);
+  }
+
+  // a unique term, let's try the query generator
   if (ret && d_doQueryGen)
   {
-    // use the builtin version if d_use_sygus_type is true
-    Node solb = sol;
-    if (d_use_sygus_type)
-    {
-      solb = d_tds->sygusToBuiltin(sol);
-    }
-    // a unique term, let's try the query generator
     d_qg.addTerm(solb, out);
   }
+
+  // filter if it's implied
+  if (ret && d_doFilterImplied)
+  {
+    ret = d_solf.addTerm(solb, out);
+  }
   return ret;
 }
 
diff --git a/src/theory/quantifiers/expr_miner_manager.h b/src/theory/quantifiers/expr_miner_manager.h
index d15b69cb5..d8e6ae651 100644
--- a/src/theory/quantifiers/expr_miner_manager.h
+++ b/src/theory/quantifiers/expr_miner_manager.h
@@ -21,6 +21,7 @@
 #include "theory/quantifiers/candidate_rewrite_database.h"
 #include "theory/quantifiers/extended_rewrite.h"
 #include "theory/quantifiers/query_generator.h"
+#include "theory/quantifiers/solution_filter.h"
 #include "theory/quantifiers/sygus_sampler.h"
 #include "theory/quantifiers_engine.h"
 
@@ -70,6 +71,8 @@ class ExpressionMinerManager
   void enableRewriteRuleSynth();
   /** enable query generation (--sygus-query-gen) */
   void enableQueryGeneration(unsigned deqThresh);
+  /** filter implied solutions (--sygus-sol-filter-implied) */
+  void enableFilterImpliedSolutions();
   /** add term
    *
    * Expression miners may print information on the output stream out, for
@@ -89,6 +92,8 @@ class ExpressionMinerManager
   bool d_doRewSynth;
   /** whether we are doing query generation */
   bool d_doQueryGen;
+  /** whether we are filtering implied candidates */
+  bool d_doFilterImplied;
   /** the sygus function passed to initializeSygus, if any */
   Node d_sygus_fun;
   /** whether we are using sygus types */
@@ -101,6 +106,8 @@ class ExpressionMinerManager
   CandidateRewriteDatabase d_crd;
   /** query generator */
   QueryGenerator d_qg;
+  /** solution filter */
+  SolutionFilter d_solf;
   /** sygus sampler object */
   SygusSampler d_sampler;
   /** extended rewriter object */
diff --git a/src/theory/quantifiers/solution_filter.cpp b/src/theory/quantifiers/solution_filter.cpp
new file mode 100644
index 000000000..bea3356d1
--- /dev/null
+++ b/src/theory/quantifiers/solution_filter.cpp
@@ -0,0 +1,92 @@
+/*********************                                                        */
+/*! \file solution_filter.cpp
+ ** \verbatim
+ ** Top contributors (to current version):
+ **   Andrew Reynolds
+ ** This file is part of the CVC4 project.
+ ** Copyright (c) 2009-2018 by the authors listed in the file AUTHORS
+ ** in the top-level source directory) and their institutional affiliations.
+ ** All rights reserved.  See the file COPYING in the top-level source
+ ** directory for licensing information.\endverbatim
+ **
+ ** \brief Utilities for filtering solutions.
+ **/
+
+#include "theory/quantifiers/solution_filter.h"
+
+#include <fstream>
+#include "options/quantifiers_options.h"
+#include "smt/smt_engine.h"
+#include "smt/smt_engine_scope.h"
+#include "util/random.h"
+
+using namespace CVC4::kind;
+
+namespace CVC4 {
+namespace theory {
+namespace quantifiers {
+
+SolutionFilter::SolutionFilter() {}
+void SolutionFilter::initialize(const std::vector<Node>& vars, SygusSampler* ss)
+{
+  ExprMiner::initialize(vars, ss);
+}
+
+bool SolutionFilter::addTerm(Node n, std::ostream& out)
+{
+  if (!n.getType().isBoolean())
+  {
+    // currently, should not register non-Boolean terms here
+    Assert(false);
+    return true;
+  }
+  NodeManager* nm = NodeManager::currentNM();
+  Node imp = d_conj.isNull() ? n.negate() : nm->mkNode(AND, d_conj, n.negate());
+  imp = Rewriter::rewrite(imp);
+  bool success = false;
+  if (imp.isConst())
+  {
+    if (!imp.getConst<bool>())
+    {
+      // if the implication rewrites to false, we filter
+      Trace("sygus-sol-implied-filter") << "Filtered (by rewriting) : " << n
+                                        << std::endl;
+      return false;
+    }
+    else
+    {
+      // if the implication rewrites to true, it is trivial
+      success = true;
+    }
+  }
+  if (!success)
+  {
+    Trace("sygus-sol-implied") << "  implies: check " << imp << "..."
+                               << std::endl;
+    // make the satisfiability query
+    bool needExport = false;
+    ExprManagerMapCollection varMap;
+    ExprManager em(nm->getOptions());
+    std::unique_ptr<SmtEngine> queryChecker;
+    initializeChecker(queryChecker, em, varMap, imp, needExport);
+    Result r = queryChecker->checkSat();
+    Trace("sygus-sol-implied") << "  implies: ...got : " << r << std::endl;
+    if (r.asSatisfiabilityResult().isSat() != Result::UNSAT)
+    {
+      success = true;
+    }
+  }
+  if (success)
+  {
+    d_conj = d_conj.isNull() ? n : nm->mkNode(AND, d_conj, n);
+    d_conj = Rewriter::rewrite(d_conj);
+    // note if d_conj is false, we could terminate here
+    return true;
+  }
+  Trace("sygus-sol-implied-filter") << "Filtered : " << n << std::endl;
+  return false;
+}
+
+}  // namespace quantifiers
+}  // namespace theory
+}  // namespace CVC4
diff --git a/src/theory/quantifiers/solution_filter.h b/src/theory/quantifiers/solution_filter.h
new file mode 100644
index 000000000..9f098cf69
--- /dev/null
+++ b/src/theory/quantifiers/solution_filter.h
@@ -0,0 +1,62 @@
+/*********************                                                        */
+/*! \file solution_filter.h
+ ** \verbatim
+ ** Top contributors (to current version):
+ **   Andrew Reynolds
+ ** This file is part of the CVC4 project.
+ ** Copyright (c) 2009-2018 by the authors listed in the file AUTHORS
+ ** in the top-level source directory) and their institutional affiliations.
+ ** All rights reserved.  See the file COPYING in the top-level source
+ ** directory for licensing information.\endverbatim
+ **
+ ** \brief Utility for filtering sygus solutions.
+ **/
+
+#include "cvc4_private.h"
+
+#ifndef __CVC4__THEORY__QUANTIFIERS__SOLUTION_FILTER_H
+#define __CVC4__THEORY__QUANTIFIERS__SOLUTION_FILTER_H
+
+#include <map>
+#include <unordered_set>
+#include "expr/node.h"
+#include "theory/quantifiers/expr_miner.h"
+#include "theory/quantifiers/lazy_trie.h"
+#include "theory/quantifiers/sygus_sampler.h"
+
+namespace CVC4 {
+namespace theory {
+namespace quantifiers {
+
+/**
+ * This class is used to filter solutions based on some criteria.
+ *
+ * Currently, it is used to filter predicate solutions that are collectively
+ * entailed by the previous predicate solutions.
+ */
+class SolutionFilter : public ExprMiner
+{
+ public:
+  SolutionFilter();
+  ~SolutionFilter() {}
+  /** initialize */
+  void initialize(const std::vector<Node>& vars,
+                  SygusSampler* ss = nullptr) override;
+  /**
+   * Add term to this module. It is expected that n has Boolean type.
+   * If this method returns false, then the entailment n_1 ^ ... ^ n_m |= n
+   * holds, where n_1, ..., n_m are the terms previously registered to this
+   * class.
+   */
+  bool addTerm(Node n, std::ostream& out) override;
+
+ private:
+  /** conjunction of all (non-implied) terms registered to this class */
+  Node d_conj;
+};
+
+}  // namespace quantifiers
+}  // namespace theory
+}  // namespace CVC4
+
+#endif /* __CVC4__THEORY__QUANTIFIERS__SOLUTION_FILTER_H */
diff --git a/src/theory/quantifiers/sygus/synth_conjecture.cpp b/src/theory/quantifiers/sygus/synth_conjecture.cpp
index 32342a9ba..adc20008e 100644
--- a/src/theory/quantifiers/sygus/synth_conjecture.cpp
+++ b/src/theory/quantifiers/sygus/synth_conjecture.cpp
@@ -955,7 +955,7 @@ void SynthConjecture::printAndContinueStream()
 
 void SynthConjecture::printSynthSolution(std::ostream& out)
 {
-  Trace("cegqi-debug") << "Printing synth solution..." << std::endl;
+  Trace("cegqi-sol-debug") << "Printing synth solution..." << std::endl;
   Assert(d_quant[0].getNumChildren() == d_embed_quant[0].getNumChildren());
   std::vector<Node> sols;
   std::vector<int> statuses;
@@ -981,8 +981,10 @@ void SynthConjecture::printSynthSolution(std::ostream& out)
 
       bool is_unique_term = true;
 
-      if (status != 0 && (options::sygusRewSynth() || options::sygusQueryGen()))
+      if (status != 0 && (options::sygusRewSynth() || options::sygusQueryGen()
+                          || options::sygusSolFilterImplied()))
       {
+        Trace("cegqi-sol-debug") << "Run expression mining..." << std::endl;
         std::map<Node, ExpressionMinerManager>::iterator its =
             d_exprm.find(prog);
         if (its == d_exprm.end())
@@ -997,6 +999,10 @@ void SynthConjecture::printSynthSolution(std::ostream& out)
           {
             d_exprm[prog].enableQueryGeneration(options::sygusQueryGenThresh());
           }
+          if (options::sygusSolFilterImplied())
+          {
+            d_exprm[prog].enableFilterImpliedSolutions();
+          }
           its = d_exprm.find(prog);
         }
         bool rew_print = false;
@@ -1007,7 +1013,7 @@ void SynthConjecture::printSynthSolution(std::ostream& out)
         }
         if (!is_unique_term)
         {
-          ++(cei->d_statistics.d_candidate_rewrites);
+          ++(cei->d_statistics.d_filtered_solutions);
         }
       }
       if (is_unique_term)
diff --git a/src/theory/quantifiers/sygus/synth_engine.cpp b/src/theory/quantifiers/sygus/synth_engine.cpp
index ba227bc8f..479cfa535 100644
--- a/src/theory/quantifiers/sygus/synth_engine.cpp
+++ b/src/theory/quantifiers/sygus/synth_engine.cpp
@@ -426,17 +426,16 @@ SynthEngine::Statistics::Statistics()
       d_cegqi_lemmas_refine("SynthEngine::cegqi_lemmas_refine", 0),
       d_cegqi_si_lemmas("SynthEngine::cegqi_lemmas_si", 0),
       d_solutions("SynthConjecture::solutions", 0),
-      d_candidate_rewrites_print("SynthConjecture::candidate_rewrites_print",
-                                 0),
-      d_candidate_rewrites("SynthConjecture::candidate_rewrites", 0)
+      d_filtered_solutions("SynthConjecture::filtered_solutions", 0),
+      d_candidate_rewrites_print("SynthConjecture::candidate_rewrites_print", 0)
 
 {
   smtStatisticsRegistry()->registerStat(&d_cegqi_lemmas_ce);
   smtStatisticsRegistry()->registerStat(&d_cegqi_lemmas_refine);
   smtStatisticsRegistry()->registerStat(&d_cegqi_si_lemmas);
   smtStatisticsRegistry()->registerStat(&d_solutions);
+  smtStatisticsRegistry()->registerStat(&d_filtered_solutions);
   smtStatisticsRegistry()->registerStat(&d_candidate_rewrites_print);
-  smtStatisticsRegistry()->registerStat(&d_candidate_rewrites);
 }
 
 SynthEngine::Statistics::~Statistics()
@@ -445,8 +444,8 @@ SynthEngine::Statistics::~Statistics()
   smtStatisticsRegistry()->unregisterStat(&d_cegqi_lemmas_refine);
   smtStatisticsRegistry()->unregisterStat(&d_cegqi_si_lemmas);
   smtStatisticsRegistry()->unregisterStat(&d_solutions);
+  smtStatisticsRegistry()->unregisterStat(&d_filtered_solutions);
   smtStatisticsRegistry()->unregisterStat(&d_candidate_rewrites_print);
-  smtStatisticsRegistry()->unregisterStat(&d_candidate_rewrites);
 }
 
 }  // namespace quantifiers
diff --git a/src/theory/quantifiers/sygus/synth_engine.h b/src/theory/quantifiers/sygus/synth_engine.h
index 8f0eea58f..a7346b888 100644
--- a/src/theory/quantifiers/sygus/synth_engine.h
+++ b/src/theory/quantifiers/sygus/synth_engine.h
@@ -100,8 +100,8 @@ class SynthEngine : public QuantifiersModule
     IntStat d_cegqi_lemmas_refine;
     IntStat d_cegqi_si_lemmas;
     IntStat d_solutions;
+    IntStat d_filtered_solutions;
     IntStat d_candidate_rewrites_print;
-    IntStat d_candidate_rewrites;
     Statistics();
     ~Statistics();
   }; /* class SynthEngine::Statistics */
diff --git a/src/theory/sets/.gitignore b/src/theory/sets/.gitignore
deleted file mode 100644
index 4c83ffd6f..000000000
--- a/src/theory/sets/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-README.WHATS-NEXT
diff --git a/src/util/Makefile b/src/util/Makefile
deleted file mode 100644
index ea9087049..000000000
--- a/src/util/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-topdir = ../..
-srcdir = src/util
-
-include $(topdir)/Makefile.subdir
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
deleted file mode 100644
index baa3286ab..000000000
--- a/src/util/Makefile.am
+++ /dev/null
@@ -1,118 +0,0 @@
-AM_CPPFLAGS = \
-	-D__BUILDING_CVC4LIB \
-	-I@builddir@/.. -I@srcdir@/../include -I@srcdir@/..
-AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN)
-
-noinst_LTLIBRARIES = libutil.la
-
-
-# Do not list built sources (like integer.h, rational.h) here!
-# Rather, list them under BUILT_SOURCES, and their .in versions under
-# EXTRA_DIST.  Otherwise, they're packaged up in the tarball, which is
-# no good---they belong in the configured builds/ directory.  If they
-# end up in the source directory, they build the cvc4 that was
-# configured at the time of the "make dist", which (1) may not be the
-# configuration that the user wants, and (2) might cause link errors.
-libutil_la_SOURCES = \
-	Makefile.am \
-	Makefile.in \
-	abstract_value.cpp \
-	abstract_value.h \
-	bin_heap.h \
-	bitvector.cpp \
-	bitvector.h \
-	bool.h \
-	cardinality.cpp \
-	cardinality.h \
-	channel.h \
-	debug.h \
-	dense_map.h \
-	divisible.cpp \
-	divisible.h \
-	floatingpoint.cpp \
-	gmp_util.h \
-	hash.h \
-	index.cpp \
-	index.h \
-	maybe.h \
-	ostream_util.cpp \
-	ostream_util.h \
-	proof.h \
-	random.cpp \
-	random.h \
-	regexp.cpp \
-	regexp.h \
-	resource_manager.cpp \
-	resource_manager.h \
-	result.cpp \
-	result.h \
-	safe_print.cpp \
-	safe_print.h \
-	sampler.cpp \
-	sampler.h \
-	sexpr.cpp \
-	sexpr.h \
-	smt2_quote_string.cpp \
-	smt2_quote_string.h \
-	statistics.cpp \
-	statistics.h \
-	statistics_registry.cpp \
-	statistics_registry.h \
-	tuple.h \
-	unsafe_interrupt_exception.h \
-	utility.h
-
-BUILT_SOURCES = \
-	floatingpoint.h \
-	integer.h \
-	rational.h
-
-if CVC4_CLN_IMP
-libutil_la_SOURCES += \
-	rational_cln_imp.cpp \
-	integer_cln_imp.cpp
-endif
-if CVC4_GMP_IMP
-libutil_la_SOURCES += \
-	rational_gmp_imp.cpp \
-	integer_gmp_imp.cpp
-endif
-
-
-EXTRA_DIST = \
-	bitvector.i \
-	bool.i \
-	cardinality.i \
-	divisible.i \
-	floatingpoint.h.in \
-	floatingpoint.i \
-	hash.i \
-	integer.h.in \
-	integer.i \
-	integer_cln_imp.cpp \
-	integer_cln_imp.h \
-	integer_gmp_imp.cpp \
-	integer_gmp_imp.h \
-	proof.i \
-	rational.h.in \
-	rational.i \
-	rational_cln_imp.cpp \
-	rational_cln_imp.h \
-	rational_gmp_imp.cpp \
-	rational_gmp_imp.h \
-	regexp.i \
-	resource_manager.i \
-	result.i \
-	sexpr.i \
-	statistics.i \
-	tuple.i \
-	unsafe_interrupt_exception.i
-
-
-DISTCLEANFILES = \
-	floatingpoint.h.tmp \
-	integer.h.tmp \
-	rational.h.tmp \
-	floatingpoint.h \
-	integer.h \
-	rational.h
diff --git a/src/util/random.h b/src/util/random.h
index e746666fc..e6443c3da 100644
--- a/src/util/random.h
+++ b/src/util/random.h
@@ -39,10 +39,10 @@ class Random
   }
 
   /** Get the minimum number that can be picked. */
-  static uint64_t min() { return 0u; }
+  static constexpr uint64_t min() { return 0u; }
 
   /** Get the maximum number that can be picked. */
-  static uint64_t max() { return UINT64_MAX; }
+  static constexpr uint64_t max() { return UINT64_MAX; }
 
   /** Set seed of Random.  */
   void setSeed(uint64_t seed);
diff --git a/test/.gitignore b/test/.gitignore
deleted file mode 100644
index f39e98071..000000000
--- a/test/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/.deps
-/Makefile.in
diff --git a/test/Makefile b/test/Makefile
deleted file mode 100644
index d1ebf4bb9..000000000
--- a/test/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-topdir = ..
-srcdir = test
-
-include $(topdir)/Makefile.subdir
-
-# synonyms for "check"
-.PHONY: test
-test: check
diff --git a/test/Makefile.am b/test/Makefile.am
deleted file mode 100644
index 372f42bb0..000000000
--- a/test/Makefile.am
+++ /dev/null
@@ -1,121 +0,0 @@
-SUBDIRS = unit system regress .
-
-MAKEFLAGS = -k
-
-.PHONY: units systemtests regress regress0 regress1 regress2 regress3 regress4
-units systemtests regress regress0 regress1 regress2 regress3 regress4:
-	@$(MAKE) check-pre; \
-	for dir in $(SUBDIRS); do \
-		test $$dir = . || (cd $$dir && $(MAKE) $(AM_MAKEFLAGS) $@); \
-	done; \
-	$(MAKE) check-local
-
-# synonyms for "check" in this directory
-.PHONY: test
-test: check
-
-am__tty_colors = \
-red=; grn=; lgn=; blu=; mag=; std=; \
-test "X$(AM_COLOR_TESTS)" != Xno \
-&& test "X$$TERM" != Xdumb \
-&& { test "X$(AM_COLOR_TESTS)" = Xalways || test -t 1 2>/dev/null; } \
-&& { \
-  red=''; \
-  grn=''; \
-  lgn=''; \
-  blu=''; \
-  mag=''; \
-  std=''; \
-}
-
-subdirs_to_check = \
-	system \
-	unit
-
-check-recursive: check-pre
-.PHONY: check-pre
-check-pre:
-	@rm -f $(subdirs_to_check:=/test-suite.log)
-	@find regress -name '*.trs' -exec rm {} \;
-
-if HAVE_CXXTESTGEN
-HANDLE_UNIT_TEST_SUMMARY = \
-	if test -s "unit/test-suite.log"; then :; else \
-		echo "$${red}Unit tests did not run; maybe there were compilation problems ?$$std"; \
-	fi
-else
-HANDLE_UNIT_TEST_SUMMARY = \
-	echo "$${mag}Unit tests not supported, since CxxTest wasn't found$$std"; \
-	rm -f "unit/test-suite.log"
-endif
-
-if AUTOMAKE_1_11
-# automake 1.11 version
-check-local:
-	@$(am__tty_colors); \
-	echo $${blu}===============================  TESTING SUMMARY  =============================$$std; \
-	$(HANDLE_UNIT_TEST_SUMMARY); \
-	if test -s "system/test-suite.log"; then :; else \
-		echo "$${red}System tests did not run; maybe there were compilation problems ?$$std"; \
-	fi; \
-	echo $${red}Upgrade to a newer version of Automake to get a more detailed summary; \
-	echo $${blu}===============================  TESTING SUMMARY  =============================$$std
-else
-# automake 1.12 version
-check-local:
-	@$(am__tty_colors); \
-	echo $${blu}===============================  TESTING SUMMARY  =============================$$std; \
-	$(HANDLE_UNIT_TEST_SUMMARY); \
-	if test -s "system/test-suite.log"; then :; else \
-		echo "$${red}System tests did not run; maybe there were compilation problems ?$$std"; \
-	fi; \
-	for dir in $(subdirs_to_check); do \
-		log=$$dir/test-suite.log; \
-		if test -s "$$log"; then \
-			status="`head -n 11 $$log | tail -7`"; \
-			nicestatus="`echo $$status | sed 's/# [A-Z]*: 0 *//g;s/# \([A-Z]*\): \([0-9]*\)/\2 \1,/g;s/, *$$//;'`"; \
-			if	echo "$$status" | grep -q '# FAIL:  0' && \
-				echo "$$status" | grep -q '# XPASS: 0' && \
-				echo "$$status" | grep -q '# ERROR: 0' && \
-				echo "$$status" | grep -q '# SKIP:  0'; then \
-				printf "$$grn%-30s in $$dir$$std\\n" "$$nicestatus"; \
-			else \
-				echo "$$red$$nicestatus"; \
-				echo "    @abs_builddir@/$$log$$std"; \
-			fi; \
-		fi; \
-	done; \
-	for dir in `find regress -maxdepth 2 -not -empty -type d | sort`; do \
-		if [[ "$$dir" =~ .*regress[0-4]$$ ]]; then \
-			status_info=`grep -d skip ":test-result: " $$dir/*`; \
-		else \
-			status_info=`grep -r ":test-result: " $$dir`; \
-		fi; \
-		total=`echo "$$status_info" | grep ":test-result: " | wc -l`; \
-		if [ $$total -ne 0 ]; then \
-			status="$${std}$$total TOTAL"; \
-			pass=`echo "$$status_info" | grep " PASS" | wc -l`; \
-			if [ $$pass -ne 0 ]; then \
-				status="$$status $${grn}$$pass PASS"; \
-			fi; \
-			fail=`echo "$$status_info" | grep " FAIL" | wc -l`; \
-			if [ $$fail -ne 0 ]; then \
-				status="$$status $${red}$$fail FAIL"; \
-			fi; \
-			xpass=`echo "$$status_info" | grep " XPASS" | wc -l`; \
-			if [ $$xpass -ne 0 ]; then \
-				status="$$status $${red}$$xpass XPASS"; \
-			fi; \
-			error=`echo "$$status_info" | grep " ERROR" | wc -l`; \
-			if [ $$error -ne 0 ]; then \
-				status="$$status $${red}$$error ERROR"; \
-			fi; \
-			skip=`echo "$$status_info" | grep " SKIP" | wc -l`; \
-			if [ $$skip -ne 0 ]; then \
-				status="$$status $${blu}$$skip SKIP"; \
-			fi; \
-			printf "$$grn%-30s in $$dir\\n" "$$status"; \
-		fi; \
-	done; \
-	echo $${blu}===============================  TESTING SUMMARY  =============================$$std
-endif
diff --git a/test/java/build.xml b/test/java/build.xml
deleted file mode 100644
index d8973cedc..000000000
--- a/test/java/build.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="CVC4" default="test" basedir=".">
-  <property name="class-dir" value="classes" />
-  <path id="classpath">
-    <fileset dir="local-lib" includes="**/*.jar" />
-    <fileset dir="../../builds" includes="**/*.jar" />
-  </path>
-
-  <path id="testpath">
-    <path refid="classpath" />
-    <pathelement location="${class-dir}" />
-  </path>
-
-  <dirset id="lib-dirs" dir="../.." includes="builds/**/*/src/bindings/java/.libs" />
-  <pathconvert property="lib-path" refid="lib-dirs" />
-
-  <target name="compile">
-    <mkdir dir="${class-dir}" />
-    <javac srcdir="." destdir="${class-dir}" classpathref="classpath" includeantruntime="false" />
-  </target>
-
-  <target name="test" depends="compile">
-    <junit printsummary="withOutAndErr" haltonfailure="yes" fork="yes">
-      <jvmarg value='-Djava.library.path=${lib-path}'/>
-      <classpath refid="testpath" />
-      <batchtest>
-        <fileset dir="${class-dir}" includes="**/*.class"/>
-      </batchtest>
-    </junit>
-  </target>
-</project>
diff --git a/test/regress/Makefile b/test/regress/Makefile
deleted file mode 100644
index 663fc1407..000000000
--- a/test/regress/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-topdir = ../..
-srcdir = test/regress
-
-include $(topdir)/Makefile.subdir
-
-# synonyms for "check"
-.PHONY: test
-test: check
diff --git a/test/regress/Makefile.am b/test/regress/Makefile.am
deleted file mode 100644
index 295335ed4..000000000
--- a/test/regress/Makefile.am
+++ /dev/null
@@ -1,60 +0,0 @@
-include Makefile.tests
-
-TESTS = $(REG0_TESTS) $(REG1_TESTS) $(REG2_TESTS) $(REG3_TESTS) $(REG4_TESTS)
-
-@mk_include@ @srcdir@/Makefile.levels
-
-# don't override a BINARY imported from a personal.mk
-@mk_if@eq ($(BINARY),)
-@mk_empty@BINARY = cvc4
-end@mk_if@
-
-LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
-			 	 $(top_srcdir)/config/tap-driver.sh --comments
-LOG_COMPILER = @abs_top_srcdir@/test/regress/run_regression.py
-AM_LOG_FLAGS = $(RUN_REGRESSION_ARGS) @abs_top_builddir@/src/main/$(BINARY)$(EXEEXT)
-
-if AUTOMAKE_1_11
-# old-style (pre-automake 1.12) test harness
-TESTS_ENVIRONMENT = \
-	$(LOG_COMPILER) \
-	$(AM_LOG_FLAGS) $(LOG_FLAGS)
-endif
-
-MAKEFLAGS = -k
-
-export VERBOSE = 1
-.PHONY: regress regress0 regress1 regress2 regress3 regress4
-
-regress: regress1
-
-regress0:
-	REGRESSION_LEVEL=0 $(MAKE) check
-
-regress1:
-	REGRESSION_LEVEL=1 $(MAKE) check
-
-regress2:
-	REGRESSION_LEVEL=2 $(MAKE) check
-
-regress3:
-	REGRESSION_LEVEL=3 $(MAKE) check
-
-regress4:
-	REGRESSION_LEVEL=4 $(MAKE) check
-
-EXTRA_DIST = \
-  $(REG0_TESTS) \
-  $(REG1_TESTS) \
-  $(REG2_TESTS) \
-  $(REG3_TESTS) \
-  $(REG4_TESTS) \
-	regress0/uf/mkpidgeon \
-	regress0/tptp/Axioms/BOO004-0.ax \
-	regress0/tptp/Axioms/SYN000+0.ax \
-	regress0/tptp/Axioms/SYN000-0.ax \
-	regress0/tptp/Axioms/SYN000_0.ax \
-	Makefile.levels \
-	Makefile.tests \
-	run_regression.py \
-	README.md
diff --git a/test/regress/Makefile.levels b/test/regress/Makefile.levels
deleted file mode 100644
index 0bd958688..000000000
--- a/test/regress/Makefile.levels
+++ /dev/null
@@ -1,21 +0,0 @@
-# This Makefile fragment allows one to use "make check" but also specify
-# a regression level.
-
-# Regression level 1 is the default
-ALL_TESTS = $(REG0_TESTS) $(REG1_TESTS)
-
-ifeq ($(REGRESSION_LEVEL),0)
-ALL_TESTS = $(REG0_TESTS)
-endif
-ifeq ($(REGRESSION_LEVEL),2)
-ALL_TESTS = $(REG0_TESTS) $(REG1_TESTS) $(REG2_TESTS)
-endif
-ifeq ($(REGRESSION_LEVEL),3)
-ALL_TESTS = $(REG0_TESTS) $(REG1_TESTS) $(REG2_TESTS) $(REG3_TESTS)
-endif
-ifeq ($(REGRESSION_LEVEL),4)
-ALL_TESTS = $(REG0_TESTS) $(REG1_TESTS) $(REG2_TESTS) $(REG3_TESTS) $(REG4_TESTS)
-endif
-
-TEST_REGEX ?= ".*"
-TESTS = $(shell echo $(ALL_TESTS) | tr ' ' '\n' | grep $(TEST_REGEX) | tr '\n' ' ')
diff --git a/test/regress/Makefile.tests b/test/regress/Makefile.tests
deleted file mode 100644
index 5b2280b02..000000000
--- a/test/regress/Makefile.tests
+++ /dev/null
@@ -1,2074 +0,0 @@
-# escape the `=' in file names
-equals = =
-
-REG0_TESTS = \
-	regress0/arith/apply2const-test.smt2 \
-	regress0/arith/arith.01.cvc \
-	regress0/arith/arith.02.cvc \
-	regress0/arith/arith.03.cvc \
-	regress0/arith/bug443.delta01.smt \
-	regress0/arith/bug547.2.smt2 \
-	regress0/arith/bug569.smt2 \
-	regress0/arith/delta-minimized-row-vector-bug.smt \
-	regress0/arith/div-chainable.smt2 \
-	regress0/arith/div.01.smt2 \
-	regress0/arith/div.02.smt2 \
-	regress0/arith/div.04.smt2 \
-	regress0/arith/div.05.smt2 \
-	regress0/arith/div.07.smt2 \
-	regress0/arith/fuzz_3-eq.smt \
-	regress0/arith/integers/arith-int-042.cvc \
-	regress0/arith/integers/arith-int-042.min.cvc \
-	regress0/arith/leq.01.smt \
-	regress0/arith/miplib.cvc \
-	regress0/arith/miplib2.cvc \
-	regress0/arith/miplib4.cvc \
-	regress0/arith/miplibtrick.smt \
-	regress0/arith/mod-simp.smt2 \
-	regress0/arith/mod.01.smt2 \
-	regress0/arith/mult.01.smt2 \
-	regress0/arrayinuf_declare.smt2 \
-	regress0/arrays/arrays0.smt2 \
-	regress0/arrays/arrays1.smt2 \
-	regress0/arrays/arrays2.smt2 \
-	regress0/arrays/arrays3.smt2 \
-	regress0/arrays/arrays4.smt2 \
-	regress0/arrays/bool-array.smt2 \
-	regress0/arrays/bug272.minimized.smt \
-	regress0/arrays/bug272.smt \
-	regress0/arrays/bug637.delta.smt2 \
-	regress0/arrays/constarr.cvc \
-	regress0/arrays/constarr.smt2 \
-	regress0/arrays/constarr2.cvc \
-	regress0/arrays/constarr2.smt2 \
-	regress0/arrays/incorrect1.smt \
-	regress0/arrays/incorrect10.smt \
-	regress0/arrays/incorrect11.smt \
-	regress0/arrays/incorrect2.minimized.smt \
-	regress0/arrays/incorrect2.smt \
-	regress0/arrays/incorrect3.smt \
-	regress0/arrays/incorrect4.smt \
-	regress0/arrays/incorrect5.smt \
-	regress0/arrays/incorrect6.smt \
-	regress0/arrays/incorrect7.smt \
-	regress0/arrays/incorrect8.minimized.smt \
-	regress0/arrays/incorrect8.smt \
-	regress0/arrays/incorrect9.smt \
-	regress0/arrays/swap_t1_np_nf_ai_00005_007.cvc.smt \
-	regress0/arrays/x2.smt \
-	regress0/arrays/x3.smt \
-	regress0/aufbv/array_rewrite_bug.smt \
-	regress0/aufbv/bug00.smt \
-	regress0/aufbv/bug338.smt2 \
-	regress0/aufbv/bug347.smt \
-	regress0/aufbv/bug451.smt \
-	regress0/aufbv/bug509.smt \
-	regress0/aufbv/bug580.delta.smt2 \
-	regress0/aufbv/diseqprop.01.smt \
-	regress0/aufbv/dubreva005ue.delta01.smt \
-	regress0/aufbv/fifo32bc06k08.delta01.smt \
-	regress0/aufbv/fuzz00.smt \
-	regress0/aufbv/fuzz01.delta01.smt \
-	regress0/aufbv/fuzz01.smt \
-	regress0/aufbv/fuzz02.delta01.smt \
-	regress0/aufbv/fuzz02.smt \
-	regress0/aufbv/fuzz03.delta01.smt \
-	regress0/aufbv/fuzz03.smt \
-	regress0/aufbv/fuzz04.delta01.smt \
-	regress0/aufbv/fuzz04.smt \
-	regress0/aufbv/fuzz05.delta01.smt \
-	regress0/aufbv/fuzz05.smt \
-	regress0/aufbv/fuzz06.delta01.smt \
-	regress0/aufbv/fuzz06.smt \
-	regress0/aufbv/fuzz07.smt \
-	regress0/aufbv/fuzz08.smt \
-	regress0/aufbv/fuzz09.smt \
-	regress0/aufbv/fuzz11.smt \
-	regress0/aufbv/fuzz12.smt \
-	regress0/aufbv/fuzz13.smt \
-	regress0/aufbv/fuzz14.smt \
-	regress0/aufbv/fuzz15.smt \
-	regress0/aufbv/rewrite_bug.smt \
-	regress0/aufbv/try3_sameret_functions_fse-bfs_tac.calc_next.il.fse-bfs.delta01.smt \
-	regress0/aufbv/try5_small_difret_functions_wp_su.set_char_quoting.il.wp.delta01.smt \
-	regress0/aufbv/wchains010ue.delta01.smt \
-	regress0/aufbv/wchains010ue.delta02.smt \
-	regress0/auflia/a17.smt \
-	regress0/auflia/bug336.smt2 \
-	regress0/auflia/error72.delta2.smt \
-	regress0/auflia/fuzz-error1099.smt \
-	regress0/auflia/fuzz-error232.smt \
-	regress0/auflia/fuzz01.delta01.smt \
-	regress0/auflia/fuzz02.smt \
-	regress0/auflia/fuzz03.smt \
-	regress0/auflia/fuzz04.smt \
-	regress0/auflia/fuzz05.smt \
-	regress0/auflia/x2.smt \
-	regress0/boolean-prec.cvc \
-	regress0/boolean-terms-bug-array.smt2 \
-	regress0/boolean-terms-kernel1.smt2 \
-	regress0/boolean-terms.cvc \
-	regress0/bt-test-00.smt2 \
-	regress0/bt-test-01.smt2 \
-	regress0/bug1247.smt2 \
-	regress0/bug161.smt \
-	regress0/bug164.smt \
-	regress0/bug167.smt \
-	regress0/bug168.smt \
-	regress0/bug187.smt2 \
-	regress0/bug217.smt2 \
-	regress0/bug220.smt2 \
-	regress0/bug239.smt \
-	regress0/bug274.cvc \
-	regress0/bug288.smt \
-	regress0/bug288b.smt \
-	regress0/bug288c.smt \
-	regress0/bug303.smt2 \
-	regress0/bug310.cvc \
-	regress0/bug32.cvc \
-	regress0/bug322.cvc \
-	regress0/bug322b.cvc \
-	regress0/bug339.smt2 \
-	regress0/bug365.smt2 \
-	regress0/bug382.smt2 \
-	regress0/bug383.smt2 \
-	regress0/bug398.smt2 \
-	regress0/bug421.smt2 \
-	regress0/bug421b.smt2 \
-	regress0/bug480.smt2 \
-	regress0/bug484.smt2 \
-	regress0/bug486.cvc \
-	regress0/bug49.smt \
-	regress0/bug512.minimized.smt2 \
-	regress0/bug521.minimized.smt2 \
-	regress0/bug522.smt2 \
-	regress0/bug528a.smt2 \
-	regress0/bug541.smt2 \
-	regress0/bug544.smt2 \
-	regress0/bug548a.smt2 \
-	regress0/bug576.smt2 \
-	regress0/bug576a.smt2 \
-	regress0/bug578.smt2 \
-	regress0/bug586.cvc \
-	regress0/bug595.cvc \
-	regress0/bug596.cvc \
-	regress0/bug596b.cvc \
-	regress0/bug605.cvc \
-	regress0/bug639.smt2 \
-	regress0/buggy-ite.smt2 \
-	regress0/bv/ackermann1.smt2 \
-	regress0/bv/ackermann2.smt2 \
-	regress0/bv/bool-to-bv.smt2 \
-	regress0/bv/bug260a.smt \
-	regress0/bv/bug260b.smt \
-	regress0/bv/bug440.smt \
-	regress0/bv/bug733.smt2 \
-	regress0/bv/bug734.smt2 \
-	regress0/bv/bv-abstr-bug.smt2 \
-	regress0/bv/bv-abstr-bug2.smt2 \
-	regress0/bv/bv-int-collapse1.smt2 \
-	regress0/bv/bv-int-collapse2.smt2 \
-	regress0/bv/bv-options1.smt2 \
-	regress0/bv/bv-options2.smt2 \
-	regress0/bv/bv-options3.smt2 \
-	regress0/bv/bv-options4.smt2 \
-	regress0/bv/bv-to-bool.smt \
-	regress0/bv/bv2nat-ground-c.smt2 \
-	regress0/bv/bv2nat-simp-range.smt2 \
-	regress0/bv/bvmul-pow2-only.smt2 \
-	regress0/bv/bvsimple.cvc \
-	regress0/bv/calc2_sec2_shifter_mult_bmc15.atlas.delta01.smt \
-	regress0/bv/core/a78test0002.smt \
-	regress0/bv/core/a95test0002.smt \
-	regress0/bv/core/bitvec0.smt \
-	regress0/bv/core/bitvec2.smt \
-	regress0/bv/core/bitvec5.smt \
-	regress0/bv/core/bitvec7.smt \
-	regress0/bv/core/bv_eq_diamond10.smt \
-	regress0/bv/core/concat-merge-0.smt \
-	regress0/bv/core/concat-merge-1.smt \
-	regress0/bv/core/concat-merge-2.smt \
-	regress0/bv/core/concat-merge-3.smt \
-	regress0/bv/core/equality-00.smt \
-	regress0/bv/core/equality-01.smt \
-	regress0/bv/core/equality-02.smt \
-	regress0/bv/core/equality-05.smt \
-	regress0/bv/core/extract-concat-0.smt \
-	regress0/bv/core/extract-concat-1.smt \
-	regress0/bv/core/extract-concat-10.smt \
-	regress0/bv/core/extract-concat-11.smt \
-	regress0/bv/core/extract-concat-2.smt \
-	regress0/bv/core/extract-concat-3.smt \
-	regress0/bv/core/extract-concat-4.smt \
-	regress0/bv/core/extract-concat-5.smt \
-	regress0/bv/core/extract-concat-6.smt \
-	regress0/bv/core/extract-concat-7.smt \
-	regress0/bv/core/extract-concat-8.smt \
-	regress0/bv/core/extract-concat-9.smt \
-	regress0/bv/core/extract-constant.smt \
-	regress0/bv/core/extract-extract-0.smt \
-	regress0/bv/core/extract-extract-1.smt \
-	regress0/bv/core/extract-extract-10.smt \
-	regress0/bv/core/extract-extract-11.smt \
-	regress0/bv/core/extract-extract-2.smt \
-	regress0/bv/core/extract-extract-3.smt \
-	regress0/bv/core/extract-extract-4.smt \
-	regress0/bv/core/extract-extract-5.smt \
-	regress0/bv/core/extract-extract-6.smt \
-	regress0/bv/core/extract-extract-7.smt \
-	regress0/bv/core/extract-extract-8.smt \
-	regress0/bv/core/extract-extract-9.smt \
-	regress0/bv/core/extract-whole-0.smt \
-	regress0/bv/core/extract-whole-1.smt \
-	regress0/bv/core/extract-whole-2.smt \
-	regress0/bv/core/extract-whole-3.smt \
-	regress0/bv/core/extract-whole-4.smt \
-	regress0/bv/core/slice-01.smt \
-	regress0/bv/core/slice-02.smt \
-	regress0/bv/core/slice-03.smt \
-	regress0/bv/core/slice-04.smt \
-	regress0/bv/core/slice-05.smt \
-	regress0/bv/core/slice-06.smt \
-	regress0/bv/core/slice-07.smt \
-	regress0/bv/core/slice-08.smt \
-	regress0/bv/core/slice-09.smt \
-	regress0/bv/core/slice-10.smt \
-	regress0/bv/core/slice-11.smt \
-	regress0/bv/core/slice-12.smt \
-	regress0/bv/core/slice-13.smt \
-	regress0/bv/core/slice-14.smt \
-	regress0/bv/core/slice-15.smt \
-	regress0/bv/core/slice-16.smt \
-	regress0/bv/core/slice-17.smt \
-	regress0/bv/core/slice-18.smt \
-	regress0/bv/core/slice-19.smt \
-	regress0/bv/core/slice-20.smt \
-	regress0/bv/divtest_2_5.smt2 \
-	regress0/bv/divtest_2_6.smt2 \
-	regress0/bv/eager-inc-cryptominisat.smt2 \
-	regress0/bv/fuzz01.smt \
-	regress0/bv/fuzz02.delta01.smt \
-	regress0/bv/fuzz02.smt \
-	regress0/bv/fuzz03.smt \
-	regress0/bv/fuzz04.smt \
-	regress0/bv/fuzz05.smt \
-	regress0/bv/fuzz06.smt \
-	regress0/bv/fuzz07.smt \
-	regress0/bv/fuzz08.smt \
-	regress0/bv/fuzz09.smt \
-	regress0/bv/fuzz10.smt \
-	regress0/bv/fuzz11.smt \
-	regress0/bv/fuzz12.smt \
-	regress0/bv/fuzz13.smt \
-	regress0/bv/fuzz14.smt \
-	regress0/bv/fuzz16.delta01.smt \
-	regress0/bv/fuzz17.delta01.smt \
-	regress0/bv/fuzz18.delta01.smt \
-	regress0/bv/fuzz18.delta02.smt \
-	regress0/bv/fuzz18.delta03.smt \
-	regress0/bv/fuzz18.smt \
-	regress0/bv/fuzz19.delta01.smt \
-	regress0/bv/fuzz19.smt \
-	regress0/bv/fuzz20.delta01.smt \
-	regress0/bv/fuzz20.smt \
-	regress0/bv/fuzz21.delta01.smt \
-	regress0/bv/fuzz21.smt \
-	regress0/bv/fuzz22.delta01.smt \
-	regress0/bv/fuzz22.smt \
-	regress0/bv/fuzz23.delta01.smt \
-	regress0/bv/fuzz23.smt \
-	regress0/bv/fuzz24.delta01.smt \
-	regress0/bv/fuzz24.smt \
-	regress0/bv/fuzz25.delta01.smt \
-	regress0/bv/fuzz25.smt \
-	regress0/bv/fuzz26.delta01.smt \
-	regress0/bv/fuzz26.smt \
-	regress0/bv/fuzz27.delta01.smt \
-	regress0/bv/fuzz27.smt \
-	regress0/bv/fuzz28.delta01.smt \
-	regress0/bv/fuzz28.smt \
-	regress0/bv/fuzz29.delta01.smt \
-	regress0/bv/fuzz29.smt \
-	regress0/bv/fuzz30.delta01.smt \
-	regress0/bv/fuzz30.smt \
-	regress0/bv/fuzz31.delta01.smt \
-	regress0/bv/fuzz31.smt \
-	regress0/bv/fuzz32.delta01.smt \
-	regress0/bv/fuzz32.smt \
-	regress0/bv/fuzz33.delta01.smt \
-	regress0/bv/fuzz33.smt \
-	regress0/bv/fuzz34.delta01.smt \
-	regress0/bv/fuzz35.delta01.smt \
-	regress0/bv/fuzz35.smt \
-	regress0/bv/fuzz36.delta01.smt \
-	regress0/bv/fuzz36.smt \
-	regress0/bv/fuzz37.delta01.smt \
-	regress0/bv/fuzz37.smt \
-	regress0/bv/fuzz38.delta01.smt \
-	regress0/bv/fuzz39.delta01.smt \
-	regress0/bv/fuzz39.smt \
-	regress0/bv/fuzz40.delta01.smt \
-	regress0/bv/fuzz40.smt \
-	regress0/bv/fuzz41.smt \
-	regress0/bv/mul-neg-unsat.smt2 \
-	regress0/bv/mul-negpow2.smt2 \
-	regress0/bv/mult-pow2-negative.smt2 \
-	regress0/bv/sizecheck.cvc \
-	regress0/bv/smtcompbug.smt \
-	regress0/bv/test-bv_intro_pow2.smt2 \
-	regress0/bv/unsound1-reduced.smt2 \
-	regress0/chained-equality.smt2 \
-	regress0/constant-rewrite.smt \
-	regress0/cvc3.userdoc.01.cvc \
-	regress0/cvc3.userdoc.02.cvc \
-	regress0/cvc3.userdoc.03.cvc \
-	regress0/cvc3.userdoc.04.cvc \
-	regress0/cvc3.userdoc.05.cvc \
-	regress0/cvc3.userdoc.06.cvc \
-	regress0/datatypes/Test1-tup-mp.cvc \
-	regress0/datatypes/boolean-equality.cvc \
-	regress0/datatypes/boolean-terms-datatype.cvc \
-	regress0/datatypes/boolean-terms-parametric-datatype-1.cvc \
-	regress0/datatypes/boolean-terms-parametric-datatype-2.cvc \
-	regress0/datatypes/boolean-terms-record.cvc \
-	regress0/datatypes/boolean-terms-rewrite.cvc \
-	regress0/datatypes/boolean-terms-tuple.cvc \
-	regress0/datatypes/bug286.cvc \
-	regress0/datatypes/bug438.cvc \
-	regress0/datatypes/bug438b.cvc \
-	regress0/datatypes/bug597-rbt.smt2 \
-	regress0/datatypes/bug604.smt2 \
-	regress0/datatypes/bug625.smt2 \
-	regress0/datatypes/cdt-model-cade15.smt2 \
-	regress0/datatypes/cdt-non-canon-stream.smt2 \
-	regress0/datatypes/coda_simp_model.smt2 \
-	regress0/datatypes/conqueue-dt-enum-iloop.smt2 \
-	regress0/datatypes/data-nested-codata.smt2 \
-	regress0/datatypes/datatype.cvc \
-	regress0/datatypes/datatype0.cvc \
-	regress0/datatypes/datatype1.cvc \
-	regress0/datatypes/datatype13.cvc \
-	regress0/datatypes/datatype2.cvc \
-	regress0/datatypes/datatype3.cvc \
-	regress0/datatypes/datatype4.cvc \
-	regress0/datatypes/dt-2.6.smt2 \
-	regress0/datatypes/dt-match-pat-param-2.6.smt2 \
-	regress0/datatypes/dt-param-2.6.smt2 \
-	regress0/datatypes/dt-param-card4-bool-sat.smt2 \
-	regress0/datatypes/dt-sel-2.6.smt2 \
-	regress0/datatypes/empty_tuprec.cvc \
-	regress0/datatypes/example-dailler-min.smt2 \
-	regress0/datatypes/is_test.smt2 \
-	regress0/datatypes/issue1433.smt2 \
-	regress0/datatypes/jsat-2.6.smt2 \
-	regress0/datatypes/model-subterms-min.smt2 \
-	regress0/datatypes/mutually-recursive.cvc \
-	regress0/datatypes/pair-bool-bool.cvc \
-	regress0/datatypes/pair-real-bool.smt2 \
-	regress0/datatypes/rec1.cvc \
-	regress0/datatypes/rec2.cvc \
-	regress0/datatypes/rec4.cvc \
-	regress0/datatypes/rewriter.cvc \
-	regress0/datatypes/sc-cdt1.smt2 \
-	regress0/datatypes/some-boolean-tests.cvc \
-	regress0/datatypes/stream-singleton.smt2 \
-	regress0/datatypes/tenum-bug.smt2 \
-	regress0/datatypes/tuple-model.cvc \
-	regress0/datatypes/tuple-no-clash.cvc \
-	regress0/datatypes/tuple-record-bug.cvc \
-	regress0/datatypes/tuple.cvc \
-	regress0/datatypes/tuples-empty.smt2 \
-	regress0/datatypes/tuples-multitype.smt2 \
-	regress0/datatypes/typed_v10l30054.cvc \
-	regress0/datatypes/typed_v1l80005.cvc \
-	regress0/datatypes/typed_v2l30079.cvc \
-	regress0/datatypes/typed_v3l20092.cvc \
-	regress0/datatypes/typed_v5l30069.cvc \
-	regress0/datatypes/v10l40099.cvc \
-	regress0/datatypes/v2l40025.cvc \
-	regress0/datatypes/v3l60006.cvc \
-	regress0/datatypes/v5l30058.cvc \
-	regress0/datatypes/wrong-sel-simp.cvc \
-	regress0/decision/aufbv-fuzz01.smt \
-	regress0/decision/bitvec0.delta01.smt \
-	regress0/decision/bitvec0.smt \
-	regress0/decision/bitvec5.smt \
-	regress0/decision/bug347.smt \
-	regress0/decision/bug374a.smt \
-	regress0/decision/bug374b.smt2 \
-	regress0/decision/error122.delta01.smt \
-	regress0/decision/error122.smt \
-	regress0/decision/error20.delta01.smt \
-	regress0/decision/error20.smt \
-	regress0/decision/error3.delta01.smt \
-	regress0/decision/pp-regfile.delta01.smt \
-	regress0/decision/pp-regfile.delta02.smt \
-	regress0/decision/quant-ex1.smt2 \
-	regress0/decision/uflia-xs-09-16-3-4-1-5.delta03.smt \
-	regress0/decision/wchains010ue.delta02.smt \
-	regress0/declare-fun-is-match.smt2 \
-	regress0/declare-funs.smt2 \
-	regress0/distinct.smt \
-	regress0/expect/scrub.01.smt \
-	regress0/expect/scrub.02.smt \
-	regress0/expect/scrub.03.smt2 \
-	regress0/expect/scrub.04.smt2 \
-	regress0/expect/scrub.06.cvc \
-	regress0/expect/scrub.08.sy \
-	regress0/expect/scrub.09.p \
-	regress0/flet.smt \
-	regress0/flet2.smt \
-	regress0/fmf/Arrow_Order-smtlib.778341.smt \
-	regress0/fmf/QEpres-uf.855035.smt \
-	regress0/fmf/array_card.smt2 \
-	regress0/fmf/bounded_sets.smt2 \
-	regress0/fmf/bug-041417-set-options.cvc \
-	regress0/fmf/bug652.smt2 \
-	regress0/fmf/bug782.smt2 \
-	regress0/fmf/cruanes-no-minimal-unk.smt2 \
-	regress0/fmf/fc-simple.smt2 \
-	regress0/fmf/fc-unsat-pent.smt2 \
-	regress0/fmf/fc-unsat-tot-2.smt2 \
-	regress0/fmf/fd-false.smt2 \
-	regress0/fmf/fmc_unsound_model.smt2 \
-	regress0/fmf/fmf-strange-bounds-2.smt2 \
-	regress0/fmf/forall_unit_data2.smt2 \
-	regress0/fmf/krs-sat.smt2 \
-	regress0/fmf/no-minimal-sat.smt2 \
-	regress0/fmf/quant_real_univ.cvc \
-	regress0/fmf/sat-logic.smt2 \
-	regress0/fmf/sc_bad_model_1221.smt2 \
-	regress0/fmf/sort-infer-typed-082718.smt2 \
-	regress0/fmf/syn002-si-real-int.smt2 \
-	regress0/fmf/tail_rec.smt2 \
-	regress0/fp/ext-rew-test.smt2 \
-	regress0/fp/simple.smt2 \
-	regress0/fuzz_1.smt \
-	regress0/fuzz_3.smt \
-	regress0/get-value-incremental.smt2 \
-	regress0/get-value-ints.smt2 \
-	regress0/get-value-reals-ints.smt2 \
-	regress0/get-value-reals.smt2 \
-	regress0/ho/apply-collapse-sat.smt2 \
-	regress0/ho/apply-collapse-unsat.smt2 \
-	regress0/ho/cong-full-apply.smt2 \
-	regress0/ho/cong.smt2 \
-	regress0/ho/declare-fun-variants.smt2 \
-	regress0/ho/def-fun-flatten.smt2 \
-	regress0/ho/ext-finite-unsat.smt2 \
-	regress0/ho/ext-ho-nested-lambda-model.smt2 \
-	regress0/ho/ext-ho.smt2 \
-	regress0/ho/ext-sat-partial-eval.smt2 \
-	regress0/ho/ext-sat.smt2 \
-	regress0/ho/finite-fun-ext.smt2 \
-	regress0/ho/fta0144-alpha-eq.smt2 \
-	regress0/ho/ho-match-fun-suffix.smt2 \
-	regress0/ho/ho-matching-enum.smt2 \
-	regress0/ho/ho-matching-nested-app.smt2 \
-	regress0/ho/ite-apply-eq.smt2 \
-	regress0/ho/lambda-equality-non-canon.smt2 \
-	regress0/ho/modulo-func-equality.smt2 \
-	regress0/ho/simple-matching-partial.smt2 \
-	regress0/ho/simple-matching.smt2 \
-	regress0/ho/trans.smt2 \
-	regress0/hung10_itesdk_output1.smt2 \
-	regress0/hung10_itesdk_output2.smt2 \
-	regress0/hung13sdk_output1.smt2 \
-	regress0/hung13sdk_output2.smt2 \
-	regress0/ineq_basic.smt \
-	regress0/ineq_slack.smt \
-	regress0/issue1063-overloading-dt-cons.smt2 \
-	regress0/issue1063-overloading-dt-fun.smt2 \
-	regress0/issue1063-overloading-dt-sel.smt2 \
-	regress0/ite.cvc \
-	regress0/ite2.smt2 \
-	regress0/ite3.smt2 \
-	regress0/ite4.smt2 \
-	regress0/ite_real_int_type.smt \
-	regress0/ite_real_valid.smt \
-	regress0/lang_opts_2_5.smt2 \
-	regress0/lang_opts_2_6_1.smt2 \
-	regress0/lemmas/clocksynchro_5clocks.main_invar.base.model.smt \
-	regress0/lemmas/fs_not_sc_seen.induction.smt \
-	regress0/lemmas/mode_cntrl.induction.smt \
-	regress0/lemmas/sc_init_frame_gap.induction.smt \
-	regress0/let.cvc \
-	regress0/let.smt \
-	regress0/let2.smt \
-	regress0/logops.01.cvc \
-	regress0/logops.02.cvc \
-	regress0/logops.03.cvc \
-	regress0/logops.04.cvc \
-	regress0/logops.05.cvc \
-	regress0/model-core.smt2 \
-	regress0/nl/coeff-sat.smt2 \
-	regress0/nl/ext-rew-aggr-test.smt2 \
-	regress0/nl/magnitude-wrong-1020-m.smt2 \
-	regress0/nl/mult-po.smt2 \
-	regress0/nl/nia-wrong-tl.smt2 \
-	regress0/nl/nlExtPurify-test.smt2 \
-	regress0/nl/nta/cos-sig-value.smt2 \
-	regress0/nl/nta/exp-n0.5-lb.smt2 \
-	regress0/nl/nta/exp-n0.5-ub.smt2 \
-	regress0/nl/nta/exp1-ub.smt2 \
-	regress0/nl/nta/real-pi.smt2 \
-	regress0/nl/nta/sin-sym.smt2 \
-	regress0/nl/nta/sqrt-simple.smt2 \
-	regress0/nl/nta/tan-rewrite.smt2 \
-	regress0/nl/real-as-int.smt2 \
-	regress0/nl/real-div-ufnra.smt2 \
-	regress0/nl/subs0-unsat-confirm.smt2 \
-	regress0/nl/very-easy-sat.smt2 \
-	regress0/nl/very-simple-unsat.smt2 \
-	regress0/options/invalid_dump.smt2 \
-	regress0/parallel-let.smt2 \
-	regress0/parser/as.smt2 \
-	regress0/parser/constraint.smt2 \
-	regress0/parser/declarefun-emptyset-uf.smt2 \
-	regress0/parser/shadow_fun_symbol_all.smt2 \
-	regress0/parser/shadow_fun_symbol_nirat.smt2 \
-	regress0/parser/strings20.smt2 \
-	regress0/parser/strings25.smt2 \
-	regress0/parser/to_fp.smt2 \
-	regress0/precedence/and-not.cvc \
-	regress0/precedence/and-xor.cvc \
-	regress0/precedence/bool-cmp.cvc \
-	regress0/precedence/cmp-plus.cvc \
-	regress0/precedence/eq-fun.cvc \
-	regress0/precedence/iff-assoc.cvc \
-	regress0/precedence/iff-implies.cvc \
-	regress0/precedence/implies-assoc.cvc \
-	regress0/precedence/implies-iff.cvc \
-	regress0/precedence/implies-or.cvc \
-	regress0/precedence/not-and.cvc \
-	regress0/precedence/not-eq.cvc \
-	regress0/precedence/or-implies.cvc \
-	regress0/precedence/or-xor.cvc \
-	regress0/precedence/plus-mult.cvc \
-	regress0/precedence/xor-and.cvc \
-	regress0/precedence/xor-assoc.cvc \
-	regress0/precedence/xor-or.cvc \
-	regress0/preprocess/preprocess_00.cvc \
-	regress0/preprocess/preprocess_01.cvc \
-	regress0/preprocess/preprocess_02.cvc \
-	regress0/preprocess/preprocess_03.cvc \
-	regress0/preprocess/preprocess_04.cvc \
-	regress0/preprocess/preprocess_05.cvc \
-	regress0/preprocess/preprocess_06.cvc \
-	regress0/preprocess/preprocess_07.cvc \
-	regress0/preprocess/preprocess_08.cvc \
-	regress0/preprocess/preprocess_09.cvc \
-	regress0/preprocess/preprocess_10.cvc \
-	regress0/preprocess/preprocess_11.cvc \
-	regress0/preprocess/preprocess_12.cvc \
-	regress0/preprocess/preprocess_13.cvc \
-	regress0/preprocess/preprocess_14.cvc \
-	regress0/preprocess/preprocess_15.cvc \
-	regress0/print_lambda.cvc \
-	regress0/push-pop/boolean/fuzz_12.smt2 \
-	regress0/push-pop/boolean/fuzz_13.smt2 \
-	regress0/push-pop/boolean/fuzz_14.smt2 \
-	regress0/push-pop/boolean/fuzz_18.smt2 \
-	regress0/push-pop/boolean/fuzz_2.smt2 \
-	regress0/push-pop/boolean/fuzz_21.smt2 \
-	regress0/push-pop/boolean/fuzz_22.smt2 \
-	regress0/push-pop/boolean/fuzz_27.smt2 \
-	regress0/push-pop/boolean/fuzz_3.smt2 \
-	regress0/push-pop/boolean/fuzz_31.smt2 \
-	regress0/push-pop/boolean/fuzz_33.smt2 \
-	regress0/push-pop/boolean/fuzz_36.smt2 \
-	regress0/push-pop/boolean/fuzz_38.smt2 \
-	regress0/push-pop/boolean/fuzz_46.smt2 \
-	regress0/push-pop/boolean/fuzz_47.smt2 \
-	regress0/push-pop/boolean/fuzz_48.smt2 \
-	regress0/push-pop/boolean/fuzz_49.smt2 \
-	regress0/push-pop/boolean/fuzz_50.smt2 \
-	regress0/push-pop/bug1990.smt2 \
-	regress0/push-pop/bug233.cvc \
-	regress0/push-pop/bug654-dd.smt2 \
-	regress0/push-pop/bug691.smt2 \
-	regress0/push-pop/bug821-check_sat_assuming.smt2 \
-	regress0/push-pop/bug821.smt2 \
-	regress0/push-pop/inc-define.smt2 \
-	regress0/push-pop/inc-double-u.smt2 \
-	regress0/push-pop/incremental-subst-bug.cvc \
-	regress0/push-pop/issue1986.smt2 \
-	regress0/push-pop/issue2137.min.smt2 \
-	regress0/push-pop/quant-fun-proc-unfd.smt2 \
-	regress0/push-pop/simple_unsat_cores.smt2 \
-	regress0/push-pop/test.00.cvc \
-	regress0/push-pop/test.01.cvc \
-	regress0/push-pop/tiny_bug.smt2 \
-	regress0/push-pop/units.cvc \
-	regress0/quantifiers/ARI176e1.smt2 \
-	regress0/quantifiers/agg-rew-test-cf.smt2 \
-	regress0/quantifiers/agg-rew-test.smt2 \
-	regress0/quantifiers/ari056.smt2 \
-	regress0/quantifiers/bug269.smt2 \
-	regress0/quantifiers/bug290.smt2 \
-	regress0/quantifiers/bug291.smt2 \
-	regress0/quantifiers/bug749-rounding.smt2 \
-	regress0/quantifiers/cbqi-lia-dt-simp.smt2 \
-	regress0/quantifiers/cegqi-nl-simp.cvc \
-	regress0/quantifiers/cegqi-nl-sq.smt2 \
-	regress0/quantifiers/clock-10.smt2 \
-	regress0/quantifiers/clock-3.smt2 \
-	regress0/quantifiers/cond-var-elim-binary.smt2 \
-	regress0/quantifiers/delta-simp.smt2 \
-	regress0/quantifiers/double-pattern.smt2 \
-	regress0/quantifiers/ex3.smt2 \
-	regress0/quantifiers/ex6.smt2 \
-	regress0/quantifiers/floor.smt2 \
-	regress0/quantifiers/horn-ground-pre-post.smt2 \
-	regress0/quantifiers/is-even-pred.smt2 \
-	regress0/quantifiers/is-int.smt2 \
-	regress0/quantifiers/issue1805.smt2 \
-	regress0/quantifiers/issue2031-bv-var-elim.smt2 \
-	regress0/quantifiers/issue2033-macro-arith.smt2 \
-	regress0/quantifiers/issue2035.smt2 \
-	regress0/quantifiers/lra-triv-gn.smt2 \
-	regress0/quantifiers/macros-int-real.smt2 \
-	regress0/quantifiers/macros-real-arg.smt2 \
-	regress0/quantifiers/matching-lia-1arg.smt2 \
-	regress0/quantifiers/mix-complete-strat.smt2 \
-	regress0/quantifiers/mix-match.smt2 \
-	regress0/quantifiers/mix-simp.smt2 \
-	regress0/quantifiers/nested-delta.smt2 \
-	regress0/quantifiers/nested-inf.smt2 \
-	regress0/quantifiers/partial-trigger.smt2 \
-	regress0/quantifiers/pure_dt_cbqi.smt2 \
-	regress0/quantifiers/qarray-sel-over-store.smt2 \
-	regress0/quantifiers/qbv-inequality2.smt2 \
-	regress0/quantifiers/qbv-simp.smt2 \
-	regress0/quantifiers/qbv-test-invert-bvadd-neq.smt2 \
-	regress0/quantifiers/qbv-test-invert-bvand-neq.smt2 \
-	regress0/quantifiers/qbv-test-invert-bvand.smt2 \
-	regress0/quantifiers/qbv-test-invert-bvashr-0-neq.smt2 \
-	regress0/quantifiers/qbv-test-invert-bvashr-1-neq.smt2 \
-	regress0/quantifiers/qbv-test-invert-bvlshr-0-neq.smt2 \
-	regress0/quantifiers/qbv-test-invert-bvlshr-0.smt2 \
-	regress0/quantifiers/qbv-test-invert-bvlshr-1-neq.smt2 \
-	regress0/quantifiers/qbv-test-invert-bvor-neq.smt2 \
-	regress0/quantifiers/qbv-test-invert-bvor.smt2 \
-	regress0/quantifiers/qbv-test-invert-bvshl-0.smt2 \
-	regress0/quantifiers/qbv-test-invert-bvult-1.smt2 \
-	regress0/quantifiers/qbv-test-invert-bvxor-neq.smt2 \
-	regress0/quantifiers/qbv-test-invert-bvxor.smt2 \
-	regress0/quantifiers/qbv-test-invert-concat-0.smt2 \
-	regress0/quantifiers/qbv-test-invert-concat-1.smt2 \
-	regress0/quantifiers/qbv-test-invert-sign-extend.smt2 \
-	regress0/quantifiers/qcf-rel-dom-opt.smt2 \
-	regress0/quantifiers/rew-to-scala.smt2 \
-	regress0/quantifiers/simp-len.smt2 \
-	regress0/quantifiers/simp-typ-test.smt2 \
-	regress0/queries0.cvc \
-	regress0/rec-fun-const-parse-bug.smt2 \
-	regress0/rels/addr_book_0.cvc \
-	regress0/rels/atom_univ2.cvc \
-	regress0/rels/card_transpose.cvc \
-	regress0/rels/iden_0.cvc \
-	regress0/rels/iden_1.cvc \
-	regress0/rels/join-eq-u-sat.cvc \
-	regress0/rels/join-eq-u.cvc \
-	regress0/rels/joinImg_0.cvc \
-	regress0/rels/oneLoc_no_quant-int_0_1.cvc \
-	regress0/rels/rel_1tup_0.cvc \
-	regress0/rels/rel_complex_0.cvc \
-	regress0/rels/rel_complex_1.cvc \
-	regress0/rels/rel_conflict_0.cvc \
-	regress0/rels/rel_join_0.cvc \
-	regress0/rels/rel_join_0_1.cvc \
-	regress0/rels/rel_join_1.cvc \
-	regress0/rels/rel_join_1_1.cvc \
-	regress0/rels/rel_join_2.cvc \
-	regress0/rels/rel_join_2_1.cvc \
-	regress0/rels/rel_join_3.cvc \
-	regress0/rels/rel_join_3_1.cvc \
-	regress0/rels/rel_join_4.cvc \
-	regress0/rels/rel_join_5.cvc \
-	regress0/rels/rel_join_6.cvc \
-	regress0/rels/rel_join_7.cvc \
-	regress0/rels/rel_product_0.cvc \
-	regress0/rels/rel_product_0_1.cvc \
-	regress0/rels/rel_product_1.cvc \
-	regress0/rels/rel_product_1_1.cvc \
-	regress0/rels/rel_symbolic_1.cvc \
-	regress0/rels/rel_symbolic_1_1.cvc \
-	regress0/rels/rel_symbolic_2_1.cvc \
-	regress0/rels/rel_symbolic_3_1.cvc \
-	regress0/rels/rel_tc_11.cvc \
-	regress0/rels/rel_tc_2_1.cvc \
-	regress0/rels/rel_tc_3.cvc \
-	regress0/rels/rel_tc_3_1.cvc \
-	regress0/rels/rel_tc_7.cvc \
-	regress0/rels/rel_tc_8.cvc \
-	regress0/rels/rel_tp_3_1.cvc \
-	regress0/rels/rel_tp_join_0.cvc \
-	regress0/rels/rel_tp_join_1.cvc \
-	regress0/rels/rel_tp_join_2.cvc \
-	regress0/rels/rel_tp_join_3.cvc \
-	regress0/rels/rel_tp_join_eq_0.cvc \
-	regress0/rels/rel_tp_join_int_0.cvc \
-	regress0/rels/rel_tp_join_pro_0.cvc \
-	regress0/rels/rel_tp_join_var_0.cvc \
-	regress0/rels/rel_transpose_0.cvc \
-	regress0/rels/rel_transpose_1.cvc \
-	regress0/rels/rel_transpose_1_1.cvc \
-	regress0/rels/rel_transpose_3.cvc \
-	regress0/rels/rel_transpose_4.cvc \
-	regress0/rels/rel_transpose_5.cvc \
-	regress0/rels/rel_transpose_6.cvc \
-	regress0/rels/rel_transpose_7.cvc \
-	regress0/rels/relations-ops.smt2 \
-	regress0/rels/rels-sharing-simp.cvc \
-	regress0/reset-assertions.smt2 \
-	regress0/rewriterules/datatypes.smt2 \
-	regress0/rewriterules/length_trick.smt2 \
-	regress0/rewriterules/native_arrays.smt2 \
-	regress0/rewriterules/relation.smt2 \
-	regress0/rewriterules/simulate_rewriting.smt2 \
-	regress0/sep/dispose-1.smt2 \
-	regress0/sep/dup-nemp.smt2 \
-	regress0/sep/nemp.smt2 \
-	regress0/sep/nil-no-elim.smt2 \
-	regress0/sep/nspatial-simp.smt2 \
-	regress0/sep/pto-01.smt2 \
-	regress0/sep/pto-02.smt2 \
-	regress0/sep/sep-01.smt2 \
-	regress0/sep/sep-plus1.smt2 \
-	regress0/sep/sep-simp-unsat-emp.smt2 \
-	regress0/sep/skolem_emp.smt2 \
-	regress0/sep/trees-1.smt2 \
-	regress0/sep/wand-crash.smt2 \
-	regress0/sets/abt-min.smt2 \
-	regress0/sets/abt-te-exh.smt2 \
-	regress0/sets/abt-te-exh2.smt2 \
-	regress0/sets/card-2.smt2 \
-	regress0/sets/card-3sets.cvc \
-	regress0/sets/card.smt2 \
-	regress0/sets/card3-ground.smt2 \
-	regress0/sets/complement.cvc \
-	regress0/sets/complement2.cvc \
-	regress0/sets/complement3.cvc \
-	regress0/sets/cvc-sample.cvc \
-	regress0/sets/dt-simp-mem.smt2 \
-	regress0/sets/emptyset.smt2 \
-	regress0/sets/eqtest.smt2 \
-	regress0/sets/error1.smt2 \
-	regress0/sets/error2.smt2 \
-	regress0/sets/insert.smt2 \
-	regress0/sets/int-real-univ-unsat.smt2 \
-	regress0/sets/int-real-univ.smt2 \
-	regress0/sets/jan24/deepmeas0.hs.fqout.cvc4.47.smt2 \
-	regress0/sets/jan24/deepmeas0.hs.fqout.small.smt2 \
-	regress0/sets/jan27/ListConcat.hs.fqout.177minimized.smt2 \
-	regress0/sets/jan27/ListConcat.hs.fqout.cvc4.177.smt2 \
-	regress0/sets/jan28/TalkingAboutSets.hs.fqout.3577minimized.smt2 \
-	regress0/sets/jan30/UniqueZipper.hs.fqout.minimized10.smt2 \
-	regress0/sets/jan30/UniqueZipper.hs.fqout.minimized1832.smt2 \
-	regress0/sets/mar2014/sharing-preregister.smt2 \
-	regress0/sets/mar2014/small.smt2 \
-	regress0/sets/mar2014/smaller.smt2 \
-	regress0/sets/nonvar-univ.smt2 \
-	regress0/sets/pre-proc-univ.smt2 \
-	regress0/sets/rec_copy_loop_check_heap_access_43_4.smt2 \
-	regress0/sets/sets-equal.smt2 \
-	regress0/sets/sets-inter.smt2 \
-	regress0/sets/sets-of-sets-subtypes.smt2 \
-	regress0/sets/sets-poly-int-real.smt2 \
-	regress0/sets/sets-poly-nonint.smt2 \
-	regress0/sets/sets-sample.smt2 \
-	regress0/sets/sets-sharing.smt2 \
-	regress0/sets/sets-testlemma.smt2 \
-	regress0/sets/sets-union.smt2 \
-	regress0/sets/sharing-simp.smt2 \
-	regress0/sets/union-1a-flip.smt2 \
-	regress0/sets/union-1a.smt2 \
-	regress0/sets/union-1b-flip.smt2 \
-	regress0/sets/union-1b.smt2 \
-	regress0/sets/union-2.smt2 \
-	regress0/sets/univset-simp.smt2 \
-	regress0/simple-lra.smt \
-	regress0/simple-lra.smt2 \
-	regress0/simple-rdl.smt \
-	regress0/simple-rdl.smt2 \
-	regress0/simple-uf.smt \
-	regress0/simple-uf.smt2 \
-	regress0/simple.cvc \
-	regress0/simple.smt \
-	regress0/simple2.smt \
-	regress0/simplification_bug.smt \
-	regress0/simplification_bug2.smt \
-	regress0/smallcnf.cvc \
-	regress0/smt2output.smt2 \
-	regress0/smtlib/get-unsat-assumptions.smt2 \
-	regress0/strings/bug001.smt2 \
-	regress0/strings/bug002.smt2 \
-	regress0/strings/bug612.smt2 \
-	regress0/strings/bug613.smt2 \
-	regress0/strings/code-sat-neg-one.smt2 \
-	regress0/strings/escchar.smt2 \
-	regress0/strings/escchar_25.smt2 \
-	regress0/strings/hconst-092618.smt2 \
-	regress0/strings/idof-rewrites.smt2 \
-	regress0/strings/idof-sem.smt2 \
-	regress0/strings/ilc-like.smt2 \
-	regress0/strings/indexof-sym-simp.smt2 \
-	regress0/strings/issue1189.smt2 \
-	regress0/strings/leadingzero001.smt2 \
-	regress0/strings/loop001.smt2 \
-	regress0/strings/model001.smt2 \
-	regress0/strings/norn-31.smt2 \
-	regress0/strings/norn-simp-rew.smt2 \
-	regress0/strings/repl-rewrites2.smt2 \
-	regress0/strings/rewrites-re-concat.smt2 \
-	regress0/strings/rewrites-v2.smt2 \
-	regress0/strings/std2.6.1.smt2 \
-	regress0/strings/stoi-solve.smt2 \
-	regress0/strings/str003.smt2 \
-	regress0/strings/str004.smt2 \
-	regress0/strings/str005.smt2 \
-	regress0/strings/str_unsound_ext_rew_eq.smt2 \
-	regress0/strings/strings-charat.cvc \
-	regress0/strings/strings-native-simple.cvc \
-	regress0/strings/strip-endpoint-itos.smt2 \
-	regress0/strings/substr-rewrites.smt2 \
-	regress0/strings/type001.smt2 \
-	regress0/strings/unsound-0908.smt2 \
-	regress0/sygus/General_plus10.sy \
-	regress0/sygus/aig-si.sy \
-	regress0/sygus/c100.sy \
-	regress0/sygus/ccp16.lus.sy \
-	regress0/sygus/check-generic-red.sy \
-	regress0/sygus/const-var-test.sy \
-	regress0/sygus/dt-no-syntax.sy \
-	regress0/sygus/hd-05-d1-prog-nogrammar.sy \
-	regress0/sygus/inv-different-var-order.sy \
-	regress0/sygus/let-ringer.sy \
-	regress0/sygus/let-simp.sy \
-	regress0/sygus/no-syntax-test-bool.sy \
-	regress0/sygus/no-syntax-test.sy \
-	regress0/sygus/parity-AIG-d0.sy \
-	regress0/sygus/parse-bv-let.sy \
-	regress0/sygus/real-si-all.sy \
-	regress0/sygus/strings-unconstrained.sy \
-	regress0/sygus/uminus_one.sy \
-	regress0/test11.cvc \
-	regress0/test9.cvc \
-	regress0/tptp/ARI086$(equals)1.p \
-	regress0/tptp/DAT001$(equals)1.p \
-	regress0/tptp/KRS018+1.p \
-	regress0/tptp/KRS063+1.p \
-	regress0/tptp/MGT019+2.p \
-	regress0/tptp/MGT041-2.p \
-	regress0/tptp/PUZ131_1.p \
-	regress0/tptp/SYN000$(equals)2.p \
-	regress0/tptp/SYN000+1.p \
-	regress0/tptp/SYN000+2.p \
-	regress0/tptp/SYN000-1.p \
-	regress0/tptp/SYN000-2.p \
-	regress0/tptp/SYN000_1.p \
-	regress0/tptp/SYN000_2.p \
-	regress0/tptp/SYN075-1.p \
-	regress0/tptp/tff0-arith.p \
-	regress0/tptp/tff0.p \
-	regress0/tptp/tptp_parser.p \
-	regress0/tptp/tptp_parser10.p \
-	regress0/tptp/tptp_parser2.p \
-	regress0/tptp/tptp_parser3.p \
-	regress0/tptp/tptp_parser4.p \
-	regress0/tptp/tptp_parser5.p \
-	regress0/tptp/tptp_parser6.p \
-	regress0/tptp/tptp_parser7.p \
-	regress0/tptp/tptp_parser8.p \
-	regress0/tptp/tptp_parser9.p \
-	regress0/uf/NEQ016_size5_reduced2a.smt \
-	regress0/uf/NEQ016_size5_reduced2b.smt \
-	regress0/uf/bool-pred-nested.smt2 \
-	regress0/uf/ccredesign-fuzz.smt \
-	regress0/uf/cnf-and-neg.smt2 \
-	regress0/uf/cnf-iff-base.smt2 \
-	regress0/uf/cnf-iff.smt2 \
-	regress0/uf/cnf-ite.smt2 \
-	regress0/uf/cnf_abc.smt2 \
-	regress0/uf/dead_dnd002.smt \
-	regress0/uf/eq_diamond1.smt \
-	regress0/uf/eq_diamond14.reduced.smt \
-	regress0/uf/eq_diamond14.reduced2.smt \
-	regress0/uf/eq_diamond23.smt \
-	regress0/uf/euf_simp01.smt \
-	regress0/uf/euf_simp02.smt \
-	regress0/uf/euf_simp03.smt \
-	regress0/uf/euf_simp04.smt \
-	regress0/uf/euf_simp05.smt \
-	regress0/uf/euf_simp06.smt \
-	regress0/uf/euf_simp08.smt \
-	regress0/uf/euf_simp09.smt \
-	regress0/uf/euf_simp10.smt \
-	regress0/uf/euf_simp11.smt \
-	regress0/uf/euf_simp12.smt \
-	regress0/uf/euf_simp13.smt \
-	regress0/uf/iso_brn001.smt \
-	regress0/uf/pred.smt \
-	regress0/uf/simple.01.cvc \
-	regress0/uf/simple.02.cvc \
-	regress0/uf/simple.03.cvc \
-	regress0/uf/simple.04.cvc \
-	regress0/uf20-03.cvc \
-	regress0/uflia/check01.smt2 \
-	regress0/uflia/check02.smt2 \
-	regress0/uflia/check03.smt2 \
-	regress0/uflia/check04.smt2 \
-	regress0/uflia/error0.delta01.smt \
-	regress0/uflia/error1.smt \
-	regress0/uflia/error30.smt \
-	regress0/uflia/stalmark_e7_27_e7_31.ec.minimized.smt2 \
-	regress0/uflia/tiny.smt2 \
-	regress0/uflia/xs-09-16-3-4-1-5.delta01.smt \
-	regress0/uflia/xs-09-16-3-4-1-5.delta02.smt \
-	regress0/uflia/xs-09-16-3-4-1-5.delta03.smt \
-	regress0/uflia/xs-09-16-3-4-1-5.delta04.smt \
-	regress0/uflra/bug293.cvc \
-	regress0/uflra/bug449.smt \
-	regress0/uflra/constants0.smt \
-	regress0/uflra/fuzz01.smt \
-	regress0/uflra/incorrect1.delta01.smt \
-	regress0/uflra/incorrect1.delta02.smt \
-	regress0/uflra/neq-deltacomp.smt \
-	regress0/uflra/pb_real_10_0100_10_10.smt \
-	regress0/uflra/pb_real_10_0100_10_11.smt \
-	regress0/uflra/pb_real_10_0100_10_15.smt \
-	regress0/uflra/pb_real_10_0100_10_16.smt \
-	regress0/uflra/pb_real_10_0100_10_19.smt \
-	regress0/uflra/pb_real_10_0200_10_22.smt \
-	regress0/uflra/pb_real_10_0200_10_26.smt \
-	regress0/uflra/pb_real_10_0200_10_29.smt \
-	regress0/uflra/simple.01.cvc \
-	regress0/uflra/simple.02.cvc \
-	regress0/uflra/simple.03.cvc \
-	regress0/uflra/simple.04.cvc \
-	regress0/unconstrained/arith.smt2 \
-	regress0/unconstrained/arith3.smt2 \
-	regress0/unconstrained/arith4.smt2 \
-	regress0/unconstrained/arith5.smt2 \
-	regress0/unconstrained/arith6.smt2 \
-	regress0/unconstrained/array1.smt2 \
-	regress0/unconstrained/bvbool.smt2 \
-	regress0/unconstrained/bvbool2.smt2 \
-	regress0/unconstrained/bvbool3.smt2 \
-	regress0/unconstrained/bvcmp.smt2 \
-	regress0/unconstrained/bvconcat2.smt2 \
-	regress0/unconstrained/bvext.smt2 \
-	regress0/unconstrained/bvite.smt2 \
-	regress0/unconstrained/bvmul.smt2 \
-	regress0/unconstrained/bvmul2.smt2 \
-	regress0/unconstrained/bvmul3.smt2 \
-	regress0/unconstrained/bvnot.smt2 \
-	regress0/unconstrained/bvsle.smt2 \
-	regress0/unconstrained/bvsle2.smt2 \
-	regress0/unconstrained/bvsle3.smt2 \
-	regress0/unconstrained/bvsle4.smt2 \
-	regress0/unconstrained/bvsle5.smt2 \
-	regress0/unconstrained/bvslt.smt2 \
-	regress0/unconstrained/bvslt2.smt2 \
-	regress0/unconstrained/bvslt3.smt2 \
-	regress0/unconstrained/bvslt4.smt2 \
-	regress0/unconstrained/bvslt5.smt2 \
-	regress0/unconstrained/bvule.smt2 \
-	regress0/unconstrained/bvule2.smt2 \
-	regress0/unconstrained/bvule3.smt2 \
-	regress0/unconstrained/bvule4.smt2 \
-	regress0/unconstrained/bvule5.smt2 \
-	regress0/unconstrained/bvult.smt2 \
-	regress0/unconstrained/bvult2.smt2 \
-	regress0/unconstrained/bvult3.smt2 \
-	regress0/unconstrained/bvult4.smt2 \
-	regress0/unconstrained/bvult5.smt2 \
-	regress0/unconstrained/geq.smt2 \
-	regress0/unconstrained/gt.smt2 \
-	regress0/unconstrained/ite.smt2 \
-	regress0/unconstrained/leq.smt2 \
-	regress0/unconstrained/lt.smt2 \
-	regress0/unconstrained/mult1.smt2 \
-	regress0/unconstrained/uf1.smt2 \
-	regress0/unconstrained/xor.smt2 \
-	regress0/wiki.01.cvc \
-	regress0/wiki.02.cvc \
-	regress0/wiki.03.cvc \
-	regress0/wiki.04.cvc \
-	regress0/wiki.05.cvc \
-	regress0/wiki.06.cvc \
-	regress0/wiki.07.cvc \
-	regress0/wiki.08.cvc \
-	regress0/wiki.09.cvc \
-	regress0/wiki.10.cvc \
-	regress0/wiki.11.cvc \
-	regress0/wiki.12.cvc \
-	regress0/wiki.13.cvc \
-	regress0/wiki.14.cvc \
-	regress0/wiki.15.cvc \
-	regress0/wiki.16.cvc \
-	regress0/wiki.17.cvc \
-	regress0/wiki.18.cvc \
-	regress0/wiki.19.cvc \
-	regress0/wiki.20.cvc \
-	regress0/wiki.21.cvc
-
-REG1_TESTS = \
-	regress1/arith/arith-int-004.cvc \
-	regress1/arith/arith-int-011.cvc \
-	regress1/arith/arith-int-012.cvc \
-	regress1/arith/arith-int-013.cvc \
-	regress1/arith/arith-int-022.cvc \
-	regress1/arith/arith-int-024.cvc \
-	regress1/arith/arith-int-047.cvc \
-	regress1/arith/arith-int-048.cvc \
-	regress1/arith/arith-int-050.cvc \
-	regress1/arith/arith-int-084.cvc \
-	regress1/arith/arith-int-085.cvc \
-	regress1/arith/arith-int-097.cvc \
-	regress1/arith/bug547.1.smt2 \
-	regress1/arith/bug716.0.smt2 \
-	regress1/arith/bug716.1.cvc \
-	regress1/arith/div.03.smt2 \
-	regress1/arith/div.06.smt2 \
-	regress1/arith/div.08.smt2 \
-	regress1/arith/div.09.smt2 \
-	regress1/arith/miplib3.cvc \
-	regress1/arith/mod.02.smt2 \
-	regress1/arith/mod.03.smt2 \
-	regress1/arith/mult.02.smt2 \
-	regress1/arith/pbrewrites-test.smt2 \
-	regress1/arith/problem__003.smt2 \
-	regress1/arith/real2int-test.smt2 \
-	regress1/arrayinuf_error.smt2 \
-	regress1/aufbv/bug580.smt2 \
-	regress1/aufbv/fuzz10.smt \
-	regress1/auflia/bug330.smt2 \
-	regress1/boolean-terms-kernel2.smt2 \
-	regress1/boolean.cvc \
-	regress1/bug216.smt2 \
-	regress1/bug296.smt2 \
-	regress1/bug425.cvc \
-	regress1/bug507.smt2 \
-	regress1/bug512.smt2 \
-	regress1/bug516.smt2 \
-	regress1/bug519.smt2 \
-	regress1/bug520.smt2 \
-	regress1/bug521.smt2 \
-	regress1/bug543.smt2 \
-	regress1/bug567.smt2 \
-	regress1/bug593.smt2 \
-	regress1/bug681.smt2 \
-	regress1/bug694-Unapply1.scala-0.smt2 \
-	regress1/bug800.smt2 \
-	regress1/bv/bug787.smt2 \
-	regress1/bv/bug_extract_mult_leading_bit.smt2 \
-	regress1/bv/bv-int-collapse2-sat.smt2 \
-	regress1/bv/bv-proof00.smt \
-	regress1/bv/bv2nat-ground.smt2 \
-	regress1/bv/bv2nat-simp-range-sat.smt2 \
-	regress1/bv/bv2nat-types.smt2 \
-	regress1/bv/cmu-rdk-3.smt2 \
-	regress1/bv/decision-weight00.smt2 \
-	regress1/bv/divtest.smt2 \
-	regress1/bv/fuzz34.smt \
-	regress1/bv/fuzz38.smt \
-	regress1/bv/test-bv-abstraction.smt2 \
-	regress1/bv/unsound1.smt2 \
-	regress1/bvdiv2.smt2 \
-	regress1/constarr3.cvc \
-	regress1/constarr3.smt2 \
-	regress1/datatypes/acyclicity-sr-ground096.smt2 \
-	regress1/datatypes/dt-color-2.6.smt2 \
-	regress1/datatypes/dt-param-card4-unsat.smt2 \
-	regress1/datatypes/error.cvc \
-	regress1/datatypes/manos-model.smt2 \
-	regress1/decision/error3.smt \
-	regress1/decision/quant-Arrays_Q1-noinfer.smt2 \
-	regress1/decision/quant-symmetric_unsat_7.smt2 \
-	regress1/error.cvc \
-	regress1/errorcrash.smt2 \
-	regress1/fmf-fun-dbu.smt2 \
-	regress1/fmf/ALG008-1.smt2 \
-	regress1/fmf/Hoare-z3.931718.smt \
-	regress1/fmf/LeftistHeap.scala-8-ncm.smt2 \
-	regress1/fmf/PUZ001+1.smt2 \
-	regress1/fmf/agree466.smt2 \
-	regress1/fmf/agree467.smt2 \
-	regress1/fmf/alg202+1.smt2 \
-	regress1/fmf/am-bad-model.cvc \
-	regress1/fmf/bound-int-alt.smt2 \
-	regress1/fmf/bug0909.smt2 \
-	regress1/fmf/bug651.smt2 \
-	regress1/fmf/bug723-irrelevant-funs.smt2 \
-	regress1/fmf/bug764.smt2 \
-	regress1/fmf/cons-sets-bounds.smt2 \
-	regress1/fmf/constr-ground-to.smt2 \
-	regress1/fmf/datatypes-ufinite-nested.smt2 \
-	regress1/fmf/datatypes-ufinite.smt2 \
-	regress1/fmf/dt-proper-model.smt2 \
-	regress1/fmf/fc-pigeonhole19.smt2 \
-	regress1/fmf/fib-core.smt2 \
-	regress1/fmf/fmf-bound-2dim.smt2 \
-	regress1/fmf/fmf-bound-int.smt2 \
-	regress1/fmf/fmf-fun-divisor-pp.smt2 \
-	regress1/fmf/fmf-fun-no-elim-ext-arith.smt2 \
-	regress1/fmf/fmf-fun-no-elim-ext-arith2.smt2 \
-	regress1/fmf/fmf-strange-bounds.smt2 \
-	regress1/fmf/forall_unit_data.smt2 \
-	regress1/fmf/fore19-exp2-core.smt2 \
-	regress1/fmf/german169.smt2 \
-	regress1/fmf/german73.smt2 \
-	regress1/fmf/issue2034-preinit.smt2 \
-	regress1/fmf/issue916-fmf-or.smt2 \
-	regress1/fmf/jasmin-cdt-crash.smt2 \
-	regress1/fmf/ko-bound-set.cvc \
-	regress1/fmf/loopy_coda.smt2 \
-	regress1/fmf/lst-no-self-rev-exp.smt2 \
-	regress1/fmf/memory_model-R_cpp-dd.cvc \
-	regress1/fmf/nlp042+1.smt2 \
-	regress1/fmf/nun-0208-to.smt2 \
-	regress1/fmf/pow2-bool.smt2 \
-	regress1/fmf/radu-quant-set.smt2 \
-	regress1/fmf/refcount24.cvc.smt2 \
-	regress1/fmf/sc-crash-052316.smt2 \
-	regress1/fmf/sort-inf-int-real.smt2 \
-	regress1/fmf/sort-inf-int.smt2 \
-	regress1/fmf/with-ind-104-core.smt2 \
-	regress1/gensys_brn001.smt2 \
-	regress1/ho/auth0068.smt2 \
-	regress1/ho/fta0210.smt2 \
-	regress1/ho/fta0409.smt2 \
-	regress1/ho/ho-exponential-model.smt2 \
-	regress1/ho/ho-matching-enum-2.smt2 \
-	regress1/ho/ho-std-fmf.smt2 \
-	regress1/ho/hoa0008.smt2 \
-	regress1/ho/match-middle.smt2 \
-	regress1/hole6.cvc \
-	regress1/ite5.smt2 \
-	regress1/lemmas/clocksynchro_5clocks.main_invar.base.smt \
-	regress1/lemmas/pursuit-safety-8.smt \
-	regress1/lemmas/simple_startup_9nodes.abstract.base.smt \
-	regress1/nl/NAVIGATION2.smt2 \
-	regress1/nl/approx-sqrt-unsat.smt2 \
-	regress1/nl/approx-sqrt.smt2 \
-	regress1/nl/arctan2-expdef.smt2 \
-	regress1/nl/arrowsmith-050317.smt2 \
-	regress1/nl/bad-050217.smt2 \
-	regress1/nl/bug698.smt2 \
-	regress1/nl/coeff-unsat-base.smt2 \
-	regress1/nl/coeff-unsat.smt2 \
-	regress1/nl/combine.smt2 \
-	regress1/nl/cos-bound.smt2 \
-	regress1/nl/cos1-tc.smt2 \
-	regress1/nl/disj-eval.smt2 \
-	regress1/nl/dist-big.smt2 \
-	regress1/nl/div-mod-partial.smt2 \
-	regress1/nl/dumortier_llibre_artes_ex_5_13.transcendental.k2.smt2 \
-	regress1/nl/exp-4.5-lt.smt2 \
-	regress1/nl/exp-approx.smt2 \
-	regress1/nl/exp1-lb.smt2 \
-	regress1/nl/exp_monotone.smt2 \
-	regress1/nl/factor_agg_s.smt2 \
-	regress1/nl/metitarski-1025.smt2 \
-	regress1/nl/metitarski-3-4.smt2 \
-	regress1/nl/metitarski_3_4_2e.smt2 \
-	regress1/nl/mirko-050417.smt2 \
-	regress1/nl/nl-eq-infer.smt2 \
-	regress1/nl/nl-help-unsat-quant.smt2 \
-	regress1/nl/nl-unk-quant.smt2 \
-	regress1/nl/nl_uf_lalt.smt2 \
-	regress1/nl/ones.smt2 \
-	regress1/nl/poly-1025.smt2 \
-	regress1/nl/quant-nl.smt2 \
-	regress1/nl/red-exp.smt2 \
-	regress1/nl/rewriting-sums.smt2 \
-	regress1/nl/shifting.smt2 \
-	regress1/nl/shifting2.smt2 \
-	regress1/nl/simple-mono-unsat.smt2 \
-	regress1/nl/simple-mono.smt2 \
-	regress1/nl/sin-compare-across-phase.smt2 \
-	regress1/nl/sin-compare.smt2 \
-	regress1/nl/sin-init-tangents.smt2 \
-	regress1/nl/sin-sign.smt2 \
-	regress1/nl/sin-sym2.smt2 \
-	regress1/nl/sin1-deq-sat.smt2 \
-	regress1/nl/sin1-lb.smt2 \
-	regress1/nl/sin1-sat.smt2 \
-	regress1/nl/sin1-ub.smt2 \
-	regress1/nl/sin2-lb.smt2 \
-	regress1/nl/sin2-ub.smt2 \
-	regress1/nl/solve-eq-small-qf-nra.smt2 \
-	regress1/nl/sqrt-problem-1.smt2 \
-	regress1/nl/sugar-ident-2.smt2 \
-	regress1/nl/sugar-ident-3.smt2 \
-	regress1/nl/sugar-ident.smt2 \
-	regress1/nl/tan-rewrite2.smt2 \
-	regress1/nl/zero-subset.smt2 \
-	regress1/non-fatal-errors.smt2 \
-	regress1/parsing_ringer.cvc \
-	regress1/proof00.smt2 \
-	regress1/push-pop/arith_lra_01.smt2 \
-	regress1/push-pop/arith_lra_02.smt2 \
-	regress1/push-pop/bug-fmf-fun-skolem.smt2 \
-	regress1/push-pop/bug216.smt2 \
-	regress1/push-pop/bug326.smt2 \
-	regress1/push-pop/fuzz_1.smt2 \
-	regress1/push-pop/fuzz_10.smt2 \
-	regress1/push-pop/fuzz_11.smt2 \
-	regress1/push-pop/fuzz_15.smt2 \
-	regress1/push-pop/fuzz_16.smt2 \
-	regress1/push-pop/fuzz_19.smt2 \
-	regress1/push-pop/fuzz_1_to_52_merged.smt2 \
-	regress1/push-pop/fuzz_20.smt2 \
-	regress1/push-pop/fuzz_23.smt2 \
-	regress1/push-pop/fuzz_24.smt2 \
-	regress1/push-pop/fuzz_25.smt2 \
-	regress1/push-pop/fuzz_26.smt2 \
-	regress1/push-pop/fuzz_28.smt2 \
-	regress1/push-pop/fuzz_29.smt2 \
-	regress1/push-pop/fuzz_30.smt2 \
-	regress1/push-pop/fuzz_32.smt2 \
-	regress1/push-pop/fuzz_34.smt2 \
-	regress1/push-pop/fuzz_35.smt2 \
-	regress1/push-pop/fuzz_37.smt2 \
-	regress1/push-pop/fuzz_39.smt2 \
-	regress1/push-pop/fuzz_3_1.smt2 \
-	regress1/push-pop/fuzz_3_10.smt2 \
-	regress1/push-pop/fuzz_3_11.smt2 \
-	regress1/push-pop/fuzz_3_12.smt2 \
-	regress1/push-pop/fuzz_3_13.smt2 \
-	regress1/push-pop/fuzz_3_14.smt2 \
-	regress1/push-pop/fuzz_3_15.smt2 \
-	regress1/push-pop/fuzz_3_2.smt2 \
-	regress1/push-pop/fuzz_3_3.smt2 \
-	regress1/push-pop/fuzz_3_4.smt2 \
-	regress1/push-pop/fuzz_3_5.smt2 \
-	regress1/push-pop/fuzz_3_6.smt2 \
-	regress1/push-pop/fuzz_3_7.smt2 \
-	regress1/push-pop/fuzz_3_8.smt2 \
-	regress1/push-pop/fuzz_3_9.smt2 \
-	regress1/push-pop/fuzz_4.smt2 \
-	regress1/push-pop/fuzz_40.smt2 \
-	regress1/push-pop/fuzz_41.smt2 \
-	regress1/push-pop/fuzz_42.smt2 \
-	regress1/push-pop/fuzz_43.smt2 \
-	regress1/push-pop/fuzz_44.smt2 \
-	regress1/push-pop/fuzz_45.smt2 \
-	regress1/push-pop/fuzz_5.smt2 \
-	regress1/push-pop/fuzz_51.smt2 \
-	regress1/push-pop/fuzz_52.smt2 \
-	regress1/push-pop/fuzz_5_1.smt2 \
-	regress1/push-pop/fuzz_5_2.smt2 \
-	regress1/push-pop/fuzz_5_3.smt2 \
-	regress1/push-pop/fuzz_5_4.smt2 \
-	regress1/push-pop/fuzz_5_5.smt2 \
-	regress1/push-pop/fuzz_5_6.smt2 \
-	regress1/push-pop/fuzz_6.smt2 \
-	regress1/push-pop/fuzz_7.smt2 \
-	regress1/push-pop/fuzz_8.smt2 \
-	regress1/push-pop/fuzz_9.smt2 \
-	regress1/push-pop/quant-fun-proc-unmacro.smt2 \
-	regress1/push-pop/quant-fun-proc.smt2 \
-	regress1/quantifiers/006-cbqi-ite.smt2 \
-	regress1/quantifiers/015-psyco-pp.smt2 \
-	regress1/quantifiers/AdditiveMethods_OwnedResults.Mz.smt2 \
-	regress1/quantifiers/Arrays_Q1-noinfer.smt2 \
-	regress1/quantifiers/NUM878.smt2 \
-	regress1/quantifiers/RND-small.smt2 \
-	regress1/quantifiers/RNDPRE_4_1-dd-nqe.smt2 \
-	regress1/quantifiers/RND_4_1-existing-inst.smt2 \
-	regress1/quantifiers/RND_4_16.smt2 \
-	regress1/quantifiers/anti-sk-simp.smt2 \
-	regress1/quantifiers/ari118-bv-2occ-x.smt2 \
-	regress1/quantifiers/arith-rec-fun.smt2 \
-	regress1/quantifiers/arith-snorm.smt2 \
-	regress1/quantifiers/array-unsat-simp3.smt2 \
-	regress1/quantifiers/bi-artm-s.smt2 \
-	regress1/quantifiers/bignum_quant.smt2 \
-	regress1/quantifiers/bug802.smt2 \
-	regress1/quantifiers/bug822.smt2 \
-	regress1/quantifiers/bug_743.smt2 \
-	regress1/quantifiers/burns13.smt2 \
-	regress1/quantifiers/burns4.smt2 \
-	regress1/quantifiers/cbqi-sdlx-fixpoint-3-dd.smt2 \
-	regress1/quantifiers/cdt-0208-to.smt2 \
-	regress1/quantifiers/const.cvc \
-	regress1/quantifiers/constfunc.cvc \
-	regress1/quantifiers/dump-inst.smt2 \
-	regress1/quantifiers/dump-inst-i.smt2 \
-	regress1/quantifiers/dump-inst-proof.smt2 \
-	regress1/quantifiers/ext-ex-deq-trigger.smt2 \
-	regress1/quantifiers/extract-nproc.smt2 \
-	regress1/quantifiers/florian-case-ax.smt2 \
-	regress1/quantifiers/fp-cegqi-unsat.smt2 \
-	regress1/quantifiers/gauss_init_0030.fof.smt2 \
-	regress1/quantifiers/horn-simple.smt2 \
-	regress1/quantifiers/infer-arith-trigger-eq.smt2 \
-	regress1/quantifiers/inst-max-level-segf.smt2 \
-	regress1/quantifiers/inst-prop-simp.smt2 \
-	regress1/quantifiers/intersection-example-onelane.proof-node22337.smt2 \
-	regress1/quantifiers/is-even.smt2 \
-	regress1/quantifiers/isaplanner-goal20.smt2 \
-	regress1/quantifiers/javafe.ast.StmtVec.009.smt2 \
-	regress1/quantifiers/lra-vts-inf.smt2 \
-	regress1/quantifiers/mix-coeff.smt2 \
-	regress1/quantifiers/model_6_1_bv.smt2 \
-	regress1/quantifiers/mutualrec2.cvc \
-	regress1/quantifiers/nested9_true-unreach-call.i_575.smt2 \
-	regress1/quantifiers/nl-pow-trick.smt2 \
-	regress1/quantifiers/nra-interleave-inst.smt2 \
-	regress1/quantifiers/opisavailable-12.smt2 \
-	regress1/quantifiers/parametric-lists.smt2 \
-	regress1/quantifiers/psyco-001-bv.smt2 \
-	regress1/quantifiers/psyco-107-bv.smt2 \
-	regress1/quantifiers/psyco-196.smt2 \
-	regress1/quantifiers/qbv-disequality3.smt2 \
-	regress1/quantifiers/qbv-simple-2vars-vo.smt2 \
-	regress1/quantifiers/qbv-subcall.smt2 \
-	regress1/quantifiers/qbv-test-invert-bvashr-0.smt2 \
-	regress1/quantifiers/qbv-test-invert-bvashr-1.smt2 \
-	regress1/quantifiers/qbv-test-invert-bvcomp.smt2 \
-	regress1/quantifiers/qbv-test-invert-bvlshr-1.smt2 \
-	regress1/quantifiers/qbv-test-invert-bvmul-neq.smt2 \
-	regress1/quantifiers/qbv-test-invert-bvmul.smt2 \
-	regress1/quantifiers/qbv-test-invert-bvudiv-0-neq.smt2 \
-	regress1/quantifiers/qbv-test-invert-bvudiv-0.smt2 \
-	regress1/quantifiers/qbv-test-invert-bvudiv-1-neq.smt2 \
-	regress1/quantifiers/qbv-test-invert-bvudiv-1.smt2 \
-	regress1/quantifiers/qbv-test-invert-bvurem-1-neq.smt2 \
-	regress1/quantifiers/qbv-test-invert-bvurem-1.smt2 \
-	regress1/quantifiers/qbv-test-urem-rewrite.smt2 \
-	regress1/quantifiers/qcft-javafe.filespace.TreeWalker.006.smt2 \
-	regress1/quantifiers/qcft-smtlib3dbc51.smt2 \
-	regress1/quantifiers/qe.smt2 \
-	regress1/quantifiers/qe-partial.smt2 \
-	regress1/quantifiers/quant-wf-int-ind.smt2 \
-	regress1/quantifiers/quaternion_ds1_symm_0428.fof.smt2 \
-	regress1/quantifiers/recfact.cvc \
-	regress1/quantifiers/repair-const-nterm.smt2 \
-	regress1/quantifiers/rew-to-0211-dd.smt2 \
-	regress1/quantifiers/ricart-agrawala6.smt2 \
-	regress1/quantifiers/set-choice-koikonomou.cvc \
-	regress1/quantifiers/set8.smt2 \
-	regress1/quantifiers/small-pipeline-fixpoint-3.smt2 \
-	regress1/quantifiers/smtcomp-qbv-053118.smt2 \
-	regress1/quantifiers/smtlib384a03.smt2 \
-	regress1/quantifiers/smtlib46f14a.smt2 \
-	regress1/quantifiers/smtlibe99bbe.smt2 \
-	regress1/quantifiers/smtlibf957ea.smt2 \
-	regress1/quantifiers/stream-x2014-09-18-unsat.smt2 \
-	regress1/quantifiers/sygus-infer-nested.smt2 \
-	regress1/quantifiers/symmetric_unsat_7.smt2 \
-	regress1/quantifiers/z3.620661-no-fv-trigger.smt2 \
-	regress1/rels/addr_book_1.cvc \
-	regress1/rels/addr_book_1_1.cvc \
-	regress1/rels/bv1-unit.cvc \
-	regress1/rels/bv1-unitb.cvc \
-	regress1/rels/bv1.cvc \
-	regress1/rels/bv1p-sat.cvc \
-	regress1/rels/bv1p.cvc \
-	regress1/rels/bv2.cvc \
-	regress1/rels/iden_1_1.cvc \
-	regress1/rels/join-eq-structure-and.cvc \
-	regress1/rels/join-eq-structure.cvc \
-	regress1/rels/join-eq-structure_0_1.cvc \
-	regress1/rels/joinImg_0_1.cvc \
-	regress1/rels/joinImg_0_2.cvc \
-	regress1/rels/joinImg_1.cvc \
-	regress1/rels/joinImg_1_1.cvc \
-	regress1/rels/joinImg_2.cvc \
-	regress1/rels/joinImg_2_1.cvc \
-	regress1/rels/prod-mod-eq.cvc \
-	regress1/rels/prod-mod-eq2.cvc \
-	regress1/rels/rel_complex_3.cvc \
-	regress1/rels/rel_complex_4.cvc \
-	regress1/rels/rel_complex_5.cvc \
-	regress1/rels/rel_mix_0_1.cvc \
-	regress1/rels/rel_pressure_0.cvc \
-	regress1/rels/rel_tc_10_1.cvc \
-	regress1/rels/rel_tc_4.cvc \
-	regress1/rels/rel_tc_4_1.cvc \
-	regress1/rels/rel_tc_5_1.cvc \
-	regress1/rels/rel_tc_6.cvc \
-	regress1/rels/rel_tc_9_1.cvc \
-	regress1/rels/rel_tp_2.cvc \
-	regress1/rels/rel_tp_join_2_1.cvc \
-	regress1/rels/set-strat.cvc \
-	regress1/rels/strat.cvc \
-	regress1/rels/strat_0_1.cvc \
-	regress1/rewriterules/datatypes_sat.smt2 \
-	regress1/rewriterules/length_gen.smt2 \
-	regress1/rewriterules/length_gen_020.smt2 \
-	regress1/rewriterules/length_gen_020_sat.smt2 \
-	regress1/rewriterules/length_gen_040.smt2 \
-	regress1/rewriterules/length_gen_040_lemma.smt2 \
-	regress1/rewriterules/length_gen_040_lemma_trigger.smt2 \
-	regress1/rewriterules/reachability_back_to_the_future.smt2 \
-	regress1/rewriterules/read5.smt2 \
-	regress1/rr-verify/bool-crci.sy \
-	regress1/rr-verify/bv-term-32.sy \
-	regress1/rr-verify/bv-term.sy \
-	regress1/rr-verify/fp-arith.sy \
-	regress1/rr-verify/fp-bool.sy \
-	regress1/rr-verify/regex.sy \
-	regress1/rr-verify/string-term.sy \
-	regress1/sep/chain-int.smt2 \
-	regress1/sep/crash1220.smt2 \
-	regress1/sep/dispose-list-4-init.smt2 \
-	regress1/sep/emp2-quant-unsat.smt2 \
-	regress1/sep/finite-witness-sat.smt2 \
-	regress1/sep/fmf-nemp-2.smt2 \
-	regress1/sep/loop-1220.smt2 \
-	regress1/sep/pto-04.smt2 \
-	regress1/sep/quant_wand.smt2 \
-	regress1/sep/sep-02.smt2 \
-	regress1/sep/sep-03.smt2 \
-	regress1/sep/sep-find2.smt2 \
-	regress1/sep/sep-fmf-priority.smt2 \
-	regress1/sep/sep-neg-1refine.smt2 \
-	regress1/sep/sep-neg-nstrict.smt2 \
-	regress1/sep/sep-neg-nstrict2.smt2 \
-	regress1/sep/sep-neg-simple.smt2 \
-	regress1/sep/sep-neg-swap.smt2 \
-	regress1/sep/sep-nterm-again.smt2 \
-	regress1/sep/sep-nterm-val-model.smt2 \
-	regress1/sep/sep-simp-unc.smt2 \
-	regress1/sep/simple-neg-sat.smt2 \
-	regress1/sep/sl-standard.smt2 \
-	regress1/sep/split-find-unsat-w-emp.smt2 \
-	regress1/sep/split-find-unsat.smt2 \
-	regress1/sep/wand-0526-sat.smt2 \
-	regress1/sep/wand-false.smt2 \
-	regress1/sep/wand-nterm-simp.smt2 \
-	regress1/sep/wand-nterm-simp2.smt2 \
-	regress1/sep/wand-simp-sat.smt2 \
-	regress1/sep/wand-simp-sat2.smt2 \
-	regress1/sep/wand-simp-unsat.smt2 \
-	regress1/sets/ListElem.hs.fqout.cvc4.38.smt2 \
-	regress1/sets/ListElts.hs.fqout.cvc4.317.smt2 \
-	regress1/sets/TalkingAboutSets.hs.fqout.cvc4.3577.smt2 \
-	regress1/sets/UniqueZipper.hs.1030minimized.cvc4.smt2 \
-	regress1/sets/UniqueZipper.hs.1030minimized2.cvc4.smt2 \
-	regress1/sets/UniqueZipper.hs.fqout.cvc4.10.smt2 \
-	regress1/sets/UniqueZipper.hs.fqout.cvc4.1832.smt2 \
-	regress1/sets/arjun-set-univ.cvc \
-	regress1/sets/card-3.smt2 \
-	regress1/sets/card-4.smt2 \
-	regress1/sets/card-5.smt2 \
-	regress1/sets/card-6.smt2 \
-	regress1/sets/card-7.smt2 \
-	regress1/sets/card-vc6-minimized.smt2 \
-	regress1/sets/copy_check_heap_access_33_4.smt2 \
-	regress1/sets/deepmeas0.hs.fqout.cvc4.41.smt2 \
-	regress1/sets/fuzz14418.smt2 \
-	regress1/sets/fuzz15201.smt2 \
-	regress1/sets/fuzz31811.smt2 \
-	regress1/sets/insert_invariant_37_2.smt2 \
-	regress1/sets/issue2568.smt2 \
-	regress1/sets/lemmabug-ListElts317minimized.smt2 \
-	regress1/sets/remove_check_free_31_6.smt2 \
-	regress1/sets/sets-disequal.smt2 \
-	regress1/sets/sets-tuple-poly.cvc \
-	regress1/sets/sharingbug.smt2 \
-	regress1/sets/univ-set-uf-elim.smt2 \
-	regress1/simplification_bug4.smt2 \
-	regress1/sqrt2-sort-inf-unk.smt2 \
-	regress1/strings/artemis-0512-nonterm.smt2 \
-	regress1/strings/at001.smt2 \
-	regress1/strings/bug615.smt2 \
-	regress1/strings/bug682.smt2 \
-	regress1/strings/bug686dd.smt2 \
-	regress1/strings/bug768.smt2 \
-	regress1/strings/bug799-min.smt2 \
-	regress1/strings/chapman150408.smt2 \
-	regress1/strings/cmu-2db2-extf-reg.smt2 \
-	regress1/strings/cmu-5042-0707-2.smt2 \
-	regress1/strings/cmu-inc-nlpp-071516.smt2 \
-	regress1/strings/cmu-substr-rw.smt2 \
-	regress1/strings/code-sequence.smt2 \
-	regress1/strings/crash-1019.smt2 \
-	regress1/strings/csp-prefix-exp-bug.smt2 \
-	regress1/strings/double-replace.smt2 \
-	regress1/strings/fmf001.smt2 \
-	regress1/strings/fmf002.smt2 \
-	regress1/strings/gm-inc-071516-2.smt2 \
-	regress1/strings/goodAI.smt2 \
-	regress1/strings/idof-handg.smt2 \
-	regress1/strings/idof-nconst-index.smt2 \
-	regress1/strings/idof-neg-index.smt2 \
-	regress1/strings/idof-triv.smt2 \
-	regress1/strings/ilc-l-nt.smt2 \
-	regress1/strings/issue1105.smt2 \
-	regress1/strings/issue1684-regex.smt2 \
-	regress1/strings/issue2060.smt2 \
-	regress1/strings/issue2429-code.smt2 \
-	regress1/strings/kaluza-fl.smt2 \
-	regress1/strings/loop002.smt2 \
-	regress1/strings/loop003.smt2 \
-	regress1/strings/loop004.smt2 \
-	regress1/strings/loop005.smt2 \
-	regress1/strings/loop006.smt2 \
-	regress1/strings/loop007.smt2 \
-	regress1/strings/loop008.smt2 \
-	regress1/strings/loop009.smt2 \
-	regress1/strings/nf-ff-contains-abs.smt2 \
-	regress1/strings/non_termination_regular_expression4.smt2 \
-	regress1/strings/norn-13.smt2 \
-	regress1/strings/norn-360.smt2 \
-	regress1/strings/norn-ab.smt2 \
-	regress1/strings/norn-nel-bug-052116.smt2 \
-	regress1/strings/norn-simp-rew-sat.smt2 \
-	regress1/strings/nt6-dd.smt2 \
-	regress1/strings/nterm-re-inter-sigma.smt2 \
-	regress1/strings/pierre150331.smt2 \
-	regress1/strings/policy_variable.smt2 \
-	regress1/strings/re-elim-exact.smt2 \
-	regress1/strings/re-unsound-080718.smt2 \
-	regress1/strings/regexp001.smt2 \
-	regress1/strings/regexp002.smt2 \
-	regress1/strings/regexp003.smt2 \
-	regress1/strings/reloop.smt2 \
-	regress1/strings/repl-empty-sem.smt2 \
-	regress1/strings/repl-soundness-sem.smt2 \
-	regress1/strings/rew-020618.smt2 \
-	regress1/strings/stoi-400million.smt2 \
-	regress1/strings/str-code-sat.smt2 \
-	regress1/strings/str-code-unsat-2.smt2 \
-	regress1/strings/str-code-unsat-3.smt2 \
-	regress1/strings/str-code-unsat.smt2 \
-	regress1/strings/str001.smt2 \
-	regress1/strings/str002.smt2 \
-	regress1/strings/str006.smt2 \
-	regress1/strings/str007.smt2 \
-	regress1/strings/string-unsound-sem.smt2 \
-	regress1/strings/strings-index-empty.smt2 \
-	regress1/strings/strings-leq-trans-unsat.smt2 \
-	regress1/strings/strings-lt-len5.smt2 \
-	regress1/strings/strings-lt-simple.smt2 \
-	regress1/strings/strip-endpt-sound.smt2 \
-	regress1/strings/substr001.smt2 \
-	regress1/strings/timeout-no-resp.smt2 \
-	regress1/strings/type002.smt2 \
-	regress1/strings/type003.smt2 \
-	regress1/strings/username_checker_min.smt2 \
-	regress1/sygus/VC22_a.sy \
-	regress1/sygus/abv.sy \
-	regress1/sygus/array_search_2.sy \
-	regress1/sygus/array_search_5-Q-easy.sy \
-	regress1/sygus/array_sum_2_5.sy \
-	regress1/sygus/bvudiv-by-2.sy \
-	regress1/sygus/car_3.lus.sy \
-	regress1/sygus/cegar1.sy \
-	regress1/sygus/cegis-unif-inv-eq-fair.sy \
-	regress1/sygus/cegisunif-depth1.sy \
-	regress1/sygus/cggmp.sy \
-	regress1/sygus/clock-inc-tuple.sy \
-	regress1/sygus/commutative-stream.sy \
-	regress1/sygus/commutative.sy \
-	regress1/sygus/constant-bool-si-all.sy \
-	regress1/sygus/constant-dec-tree-bug.sy \
-	regress1/sygus/constant-ite-bv.sy \
-	regress1/sygus/constant.sy \
-	regress1/sygus/crci-ssb-unk.sy \
-	regress1/sygus/crcy-si-rcons.sy \
-	regress1/sygus/crcy-si.sy \
-	regress1/sygus/dt-test-ns.sy \
-	regress1/sygus/dup-op.sy \
-	regress1/sygus/fg_polynomial3.sy \
-	regress1/sygus/find_sc_bvult_bvnot.sy \
-	regress1/sygus/hd-01-d1-prog.sy \
-	regress1/sygus/hd-19-d1-prog-dup-op.sy \
-	regress1/sygus/hd-sdiv.sy \
-	regress1/sygus/icfp_14.12-flip-args.sy \
-	regress1/sygus/icfp_14.12.sy \
-	regress1/sygus/icfp_14_12_diff_types.sy \
-	regress1/sygus/icfp_28_10.sy \
-	regress1/sygus/icfp_easy-ite.sy \
-	regress1/sygus/inv-example.sy \
-	regress1/sygus/inv-missed-sol-true.sy \
-	regress1/sygus/inv-unused.sy \
-	regress1/sygus/large-const-simp.sy \
-	regress1/sygus/let-bug-simp.sy \
-	regress1/sygus/list-head-x.sy \
-	regress1/sygus/logiccell_help.sy \
-	regress1/sygus/max.sy \
-	regress1/sygus/max2-bv.sy \
-	regress1/sygus/multi-fun-polynomial2.sy \
-	regress1/sygus/nflat-fwd-3.sy \
-	regress1/sygus/nflat-fwd.sy \
-	regress1/sygus/nia-max-square-ns.sy \
-	regress1/sygus/no-flat-simp.sy \
-	regress1/sygus/no-mention.sy \
-	regress1/sygus/parity-si-rcons.sy \
-	regress1/sygus/pbe_multi.sy \
-	regress1/sygus/phone-1-long.sy \
-	regress1/sygus/planning-unif.sy \
-	regress1/sygus/process-10-vars.sy \
-	regress1/sygus/qe.sy \
-	regress1/sygus/real-grammar.sy \
-	regress1/sygus/simple-regexp.sy \
-	regress1/sygus/stopwatch-bt.sy \
-	regress1/sygus/strings-concat-3-args.sy \
-	regress1/sygus/strings-double-rec.sy \
-	regress1/sygus/strings-small.sy \
-	regress1/sygus/strings-template-infer-unused.sy \
-	regress1/sygus/strings-template-infer.sy \
-	regress1/sygus/strings-trivial-simp.sy \
-	regress1/sygus/strings-trivial-two-type.sy \
-	regress1/sygus/strings-trivial.sy \
-	regress1/sygus/sygus-dt.sy \
-	regress1/sygus/sygus-lambda-fv.sy \
-	regress1/sygus/sygus-uf-ex.sy \
-	regress1/sygus/t8.sy \
-	regress1/sygus/tl-type-0.sy \
-	regress1/sygus/tl-type-4x.sy \
-	regress1/sygus/tl-type.sy \
-	regress1/sygus/triv-type-mismatch-si.sy \
-	regress1/sygus/trivial-stream.sy \
-	regress1/sygus/twolets1.sy \
-	regress1/sygus/twolets2-orig.sy \
-	regress1/sygus/unbdd_inv_gen_ex7.sy \
-	regress1/sygus/unbdd_inv_gen_winf1.sy \
-	regress1/sygus/univ_2-long-repeat.sy \
-	regress1/sym/qf-function.smt2 \
-	regress1/sym/q-constant.smt2 \
-	regress1/sym/q-function.smt2 \
-	regress1/sym/sb-wrong.smt2 \
-	regress1/sym/sym1.smt2 \
-	regress1/sym/sym2.smt2 \
-	regress1/sym/sym3.smt2 \
-	regress1/sym/sym4.smt2 \
-	regress1/sym/sym5.smt2 \
-	regress1/sym/sym6.smt2 \
-	regress1/sym/sym7-uf.smt2 \
-	regress1/sym/sym-setAB.smt2 \
-	regress1/test12.cvc \
-	regress1/trim.cvc \
-	regress1/uf2.smt2 \
-	regress1/uflia/DRAGON_11_e1_2450.ec.minimized.smt2 \
-	regress1/uflia/FIREFLY_3_e2_2236_e7_3681.ec.core.smt2 \
-	regress1/uflia/FIREFLY_luke_1b_e2_3049_e7_1173.ec.minimized.smt2 \
-	regress1/uflia/microwave21.ec.minimized.smt2 \
-	regress1/uflia/simple_cyclic2.smt2 \
-	regress1/uflia/speed2_e8_449_e8_517.ec.smt2 \
-	regress1/uflia/stalmark_e7_27_e7_31.ec.smt2 \
-	regress1/wrong-qfabvfp-smtcomp2018.smt2
-
-REG2_TESTS = \
-	regress2/DTP_k2_n35_c175_s15.smt2 \
-	regress2/FIREFLY_3_e2_2236_e7_3681.ec.minimized.smt2 \
-	regress2/GEO123+1.minimized.smt2 \
-	regress2/arith/abz5_1400.smt \
-	regress2/arith/lpsat-goal-9.smt2 \
-	regress2/arith/prp-13-24.smt2 \
-	regress2/arith/pursuit-safety-11.smt \
-	regress2/arith/pursuit-safety-12.smt \
-	regress2/arith/qlock-4-10-9.base.cvc.smt2 \
-	regress2/arith/sc-7.base.cvc.smt \
-	regress2/arith/uart-8.base.cvc.smt \
-	regress2/auflia-fuzz06.smt \
-	regress2/bug136.smt \
-	regress2/bug148.smt \
-	regress2/bug394.smt2 \
-	regress2/bug674.smt2 \
-	regress2/bug765.smt2 \
-	regress2/bug812.smt2 \
-	regress2/error0.smt2 \
-	regress2/error1.smt \
-	regress2/friedman_n4_i5.smt \
-	regress2/fuzz_2.smt \
-	regress2/hash_sat_06_19.smt2 \
-	regress2/hash_sat_07_17.smt2 \
-	regress2/hash_sat_09_09.smt2 \
-	regress2/hash_sat_10_09.smt2 \
-	regress2/hole7.cvc \
-	regress2/hole8.cvc \
-	regress2/instance_1444.smt \
-	regress2/javafe.ast.StandardPrettyPrint.319_no_forall.smt2 \
-	regress2/javafe.ast.WhileStmt.447_no_forall.smt2 \
-	regress2/nl/siegel-nl-bases.smt2 \
-	regress2/ooo.rf6.smt2 \
-	regress2/ooo.tag10.smt2 \
-	regress2/piVC_5581bd.smt2 \
-	regress2/push-pop/DRAGON_4_e2_2799_e3_1915.lus.ic3.1.min.smt2 \
-	regress2/quantifiers/AdditiveMethods_AdditiveMethods..ctor.smt2 \
-	regress2/quantifiers/gn-wrong-091018.smt2 \
-	regress2/quantifiers/javafe.ast.ArrayInit.35.smt2 \
-	regress2/quantifiers/javafe.ast.StandardPrettyPrint.319.smt2 \
-	regress2/quantifiers/javafe.ast.WhileStmt.447.smt2 \
-	regress2/quantifiers/javafe.tc.CheckCompilationUnit.001.smt2 \
-	regress2/quantifiers/javafe.tc.FlowInsensitiveChecks.682.smt2 \
-	regress2/quantifiers/mutualrec2.cvc \
-	regress2/quantifiers/net-policy-no-time.smt2 \
-	regress2/quantifiers/nunchaku2309663.nun.min.smt2 \
-	regress2/simplify.javafe.ast.ArrayInit.35_without_quantification2.smt2 \
-	regress2/strings/cmu-dis-0707-3.smt2 \
-	regress2/strings/cmu-disagree-0707-dd.smt2 \
-	regress2/strings/cmu-prereg-fmf.smt2 \
-	regress2/strings/cmu-repl-len-nterm.smt2 \
-	regress2/strings/non_termination_regular_expression6.smt2 \
-	regress2/strings/norn-dis-0707-3.smt2 \
-	regress2/strings/repl-repl.smt2 \
-	regress2/sygus/MPwL_d1s3.sy \
-	regress2/sygus/array_sum_dd.sy \
-	regress2/sygus/cegisunif-depth1-bv.sy \
-	regress2/sygus/ex23.sy \
-	regress2/sygus/icfp_easy_mt_ite.sy \
-	regress2/sygus/inv_gen_n_c11.sy \
-	regress2/sygus/lustre-real.sy \
-	regress2/sygus/max2-univ.sy \
-	regress2/sygus/mpg_guard1-dd.sy \
-	regress2/sygus/multi-udiv.sy \
-	regress2/sygus/nia-max-square.sy \
-	regress2/sygus/no-syntax-test-no-si.sy \
-	regress2/sygus/process-10-vars-2fun.sy \
-	regress2/sygus/process-arg-invariance.sy \
-	regress2/sygus/real-grammar-neg.sy \
-	regress2/sygus/three.sy \
-	regress2/sygus/vcb.sy \
-	regress2/typed_v1l50016-simp.cvc \
-	regress2/uflia-error0.smt2 \
-	regress2/xs-09-16-3-4-1-5.decn.smt \
-	regress2/xs-09-16-3-4-1-5.smt
-
-REG3_TESTS = \
-	regress3/bmc-ibm-1.smt \
-	regress3/bmc-ibm-2.smt \
-	regress3/bmc-ibm-5.smt \
-	regress3/bmc-ibm-7.smt \
-	regress3/eq_diamond14.smt \
-	regress3/friedman_n6_i4.smt \
-	regress3/hole9.cvc \
-	regress3/incorrect1.smt \
-	regress3/incorrect2.smt \
-	regress3/issue2429.smt2 \
-	regress3/pp-regfile.smt \
-	regress3/qwh.35.405.shuffled-as.sat03-1651.smt \
-	regress3/sixfuncs.sy
-
-REG4_TESTS = \
-	regress4/C880mul.miter.shuffled-as.sat03-348.smt \
-	regress4/NEQ016_size5.smt \
-	regress4/bug143.smt \
-	regress4/comb2.shuffled-as.sat03-420.smt \
-	regress4/hole10.cvc \
-	regress4/instance_1151.smt
-
-# dejan: disabled these because it's mixed arithmetic and it doesn't go
-# well when changing theoryof:
-# - regress0/unconstrained/arith2.smt2
-# - regress0/unconstrained/arith7.smt2
-#
-# lianah: disabled these as the unconstrained terms are no longer
-# recognized after implementing the divide-by-zero semantics for bv division:
-# - regress0/unconstrained/bvdiv.smt2,
-# - regress0/unconstrained/bvconcat.smt2
-#
-# Proof checking takes too long. Add this back.
-# - regress0/bv/fuzz15.delta01.smt 
-#
-# regress1/ho/hoa0102.smt2 results in an assertion failure (see issue #1650).
-#
-# ajreynol: disabled these since they give different error messages on
-# production and debug:
-# - regress1/quantifiers/macro-subtype-param.smt2 
-# - regress1/quantifiers/subtype-param-unk.smt2
-# - regress1/quantifiers/subtype-param.smt2
-#
-# issue1048-arrays-int-real.smt2 -- different errors on debug and production.
-#
-# regress0/aufbv/bug348 does not seem to terminate with proofs
-# regress0/datatypes/datatype-dump.cvc (FIXME #1649)
-#
-# regress1/quantifiers/set3.smt2 does not terminate/takes a long time when
-# doing a coverage build with LFSC.
-DISABLED_TESTS = \
-	regress0/arith/bug549.cvc \
-	regress0/arith/incorrect1.smt \
-	regress0/arith/integers/arith-int-014.cvc \
-	regress0/arith/integers/arith-int-015.cvc \
-	regress0/arith/integers/arith-int-021.cvc \
-	regress0/arith/integers/arith-int-023.cvc \
-	regress0/arith/integers/arith-int-025.cvc \
-	regress0/arith/integers/arith-int-079.cvc \
-	regress0/arith/integers/arith-interval.cvc \
-	regress0/arith/miplib-opt1217--27.smt \
-	regress0/arith/miplib-pp08a-3000.smt \
-	regress0/arr1.smt \
-	regress0/arr1.smt2 \
-	regress0/arr2.smt \
-	regress0/aufbv/bug348.smt \
-	regress0/aufbv/bug349.smt \
-	regress0/aufbv/bug493.smt \
-	regress0/aufbv/dubreva005ue.smt \
-	regress0/aufbv/fifo32bc06k08.smt \
-	regress0/aufbv/fifo32in06k08.delta01.smt \
-	regress0/aufbv/fifo32in06k08.smt \
-	regress0/aufbv/no_init_multi_delete14.smt \
-	regress0/aufbv/try3_sameret_functions_fse-bfs_tac.calc_next.il.fse-bfs.smt \
-	regress0/aufbv/wchains010ue.smt \
-	regress0/auflia/fuzz01.smt \
-	regress0/bug2.smt \
-	regress0/bug374.delta01.smt \
-	regress0/bug374.smt \
-	regress0/bv/bug345.smt \
-	regress0/bv/bvcomp.cvc \
-	regress0/bv/bvsmod.smt2 \
-	regress0/bv/core/bitvec0.delta01.smt \
-	regress0/bv/core/bitvec1.smt \
-	regress0/bv/core/bitvec3.smt \
-	regress0/bv/core/bv_eq_diamond11.smt \
-	regress0/bv/core/bv_eq_diamond12.smt \
-	regress0/bv/core/bv_eq_diamond13.smt \
-	regress0/bv/core/bv_eq_diamond14.smt \
-	regress0/bv/core/bv_eq_diamond15.smt \
-	regress0/bv/core/bv_eq_diamond16.smt \
-	regress0/bv/core/bv_eq_diamond17.smt \
-	regress0/bv/core/concat-merge-0.cvc \
-	regress0/bv/core/concat-merge-1.cvc \
-	regress0/bv/core/concat-merge-2.cvc \
-	regress0/bv/core/concat-merge-3.cvc \
-	regress0/bv/core/constant_core.smt2 \
-	regress0/bv/core/equality-00.cvc \
-	regress0/bv/core/equality-01.cvc \
-	regress0/bv/core/equality-02.cvc \
-	regress0/bv/core/equality-03.cvc \
-	regress0/bv/core/equality-03.smt \
-	regress0/bv/core/equality-04.smt \
-	regress0/bv/core/equality-05.smt \
-	regress0/bv/core/ext_con_004_001_1024.smt \
-	regress0/bv/core/extract-concat-0.cvc \
-	regress0/bv/core/extract-concat-1.cvc \
-	regress0/bv/core/extract-concat-10.cvc \
-	regress0/bv/core/extract-concat-11.cvc \
-	regress0/bv/core/extract-concat-2.cvc \
-	regress0/bv/core/extract-concat-3.cvc \
-	regress0/bv/core/extract-concat-4.cvc \
-	regress0/bv/core/extract-concat-5.cvc \
-	regress0/bv/core/extract-concat-6.cvc \
-	regress0/bv/core/extract-concat-7.cvc \
-	regress0/bv/core/extract-concat-8.cvc \
-	regress0/bv/core/extract-concat-9.cvc \
-	regress0/bv/core/extract-constant.cvc \
-	regress0/bv/core/extract-extract-0.cvc \
-	regress0/bv/core/extract-extract-1.cvc \
-	regress0/bv/core/extract-extract-10.cvc \
-	regress0/bv/core/extract-extract-11.cvc \
-	regress0/bv/core/extract-extract-2.cvc \
-	regress0/bv/core/extract-extract-3.cvc \
-	regress0/bv/core/extract-extract-4.cvc \
-	regress0/bv/core/extract-extract-5.cvc \
-	regress0/bv/core/extract-extract-6.cvc \
-	regress0/bv/core/extract-extract-7.cvc \
-	regress0/bv/core/extract-extract-8.cvc \
-	regress0/bv/core/extract-extract-9.cvc \
-	regress0/bv/core/extract-whole-0.cvc \
-	regress0/bv/core/extract-whole-1.cvc \
-	regress0/bv/core/extract-whole-2.cvc \
-	regress0/bv/core/extract-whole-3.cvc \
-	regress0/bv/core/extract-whole-4.cvc \
-	regress0/bv/core/incremental.smt \
-	regress0/bv/core/slice-01.cvc \
-	regress0/bv/core/slice-02.cvc \
-	regress0/bv/core/slice-03.cvc \
-	regress0/bv/core/slice-04.cvc \
-	regress0/bv/core/slice-05.cvc \
-	regress0/bv/core/slice-06.cvc \
-	regress0/bv/core/slice-07.cvc \
-	regress0/bv/core/slice-08.cvc \
-	regress0/bv/core/slice-09.cvc \
-	regress0/bv/core/slice-10.cvc \
-	regress0/bv/core/slice-11.cvc \
-	regress0/bv/core/slice-12.cvc \
-	regress0/bv/core/slice-13.cvc \
-	regress0/bv/core/slice-14.cvc \
-	regress0/bv/core/slice-15.cvc \
-	regress0/bv/core/slice-16.cvc \
-	regress0/bv/core/slice-17.cvc \
-	regress0/bv/core/slice-18.cvc \
-	regress0/bv/core/slice-19.cvc \
-	regress0/bv/core/slice-20.cvc \
-	regress0/bv/fuzz07-delta.smt \
-	regress0/bv/fuzz15.delta01.smt \
-	regress0/bv/fuzz15.smt \
-	regress0/bv/fuzz16.smt \
-	regress0/bv/fuzz17.smt \
-	regress0/bv/incorrect1.delta01.smt \
-	regress0/bv/incorrect1.smt \
-	regress0/bv/inequality00.smt2 \
-	regress0/bv/inequality01.smt2 \
-	regress0/bv/inequality02.smt2 \
-	regress0/bv/inequality03.smt2 \
-	regress0/bv/inequality04.smt2 \
-	regress0/bv/inequality05.smt2 \
-	regress0/bv/test00.smt \
-	regress0/cvc3-bug15.cvc \
-	regress0/decision/uflia-xs-09-16-3-4-1-5.smt \
-	regress0/decision/wchains010ue.smt \
-	regress0/incorrect1.smt \
-	regress0/ite.smt2 \
-	regress0/ite_arith.smt2 \
-	regress0/lemmas/fischer3-mutex-16.smt \
-	regress0/nl/all-logic.smt2 \
-	regress0/quantifiers/qbv-multi-lit-uge.smt2 \
-	regress0/quantifiers/qbv-test-invert-bvshl-0-neq.smt2 \
-	regress0/quantifiers/qbv-test-invert-concat-0-neq.smt2 \
-	regress0/quantifiers/qbv-test-invert-concat-1-neq.smt2 \
-	regress0/rewriterules/datatypes_clark.smt2 \
-	regress0/rewriterules/length.smt2 \
-	regress0/rewriterules/length_gen_n.smt2 \
-	regress0/rewriterules/length_gen_n_lemma.smt2 \
-	regress0/rewriterules/length_trick2.smt2 \
-	regress0/rewriterules/native_datatypes.smt2 \
-	regress0/sets/mar2014/stacks0.hs.78.cvc4.smt2 \
-	regress0/sets/setel-eq.smt2 \
-	regress0/sets/sets-new.smt2 \
-	regress0/sets/sets-testlemma-ints.smt2 \
-	regress0/sets/sets-testlemma-reals.smt2 \
-	regress0/sygus/sygus-uf.sy \
-	regress0/symmetric.smt \
-	regress0/tptp/BOO003-4.p \
-	regress0/tptp/BOO027-1.p \
-	regress0/tptp/MGT031-1.p \
-	regress0/tptp/NLP114-1.p \
-	regress0/tptp/SYN075+1.p \
-	regress0/uf/PEQ018_size4.smt \
-	regress0/uf/SEQ032_size2.smt \
-	regress0/uf/iso_icl_repgen004.smt \
-	regress0/uflia/diseqprop.01.smt \
-	regress0/uflia/diseqprop.02.smt \
-	regress0/uflia/diseqprop.03.smt \
-	regress0/uflia/diseqprop.04.smt \
-	regress0/uflia/diseqprop.05.smt \
-	regress0/uflia/diseqprop.06.smt \
-	regress0/uflia/xs-09-16-3-4-1-5.delta05.smt \
-	regress0/uflra/pb_real_10_0200_10_25.smt \
-	regress0/uflra/pb_real_10_0200_10_27.smt \
-	regress0/unconstrained/arith2.smt2 \
-	regress0/unconstrained/arith7.smt2 \
-	regress0/unconstrained/bvconcat.smt2 \
-	regress0/unconstrained/bvdiv.smt \
-	regress1/arith/arith-int-001.cvc \
-	regress1/arith/arith-int-002.cvc \
-	regress1/arith/arith-int-003.cvc \
-	regress1/arith/arith-int-005.cvc \
-	regress1/arith/arith-int-006.cvc \
-	regress1/arith/arith-int-007.cvc \
-	regress1/arith/arith-int-008.cvc \
-	regress1/arith/arith-int-009.cvc \
-	regress1/arith/arith-int-010.cvc \
-	regress1/arith/arith-int-016.cvc \
-	regress1/arith/arith-int-017.cvc \
-	regress1/arith/arith-int-018.cvc \
-	regress1/arith/arith-int-019.cvc \
-	regress1/arith/arith-int-020.cvc \
-	regress1/arith/arith-int-026.cvc \
-	regress1/arith/arith-int-027.cvc \
-	regress1/arith/arith-int-028.cvc \
-	regress1/arith/arith-int-029.cvc \
-	regress1/arith/arith-int-030.cvc \
-	regress1/arith/arith-int-031.cvc \
-	regress1/arith/arith-int-032.cvc \
-	regress1/arith/arith-int-033.cvc \
-	regress1/arith/arith-int-034.cvc \
-	regress1/arith/arith-int-035.cvc \
-	regress1/arith/arith-int-036.cvc \
-	regress1/arith/arith-int-037.cvc \
-	regress1/arith/arith-int-038.cvc \
-	regress1/arith/arith-int-039.cvc \
-	regress1/arith/arith-int-040.cvc \
-	regress1/arith/arith-int-041.cvc \
-	regress1/arith/arith-int-043.cvc \
-	regress1/arith/arith-int-044.cvc \
-	regress1/arith/arith-int-045.cvc \
-	regress1/arith/arith-int-046.cvc \
-	regress1/arith/arith-int-049.cvc \
-	regress1/arith/arith-int-051.cvc \
-	regress1/arith/arith-int-052.cvc \
-	regress1/arith/arith-int-053.cvc \
-	regress1/arith/arith-int-054.cvc \
-	regress1/arith/arith-int-055.cvc \
-	regress1/arith/arith-int-056.cvc \
-	regress1/arith/arith-int-057.cvc \
-	regress1/arith/arith-int-058.cvc \
-	regress1/arith/arith-int-059.cvc \
-	regress1/arith/arith-int-060.cvc \
-	regress1/arith/arith-int-061.cvc \
-	regress1/arith/arith-int-062.cvc \
-	regress1/arith/arith-int-063.cvc \
-	regress1/arith/arith-int-064.cvc \
-	regress1/arith/arith-int-065.cvc \
-	regress1/arith/arith-int-066.cvc \
-	regress1/arith/arith-int-067.cvc \
-	regress1/arith/arith-int-068.cvc \
-	regress1/arith/arith-int-069.cvc \
-	regress1/arith/arith-int-070.cvc \
-	regress1/arith/arith-int-071.cvc \
-	regress1/arith/arith-int-072.cvc \
-	regress1/arith/arith-int-073.cvc \
-	regress1/arith/arith-int-074.cvc \
-	regress1/arith/arith-int-075.cvc \
-	regress1/arith/arith-int-076.cvc \
-	regress1/arith/arith-int-077.cvc \
-	regress1/arith/arith-int-078.cvc \
-	regress1/arith/arith-int-080.cvc \
-	regress1/arith/arith-int-081.cvc \
-	regress1/arith/arith-int-082.cvc \
-	regress1/arith/arith-int-083.cvc \
-	regress1/arith/arith-int-086.cvc \
-	regress1/arith/arith-int-087.cvc \
-	regress1/arith/arith-int-088.cvc \
-	regress1/arith/arith-int-089.cvc \
-	regress1/arith/arith-int-090.cvc \
-	regress1/arith/arith-int-091.cvc \
-	regress1/arith/arith-int-092.cvc \
-	regress1/arith/arith-int-093.cvc \
-	regress1/arith/arith-int-094.cvc \
-	regress1/arith/arith-int-095.cvc \
-	regress1/arith/arith-int-096.cvc \
-	regress1/arith/arith-int-099.cvc \
-	regress1/arith/arith-int-100.cvc \
-	regress1/auflia/bug337.smt2 \
-	regress1/bug472.smt2 \
-	regress1/bug585.cvc \
-	regress1/bug590.smt2 \
-	regress1/bv/bench_38.delta.smt2 \
-	regress1/crash_burn_locusts.smt2 \
-	regress1/ho/hoa0102.smt2 \
-	regress1/issue1048-arrays-int-real.smt2 \
-	regress1/quantifiers/macro-subtype-param.smt2 \
-	regress1/quantifiers/set3.smt2 \
-	regress1/quantifiers/subtype-param-unk.smt2 \
-	regress1/quantifiers/subtype-param.smt2 \
-	regress1/rels/garbage_collect.cvc \
-	regress1/rewriterules/datatypes2.smt2 \
-	regress1/rewriterules/datatypes3.smt2 \
-	regress1/rewriterules/datatypes_clark_quantification.smt2 \
-	regress1/rewriterules/length_gen_010.smt2 \
-	regress1/rewriterules/length_gen_010_lemma.smt2 \
-	regress1/rewriterules/length_gen_080.smt2 \
-	regress1/rewriterules/length_gen_160_lemma.smt2 \
-	regress1/rewriterules/length_gen_inv_160.smt2 \
-	regress1/rewriterules/length_trick3.smt2 \
-	regress1/rewriterules/length_trick3_int.smt2 \
-	regress1/rewriterules/set_A_new_fast_tableau-base.smt2 \
-	regress1/rewriterules/set_A_new_fast_tableau-base_sat.smt2 \
-	regress1/rewriterules/test_guards.smt2 \
-	regress1/rewriterules/why3_vstte10_max_sum_harness2.smt2 \
-	regress1/sets/setofsets-disequal.smt2 \
-	regress1/simple-rdl-definefun.smt2 \
-	regress1/sygus/Base16_1.sy \
-	regress1/sygus/enum-test.sy \
-	regress1/sygus/inv_gen_fig8.sy \
-	regress2/arith/arith-int-098.cvc \
-	regress2/arith/miplib-opt1217--27.smt2 \
-	regress2/arith/miplib-pp08a-3000.smt2 \
-	regress2/bug396.smt2 \
-	regress2/nl/dumortier-050317.smt2 \
-	regress2/nl/nt-lemmas-bad.smt2 \
-	regress2/quantifiers/ForElimination-scala-9.smt2 \
-	regress2/quantifiers/small-bug1-fixpoint-3.smt2 \
-	regress2/xs-11-20-5-2-5-3.smt \
-	regress2/xs-11-20-5-2-5-3.smt2
diff --git a/test/regress/regress0/options/invalid_dump.smt2 b/test/regress/regress0/options/invalid_dump.smt2
index 9f92a7a64..ab6f6db31 100644
--- a/test/regress/regress0/options/invalid_dump.smt2
+++ b/test/regress/regress0/options/invalid_dump.smt2
@@ -1,3 +1,4 @@
+; REQUIRES: dumping
 ; COMMAND-LINE: --dump invalidDumpTag
 ; ERROR-SCRUBBER: grep -o "unknown option for --dump"
 ; EXPECT-ERROR: unknown option for --dump
diff --git a/test/system/Makefile b/test/system/Makefile
deleted file mode 100644
index 87b92bb11..000000000
--- a/test/system/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-topdir = ../..
-srcdir = test/system
-
-include $(topdir)/Makefile.subdir
-
-# synonyms for "check"
-.PHONY: test
-test: check
diff --git a/test/system/Makefile.am b/test/system/Makefile.am
deleted file mode 100644
index 253a7f133..000000000
--- a/test/system/Makefile.am
+++ /dev/null
@@ -1,102 +0,0 @@
-TESTS_ENVIRONMENT =
-TEST_EXTENSIONS = .class
-CPLUSPLUS_TESTS = \
-	boilerplate \
-	ouroborous \
-	reset_assertions \
-	two_smt_engines \
-	smt2_compliance \
-	statistics \
-	sep_log_api
-
-TESTS = $(CPLUSPLUS_TESTS)
-
-if CVC4_LANGUAGE_BINDING_JAVA
-TESTS += CVC4JavaTest.class
-endif
-
-# we set the DYLD_LIBRARY_PATH in addition to -Djava.library.path, seems
-# to be necessary on Mac
-CLASS_LOG_COMPILER = env DYLD_LIBRARY_PATH=$(abs_top_builddir)/src/bindings/java/.libs:$(abs_top_builddir)/src/.libs:$(abs_top_builddir)/src/parser/.libs @srcdir@/run_java_test $(JAVA) -classpath .:@abs_top_builddir@/src/bindings/CVC4.jar -Djava.library.path=$(abs_top_builddir)/src/bindings/java/.libs:$(abs_top_builddir)/src/.libs:$(abs_top_builddir)/src/parser/.libs
-
-# Things that aren't tests but that tests rely on and need to
-# go into the distribution
-TEST_DEPS_DIST = \
-	CVC4JavaTest.java \
-	run_java_test
-
-# Make-level dependencies; these don't go in the source distribution
-# but should trigger a re-compile of all unit tests.  Libraries are
-# included here because (1) if static-linking, the tests must be
-# relinked, and (2) if they've changed that means the sources changed,
-# and that means we should ensure the tests compile against any
-# changes made in the header files.
-TEST_DEPS_NODIST = \
-	$(abs_top_builddir)/src/libcvc4.la \
-	$(abs_top_builddir)/src/parser/libcvc4parser.la
-
-TEST_DEPS = \
-	$(TEST_DEPS_DIST) \
-	$(TEST_DEPS_NODIST)
-
-EXTRA_DIST = \
-	$(CPLUSPLUS_TESTS:%=%.cpp) \
-	$(TEST_DEPS_DIST)
-
-MOSTLYCLEANFILES = $(TESTS)
-
-if STATIC_BINARY
-system_LINK = $(CXXLINK) -all-static
-else
-system_LINK = $(CXXLINK)
-endif
-
-AM_CPPFLAGS = \
-	-I. \
-	"-I@top_builddir@/src" \
-	"-I@top_srcdir@/src/include" \
-	"-I@top_srcdir@/lib" \
-	"-I@top_srcdir@/src" \
-	"-I@top_srcdir@/src/prop/minisat" \
-	-D __STDC_LIMIT_MACROS \
-	-D __STDC_FORMAT_MACROS \
-	-D __BUILDING_CVC4_SYSTEM_TEST \
-	$(TEST_CPPFLAGS)
-
-LIBADD = \
-	@abs_top_builddir@/src/parser/libcvc4parser.la \
-	@abs_top_builddir@/src/libcvc4.la
-
-# WHEN SYSTEM TESTS ARE ADDED, BUILD LIKE THIS:
-$(filter-out %.class.lo,$(TESTS:%=%.lo)): %.lo: %.cpp $(LIBADD)
-	$(AM_V_CXX)$(LTCXXCOMPILE) $(AM_CXXFLAGS) -c -o $@ $<
-$(filter-out %.class,$(TESTS)): %: %.lo $(LIBADD)
-	$(AM_V_CXXLD)$(system_LINK) $(LIBADD) $(AM_LDFLAGS) $(LIBS) $<
-CVC4JavaTest.class: CVC4JavaTest.java @abs_top_builddir@/src/bindings/CVC4.jar @abs_top_builddir@/src/bindings/java/libcvc4jni.la
-	$(AM_V_JAVAC)$(JAVAC) -classpath @abs_top_builddir@/src/bindings/CVC4.jar -d $(builddir) $<
-
-# for silent automake rules
-AM_V_JAVAC = $(am__v_JAVAC_$(V))
-am__v_JAVAC_ = $(am__v_JAVAC_$(AM_DEFAULT_VERBOSITY))
-am__v_JAVAC_0 = @echo "  JAVAC " $@;
-
-# trick automake into setting LTCXXCOMPILE, CXXLINK, etc.
-if CVC4_FALSE
-noinst_LTLIBRARIES = libdummy.la
-nodist_libdummy_la_SOURCES = ouroborous.cpp
-libdummy_la_LIBADD = @abs_top_builddir@/src/libcvc4.la
-endif
-
-# rebuild tests if a library changes
-#$(TESTS):: $(TEST_DEPS)
-
-MAKEFLAGS = -k
-export VERBOSE = 1
-
-# synonyms for "check" in this directory in this directory
-.PHONY: test systemtests
-test systemtests: check
-
-# no-ops here
-.PHONY: units regress regress0 regress1 regress2 regress3 regress4
-units regress regress0 regress1 regress2 regress3 regress4:
diff --git a/test/system/run_java_test b/test/system/run_java_test
deleted file mode 100755
index 24947d523..000000000
--- a/test/system/run_java_test
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-#
-# run_java_test
-# Morgan Deters, September 2011
-#
-# The purpose of this script is to change an automake test command
-# line into something that a JVM likes.  In particular, any dir/Foo.class
-# listed on the command line is stripped of its dir/ and its .class extension.
-# Works only for tests in the default package.
-#
-args=("$@")
-args[$((${#args}))]="$(echo "${args[${#args}]}" | sed 's,\(.*/\)*\(.*\)\.class$,\2,')"
-echo "${args[@]}"
-exec "${args[@]}"
diff --git a/test/unit/.gitignore b/test/unit/.gitignore
deleted file mode 100644
index 77b1fc5e3..000000000
--- a/test/unit/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*_black
-*_white
-*_black.cpp
-*_white.cpp
diff --git a/test/unit/Makefile b/test/unit/Makefile
deleted file mode 100644
index 16dc971e1..000000000
--- a/test/unit/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-topdir = ../..
-srcdir = test/unit
-
-include $(topdir)/Makefile.subdir
-
-# synonyms for "check"
-.PHONY: test
-test: check
diff --git a/test/unit/Makefile.am b/test/unit/Makefile.am
deleted file mode 100644
index 0ce6368c2..000000000
--- a/test/unit/Makefile.am
+++ /dev/null
@@ -1,248 +0,0 @@
-# All unit tests
-UNIT_TESTS = \
-	expr/expr_public \
-	expr/expr_manager_public \
-	expr/type_cardinality_public \
-	util/cardinality_public
-if WHITE_AND_BLACK_TESTS
-UNIT_TESTS += \
-	base/map_util_black \
-	theory/evaluator_white \
-	theory/logic_info_white \
-	theory/theory_arith_white \
-	theory/theory_black \
-	theory/theory_bv_white \
-	theory/theory_engine_white \
-	theory/theory_quantifiers_bv_instantiator_white \
-	theory/theory_quantifiers_bv_inverter_white \
-	theory/theory_strings_rewriter_white \
-	theory/theory_white \
-	theory/type_enumerator_white \
-	expr/node_white \
-	expr/node_black \
-	expr/kind_black \
-	expr/kind_map_black \
-	expr/node_builder_black \
-	expr/node_manager_black \
-	expr/node_manager_white \
-	expr/attribute_white \
-	expr/attribute_black \
-	expr/symbol_table_black \
-	expr/node_self_iterator_black \
-	expr/type_node_white \
-	parser/parser_black \
-	parser/parser_builder_black \
-	preprocessing/pass_bv_gauss_white \
-	prop/cnf_stream_white \
-	context/context_black \
-	context/context_white \
-	context/context_mm_black \
-	context/cdo_black \
-	context/cdlist_black \
-	context/cdmap_black \
-	context/cdmap_white \
-	util/array_store_all_black \
-	util/assert_white \
-	util/check_white \
-	util/binary_heap_black \
-	util/bitvector_black \
-	util/datatype_black \
-	util/configuration_black \
-	util/output_black \
-	util/exception_black \
-	util/integer_black \
-	util/integer_white \
-	util/listener_black \
-	util/rational_black \
-	util/rational_white \
-	util/stats_black \
-	util/boolean_simplification_black \
-	main/interactive_shell_black
-endif
-
-export VERBOSE = 1
-
-# Things that aren't tests but that tests rely on and need to
-# go into the distribution
-TEST_DEPS_DIST = \
-	memory.h \
-	Makefile.tests
-
-if HAVE_CXXTESTGEN
-
-AM_CPPFLAGS = \
-	-I. \
-	"-I@top_builddir@/src" \
-	"-I@top_srcdir@/src/include" \
-	"-I@top_srcdir@/lib" \
-	"-I@top_srcdir@/src" \
-	"-I@top_srcdir@/src/prop/minisat" \
-	-D __STDC_LIMIT_MACROS \
-	-D __STDC_FORMAT_MACROS \
-	$(ANTLR_INCLUDES) \
-	$(TEST_CPPFLAGS)
-AM_CXXFLAGS = -Wall -Wno-unknown-pragmas -Wno-parentheses $(TEST_CXXFLAGS)
-AM_LDFLAGS = $(TEST_LDFLAGS) $(READLINE_LIBS) $(LIBS)
-CXXFLAGS=-Wno-suggest-override
-
-AM_CXXFLAGS_WHITE = -fno-access-control -D__BUILDING_CVC4LIB_UNIT_TEST -D__BUILDING_CVC4PARSERLIB_UNIT_TEST
-AM_CXXFLAGS_BLACK = -D__BUILDING_CVC4LIB_UNIT_TEST -D__BUILDING_CVC4PARSERLIB_UNIT_TEST
-AM_CXXFLAGS_PUBLIC =
-AM_LDFLAGS_WHITE =
-AM_LDFLAGS_BLACK =
-AM_LDFLAGS_PUBLIC =
-AM_LIBADD_WHITE = \
-	@abs_top_builddir@/src/main/libmain.a \
-	@abs_top_builddir@/src/parser/libcvc4parser.la \
-	@abs_top_builddir@/src/libcvc4.la
-AM_LIBADD_BLACK = \
-	@abs_top_builddir@/src/main/libmain.a \
-	@abs_top_builddir@/src/parser/libcvc4parser.la \
-	@abs_top_builddir@/src/libcvc4.la
-AM_LIBADD_PUBLIC = \
-	@abs_top_builddir@/src/parser/libcvc4parser.la \
-	@abs_top_builddir@/src/libcvc4.la
-
-EXTRA_DIST = \
-	no_cxxtest \
-	$(UNIT_TESTS:%=%.cpp) \
-	$(UNIT_TESTS:%=%.h) \
-	$(TEST_DEPS_DIST)
-
-MOSTLYCLEANFILES = $(UNIT_TESTS) $(UNIT_TESTS:%=%.cpp) $(UNIT_TESTS:%=%.lo)
-DISTCLEANFILES = $(UNIT_TESTS:%=@DEPDIR@/%.Plo)
-
-# the tests automake infrastructure doesn't clean up .o files :-(
-# handle both .libs and _libs variants
-mostlyclean-local:
-	@for f in $(UNIT_TESTS); do \
-		dir="$$(dirname "$$f")"; fil="$$(basename "$$f")"; \
-		for junk in	"$$dir/.libs/$$fil.o" \
-				"$$dir/_libs/$$fil.o" \
-				"$$dir/.libs/lt-$$fil" \
-				"$$dir/_libs/lt-$$fil" \
-				"$$dir/.libs/$$fil" \
-				"$$dir/_libs/$$fil"; do \
-			if test -e "$$junk"; then \
-				echo "rm -f \"$$junk\""; \
-				rm -f "$$junk"; \
-			fi; \
-		done; \
-	done
-
-@mk_include@ @srcdir@/Makefile.tests
-
-# We leave "TESTS" empty here; it's handled in Makefile.tests (see
-# that file for comment)
-TESTS = $(UNIT_TESTS)
-
-if STATIC_BINARY
-unit_LINK = $(CXXLINK) -all-static
-else
-unit_LINK = $(CXXLINK)
-endif
-
-@AMDEP_TRUE@@am__include@ $(UNIT_TESTS:%=@am__quote@./@DEPDIR@/%.Plo@am__quote@)
-
-$(UNIT_TESTS:%=@am__quote@./@DEPDIR@/%.Plo@am__quote@): %.Plo:
-	$(AM_V_at)$(MKDIR_P) `dirname "$@"`
-	$(AM_V_GEN)test -e "$@" || touch "$@"
-
-$(UNIT_TESTS:%=@abs_builddir@/%.cpp): @abs_builddir@/%.cpp: %.h
-	$(AM_V_at)$(MKDIR_P) `dirname "$@"`
-	$(AM_V_GEN)$(CXXTESTGEN) --no-static-init --have-eh --have-std --error-printer -o "$@" "$<"
-
-$(WHITE_TESTS:%=%.lo): %_white.lo: @abs_builddir@/%_white.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) $(AM_CXXFLAGS_WHITE) -MT $@ -MD -MP -MF $(DEPDIR)/$(@:%.lo=%).Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$(@:%.lo=%).Tpo $(DEPDIR)/$(@:%.lo=%).Plo
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) $(AM_CXXFLAGS_WHITE) -c -o $@ $<
-
-$(WHITE_TESTS): %_white: %_white.lo $(AM_LIBADD_WHITE)
-	$(AM_V_CXXLD)$(unit_LINK) $(AM_LIBADD_WHITE) $(AM_LDFLAGS) $(AM_LDFLAGS_WHITE) $<
-
-$(BLACK_TESTS:%=%.lo): %_black.lo: @abs_builddir@/%_black.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) $(AM_CXXFLAGS_BLACK) -MT $@ -MD -MP -MF $(DEPDIR)/$(@:%.lo=%).Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$(@:%.lo=%).Tpo $(DEPDIR)/$(@:%.lo=%).Plo
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) $(AM_CXXFLAGS_BLACK) -c -o $@ $<
-
-$(BLACK_TESTS): %_black: %_black.lo $(AM_LIBADD_BLACK)
-	$(AM_V_CXXLD)$(unit_LINK) $(AM_LIBADD_BLACK) $(AM_LDFLAGS) $(AM_LDFLAGS_BLACK) $<
-
-$(PUBLIC_TESTS:%=%.lo): %_public.lo: @abs_builddir@/%_public.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) $(AM_CXXFLAGS_PUBLIC) -MT $@ -MD -MP -MF $(DEPDIR)/$(@:%.lo=%).Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$(@:%.lo=%).Tpo $(DEPDIR)/$(@:%.lo=%).Plo
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) $(AM_CXXFLAGS_PUBLIC) -c -o $@ $<
-
-$(PUBLIC_TESTS): %_public: %_public.lo $(AM_LIBADD_PUBLIC)
-	$(AM_V_CXXLD)$(unit_LINK) $(AM_LIBADD_PUBLIC) $(AM_LDFLAGS) $(AM_LDFLAGS_PUBLIC) $<
-
-else
-
-# force a user-visible failure for "make check"
-TESTS = no_cxxtest
-
-EXTRA_DIST = \
-	no_cxxtest \
-	$(UNIT_TESTS:%=%.h) \
-	$(TEST_DEPS_DIST) \
-	no-cxxtest-available
-
-endif
-
-$(UNIT_TESTS:%=%.cpp): $(UNIT_TESTS:%=@abs_builddir@/%.cpp)
-
-# trick automake into setting LTCXXCOMPILE, CXXLINK, etc.
-if CVC4_FALSE
-noinst_LTLIBRARIES = libdummy.la
-nodist_libdummy_la_SOURCES = expr/node_black.cpp
-libdummy_la_LIBADD = @abs_top_builddir@/src/libcvc4.la
-endif
-
-# synonyms for "check" in this directory in this directory
-.PHONY: units test
-units test: check
-
-# no-ops here
-.PHONY: systemtests regress regress0 regress1 regress2 regress3 regress4
-regress regress0 regress1 regress2 regress3 regress4:
-
-if HAVE_CXXTESTGEN
-# all is fine with the world
-else
-# all is not !
-no-cxxtest-available:
-	@if test "$(I_REALLY_WANT_TO_BUILD_CVC4_DIST_WITHOUT_TESTS)" = 1; then \
-		echo; \
-		echo "WARNING:"; \
-		echo "WARNING: No CxxTest to build unit tests, but, then, you know that;"; \
-		echo "WARNING: I hope you know what you're doing."; \
-		echo "WARNING:"; \
-		echo; \
-		( echo "CxxTest was not available at the time this distribution was built,"; \
-		  echo "so the tests could not be built.  You'll need CxxTest to test this"; \
-		  echo "distribution." ) >no-cxxtest-available; \
-	else \
-		echo; \
-		echo "ERROR:"; \
-		echo "ERROR: You cannot make dist in this build directory, you do not have CxxTest."; \
-		echo "ERROR: The tests should be generated for the user and included in the tarball,"; \
-		echo "ERROR: otherwise they'll be required to have CxxTest just to test the standard"; \
-		echo "ERROR: distribution built correctly."; \
-		echo "ERROR: If you really want to do this, append the following to your make command."; \
-		echo "ERROR:"; \
-		echo "ERROR:     I_REALLY_WANT_TO_BUILD_CVC4_DIST_WITHOUT_TESTS=1"; \
-		echo "ERROR:"; \
-		echo; \
-		exit 1; \
-	fi >&2
-endif
-
diff --git a/test/unit/Makefile.tests b/test/unit/Makefile.tests
deleted file mode 100644
index e3ec536ce..000000000
--- a/test/unit/Makefile.tests
+++ /dev/null
@@ -1,20 +0,0 @@
-# This makefile is separated because it's not under automake control.
-# This gets confusing, because we want:
-#
-#  1. to (re)build only the tests in the "filtered" set of tests
-#     (those that we're going to run)
-#  2. run only the tests in the "filtered" set of tests.
-#
-# It's a pain to make automake happy.
-
-# Add "filtered" tests to the set of TESTS
-TESTS = $(filter $(TEST_PREFIX)%,$(filter %$(TEST_SUFFIX),$(UNIT_TESTS)))
-
-# subsets of the tests, based on name
-WHITE_TESTS = $(filter %_white,$(UNIT_TESTS))
-BLACK_TESTS = $(filter %_black,$(UNIT_TESTS))
-PUBLIC_TESTS = $(filter %_public,$(UNIT_TESTS))
-
-# This rule forces automake to correctly build our filtered
-# set of tests
-check-TESTS: $(TESTS)
diff --git a/test/unit/no_cxxtest b/test/unit/no_cxxtest
deleted file mode 100755
index fec2dfb82..000000000
--- a/test/unit/no_cxxtest
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-echo
-echo '***************************************************************************'
-echo '*                                                                         *'
-echo '*  WARNING:  CxxTest not found at configure time; unit tests cannot run.  *'
-echo '*                                                                         *'
-echo '***************************************************************************'
-echo
-
-# skip this test, rather than reporting an error
-exit 77