]> git.ipfire.org Git - thirdparty/iptables.git/commitdiff
Merge branch 'master' of git://dev.medozas.de/iptables
authorPatrick McHardy <kaber@trash.net>
Thu, 12 Feb 2009 06:09:55 +0000 (07:09 +0100)
committerPatrick McHardy <kaber@trash.net>
Thu, 12 Feb 2009 06:09:55 +0000 (07:09 +0100)
1  2 
Makefile.am
include/xtables.h.in
ip6tables.c
iptables.c
xtables.c

diff --cc Makefile.am
index 96de1b2eed65f241b62042b1b198c0e2c93aeebb,0e247176af5a7e68bae768fbf3dd0a8b616c75e1..dbdfa97a3b847f04ccd5585e70f42e2ec2b2929e
@@@ -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
Simple merge
diff --cc ip6tables.c
Simple merge
diff --cc iptables.c
Simple merge
diff --cc xtables.c
Simple merge