From 2b87db455c8438ebad26f421cee409c729554e0c Mon Sep 17 00:00:00 2001 From: Ruben Kerkhof Date: Fri, 3 Jun 2016 20:38:10 +0200 Subject: [PATCH] mysql plugin: simplify build logic The MySQL plugin can't be build without libmysql support. ./configure already takes care of that. --- src/Makefile.am | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) 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 -- 2.11.0