From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Fri, 3 Jun 2016 18:38:10 +0000 (+0200)
Subject: mysql plugin: simplify build logic
X-Git-Tag: collectd-5.6.0~271
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2b87db455c8438ebad26f421cee409c729554e0c;p=collectd.git

mysql plugin: simplify build logic

The MySQL plugin can't be build without libmysql support.
./configure already takes care of that.
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 0ea0e294..c6f79ce2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -640,13 +640,9 @@ endif
 if BUILD_PLUGIN_MYSQL
 pkglib_LTLIBRARIES += mysql.la
 mysql_la_SOURCES = mysql.c
+mysql_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBMYSQL_CFLAGS)
 mysql_la_LDFLAGS = $(PLUGIN_LDFLAGS)
-mysql_la_CFLAGS = $(AM_CFLAGS)
-mysql_la_LIBADD =
-if BUILD_WITH_LIBMYSQL
-mysql_la_CFLAGS += $(BUILD_WITH_LIBMYSQL_CFLAGS)
-mysql_la_LIBADD += $(BUILD_WITH_LIBMYSQL_LIBS)
-endif
+mysql_la_LIBADD = $(BUILD_WITH_LIBMYSQL_LIBS)
 endif
 
 if BUILD_PLUGIN_NETAPP