diff options
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/bindings/compat/c/Makefile.am | 3 | ||||
| -rw-r--r-- | src/bindings/compat/java/Makefile.am | 5 |
3 files changed, 8 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 31dec369b..487ec7e38 100644 --- 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 3d9966d41..5a788f2bf 100644 --- 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 53e0cc3cd..5e2911af0 100644 --- 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 |