From a133c9c3b637b1dbe7b5b053f7e2572c1950cead Mon Sep 17 00:00:00 2001
From: Lennart Weller <lhw@ring0.de>
Date: Thu, 27 Jul 2017 11:55:47 +0200
Subject: New upstream version 1.7.0+dfsg

---
 configure.ac | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 2c83830ca..010e0e939 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 AC_PREREQ(2.60)
 
 define([VERSION_MAJOR], [1])
-define([VERSION_MINOR], [6])
+define([VERSION_MINOR], [7])
 define([VERSION_FIX], [0])
 define([VERSION_NUMBER], VERSION_MAJOR[.]VERSION_MINOR[.]VERSION_FIX)
 define([VERSION_SUFFIX], [])
@@ -126,6 +126,7 @@ AC_CHECK_TYPES([struct timespec, clockid_t], [], [], [[#include <time.h>]])
 AC_SEARCH_LIBS([clock_gettime], [rt posix4])
 AC_CHECK_FUNCS([clock_gettime])
 AC_CHECK_FUNCS([sched_setscheduler sched_get_priority_min sched_get_priority_max nice])
+AC_CHECK_FUNCS([recvmmsg])
 
 AC_TYPE_INT8_T
 AC_TYPE_INT16_T
@@ -155,6 +156,7 @@ AC_MSG_CHECKING([operating system])
 case "$host_os" in
 freebsd*)
     build_target=freebsd
+    CFLAGS="${CFLAGS} -I/usr/local/include"
     ;;
 darwin*)
     build_target=macos
@@ -341,7 +343,30 @@ AM_CONDITIONAL([ENABLE_PLUGIN_APPS], [test "${enable_plugin_apps}" = "yes"])
 PKG_CHECK_MODULES(
     [IPMIMONITORING],
     [libipmimonitoring],
-    [have_ipmimonitoring=yes],
+    [AC_CHECK_LIB([ipmimonitoring], [
+        ipmi_monitoring_sensor_readings_by_record_id,
+        ipmi_monitoring_sensor_readings_by_sensor_type,
+        ipmi_monitoring_sensor_read_sensor_number,
+        ipmi_monitoring_sensor_read_sensor_name,
+        ipmi_monitoring_sensor_read_sensor_state,
+        ipmi_monitoring_sensor_read_sensor_units,
+        ipmi_monitoring_sensor_iterator_next,
+        ipmi_monitoring_ctx_sensor_config_file,
+        ipmi_monitoring_ctx_sdr_cache_directory,
+        ipmi_monitoring_ctx_errormsg,
+        ipmi_monitoring_ctx_create
+    ],
+        [AC_CHECK_HEADER(
+            [ipmi_monitoring.h],
+            [AC_CHECK_HEADER(
+                [ipmi_monitoring_bitmasks.h],
+                [have_ipmimonitoring=yes],
+                [have_ipmimonitoring=no]
+            )],
+            [have_ipmimonitoring=no]
+        )],
+        [have_ipmimonitoring=no]
+    )],
     [have_ipmimonitoring=no]
 )
 test "${enable_plugin_freeipmi}" = "yes" -a "${have_ipmimonitoring}" != "yes" && \
-- 
cgit v1.2.3