@@ -1394,10 +1394,11 @@
 
 	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, [
@@ -1406,15 +1407,10 @@
 	])
 	AC_CHECK_HEADERS([arpa/inet.h netdb.h])
 	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
@@ -1497,10 +1493,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
@@ -1568,10 +1568,87 @@
 		], [
 			AC_DEFINE(OF_HAVE_IPX, 1, [Whether we have IPX/SPX])
 			AC_SUBST(USE_SRCS_IPX, '${SRCS_IPX}')
 		])
 	])
+
+	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_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_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])