X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=configure.ac;h=4be85bbf9ced37307f05cc52633665643e653fca;hb=3f4d0cbd79ca46e1b98edb10ddee3a723d69a6bb;hp=0443dbc7bc180dbc4c00e55107274a88a2c8788c;hpb=f9aaf837d506abb28e607ff86da03cbdf00cb40d;p=collectd.git

diff --git a/configure.ac b/configure.ac
index 0443dbc7..4be85bbf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -767,7 +767,6 @@ AC_FUNC_STRERROR_R
 
 SAVE_CFLAGS="$CFLAGS"
 CFLAGS="-Wall -Werror"
-fi
 
 AC_CACHE_CHECK([for strtok_r],
   [c_cv_have_strtok_r_default],
@@ -1876,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