dbs: Fix expat plugin linking

dbs/expat/Makefile.am

@@ -1,9 +1,8 @@
 db_LTLIBRARIES += kdb-expat.la
 kdb_expat_la_SOURCES =
-kdb_expat_la_LDFLAGS = $(AM_LDFLAGS) $(EXPAT_LDFLAGS) -avoid-version -module
-kdb_expat_la_LIBS = $(EXPAT_LIBS)
-kdb_expat_la_CFLAGS = $(AM_LDFLAGS) $(EXPAT_CFLAGS)
-kdb_expat_la_LIBADD = libklish-helper-xml.la
+kdb_expat_la_LDFLAGS = $(AM_LDFLAGS) @EXPAT_LDFLAGS@ -avoid-version -module
+kdb_expat_la_CFLAGS = $(AM_LDFLAGS) @EXPAT_CFLAGS@
+kdb_expat_la_LIBADD = libklish-helper-xml.la @EXPAT_LIBS@
 
 kdb_expat_la_SOURCES += \
 	dbs/expat/expat_api.c \

dbs/expat/expat_api.c

@@ -6,7 +6,7 @@
  * and populate the CLI tree based on the contents. It implements
  * the kxml_ API using the expat XML parser
  *
- * expat is not your typicall XML parser. It does not work
+ * expat is not your typical XML parser. It does not work
  * by creating a full in-memory XML tree, but by calling specific
  * callbacks (element handlers) regularly while parsing. It's up
  * to the user to create the corresponding XML tree if needed

dbs/libxml2/Makefile.am

@@ -1,9 +1,8 @@
 db_LTLIBRARIES += kdb-libxml2.la
 kdb_libxml2_la_SOURCES =
-kdb_libxml2_la_LDFLAGS = $(AM_LDFLAGS) $(LIBXML2_LDFLAGS) -avoid-version -module
-kdb_libxml2_la_LIBS = $(LIBXML2_LIBS)
-kdb_libxml2_la_CFLAGS = $(AM_LDFLAGS) $(LIBXML2_CFLAGS)
-kdb_libxml2_la_LIBADD = libklish-helper-xml.la
+kdb_libxml2_la_LDFLAGS = $(AM_LDFLAGS) @LIBXML2_LDFLAGS@ -avoid-version -module
+kdb_libxml2_la_CFLAGS = $(AM_LDFLAGS) @LIBXML2_CFLAGS@
+kdb_libxml2_la_LIBADD = libklish-helper-xml.la @LIBXML2_LIBS@
 
 kdb_libxml2_la_SOURCES += \
 	dbs/libxml2/libxml2_api.c \

dbs/roxml/Makefile.am

@@ -1,9 +1,8 @@
 db_LTLIBRARIES += kdb-roxml.la
 kdb_roxml_la_SOURCES =
-kdb_roxml_la_LDFLAGS = $(AM_LDFLAGS) $(ROXML_LDFLAGS) -avoid-version -module
-kdb_roxml_la_LIBS = $(ROXML_LIBS)
-kdb_roxml_la_CFLAGS = $(AM_LDFLAGS) $(ROXML_CFLAGS)
-kdb_roxml_la_LIBADD = libklish-helper-xml.la
+kdb_roxml_la_LDFLAGS = $(AM_LDFLAGS) @ROXML_LDFLAGS@ -avoid-version -module
+kdb_roxml_la_CFLAGS = $(AM_LDFLAGS) @ROXML_CFLAGS@
+kdb_roxml_la_LIBADD = libklish-helper-xml.la @ROXML_LIBS@
 
 kdb_roxml_la_SOURCES += \
 	dbs/roxml/roxml_api.c \