From: "Jörg Sommer" <joerg.sommer@navimatix.de>
To: libtirpc-devel@lists.sourceforge.net
Cc: linux-nfs@vger.kernel.org, "Jörg Sommer" <joerg.sommer@navimatix.de>
Subject: [PATCH] netconfig: remove tcp6, udp6 on --disable-ipv6
Date: Thu, 12 Oct 2023 16:28:29 +0200 [thread overview]
Message-ID: <077bbd32e8b7474dc5f153997732e1e6aec7fad6.1697120909.git.joerg.sommer@navimatix.de> (raw)
If the configuration for IPv6 is disabled, the netconfig should not contain
settings for tcp6 and udp6.
The test for the configure option didn't work, because it check the wrong
variable.
Signed-off-by: Jörg Sommer <joerg.sommer@navimatix.de>
---
configure.ac | 2 +-
doc/Makefile.am | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index fe6c517..b687f8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,7 +64,7 @@ fi
AC_ARG_ENABLE(ipv6,
[AC_HELP_STRING([--disable-ipv6], [Disable IPv6 support @<:@default=no@:>@])],
[],[enable_ipv6=yes])
-AM_CONDITIONAL(INET6, test "x$disable_ipv6" != xno)
+AM_CONDITIONAL(INET6, test "x$enable_ipv6" != xno)
if test "x$enable_ipv6" != xno; then
AC_DEFINE(INET6, 1, [Define to 1 if IPv6 is available])
fi
diff --git a/doc/Makefile.am b/doc/Makefile.am
index d42ab90..b9678f6 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,3 +2,8 @@ dist_sysconf_DATA = netconfig bindresvport.blacklist
CLEANFILES = cscope.* *~
DISTCLEANFILES = Makefile.in
+
+if ! INET6
+install-exec-hook:
+ $(SED) -i '/^tcp6\|^udp6/d' "$(DESTDIR)$(sysconfdir)"/netconfig
+endif
--
2.34.1
next reply other threads:[~2023-10-12 14:29 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-12 14:28 Jörg Sommer [this message]
2024-01-05 16:53 ` [PATCH] netconfig: remove tcp6, udp6 on --disable-ipv6 Steve Dickson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=077bbd32e8b7474dc5f153997732e1e6aec7fad6.1697120909.git.joerg.sommer@navimatix.de \
--to=joerg.sommer@navimatix.de \
--cc=libtirpc-devel@lists.sourceforge.net \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.