ping plugin: Protect access to ping_thread_error.

[collectd.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 2175bee..6cdfcd6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -70,7 +70,7 @@ then
 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)"])
 
@@ -1971,8 +1971,10 @@ fi
 
 SAVE_CPPFLAGS="$CPPFLAGS"
 SAVE_LDFLAGS="$LDFLAGS"
+SAVE_LIBS="$LIBS"
 CPPFLAGS="$CPPFLAGS $GCRYPT_CPPFLAGS"
 LDFLAGS="$LDFLAGS $GCRYPT_LDFLAGS"
+LIBS="$LIBS $GCRYPT_LIBS"
 
 if test "x$with_libgcrypt" = "xyes"
 then
@@ -2000,6 +2002,7 @@ fi
 
 CPPFLAGS="$SAVE_CPPFLAGS"
 LDFLAGS="$SAVE_LDFLAGS"
+LIBS="$SAVE_LIBS"
 
 if test "x$with_libgcrypt" = "xyes"
 then
@@ -2182,7 +2185,7 @@ then
                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])