build: add configure option to disable ipv4 iptables

This patch complements the previous one.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>

diff --git a/Makefile.am b/Makefile.am
index a6b726c52a123548fb8fd11615daaf8d5c0ff802..fd99098f9604adae7369a078490a8a28bc4ea03b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -85,13 +85,17 @@ man_MANS         = iptables.8 iptables-restore.8 iptables-save.8 \
 CLEANFILES       = iptables.8 ip6tables.8
 
 if ENABLE_STATIC
+if ENABLE_IPV4
 sbin_PROGRAMS += iptables-static
+endif
 if ENABLE_IPV6
 sbin_PROGRAMS += ip6tables-static
 endif
 endif
 if ENABLE_SHARED
+if ENABLE_IPV4
 sbin_PROGRAMS += iptables iptables-multi iptables-restore iptables-save
+endif
 if ENABLE_IPV6
 sbin_PROGRAMS += ip6tables ip6tables-multi ip6tables-restore ip6tables-save
 endif

diff --git a/configure.ac b/configure.ac
index eefcdac9e43c8b08e512ffae9da2d0e3b62ca835..152ad59284557020c8ffb7acacfb7d14f9ef0eed 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([ipv4],
+       AS_HELP_STRING([--disable-ipv4], [Do not build iptables]),
+       [enable_ipv4="$enableval"], [enable_ipv4="yes"])
 AC_ARG_ENABLE([ipv6],
        AS_HELP_STRING([--disable-ipv6], [Do not build ip6tables]),
        [enable_ipv6="$enableval"], [enable_ipv6="yes"])
@@ -54,6 +57,7 @@ AC_SUBST([blacklist_modules])
 
 AM_CONDITIONAL([ENABLE_STATIC], [test "$enable_static" = "yes"])
 AM_CONDITIONAL([ENABLE_SHARED], [test "$enable_shared" = "yes"])
+AM_CONDITIONAL([ENABLE_IPV4], [test "$enable_ipv4" = "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 17dd5af7ccc833410e770771d08f6dc3b291d6f8..66a4f46aa88a9e50327a0fd12eada1f2b0cd222b 100644 (file)
--- a/extensions/GNUmakefile.in
+++ b/extensions/GNUmakefile.in
@@ -35,7 +35,7 @@ endif
 #      Wildcard module list
 #
 pfx_build_mod := $(patsubst ${srcdir}/libxt_%.c,%,$(wildcard ${srcdir}/libxt_*.c))
-pf4_build_mod := $(patsubst ${srcdir}/libipt_%.c,%,$(wildcard ${srcdir}/libipt_*.c))
+@ENABLE_IPV4_TRUE@ pf4_build_mod := $(patsubst ${srcdir}/libipt_%.c,%,$(wildcard ${srcdir}/libipt_*.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})