From: Jan Engelhardt <jengelh@medozas.de>
Date: Tue, 19 Oct 2010 14:02:04 +0000 (+0200)
Subject: build: use libmnl's pkgconfig files
X-Git-Tag: v5.0-pre9~1^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7607e809e947dbdc89de84cbad960e5aa0accc91;p=ipset

build: use libmnl's pkgconfig files

libmnl installs .pc files that we can directly use and which are
preferable over AC_CHECK_LIB.

Also make sure that libipset.so is linked with libmnl, otherwise
linking errors can ensue when a program tries to link to libipset.

Furthermore, remove the now-unused LIBS variable.

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

diff --git a/configure.ac b/configure.ac
index 906ef84..99129ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -109,10 +109,7 @@ AC_PROG_INSTALL
 AC_PROG_LN_S
 
 dnl Checks for libraries
-AC_CHECK_LIB([mnl], [mnl_socket_open])
-if test x"${ac_cv_lib_mnl_mnl_socket_open}" = xno; then
-  AC_MSG_ERROR(libmnl not found)
-fi
+PKG_CHECK_MODULES([libmnl], [libmnl >= 1])
 
 dnl Checks for header files
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index bf4e133..74f36e8 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,11 +1,11 @@
 include $(top_srcdir)/Make_global.am
 
-AM_CFLAGS += -fPIC
-LIBS =
+AM_CFLAGS += -fPIC ${libmnl_CFLAGS}
 
 lib_LTLIBRARIES = libipset.la
 
 libipset_la_LDFLAGS = -version-info $(LIBVERSION)
+libipset_la_LIBADD  = ${libmnl_LIBS}
 libipset_la_SOURCES = \
 	data.c \
 	mnl.c \