|
@@ -0,0 +1,42 @@
|
|
|
+From ab7769e4b57741c654f1a815b006d6548104ba95 Mon Sep 17 00:00:00 2001
|
|
|
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
|
+Date: Sat, 10 Nov 2012 22:24:56 +0100
|
|
|
+Subject: [PATCH] Make IPv6 configurable
|
|
|
+
|
|
|
+Add an autoconf check that verifies whether IPv6 is available or not,
|
|
|
+and define the INET6 macro if available, instead of hardcoding it in
|
|
|
+src/Makefile.am.
|
|
|
+
|
|
|
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
|
+---
|
|
|
+ configure.in | 3 +++
|
|
|
+ src/Makefile.am | 2 +-
|
|
|
+ 2 files changed, 4 insertions(+), 1 deletion(-)
|
|
|
+
|
|
|
+diff --git a/configure.in b/configure.in
|
|
|
+index de1c730..57f0bf0 100644
|
|
|
+--- a/configure.in
|
|
|
++++ b/configure.in
|
|
|
+@@ -61,6 +61,9 @@ AC_ARG_ENABLE(libwrap,[ --enable-libwrap Enables host name checking],
|
|
|
+ esac],[libwarp=false])
|
|
|
+ AM_CONDITIONAL(LIBWRAP, test x$libwarp = xtrue)
|
|
|
+
|
|
|
++AC_CHECK_HEADER(netinet/ip6.h,
|
|
|
++ AC_DEFINE(INET6, 1, [Define to 1 if IPv6 is available]))
|
|
|
++
|
|
|
+ AC_CONFIG_FILES([Makefile src/Makefile man/Makefile])
|
|
|
+ AC_OUTPUT()
|
|
|
+
|
|
|
+diff --git a/src/Makefile.am b/src/Makefile.am
|
|
|
+index cc0a85b..3826eca 100644
|
|
|
+--- a/src/Makefile.am
|
|
|
++++ b/src/Makefile.am
|
|
|
+@@ -1,4 +1,4 @@
|
|
|
+-INCLUDES = -I$(srcdir)/tirpc -DPORTMAP -DINET6 -DVERSION="\"$(VERSION)\"" \
|
|
|
++INCLUDES = -I$(srcdir)/tirpc -DPORTMAP -DVERSION="\"$(VERSION)\"" \
|
|
|
+ -D_GNU_SOURCE -Wall -pipe
|
|
|
+ if DEBUG
|
|
|
+ INCLUDES += -DRPCBIND_DEBUG -DSVC_RUN_DEBUG -DDEBUG_RMTCALL
|
|
|
+--
|
|
|
+1.7.9.5
|
|
|
+
|