Adjust library dependencies to be more correct (fixes lintian warnings).

diff --git a/configure.ac b/configure.ac
index 31dec369b67d27cfd6e6defe44a2c7dadee69ed5..487ec7e3845aa471a700582bd28a0c4e8aa6b95a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -335,8 +335,10 @@ if test $cvc4_use_cln != 0; then
   )
 fi
 if test $cvc4_use_cln = 0; then
-  # try GMPXX, fail if not found
-  AC_CHECK_LIB(gmpxx, __gmpz_init, , [AC_MSG_ERROR([GNU MP C++ library (libgmpxx) not found, see http://gmplib.org/])])
+  # 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"

diff --git a/src/bindings/compat/c/Makefile.am b/src/bindings/compat/c/Makefile.am
index 3d9966d416cda5a0d8eddb52ee84807a10a70be4..5a788f2bfa6a73183cebb5203c55b8e792202dc7 100644 (file)
--- a/src/bindings/compat/c/Makefile.am
+++ b/src/bindings/compat/c/Makefile.am
@@ -25,7 +25,8 @@ lib_LTLIBRARIES += libcvc4bindings_c_compat.la
 libcvc4bindings_c_compat_la_LDFLAGS = \
        -version-info $(LIBCVC4BINDINGS_VERSION)
 libcvc4bindings_c_compat_la_LIBADD = \
-       -L@builddir@/../../../compat -lcvc4compat
+       -L@builddir@/../../../compat -lcvc4compat \
+       -L@builddir@/../../.. -lcvc4
 
 endif
 

diff --git a/src/bindings/compat/java/Makefile.am b/src/bindings/compat/java/Makefile.am
index 53e0cc3cdb879d7f5260585e695a15b6eea9020a..5e2911af05343b4157ca124dbca6c1da9e4e5a5d 100644 (file)
--- a/src/bindings/compat/java/Makefile.am
+++ b/src/bindings/compat/java/Makefile.am
@@ -33,9 +33,8 @@ libcvc4compatjni_la_LDFLAGS = \
        -shrext $(CVC4_JAVA_MODULE_EXT) \
        -version-info $(LIBCVC4BINDINGS_VERSION)
 libcvc4compatjni_la_LIBADD = \
-       -L@builddir@/../../.. -lcvc4 \
-       -L@builddir@/../../../parser -lcvc4parser \
-       -L@builddir@/../../../compat -lcvc4compat
+       -L@builddir@/../../../compat -lcvc4compat \
+       -L@builddir@/../../.. -lcvc4
 BUILT_SOURCES += $(JNI_CPP_FILES)
 
 endif