build fixes, configuration simplifications

13 files changed, 13 insertions, 13 deletions

diff --git a/src/Makefile.in b/src/Makefile.in
index fb902f2ce..8f33fd330 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -39,7 +39,7 @@ subdir = src
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/config/antlr.m4 \
-	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/cvc4.m4 $(top_srcdir)/config/libtool.m4 \
 	$(top_srcdir)/config/ltoptions.m4 \
 	$(top_srcdir)/config/ltsugar.m4 \
 	$(top_srcdir)/config/ltversion.m4 \
diff --git a/src/context/Makefile.in b/src/context/Makefile.in
index a7a000c3e..0e5281ca6 100644
--- a/src/context/Makefile.in
+++ b/src/context/Makefile.in
@@ -39,7 +39,7 @@ subdir = src/context
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/config/antlr.m4 \
-	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/cvc4.m4 $(top_srcdir)/config/libtool.m4 \
 	$(top_srcdir)/config/ltoptions.m4 \
 	$(top_srcdir)/config/ltsugar.m4 \
 	$(top_srcdir)/config/ltversion.m4 \
diff --git a/src/expr/Makefile.in b/src/expr/Makefile.in
index de0bad1bd..a668e8876 100644
--- a/src/expr/Makefile.in
+++ b/src/expr/Makefile.in
@@ -39,7 +39,7 @@ subdir = src/expr
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/config/antlr.m4 \
-	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/cvc4.m4 $(top_srcdir)/config/libtool.m4 \
 	$(top_srcdir)/config/ltoptions.m4 \
 	$(top_srcdir)/config/ltsugar.m4 \
 	$(top_srcdir)/config/ltversion.m4 \
diff --git a/src/main/Makefile.in b/src/main/Makefile.in
index 6498610be..ba924109e 100644
--- a/src/main/Makefile.in
+++ b/src/main/Makefile.in
@@ -40,7 +40,7 @@ subdir = src/main
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/config/antlr.m4 \
-	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/cvc4.m4 $(top_srcdir)/config/libtool.m4 \
 	$(top_srcdir)/config/ltoptions.m4 \
 	$(top_srcdir)/config/ltsugar.m4 \
 	$(top_srcdir)/config/ltversion.m4 \
diff --git a/src/parser/Makefile.in b/src/parser/Makefile.in
index 24cd1ed84..b2e066f8d 100644
--- a/src/parser/Makefile.in
+++ b/src/parser/Makefile.in
@@ -39,7 +39,7 @@ subdir = src/parser
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/config/antlr.m4 \
-	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/cvc4.m4 $(top_srcdir)/config/libtool.m4 \
 	$(top_srcdir)/config/ltoptions.m4 \
 	$(top_srcdir)/config/ltsugar.m4 \
 	$(top_srcdir)/config/ltversion.m4 \
diff --git a/src/parser/cvc/Makefile.in b/src/parser/cvc/Makefile.in
index b953d3c54..cbab2fd5c 100644
--- a/src/parser/cvc/Makefile.in
+++ b/src/parser/cvc/Makefile.in
@@ -39,7 +39,7 @@ subdir = src/parser/cvc
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/config/antlr.m4 \
-	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/cvc4.m4 $(top_srcdir)/config/libtool.m4 \
 	$(top_srcdir)/config/ltoptions.m4 \
 	$(top_srcdir)/config/ltsugar.m4 \
 	$(top_srcdir)/config/ltversion.m4 \
diff --git a/src/parser/smt/Makefile.in b/src/parser/smt/Makefile.in
index e153135c5..281d2152b 100644
--- a/src/parser/smt/Makefile.in
+++ b/src/parser/smt/Makefile.in
@@ -39,7 +39,7 @@ subdir = src/parser/smt
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/config/antlr.m4 \
-	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/cvc4.m4 $(top_srcdir)/config/libtool.m4 \
 	$(top_srcdir)/config/ltoptions.m4 \
 	$(top_srcdir)/config/ltsugar.m4 \
 	$(top_srcdir)/config/ltversion.m4 \
diff --git a/src/prop/Makefile.in b/src/prop/Makefile.in
index 5fb636c23..6d4e7f0b5 100644
--- a/src/prop/Makefile.in
+++ b/src/prop/Makefile.in
@@ -39,7 +39,7 @@ subdir = src/prop
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/config/antlr.m4 \
-	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/cvc4.m4 $(top_srcdir)/config/libtool.m4 \
 	$(top_srcdir)/config/ltoptions.m4 \
 	$(top_srcdir)/config/ltsugar.m4 \
 	$(top_srcdir)/config/ltversion.m4 \
diff --git a/src/prop/minisat/Makefile.in b/src/prop/minisat/Makefile.in
index e77369348..a2cc36300 100644
--- a/src/prop/minisat/Makefile.in
+++ b/src/prop/minisat/Makefile.in
@@ -39,7 +39,7 @@ subdir = src/prop/minisat
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/config/antlr.m4 \
-	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/cvc4.m4 $(top_srcdir)/config/libtool.m4 \
 	$(top_srcdir)/config/ltoptions.m4 \
 	$(top_srcdir)/config/ltsugar.m4 \
 	$(top_srcdir)/config/ltversion.m4 \
diff --git a/src/smt/Makefile.in b/src/smt/Makefile.in
index c3c47037d..7c60db89b 100644
--- a/src/smt/Makefile.in
+++ b/src/smt/Makefile.in
@@ -39,7 +39,7 @@ subdir = src/smt
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/config/antlr.m4 \
-	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/cvc4.m4 $(top_srcdir)/config/libtool.m4 \
 	$(top_srcdir)/config/ltoptions.m4 \
 	$(top_srcdir)/config/ltsugar.m4 \
 	$(top_srcdir)/config/ltversion.m4 \
diff --git a/src/theory/Makefile.in b/src/theory/Makefile.in
index 15b0f0b21..7af3f957c 100644
--- a/src/theory/Makefile.in
+++ b/src/theory/Makefile.in
@@ -39,7 +39,7 @@ subdir = src/theory
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/config/antlr.m4 \
-	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/cvc4.m4 $(top_srcdir)/config/libtool.m4 \
 	$(top_srcdir)/config/ltoptions.m4 \
 	$(top_srcdir)/config/ltsugar.m4 \
 	$(top_srcdir)/config/ltversion.m4 \
diff --git a/src/theory/uf/Makefile.in b/src/theory/uf/Makefile.in
index d80103452..4920e7a0c 100644
--- a/src/theory/uf/Makefile.in
+++ b/src/theory/uf/Makefile.in
@@ -39,7 +39,7 @@ subdir = src/theory/uf
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/config/antlr.m4 \
-	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/cvc4.m4 $(top_srcdir)/config/libtool.m4 \
 	$(top_srcdir)/config/ltoptions.m4 \
 	$(top_srcdir)/config/ltsugar.m4 \
 	$(top_srcdir)/config/ltversion.m4 \
diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index 9f17df4c7..61768f933 100644
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -39,7 +39,7 @@ subdir = src/util
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/config/antlr.m4 \
-	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/cvc4.m4 $(top_srcdir)/config/libtool.m4 \
 	$(top_srcdir)/config/ltoptions.m4 \
 	$(top_srcdir)/config/ltsugar.m4 \
 	$(top_srcdir)/config/ltversion.m4 \