Merge pull request #2783 from rpv-tomsk/tmpfix

Added support for libi2c-4.0

diff --combined Makefile.am
index b7d5448,3d0964e..d547a4f
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -61,7 -61,6 +61,7 @@@ EXTRA_DIST = 
        src/types.db \
        src/types.db.pod \
        src/valgrind.FreeBSD.suppress \
 +      src/valgrind.suppress \
        testwrapper.sh \
        version-gen.sh
  
@@@ -594,7 -593,7 +594,7 @@@ if BUILD_PLUGIN_BAROMETE
  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
@@@ -1760,15 -1759,18 +1760,15 @@@ virt_la_CFLAGS = $(AM_CFLAGS) 
  virt_la_LDFLAGS = $(PLUGIN_LDFLAGS)
  virt_la_LIBADD = libignorelist.la $(BUILD_WITH_LIBVIRT_LIBS) $(BUILD_WITH_LIBXML2_LIBS)
  
 -# TODO: enable once we support only modern libvirts which depends on libnl-3
 -# the libvirt on wheezy is linked in libnl v1, and there is a small leak here,
 -# triggered by the library initialization. There are no means to avoid it,
 -# and libvirt switched to libnl3 anyway
 -#test_plugin_virt_SOURCES = src/virt_test.c
 -#test_plugin_virt_CPPFLAGS = $(AM_CPPFLAGS) \
 -#     $(BUILD_WITH_LIBVIRT_CFLAGS) $(BUILD_WITH_LIBXML2_CFLAGS)
 -#test_plugin_virt_LDFLAGS = $(PLUGIN_LDFLAGS)
 -#test_plugin_virt_LDADD = libplugin_mock.la \
 -#     $(BUILD_WITH_LIBVIRT_LIBS) $(BUILD_WITH_LIBXML2_LIBS)
 -#check_PROGRAMS += test_plugin_virt
 -#TESTS += test_plugin_virt
 +test_plugin_virt_SOURCES = src/virt_test.c
 +test_plugin_virt_CPPFLAGS = $(AM_CPPFLAGS) \
 +      $(BUILD_WITH_LIBVIRT_CPPFLAGS) $(BUILD_WITH_LIBXML2_CFLAGS)
 +test_plugin_virt_LDFLAGS = $(PLUGIN_LDFLAGS) \
 +      $(BUILD_WITH_LIBVIRT_LDFLAGS) $(BUILD_WITH_LIBXML2_LDFLAGS)
 +test_plugin_virt_LDADD = libplugin_mock.la \
 +      $(BUILD_WITH_LIBVIRT_LIBS) $(BUILD_WITH_LIBXML2_LIBS)
 +check_PROGRAMS += test_plugin_virt
 +TESTS += test_plugin_virt
  endif
  
  if BUILD_PLUGIN_VMEM