Code

mysql plugin: simplify build logic
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 3 Jun 2016 18:38:10 +0000 (20:38 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 3 Jun 2016 18:38:10 +0000 (20:38 +0200)
The MySQL plugin can't be build without libmysql support.
./configure already takes care of that.

src/Makefile.am

index 0ea0e294cec0bfa9f946261f40c3da763729cbbe..c6f79ce258e6acb4f32d7b910b208cf7fb155102 100644 (file)
@@ -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