From: Florian Forster <octo@huhu.verplant.org>
Date: Mon, 18 May 2009 09:28:50 +0000 (+0200)
Subject: configure.in, java plugin: Instruct `find' to return files only.
X-Git-Tag: collectd-4.7.1~9
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=de23afd;hp=6b89dd24f42ea2ee6ac5ce05a2fb3f18ea5331aa

configure.in, java plugin: Instruct `find' to return files only.

Hopefully this solves this problem:
  /home/hudson/jdk/sample/javac -d "." "./org/collectd/api"/*.java
  /bin/sh: /home/hudson/jdk/sample/javac: is a directory
---

diff --git a/configure.in b/configure.in
index 7b82b8bd..47e7291d 100644
--- a/configure.in
+++ b/configure.in
@@ -1501,7 +1501,7 @@ then
 	if test -d "$with_java_home"
 	then
 		AC_MSG_CHECKING([for jni.h])
-		TMPDIR=`find -L "$with_java_home" -name jni.h -exec 'dirname' '{}' ';' | head -n 1`
+		TMPDIR=`find -L "$with_java_home" -name jni.h -type f -exec 'dirname' '{}' ';' | head -n 1`
 		if test "x$TMPDIR" != "x"
 		then
 			AC_MSG_RESULT([found in $TMPDIR])
@@ -1511,7 +1511,7 @@ then
 		fi
 
 		AC_MSG_CHECKING([for jni_md.h])
-		TMPDIR=`find -L "$with_java_home" -name jni_md.h -exec 'dirname' '{}' ';' | head -n 1`
+		TMPDIR=`find -L "$with_java_home" -name jni_md.h -type f -exec 'dirname' '{}' ';' | head -n 1`
 		if test "x$TMPDIR" != "x"
 		then
 			AC_MSG_RESULT([found in $TMPDIR])
@@ -1521,7 +1521,7 @@ then
 		fi
 
 		AC_MSG_CHECKING([for libjvm.so])
-		TMPDIR=`find -L "$with_java_home" -name libjvm.so -exec 'dirname' '{}' ';' | head -n 1`
+		TMPDIR=`find -L "$with_java_home" -name libjvm.so -type f -exec 'dirname' '{}' ';' | head -n 1`
 		if test "x$TMPDIR" != "x"
 		then
 			AC_MSG_RESULT([found in $TMPDIR])
@@ -1533,7 +1533,7 @@ then
 		if test "x$JAVAC" = "x"
 		then
 			AC_MSG_CHECKING([for javac])
-			TMPDIR=`find -L "$with_java_home" -name javac | head -n 1`
+			TMPDIR=`find -L "$with_java_home" -name javac -type f | head -n 1`
 			if test "x$TMPDIR" != "x"
 			then
 				JAVAC="$TMPDIR"