build: add configure option to disable ip6tables

This also skips building the IPv6 extensions. It does not #ifdef out
all code however, I think that would make it too ugly.

Inspired-by: http://bugzilla.netfilter.org/show_bug.cgi?id=560
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>

diff --git a/Makefile.am b/Makefile.am
index 3099474652144888ee6e9acd107c465f0a30241e..a6b726c52a123548fb8fd11615daaf8d5c0ff802 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -85,11 +85,16 @@ man_MANS         = iptables.8 iptables-restore.8 iptables-save.8 \
 CLEANFILES       = iptables.8 ip6tables.8
 
 if ENABLE_STATIC
-sbin_PROGRAMS += iptables-static ip6tables-static
+sbin_PROGRAMS += iptables-static
+if ENABLE_IPV6
+sbin_PROGRAMS += ip6tables-static
+endif
 endif
 if ENABLE_SHARED
-sbin_PROGRAMS += iptables iptables-multi iptables-restore iptables-save \
-                 ip6tables ip6tables-multi ip6tables-restore ip6tables-save
+sbin_PROGRAMS += iptables iptables-multi iptables-restore iptables-save
+if ENABLE_IPV6
+sbin_PROGRAMS += ip6tables ip6tables-multi ip6tables-restore ip6tables-save
+endif
 endif
 
 iptables.8: ${srcdir}/iptables.8.in extensions/matches4.man extensions/targets4.man

diff --git a/configure.ac b/configure.ac
index 656bd372224de9767ca75eb47acac1af52efc3f7..eefcdac9e43c8b08e512ffae9da2d0e3b62ca835 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -31,6 +31,9 @@ AC_ARG_WITH([xtlibdir],
        [Path where to install Xtables extensions [[LIBEXECDIR/xtables]]]),
        [xtlibdir="$withval"],
        [xtlibdir="${libexecdir}/xtables"])
+AC_ARG_ENABLE([ipv6],
+       AS_HELP_STRING([--disable-ipv6], [Do not build ip6tables]),
+       [enable_ipv6="$enableval"], [enable_ipv6="yes"])
 AC_ARG_ENABLE([devel],
        AS_HELP_STRING([--enable-devel],
        [Install Xtables development headers]),
@@ -51,6 +54,7 @@ AC_SUBST([blacklist_modules])
 
 AM_CONDITIONAL([ENABLE_STATIC], [test "$enable_static" = "yes"])
 AM_CONDITIONAL([ENABLE_SHARED], [test "$enable_shared" = "yes"])
+AM_CONDITIONAL([ENABLE_IPV6], [test "$enable_ipv6" = "yes"])
 AM_CONDITIONAL([ENABLE_DEVEL], [test "$enable_devel" = "yes"])
 AM_CONDITIONAL([ENABLE_LIBIPQ], [test "$enable_libipq" = "yes"])
 

diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
index 256ac08eb4084ced9c12de171ccb3d9962b1f9f7..17dd5af7ccc833410e770771d08f6dc3b291d6f8 100644 (file)
--- a/extensions/GNUmakefile.in
+++ b/extensions/GNUmakefile.in
@@ -36,7 +36,7 @@ endif
 #
 pfx_build_mod := $(patsubst ${srcdir}/libxt_%.c,%,$(wildcard ${srcdir}/libxt_*.c))
 pf4_build_mod := $(patsubst ${srcdir}/libipt_%.c,%,$(wildcard ${srcdir}/libipt_*.c))
-pf6_build_mod := $(patsubst ${srcdir}/libip6t_%.c,%,$(wildcard ${srcdir}/libip6t_*.c))
+@ENABLE_IPV6_TRUE@ pf6_build_mod := $(patsubst ${srcdir}/libip6t_%.c,%,$(wildcard ${srcdir}/libip6t_*.c))
 pfx_build_mod := $(filter-out @blacklist_modules@,${pfx_build_mod})
 pf4_build_mod := $(filter-out @blacklist_modules@,${pf4_build_mod})
 pf6_build_mod := $(filter-out @blacklist_modules@,${pf6_build_mod})