@@ -1418,27 +1418,24 @@
 
 	AC_CHECK_HEADER(sys/socket.h, [
 		AC_DEFINE(OF_HAVE_SYS_SOCKET_H, 1,
 			[Whether we have sys/socket.h])
 	])
+
 	AC_CHECK_HEADER(netinet/in.h, [
 		AC_DEFINE(OF_HAVE_NETINET_IN_H, 1,
 			[Whether we have netinet/in.h])
 	])
 	AC_CHECK_HEADER(netinet/tcp.h, [
 		AC_DEFINE(OF_HAVE_NETINET_TCP_H, 1,
 			[Whether we have netinet/tcp.h])
 	])
-	AC_CHECK_HEADERS([arpa/inet.h netdb.h])
+	AC_CHECK_HEADERS([arpa/inet.h netdb.h net/if.h])
+	AC_CHECK_FUNCS([if_indextoname if_nametoindex])
 	AC_CHECK_HEADER(sys/un.h, [
 		AC_DEFINE(OF_HAVE_SYS_UN_H, 1, [Whether we have sys/un.h])
 	])
-	AC_CHECK_HEADER(netipx/ipx.h, [
-		AC_DEFINE(OF_HAVE_NETIPX_IPX_H, 1,
-			[Whether we have netipx/ipx.h])
-	])
-
 	AC_CHECK_MEMBER([struct sockaddr_in6.sin6_addr], [
 		AC_EGREP_CPP(egrep_cpp_yes, [
 			#ifdef _WIN32
 			typedef int BOOL;
 			#endif
@@ -1521,10 +1518,14 @@
 		#ifdef __MINT__
 		# error Gives invalid argument at runtime
 		#endif
 	])
 
+	AC_CHECK_HEADER(netipx/ipx.h, [
+		AC_DEFINE(OF_HAVE_NETIPX_IPX_H, 1,
+			[Whether we have netipx/ipx.h])
+	])
 	AC_CHECK_MEMBER(struct sockaddr_ipx.sipx_network, [], [
 		AC_CHECK_MEMBER(struct sockaddr_ipx.sa_netnum, [], [], [
 			#ifdef _WIN32
 			typedef int BOOL;
 			#endif
@@ -1592,10 +1593,101 @@
 		], [
 			AC_DEFINE(OF_HAVE_IPX, 1, [Whether we have IPX/SPX])
 			AC_SUBST(USE_SRCS_IPX, '${SRCS_IPX}')
 		])
 	])
+
+	AC_CHECK_HEADER(netat/appletalk.h, [
+		AC_DEFINE(OF_HAVE_NETAT_APPLETALK_H, 1,
+			[Whether we have netat/appletalk.h])
+	])
+	AC_CHECK_HEADER(netatalk/at.h, [
+		AC_DEFINE(OF_HAVE_NETATALK_AT_H, 1,
+			[Whether we have netatalk/at.h])
+	])
+	AC_CHECK_MEMBER(struct sockaddr_at.sat_addr, [], [
+		AC_CHECK_MEMBER(struct sockaddr_at.sat_net, [], [], [
+			#ifdef _WIN32
+			typedef int BOOL;
+			#endif
+
+			#ifdef OF_HAVE_SYS_TYPES_H
+			# include <sys/types.h>
+			#endif
+			#if defined(OF_HAVE_NETAT_APPLETALK_H)
+			# include <netat/appletalk.h>
+			#elif defined(OF_HAVE_NETATALK_AT_H)
+			# include <netatalk/at.h>
+			#endif
+
+			#ifdef _WIN32
+			# ifdef __MINGW32__
+			#  include <_mingw.h>
+			#  ifdef __MINGW64_VERSION_MAJOR
+			#   include <winsock2.h>
+			#  endif
+			# endif
+			# include <windows.h>
+			# include <atalkwsh.h>
+			#endif
+		])
+	], [
+		#ifdef _WIN32
+		typedef int BOOL;
+		#endif
+
+		#ifdef OF_HAVE_SYS_TYPES_H
+		# include <sys/types.h>
+		#endif
+		#if defined(OF_HAVE_NETAT_APPLETALK_H)
+		# include <netat/appletalk.h>
+		#elif defined(OF_HAVE_NETATALK_AT_H)
+		# include <netatalk/at.h>
+		#endif
+
+		#ifdef _WIN32
+		# ifdef __MINGW32__
+		#  include <_mingw.h>
+		#  ifdef __MINGW64_VERSION_MAJOR
+		#   include <winsock2.h>
+		#  endif
+		# endif
+		# include <windows.h>
+		# include <atalkwsh.h>
+		#endif
+	])
+	AS_IF([test x"$ac_cv_member_struct_sockaddr_at_sat_addr" = x"yes" \
+	    -o x"$ac_cv_member_struct_sockaddr_at_sat_net" = x"yes"], [
+		AC_EGREP_CPP(egrep_cpp_yes, [
+			#ifdef _WIN32
+			typedef int BOOL;
+			#endif
+
+			#ifdef OF_HAVE_SYS_SOCKET_H
+			# include <sys/socket.h>
+			#endif
+
+			#ifdef _WIN32
+			# ifdef __MINGW32__
+			#  include <_mingw.h>
+			#  ifdef __MINGW64_VERSION_MAJOR
+			#   include <winsock2.h>
+			#  endif
+			# endif
+			# include <windows.h>
+			# include <atalkwsh.h>
+			#endif
+
+			#ifdef AF_APPLETALK
+			egrep_cpp_yes
+			#endif
+		], [
+			AC_DEFINE(OF_HAVE_APPLETALK, 1,
+			    [Whether we have AppleTalk])
+			AC_SUBST(USE_SRCS_APPLETALK, '${SRCS_APPLETALK}')
+		])
+	])
 
 	AC_CHECK_FUNCS(paccept accept4, break)
 
 	AC_CHECK_FUNCS(kqueue1 kqueue, [
 		AC_DEFINE(HAVE_KQUEUE, 1, [Whether we have kqueue])
@@ -1668,10 +1760,27 @@
 			], [])
 
 			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], [
+			AC_DEFINE(HAVE_GNUTLS, 1, [Whether we have GnuTLS])
+
+			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*)
@@ -1696,27 +1805,10 @@
 					"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], [
-			AC_DEFINE(HAVE_GNUTLS, 1, [Whether we have GnuTLS])
-
-			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)
 		AC_DEFINE(HAVE_TLS_SUPPORT, 1,
@@ -2028,11 +2120,12 @@
 			# define OF_DEALLOC_UNSUPPORTED			\
 				[self doesNotRecognizeSelector: _cmd];	\
 									\
 				abort();				\
 									\
-				_Pragma("clang diagnostic push ignore	\
+				_Pragma("clang diagnostic push");	\
+			       	_Pragma("clang diagnostic ignored	\
 				    \"-Wunreachable-code\"");		\
 				[super dealloc];			\
 				_Pragma("clang diagnostic pop");
 			#else
 			# define OF_DEALLOC_UNSUPPORTED			\