From 87331f84a27c12756b2a2c0aaae79df580ca828c Mon Sep 17 00:00:00 2001
From: Xavier de Gaye <xdegaye@gmail.com>
Date: Mon, 18 Mar 2019 17:22:26 +0100
Subject: [PATCH] Do not set ipv6type in configure.ac when cross-compiling

---
 .../2019-03-18-17-21-26.bpo-36351.a8CwyA.rst     |  1 +
 configure                                        | 16 ++--------------
 configure.ac                                     |  2 +-
 3 files changed, 4 insertions(+), 15 deletions(-)
 create mode 100644 Misc/NEWS.d/next/Build/2019-03-18-17-21-26.bpo-36351.a8CwyA.rst

diff --git a/Misc/NEWS.d/next/Build/2019-03-18-17-21-26.bpo-36351.a8CwyA.rst b/Misc/NEWS.d/next/Build/2019-03-18-17-21-26.bpo-36351.a8CwyA.rst
new file mode 100644
index 00000000000000..f119b7277a568d
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2019-03-18-17-21-26.bpo-36351.a8CwyA.rst
@@ -0,0 +1 @@
+Do not set ipv6type in configure.ac when cross-compiling.
diff --git a/configure b/configure
index d0ef8a601b287b..a1e0b221cf83fb 100755
--- a/configure
+++ b/configure
@@ -783,7 +783,6 @@ infodir
 docdir
 oldincludedir
 includedir
-runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -895,7 +894,6 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1148,15 +1146,6 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
-  -runstatedir | --runstatedir | --runstatedi | --runstated \
-  | --runstate | --runstat | --runsta | --runst | --runs \
-  | --run | --ru | --r)
-    ac_prev=runstatedir ;;
-  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
-  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
-  | --run=* | --ru=* | --r=*)
-    runstatedir=$ac_optarg ;;
-
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1294,7 +1283,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir runstatedir
+		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1447,7 +1436,6 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -11004,7 +10992,7 @@ ipv6type=unknown
 ipv6lib=none
 ipv6trylibc=no
 
-if test "$ipv6" = "yes"; then
+if test "$ipv6" = yes -a "$cross_compiling" = no; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking ipv6 stack type" >&5
 $as_echo_n "checking ipv6 stack type... " >&6; }
 	for i in inria kame linux-glibc linux-inet6 solaris toshiba v6d zeta;
diff --git a/configure.ac b/configure.ac
index 73ee71c6d24997..7a84b6f0090244 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3233,7 +3233,7 @@ ipv6type=unknown
 ipv6lib=none
 ipv6trylibc=no
 
-if test "$ipv6" = "yes"; then
+if test "$ipv6" = yes -a "$cross_compiling" = no; then
 	AC_MSG_CHECKING([ipv6 stack type])
 	for i in inria kame linux-glibc linux-inet6 solaris toshiba v6d zeta;
 	do