From 37e8f739969be26fe92724a7fe535847340d09d1 Mon Sep 17 00:00:00 2001
From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Mon, 9 Jul 2007 15:22:32 +0000
Subject: [PATCH] We also need jni.h to compile (naturally) + move java checks
 to their own section

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3693 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---
 configure.ac | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8887eab277..fd96814ed8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -283,6 +283,27 @@ AC_SUBST([abs_srcdir])
 AC_SUBST([abs_top_builddir])
 AC_SUBST([abs_top_srcdir])
 
+
+
+SG_CONFIGURE_PART(Check for Java bindings...)
+# Java cruft
+AC_PATH_PROG([JAVAC], [javac], `which javac`)
+AC_PATH_PROG([JAVA],  [java] , `which java`)
+AC_PATH_PROG([JAR],   [jar]  , `which jar`)
+AC_CHECK_HEADERS(jni.h)
+AC_MSG_CHECKING(whether to compile java bindings)
+if test -n "$JAVAC"   \
+   && test -n "$JAVA" \
+   && test -n "$JAR"  \
+   && test "x$ac_cv_header_jni_h"="xyes" ; then
+   
+   use_java="yes"
+else   
+   use_java="no"
+fi
+AC_MSG_RESULT($use_java)
+AM_CONDITIONAL(HAVE_JAVA,test "x$use_java"="xyes")
+
 #####################
 ## Check for programs
 ##
@@ -320,15 +341,6 @@ if test x$ADDR2LINE != x ; then
   AC_DEFINE_UNQUOTED(ADDR2LINE,"$ADDR2LINE",[Path to the addr2line tool])
 fi
 
-# Java cruft
-AC_PATH_PROG([JAVAC], [javac], `which javac`)
-AC_PATH_PROG([JAVA],  [java] , `which java`)
-AC_PATH_PROG([JAR],   [jar]  , `which jar`)
-AM_CONDITIONAL(HAVE_JAVA, 
-               test -n "$JAVAC" && test -n "$JAVA" && test -n "$JAR")
-
-
-
 AC_SUBST(ac_configure_args)
 # Can we make status line about the compilation result?
 AC_CHECK_PROG(MD5SUM,md5sum,`which md5sum`)
-- 
2.20.1