From: Ruben Kerkhof <ruben@tilaa.nl>
Date: Fri, 11 Dec 2015 20:38:06 +0000 (+0100)
Subject: Merge pull request #1457 from rubenk/java-plugin-fixups
X-Git-Tag: collectd-5.6.0~498
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=0471b66b98b002d216d2ac885a1716afced24561;hp=-c;p=collectd.git

Merge pull request #1457 from rubenk/java-plugin-fixups

Java plugin fixups
---

0471b66b98b002d216d2ac885a1716afced24561
diff --combined configure.ac
index 84bfe8c5,0e60f7df..c857a309
--- a/configure.ac
+++ b/configure.ac
@@@ -396,7 -396,7 +396,7 @@@ AC_CHECK_HEADERS(sys/sysctl.h, [], []
  AC_MSG_CHECKING([for sysctl kern.cp_times])
  if test -x /sbin/sysctl
  then
 -	/sbin/sysctl kern.cp_times 2>/dev/null
 +	/sbin/sysctl kern.cp_times >/dev/null 2>&1
  	if test $? -eq 0
  	then
  		AC_MSG_RESULT([yes])
@@@ -2183,9 -2183,6 +2183,6 @@@ if test "x$with_java_home" = "x
  then
  	with_java_home="/usr/lib/jvm"
  fi
- with_java_vmtype="client"
- with_java_cflags=""
- with_java_libs=""
  JAVAC="$JAVAC"
  JAR="$JAR"
  AC_ARG_WITH(java, [AS_HELP_STRING([--with-java@<:@=PREFIX@:>@], [Path to Java home.])],
@@@ -2278,6 -2275,10 +2275,10 @@@ if test "x$JAVA_LDFLAGS" != "x
  then
  	AC_MSG_NOTICE([Building with JAVA_LDFLAGS set to: $JAVA_LDFLAGS])
  fi
+ if test "x$JAVA_LIBS" != "x"
+ then
+ 	AC_MSG_NOTICE([Building with JAVA_LIBS set to: $JAVA_LIBS])
+ fi
  if test "x$JAVAC" = "x"
  then
  	with_javac_path="$PATH"
@@@ -2318,9 -2319,11 +2319,11 @@@ f
  SAVE_CPPFLAGS="$CPPFLAGS"
  SAVE_CFLAGS="$CFLAGS"
  SAVE_LDFLAGS="$LDFLAGS"
+ SAVE_LIBS="$LIBS"
  CPPFLAGS="$CPPFLAGS $JAVA_CPPFLAGS"
  CFLAGS="$CFLAGS $JAVA_CFLAGS"
  LDFLAGS="$LDFLAGS $JAVA_LDFLAGS"
+ LIBS="$LIBS $JAVA_LIBS"
  
  if test "x$with_java" = "xyes"
  then
@@@ -2330,7 -2333,7 +2333,7 @@@ if test "x$with_java" = "xyes
  then
  	AC_CHECK_LIB(jvm, JNI_CreateJavaVM,
  	[with_java="yes"],
- 	[with_java="no (libjvm not found)"],
+ 	[with_java="no (Symbol 'JNI_CreateJavaVM' not found)"],
  	[$JAVA_LIBS])
  fi
  if test "x$with_java" = "xyes"
@@@ -2342,6 -2345,7 +2345,7 @@@ f
  CPPFLAGS="$SAVE_CPPFLAGS"
  CFLAGS="$SAVE_CFLAGS"
  LDFLAGS="$SAVE_LDFLAGS"
+ LIBS="$SAVE_LIBS"
  
  AC_SUBST(JAVA_CPPFLAGS)
  AC_SUBST(JAVA_CFLAGS)
@@@ -3235,13 -3239,13 +3239,13 @@@ f
  
  # --with-libowcapi {{{
  with_libowcapi_cppflags=""
 -with_libowcapi_libs="-lowcapi"
 +with_libowcapi_ldflags=""
  AC_ARG_WITH(libowcapi, [AS_HELP_STRING([--with-libowcapi@<:@=PREFIX@:>@], [Path to libowcapi.])],
  [
  	if test "x$withval" != "xno" && test "x$withval" != "xyes"
  	then
  		with_libowcapi_cppflags="-I$withval/include"
 -		with_libowcapi_libs="-L$withval/lib -lowcapi"
 +		with_libowcapi_ldflags="-L$withval/lib"
  		with_libowcapi="yes"
  	else
  		with_libowcapi="$withval"
@@@ -3253,7 -3257,7 +3257,7 @@@
  if test "x$with_libowcapi" = "xyes"
  then
  	SAVE_CPPFLAGS="$CPPFLAGS"
 -	CPPFLAGS="$with_libowcapi_cppflags"
 +	CPPFLAGS="$CPPFLAGS $with_libowcapi_cppflags"
  
  	AC_CHECK_HEADERS(owcapi.h, [with_libowcapi="yes"], [with_libowcapi="no (owcapi.h not found)"])
  
@@@ -3263,7 -3267,7 +3267,7 @@@ if test "x$with_libowcapi" = "xyes
  then
  	SAVE_LDFLAGS="$LDFLAGS"
  	SAVE_CPPFLAGS="$CPPFLAGS"
 -	LDFLAGS="$with_libowcapi_libs"
 +	LDFLAGS="$LDFLAGS $with_libowcapi_ldflags"
  	CPPFLAGS="$with_libowcapi_cppflags"
  
  	AC_CHECK_LIB(owcapi, OW_get, [with_libowcapi="yes"], [with_libowcapi="no (libowcapi not found)"])
@@@ -3274,10 -3278,8 +3278,10 @@@ f
  if test "x$with_libowcapi" = "xyes"
  then
  	BUILD_WITH_LIBOWCAPI_CPPFLAGS="$with_libowcapi_cppflags"
 -	BUILD_WITH_LIBOWCAPI_LIBS="$with_libowcapi_libs"
 +	BUILD_WITH_LIBOWCAPI_LDFLAGS="$with_libowcapi_ldflags"
 +	BUILD_WITH_LIBOWCAPI_LIBS="-lowcapi"
  	AC_SUBST(BUILD_WITH_LIBOWCAPI_CPPFLAGS)
 +	AC_SUBST(BUILD_WITH_LIBOWCAPI_LDFLAGS)
  	AC_SUBST(BUILD_WITH_LIBOWCAPI_LIBS)
  fi
  # }}}
@@@ -4087,6 -4089,11 +4091,6 @@@ the
  	SAVE_CPPFLAGS="$CPPFLAGS"
  	CPPFLAGS="$CPPFLAGS $with_sensors_cflags"
  
 -#	AC_CHECK_HEADERS(sensors/sensors.h,
 -#	[
 -#		AC_DEFINE(HAVE_SENSORS_SENSORS_H, 1, [Define to 1 if you have the <sensors/sensors.h> header file.])
 -#	],
 -#	[with_libsensors="no (sensors/sensors.h not found)"])
  	AC_CHECK_HEADERS(sensors/sensors.h, [], [with_libsensors="no (sensors/sensors.h not found)"])
  
  	CPPFLAGS="$SAVE_CPPFLAGS"
@@@ -5122,8 -5129,11 +5126,8 @@@ AM_CONDITIONAL(BUILD_WITH_LIBATASMART, 
  
  PKG_CHECK_MODULES([LIBNOTIFY], [libnotify],
  		[with_libnotify="yes"],
 -		[if test "x$LIBNOTIFY_PKG_ERRORS" = "x"; then
 -			 with_libnotify="no"
 -		 else
 -			 with_libnotify="no ($LIBNOTIFY_PKG_ERRORS)"
 -		 fi])
 +		[with_libnotify="no (pkg-config doesn't know libnotify)"]
 +)
  
  # Check for enabled/disabled features
  #
@@@ -5411,6 -5421,7 +5415,6 @@@ the
  fi
  
  # libi2c-dev
 -with_libi2c="no"
  if test "x$ac_system" = "xLinux"
  then
  AC_CHECK_DECL(i2c_smbus_read_i2c_block_data,
@@@ -5418,8 -5429,6 +5422,8 @@@
  	[with_libi2c="no (symbol i2c_smbus_read_i2c_block_data not found - have you installed libi2c-dev ?)"],
  	[[#include <stdlib.h>
  	#include <linux/i2c-dev.h>]])
 +else
 +	with_libi2c="no (Linux only)"
  fi
  
  if test "x$with_libi2c" = "xyes"