From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Wed, 25 May 2016 14:15:32 +0000 (+0200)
Subject: Stop hardcoding libudev
X-Git-Tag: collectd-5.5.2~13^2
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=0c8d275;p=collectd.git

Stop hardcoding libudev
---

diff --git a/configure.ac b/configure.ac
index e86d9b9c..ceb0b30d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4495,8 +4495,10 @@ if test "x$with_libudev" = "xyes"
 then
 	BUILD_WITH_LIBUDEV_CFLAGS="$with_libudev_cflags"
 	BUILD_WITH_LIBUDEV_LDFLAGS="$with_libudev_ldflags"
+	BUILD_WITH_LIBUDEV_LIBS="-ludev"
 	AC_SUBST(BUILD_WITH_LIBUDEV_CFLAGS)
 	AC_SUBST(BUILD_WITH_LIBUDEV_LDFLAGS)
+	AC_SUBST(BUILD_WITH_LIBUDEV_LIBS)
 fi
 AM_CONDITIONAL(BUILD_WITH_LIBUDEV, test "x$with_libudev" = "xyes")
 # }}}
diff --git a/src/Makefile.am b/src/Makefile.am
index a3da05f3..f11bd562 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -317,7 +317,7 @@ endif
 if BUILD_WITH_LIBUDEV
 disk_la_CFLAGS += $(BUILD_WITH_LIBUDEV_CFLAGS)
 disk_la_LDFLAGS += $(BUILD_WITH_LIBUDEV_LDFLAGS)
-disk_la_LIBADD += -ludev
+disk_la_LIBADD += $(BULD_WITH_LIBUDEV_LIBS)
 endif
 if BUILD_WITH_PERFSTAT
 disk_la_LIBADD += -lperfstat
@@ -920,7 +920,7 @@ pkglib_LTLIBRARIES += smart.la
 smart_la_SOURCES = smart.c
 smart_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBATASMART_CPPFLAGS) $(BUILD_WITH_LIBUDEV_CFLAGS)
 smart_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBATASMART_LDFLAGS) $(BUILD_WITH_LIBUDEV_LDFLAGS)
-smart_la_LIBADD = $(BUILD_WITH_LIBATASMART_LIBS) -ludev
+smart_la_LIBADD = $(BUILD_WITH_LIBATASMART_LIBS) $(BUILD_WITH_LIBUDEV_LIBS)
 endif
 endif