From: Patrick McHardy <kaber@trash.net>
Date: Thu, 12 Feb 2009 06:09:55 +0000 (+0100)
Subject: Merge branch 'master' of git://dev.medozas.de/iptables
X-Git-Tag: v1.4.3~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f3c30059d9cf73c438db08998c58cd1b502eb44;p=thirdparty%2Fiptables.git

Merge branch 'master' of git://dev.medozas.de/iptables
---

6f3c30059d9cf73c438db08998c58cd1b502eb44
diff --cc Makefile.am
index 96de1b2e,0e247176..dbdfa97a
--- a/Makefile.am
+++ b/Makefile.am
@@@ -19,9 -20,8 +20,9 @@@ libxtables_la_LIBADD  = -ld
  # iptables, dynamic
  iptables_SOURCES          = iptables-standalone.c iptables.c
  iptables_LDFLAGS          = -rdynamic
- iptables_LDADD            = -ldl -lm libiptc/libiptc.a extensions/libext4.a libxtables.la
+ iptables_LDADD            = -lm libiptc/libiptc.a extensions/libext4.a libxtables.la
  
 +iptables_xml_LDADD        = -ldl libxtables.la
  iptables_multi_SOURCES    = iptables-multi.c iptables-save.c \
                              iptables-restore.c iptables-xml.c \
                              iptables-standalone.c iptables.c