From: Ruben Kerkhof <ruben@tilaa.nl>
Date: Fri, 11 Dec 2015 20:37:22 +0000 (+0100)
Subject: Merge pull request #1454 from rubenk/libi2c-dev-mark-as-linux-only
X-Git-Tag: collectd-5.6.0~500
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=70ea9457f76d6cd953f2cbd64eeda0ff265f47db;hp=-c;p=collectd.git

Merge pull request #1454 from rubenk/libi2c-dev-mark-as-linux-only

libi2c only exists on Linux
---

70ea9457f76d6cd953f2cbd64eeda0ff265f47db
diff --combined configure.ac
index afb08197,f46cedbd..82591e43
--- 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])
@@@ -3235,13 -3235,13 +3235,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 -3253,7 +3253,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 -3263,7 +3263,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 -3274,8 +3274,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
  # }}}
@@@ -5127,8 -5125,11 +5127,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
  #
@@@ -5416,7 -5417,6 +5416,6 @@@ the
  fi
  
  # libi2c-dev
- with_libi2c="no"
  if test "x$ac_system" = "xLinux"
  then
  AC_CHECK_DECL(i2c_smbus_read_i2c_block_data,
@@@ -5424,6 -5424,8 +5423,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"