X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=configure.ac;h=f623263f00463014638773702f3925ad77af6cf7;hb=e68993d241360e8da64e1c1f2d8adb3bc7f67e34;hp=c9e98e153e33db8d06ec965483cb69aee58fe337;hpb=4d04d3b7e32b8777f7c7b04110b74194b991fbea;p=collectd.git

diff --git a/configure.ac b/configure.ac
index c9e98e15..f623263f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,6 +54,10 @@ AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 AC_PROG_LEX
 AC_PROG_YACC
+
+# Warn when pkg.m4 is missing
+m4_pattern_forbid([^_?PKG_[A-Z_]+$],[*** pkg.m4 missing, please install pkg-config])
+
 PKG_PROG_PKG_CONFIG
 
 AC_CHECK_PROG([have_protoc_c], [protoc-c], [yes], [no])
@@ -2185,7 +2189,7 @@ then
 		fi
 
 		AC_MSG_CHECKING([for libjvm.so])
-		TMPVAR=`find -L "$with_java_home" -type f -name libjvm.so -o -name libjvm.dylib -exec 'dirname' '{}' ';' 2>/dev/null | head -n 1`
+		TMPVAR=`find -L "$with_java_home" -type f \( -name libjvm.so -o -name libjvm.dylib \) -exec 'dirname' '{}' ';' 2>/dev/null | head -n 1`
 		if test "x$TMPVAR" != "x"
 		then
 			AC_MSG_RESULT([found in $TMPVAR])