From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Date: Mon, 25 Oct 2010 12:53:04 +0000 (+0200)
Subject: Merge branch 'ipset-5' of git://dev.medozas.de/ipset into ipset-5
X-Git-Tag: v5.0-pre9~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a68e0f336a746d6f23f6af1d2ce632069c671d17;p=thirdparty%2Fipset.git

Merge branch 'ipset-5' of git://dev.medozas.de/ipset into ipset-5
---

a68e0f336a746d6f23f6af1d2ce632069c671d17
diff --cc lib/Makefile.am
index 2d3df033,79b81dbf..7913877d
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@@ -6,10 -5,9 +5,11 @@@ AM_CFLAGS += ${libmnl_CFLAGS
  lib_LTLIBRARIES = libipset.la
  
  libipset_la_LDFLAGS = -version-info $(LIBVERSION)
+ libipset_la_LIBADD  = ${libmnl_LIBS}
  libipset_la_SOURCES = \
  	data.c \
 +	icmp.c \
 +	icmpv6.c \
  	mnl.c \
  	parse.c \
  	print.c \