make DO_IPV6 work again..

diff --git a/Makefile b/Makefile
index 953c0aa1be4ce2b760fae462a90e06a0b2f8a059..29688bc3014fbad35bc50a6fef0409c9375ed3ab 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,9 @@
 # uncomment this to get a fully statically linked version
 # NO_SHARED_LIBS = 1
 
+# uncomment this to disable IPv6 support
+# DO_IPV6 = 0
+
 ######################################################################
 # YOU SHOULD NOT NEED TO TOUCH ANYTHING BELOW THIS LINE
 ######################################################################
@@ -25,7 +28,7 @@ RELEASE_DIR:=/tmp
 
 # Need libc6 for this.  FIXME: Should covert to autoconf.
 ifeq ($(shell [ -f /usr/include/netinet/ip6.h ] && echo YES), YES)
-DO_IPV6=1
+DO_IPV6:=1
 endif
 
 COPT_FLAGS:=-O2
@@ -41,7 +44,7 @@ SH_CFLAGS:=$(CFLAGS) -fPIC
 STATIC_LIBS  =
 STATIC6_LIBS =
 LDFLAGS      = -rdynamic
-LDLIBS       = -ldl
+LDLIBS       = -ldl -lnsl
 else
 DEPFILES = $(EXT_OBJS:%.o=%.d)
 STATIC_LIBS  = extensions/libext.a
@@ -57,7 +60,7 @@ EXTRA_INSTALLS+=$(DESTDIR)$(BINDIR)/iptables $(DESTDIR)$(MANDIR)/man8/iptables.8
 EXTRAS+=iptables-save iptables-restore
 EXTRA_INSTALLS+=$(DESTDIR)$(BINDIR)/iptables-save $(DESTDIR)$(BINDIR)/iptables-restore $(DESTDIR)$(MANDIR)/man8/iptables-restore.8 $(DESTDIR)$(MANDIR)/man8/iptables-save.8
 
-ifdef DO_IPV6
+ifeq ($(DO_IPV6), 1)
 EXTRAS+=ip6tables ip6tables.o
 EXTRA_INSTALLS+=$(DESTDIR)$(BINDIR)/ip6tables $(DESTDIR)$(MANDIR)/man8/ip6tables.8
 EXTRAS_EXP+=ip6tables-save ip6tables-restore

diff --git a/extensions/Makefile b/extensions/Makefile
index 2513b8b6082ac5aa7e8240e2f3ad742c690c8c08..44783cffe87c44e3935168243d4304eb8168939d 100644 (file)
--- a/extensions/Makefile
+++ b/extensions/Makefile
@@ -22,7 +22,7 @@ ifndef NO_SHARED_LIBS
 SHARED_LIBS+=$(foreach T,$(PF_EXT_SLIB),extensions/libipt_$(T).so)
 EXTRA_INSTALLS+=$(foreach T, $(PF_EXT_SLIB), $(DESTDIR)$(LIBDIR)/iptables/libipt_$(T).so)
 
-ifdef DO_IPV6
+ifeq ($(DO_IPV6), 1)
 SHARED_LIBS+=$(foreach T,$(PF6_EXT_SLIB),extensions/libip6t_$(T).so)
 EXTRA_INSTALLS+=$(foreach T, $(PF6_EXT_SLIB), $(DESTDIR)$(LIBDIR)/iptables/libip6t_$(T).so)
 endif

diff --git a/libiptc/Makefile b/libiptc/Makefile
index b8a36c585b31ae1231542191c08e61fba590ac37..1fbebef291eb3f9fc3991c7d3e6c56d471f1f16d 100644 (file)
--- a/libiptc/Makefile
+++ b/libiptc/Makefile
@@ -13,7 +13,7 @@ EXTRA_DEPENDS+=libiptc/libip4tc.d
 
 libiptc/libiptc.a: libiptc/libiptc.a(libiptc/libip4tc.o)
 
-ifdef DO_IPV6
+ifeq ($(DO_IPV6), 1)
 EXTRA_DEPENDS+= libiptc/libip6tc.d
 libiptc/libiptc.a: libiptc/libiptc.a(libiptc/libip6tc.o)
 endif