[Pkg-bitcoin-commits] [libsecp256k1] 20/45: Test whether ECDH and Schnorr are enabled for JNI

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository libsecp256k1.

commit eee808d809a95ce9bcc0357d1239b977f21dcd67
Author: Pieter Wuille <pieter.wuille at gmail.com>
Date:   Wed May 25 19:15:42 2016 +0200

    Test whether ECDH and Schnorr are enabled for JNI
---
 configure.ac | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 31561ea..47889d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -338,11 +338,21 @@ fi
 
 if test x"$use_jni" != x"no"; then
   AX_JNI_INCLUDE_DIR
+  have_jni_dependencies=yes
+  if test x"$enable_module_schnorr" = x"no"; then
+    have_jni_dependencies=no
+  fi
+  if test x"$enable_module_ecdh" = x"no"; then
+    have_jni_dependencies=no
+  fi
   if test "x$JNI_INCLUDE_DIRS" = "x"; then
+    have_jni_dependencies=no
+  fi
+  if test "x$have_jni_dependencies" = "xno"; then
     if test x"$use_jni" = x"yes"; then
-      AC_MSG_ERROR([jni support explicitly requested but headers were not found])
+      AC_MSG_ERROR([jni support explicitly requested but headers/dependencies were not found. Enable ECDH and Schnorr and try again.])
     fi
-    AC_MSG_WARN([jni headers not found. jni support disabled])
+    AC_MSG_WARN([jni headers/dependencies not found. jni support disabled])
     use_jni=no
   else
     use_jni=yes

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/libsecp256k1.git