X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=configure.ac;h=8f7a4f33e16d985631a54bb7cc0750c34bc3cbc4;hb=218c57128f2e54960133cff3e774b5ef9944068a;hp=7fee37599cd9d07a91768ac7f69817751ca5477f;hpb=f9a6df05238501ca41931af0d8d51acea716c105;p=collectd.git

diff --git a/configure.ac b/configure.ac
index 7fee3759..8f7a4f33 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])
@@ -2233,7 +2237,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])