build: use compile/link information from pkgconfig

This is important for when the libraries are in a non-default path.
Also, libs must be listed in LDADD/LIBADD, not LDFLAGS.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>

diff --git a/filter/Makefile.am b/filter/Makefile.am
index 83a0e52c78f134c3c459b490e94a6c79f0a1c4a5..ee0a7222597c19a7f99d877e7af5196fbf59f4f8 100644 (file)
--- a/filter/Makefile.am
+++ b/filter/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS = raw2packet packet2flow
 
 AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CFLAGS = ${regular_CFLAGS}
+AM_CFLAGS = ${regular_CFLAGS} ${LIBNFNETLINK_CFLAGS}
 
 pkglibexec_LTLIBRARIES = ulogd_filter_IFINDEX.la ulogd_filter_PWSNIFF.la \
                         ulogd_filter_PRINTPKT.la ulogd_filter_PRINTFLOW.la \
@@ -9,7 +9,8 @@ pkglibexec_LTLIBRARIES = ulogd_filter_IFINDEX.la ulogd_filter_PWSNIFF.la \
                         ulogd_filter_HWHDR.la ulogd_filter_MARK.la
 
 ulogd_filter_IFINDEX_la_SOURCES = ulogd_filter_IFINDEX.c
-ulogd_filter_IFINDEX_la_LDFLAGS = -avoid-version -module -lnfnetlink
+ulogd_filter_IFINDEX_la_LDFLAGS = -avoid-version -module
+ulogd_filter_IFINDEX_la_LIBADD  = ${LIBNFNETLINK_LIBS}
 
 ulogd_filter_PWSNIFF_la_SOURCES = ulogd_filter_PWSNIFF.c
 ulogd_filter_PWSNIFF_la_LDFLAGS = -avoid-version -module

diff --git a/output/Makefile.am b/output/Makefile.am
index 3811dad20afe11584f55ff66b9b9eb2876b6608e..2ec6e8dd47b642feb77864b86db3603cc9d09730 100644 (file)
--- a/output/Makefile.am
+++ b/output/Makefile.am
@@ -1,5 +1,6 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CFLAGS = ${regular_CFLAGS}
+AM_CFLAGS = ${regular_CFLAGS} ${LIBNETFILTER_LOG_CFLAGS} \
+           ${LIBNETFILTER_CONNTRACK_CFLAGS}
 
 SUBDIRS= pcap mysql pgsql sqlite3 dbi
 
@@ -20,5 +21,6 @@ ulogd_output_NACCT_la_SOURCES = ulogd_output_NACCT.c
 ulogd_output_NACCT_la_LDFLAGS = -avoid-version -module
 
 ulogd_output_XML_la_SOURCES = ulogd_output_XML.c
-ulogd_output_XML_la_LDFLAGS = -avoid-version -module -lnetfilter_log \
-                             -lnetfilter_conntrack
+ulogd_output_XML_la_LIBADD  = ${LIBNETFILTER_LOG_LIBS} \
+                             ${LIBNETFILTER_CONNTRACK_LIBS}
+ulogd_output_XML_la_LDFLAGS = -avoid-version -module