@@ -1448,10 +1448,12 @@
 			#ifdef AF_INET6
 			egrep_cpp_yes
 			#endif
 		], [
 			AC_DEFINE(OF_HAVE_IPV6, 1, [Whether we have IPv6])
+
+			AC_CHECK_FUNCS(inet6_getscopeid)
 		])
 	], [
 		dnl Work around a bug in autoconf 2.61 that creates a broken
 		dnl configure if this branch is empty.
 		:
@@ -1783,25 +1785,10 @@
 
 			LIBS="$old_LIBS"
 		])
 	])
 
-	AS_IF([test x"$with_tls" = x"gnutls" \
-	    -o \( x"$with_tls" = x"yes" -a x"$tls_support" = x"no" \)], [
-		PKG_CHECK_MODULES(gnutls, [gnutls >= 3.5.0], [
-			tls_support="GnuTLS"
-			TLS_CPPFLAGS="$gnutls_CFLAGS $TLS_CPPFLAGS"
-			TLS_LIBS="$gnutls_LIBS $TLS_LIBS"
-
-			AC_SUBST(OF_GNUTLS_TLS_STREAM_M, "OFGnuTLSTLSStream.m")
-		], [
-			dnl Disable default action-if-not-found, which exits
-			dnl configure with an error.
-			:
-		])
-	])
-
 	AS_IF([test x"$with_tls" = x"openssl" \
 	    -o \( x"$with_tls" = x"yes" -a x"$tls_support" = x"no" \)], [
 		case "$host_os" in
 		morphos*)
 			ssl="ssl_shared"
@@ -1821,10 +1808,25 @@
 				AC_SUBST(OF_OPENSSL_TLS_STREAM_M,
 					"OFOpenSSLTLSStream.m")
 			])
 		], [], [-l$crypto])
 	])
+
+	AS_IF([test x"$with_tls" = x"gnutls" \
+	    -o \( x"$with_tls" = x"yes" -a x"$tls_support" = x"no" \)], [
+		PKG_CHECK_MODULES(gnutls, [gnutls >= 3.5.0], [
+			tls_support="GnuTLS"
+			TLS_CPPFLAGS="$gnutls_CFLAGS $TLS_CPPFLAGS"
+			TLS_LIBS="$gnutls_LIBS $TLS_LIBS"
+
+			AC_SUBST(OF_GNUTLS_TLS_STREAM_M, "OFGnuTLSTLSStream.m")
+		], [
+			dnl Disable default action-if-not-found, which exits
+			dnl configure with an error.
+			:
+		])
+	])
 
 	AS_IF([test x"$tls_support" != x"no"], [
 		AC_SUBST(TLS, "tls")
 		AC_SUBST(TLS_CPPFLAGS)
 		AC_SUBST(TLS_LIBS)