projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Build system: Check the pkg-config names "libmodbus" *and* "modbus".
[collectd.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
8be7965
..
6d9ec65
100644
(file)
--- 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])
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
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
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
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)"
if test $? -ne 0
then
with_libmodbus="no ($PKG_CONFIG failed)"