From: Ivo De Decker <ivo.dedecker@ugent.be>
Date: Mon, 7 Feb 2011 07:54:55 +0000 (+0100)
Subject: Build system: Check the pkg-config names "libmodbus" *and* "modbus".
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=2ca4c7dd5013059c911323d1b1c00073b8e58848;p=collectd.git

Build system: Check the pkg-config names "libmodbus" *and* "modbus".

Florian,

Attached is the updated version of the datagroup patch. The code itself didn't
change (apart from the rename dataset -> datagroup). It should apply cleanly
to the latest version of the master branch.

I also attached a patch to the configure.in script to make pkg-config check
for 'libmodbus' as well as 'modbus'. Different versions of the library use
different names.

Greetings,

Ivo De Decker

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
---

diff --git a/configure.in b/configure.in
index 8be79655..6d9ec652 100644
--- a/configure.in
+++ b/configure.in
@@ -2126,20 +2126,26 @@ fi
 if test "x$with_libmodbus" = "xuse_pkgconfig"
 then
 	AC_MSG_NOTICE([Checking for modbus using $PKG_CONFIG])
-	$PKG_CONFIG --exists 'modbus' 2>/dev/null
+	libmodbus_pkgconfig_name='libmodbus'
+	$PKG_CONFIG --exists $libmodbus_pkgconfig_name 2>/dev/null
 	if test $? -ne 0
 	then
-		with_libmodbus="no (pkg-config doesn't know modbus)"
+		libmodbus_pkgconfig_name='modbus'
+		$PKG_CONFIG --exists $libmodbus_pkgconfig_name 2>/dev/null
+		if test $? -ne 0
+		then
+			with_libmodbus="no (pkg-config doesn't know modbus or libmodbus)"
+		fi
 	fi
 fi
 if test "x$with_libmodbus" = "xuse_pkgconfig"
 then
-	with_libmodbus_cflags="`$PKG_CONFIG --cflags 'modbus'`"
+	with_libmodbus_cflags="`$PKG_CONFIG --cflags $libmodbus_pkgconfig_name`"
 	if test $? -ne 0
 	then
 		with_libmodbus="no ($PKG_CONFIG failed)"
 	fi
-	with_libmodbus_libs="`$PKG_CONFIG --libs 'modbus'`"
+	with_libmodbus_libs="`$PKG_CONFIG --libs $libmodbus_pkgconfig_name`"
 	if test $? -ne 0
 	then
 		with_libmodbus="no ($PKG_CONFIG failed)"