diff --git a/configure.ac b/configure.ac
index 2dfa9d86e2253da056d594137f91c14b8db2b995..f623263f00463014638773702f3925ad77af6cf7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
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])
fi
if test "x$have_protoc_c" = "xyes"
then
- AC_CHECK_LIB([protobuf-c], [protobuf_c_version],
+ AC_CHECK_LIB([protobuf-c], [protobuf_c_message_pack],
[have_protoc_c="yes"],
[have_protoc_c="no (libprotobuf-c not found)"])
fi
AC_MSG_CHECKING([for libjvm.so])
- TMPVAR=`find -L "$with_java_home" -name libjvm.so -type f -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])