From: Morgan Deters <mdeters@gmail.com>
Date: Fri, 11 Dec 2009 00:15:37 +0000 (+0000)
Subject: build fixes, configuration simplifications
X-Git-Tag: cvc5-1.0.0~9379
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=82faddb718aaae5f52001e09d0754a3d254e2285;p=cvc5.git

build fixes, configuration simplifications
---

diff --git a/Makefile.in b/Makefile.in
index ecd3bc9f8..85a9a9da1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -43,7 +43,7 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	config/missing
 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/aclocal.m4 b/aclocal.m4
index 3e9cd67d1..2d13c6081 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -950,6 +950,7 @@ AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
 m4_include([config/antlr.m4])
+m4_include([config/cvc4.m4])
 m4_include([config/libtool.m4])
 m4_include([config/ltoptions.m4])
 m4_include([config/ltsugar.m4])
diff --git a/autogen.sh b/autogen.sh
index 5f0dc09e0..3ebd6c6a7 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,8 +5,8 @@
 # If the installed autotools aren't these versions, issue a warning
 # about checking results into subversion.
 libtoolize_version='libtoolize (GNU libtool) 2.2.6'
-autoheader_version='autoheader (GNU Autoconf) 2.64'
 aclocal_version='aclocal (GNU automake) 1.11'
+autoheader_version='autoheader (GNU Autoconf) 2.64'
 autoconf_version='autoconf (GNU Autoconf) 2.64'
 automake_version='automake (GNU automake) 1.11'
 
@@ -34,9 +34,9 @@ set -ex
 
 cd "$(dirname "$0")"
 libtoolize --copy
+aclocal -I config
 autoheader -I config
 touch NEWS README AUTHORS ChangeLog
 touch stamp-h
-aclocal -I config
 autoconf -I config
 automake -ac --foreign -Woverride
diff --git a/config/cvc4.m4 b/config/cvc4.m4
new file mode 100644
index 000000000..eea9478c6
--- /dev/null
+++ b/config/cvc4.m4
@@ -0,0 +1,30 @@
+# CVC4_AC_INIT
+# ------------
+# Do early initialization/diversion of autoconf things for CVC4 build process.
+AC_DEFUN([CVC4_AC_INIT],
+[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
+
+unset ac_cvc4_rewritten_args
+for ac_option
+do
+  case $ac_option in
+    -*|*=*) ;;
+    *) ac_cvc4_build_profile_set=yes
+       AC_MSG_WARN([building profile $ac_option])
+       ac_option="--with-build=$ac_option" ;;
+  esac
+  eval 'ac_cvc4_rewritten_args="${ac_cvc4_rewritten_args+$ac_cvc4_rewritten_args }\"$ac_option\""'
+done
+eval set x $ac_cvc4_rewritten_args
+shift
+echo "args are now:" "${@}"
+m4_divert_pop([PARSE_ARGS])dnl
+])# CVC4_REWRITE_ARGS_FOR_BUILD_PROFILE
diff --git a/configure b/configure
index ae26d8ef1..f75e15ee6 100755
--- a/configure
+++ b/configure
@@ -370,44 +370,12 @@ as_fn_error ()
   as_fn_exit $as_status
 } # as_fn_error
 
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
 if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
   as_dirname=dirname
 else
   as_dirname=false
 fi
 
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
 # Avoid depending upon Character Ranges.
 as_cr_letters='abcdefghijklmnopqrstuvwxyz'
 as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
@@ -914,6 +882,21 @@ TEST_CXXFLAGS
 TEST_LDFLAGS'
 
 
+unset ac_cvc4_rewritten_args
+for ac_option
+do
+  case $ac_option in
+    -*|*=*) ;;
+    *) ac_cvc4_build_profile_set=yes
+       $as_echo "$as_me: WARNING: building profile $ac_option" >&2
+       ac_option="--with-build=$ac_option" ;;
+  esac
+  eval 'ac_cvc4_rewritten_args="${ac_cvc4_rewritten_args+$ac_cvc4_rewritten_args }\"$ac_option\""'
+done
+eval set x $ac_cvc4_rewritten_args
+shift
+echo "args are now:" "${@}"
+
 # Initialize some variables set by options.
 ac_init_help=
 ac_init_version=false
@@ -2609,7 +2592,6 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
 ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
-#AC_CONFIG_LIBOBJ_DIR([lib])
 
 
 CVC4_RELEASE=prerelease
@@ -5123,13 +5105,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:5126: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:5108: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5129: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:5111: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5132: output\"" >&5)
+  (eval echo "\"\$as_me:5114: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -6335,7 +6317,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6338 "configure"' > conftest.$ac_ext
+  echo '#line 6320 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7805,11 +7787,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7808: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7790: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7812: \$? = $ac_status" >&5
+   echo "$as_me:7794: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8144,11 +8126,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8147: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8129: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8151: \$? = $ac_status" >&5
+   echo "$as_me:8133: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8249,11 +8231,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8252: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8234: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8256: \$? = $ac_status" >&5
+   echo "$as_me:8238: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8304,11 +8286,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8307: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8289: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8311: \$? = $ac_status" >&5
+   echo "$as_me:8293: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10687,7 +10669,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10690 "configure"
+#line 10672 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10783,7 +10765,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10786 "configure"
+#line 10768 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14641,11 +14623,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14644: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14626: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14648: \$? = $ac_status" >&5
+   echo "$as_me:14630: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -14740,11 +14722,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14743: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14725: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14747: \$? = $ac_status" >&5
+   echo "$as_me:14729: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14792,11 +14774,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14795: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14777: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14799: \$? = $ac_status" >&5
+   echo "$as_me:14781: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
diff --git a/configure.ac b/configure.ac
index 7ba7a2b67..21e74726e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,11 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
+CVC4_AC_INIT
+
 AC_PREREQ([2.59])
 AC_INIT([src/include/cvc4_config.h])
 AC_CONFIG_AUX_DIR([config])
-#AC_CONFIG_LIBOBJ_DIR([lib])
 AC_CONFIG_MACRO_DIR([config])
 
 CVC4_RELEASE=prerelease
diff --git a/contrib/Makefile.in b/contrib/Makefile.in
index 33b2c08c8..a43e24709 100644
--- a/contrib/Makefile.in
+++ b/contrib/Makefile.in
@@ -38,7 +38,7 @@ subdir = contrib
 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/doc/Makefile.in b/doc/Makefile.in
index 1dedb1739..7dd071a2c 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -38,7 +38,7 @@ subdir = doc
 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/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 \
diff --git a/test/Makefile.in b/test/Makefile.in
index 42dd98fdd..0fecac937 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -38,7 +38,7 @@ subdir = test
 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/test/regress/Makefile.in b/test/regress/Makefile.in
index 691753a0f..451d333e2 100644
--- a/test/regress/Makefile.in
+++ b/test/regress/Makefile.in
@@ -38,7 +38,7 @@ subdir = test/regress
 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/test/unit/Makefile.in b/test/unit/Makefile.in
index c60adee32..bcd2d239c 100644
--- a/test/unit/Makefile.in
+++ b/test/unit/Makefile.in
@@ -39,7 +39,7 @@ subdir = test/unit
 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 \