X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=configure.in;h=107dbe39e872434de81ade84b481531cfece1de9;hb=c983405b9f18cce28d6301124a5426e53adc63b2;hp=89bdeaa2d8397a4045dce8ce528769b78a81630c;hpb=a86c1a6b695f5f967fb102da12a9f93dcee26ed3;p=collectd.git

diff --git a/configure.in b/configure.in
index 89bdeaa2..107dbe39 100644
--- a/configure.in
+++ b/configure.in
@@ -1554,6 +1554,7 @@ with_java_vmtype="client"
 with_java_cflags=""
 with_java_libs=""
 JAVAC="$JAVAC"
+JAR="$JAR"
 AC_ARG_WITH(java, [AS_HELP_STRING([--with-java@<:@=PREFIX@:>@], [Path to Java home.])],
 [
 	if test "x$withval" = "xno"
@@ -1614,6 +1615,18 @@ then
 				AC_MSG_RESULT([not found])
 			fi
 		fi
+		if test "x$JAR" = "x"
+		then
+			AC_MSG_CHECKING([for jar])
+			TMPDIR=`find "$with_java_home" -name jar -type f | head -n 1`
+			if test "x$TMPDIR" != "x"
+			then
+				JAR="$TMPDIR"
+				AC_MSG_RESULT([$JAR])
+			else
+				AC_MSG_RESULT([not found])
+			fi
+		fi
 	else if test "x$with_java_home" != "x"
 	then
 		AC_MSG_WARN([JAVA_HOME: No such directory: $with_java_home])
@@ -1650,6 +1663,24 @@ if test "x$JAVAC" = "x"
 then
 	with_java="no (javac not found)"
 fi
+if test "x$JAR" = "x"
+then
+	with_jar_path="$PATH"
+	if test "x$with_java_home" != "x"
+	then
+		with_jar_path="$with_java_home:with_jar_path"
+		if test -d "$with_java_home/bin"
+		then
+			with_jar_path="$with_jar_home/bin:with_jar_path"
+		fi
+	fi
+
+	AC_PATH_PROG(JAR, jar, [], "$with_jar_path")
+fi
+if test "x$JAR" = "x"
+then
+	with_java="no (jar not found)"
+fi
 
 SAVE_CPPFLAGS="$CPPFLAGS"
 SAVE_CFLAGS="$CFLAGS"