From: Pavel Rochnyack <pavel2000@ngs.ru>
Date: Sat, 19 May 2018 11:50:06 +0000 (+0700)
Subject: Added support for libi2c-4.0
X-Git-Tag: collectd-5.9.0~254^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F2783%2Fhead;p=thirdparty%2Fcollectd.git

Added support for libi2c-4.0

Closes:  #2646
---

diff --git a/Makefile.am b/Makefile.am
index b944b4129..3d0964e0b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -593,7 +593,7 @@ if BUILD_PLUGIN_BAROMETER
 pkglib_LTLIBRARIES += barometer.la
 barometer_la_SOURCES = src/barometer.c
 barometer_la_LDFLAGS = $(PLUGIN_LDFLAGS)
-barometer_la_LIBADD = -lm
+barometer_la_LIBADD = -lm $(BUILD_WITH_LIBI2C_LIBS)
 endif
 
 if BUILD_PLUGIN_BATTERY
diff --git a/configure.ac b/configure.ac
index 8ef9fc83b..4be85bbf9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1875,14 +1875,23 @@ fi
 
 # libi2c-dev
 if test "x$ac_system" = "xLinux"; then
+  with_libi2c_libs=""
+  AC_CHECK_HEADERS([i2c/smbus.h],
+    [with_libi2c_libs="-li2c"]
+  )
   AC_CHECK_DECL([i2c_smbus_read_i2c_block_data],
     [with_libi2c="yes"],
     [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>
+      #if HAVE_I2C_SMBUS_H
+      # include <i2c/smbus.h>
+      #endif
     ]]
   )
+  BUILD_WITH_LIBI2C_LIBS="$with_libi2c_libs"
+  AC_SUBST([BUILD_WITH_LIBI2C_LIBS])
 else
   with_libi2c="no (Linux only)"
 fi
diff --git a/src/barometer.c b/src/barometer.c
index 66ab20c02..a54d998a9 100644
--- a/src/barometer.c
+++ b/src/barometer.c
@@ -27,6 +27,9 @@
 
 #include <fcntl.h>
 #include <linux/i2c-dev.h>
+#if HAVE_I2C_SMBUS_H
+#include <i2c/smbus.h>
+#endif
 #include <math.h>
 #include <stdint.h>
 #include <sys/ioctl.h>