From 6cb3de0e1370deaf43eeb1fb84dfe1f3a625483f Mon Sep 17 00:00:00 2001 From: Morgan Deters Date: Thu, 6 Oct 2011 00:09:25 +0000 Subject: [PATCH] don't build language bindings unless expressly requested with --enable-language-bindings --- config/bindings.m4 | 2 +- src/bindings/compat/java/Makefile.am | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/config/bindings.m4 b/config/bindings.m4 index e328810fb..c478b6da3 100644 --- a/config/bindings.m4 +++ b/config/bindings.m4 @@ -23,7 +23,7 @@ AC_ARG_WITH([swig], 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=yes; try_bindings=]) + [cvc4_check_for_bindings=no; try_bindings=]) CVC4_LANGUAGE_BINDINGS= if test "$noswig" = yes; then AC_MSG_WARN([use of swig disabled by user.]) diff --git a/src/bindings/compat/java/Makefile.am b/src/bindings/compat/java/Makefile.am index 14701ebb3..9fc25ed05 100644 --- a/src/bindings/compat/java/Makefile.am +++ b/src/bindings/compat/java/Makefile.am @@ -19,6 +19,7 @@ AM_CXXFLAGS = -Wall lib_LTLIBRARIES = data_DATA = +BUILT_SOURCES = if CVC4_LANGUAGE_BINDING_JAVA @@ -28,6 +29,7 @@ libcvc4bindings_java_compat_la_LDFLAGS = \ -version-info $(LIBCVC4BINDINGS_VERSION) libcvc4bindings_java_compat_la_LIBADD = \ -L@builddir@/../../../compat -lcvc4compat +BUILT_SOURCES += $(JNI_CPP_FILES) endif @@ -114,7 +116,6 @@ CPP_FILES = $(SRC_CPP_FILES) $(JNI_CPP_FILES) dist_libcvc4bindings_java_compat_la_SOURCES = $(SRC_CPP_FILES) $(IMPL_FILES) include/cvc3/JniUtils.h nodist_libcvc4bindings_java_compat_la_SOURCES = $(JNI_CPP_FILES) -BUILT_SOURCES = $(JNI_CPP_FILES) EXTRA_DIST = \ formula_value.h \ -- 2.30.2