From 4bc220f3498ae88299dd7a557aa77d3df99e02f5 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Mon, 9 Jan 2017 22:01:45 +0800
Subject: [PATCH] Drop requirement for socket library

The socket(2) library function is only required on Linux, and does not
require special linker arguments to work.

Closes #2360.
---
 configure.ac                 | 1 -
 src/env_universal_common.cpp | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8587735e7..5dcec05ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -270,7 +270,6 @@ esac
 #
 
 # Check for os dependant libraries for all binaries.
-AC_SEARCH_LIBS( connect, [socket network], , [AC_MSG_ERROR([Cannot find the socket library, needed to build this package.] )] )
 AC_SEARCH_LIBS( nanosleep, rt, , [AC_MSG_ERROR([Cannot find the rt library, needed to build this package.] )] )
 AC_SEARCH_LIBS( shm_open, rt, [AC_DEFINE([HAVE_SHM_OPEN], [1], [Define to 1 if the shm_open() function exists])] )
 AC_SEARCH_LIBS( pthread_create, pthread, , [AC_MSG_ERROR([Cannot find the pthread library, needed to build this package.] )] )
diff --git a/src/env_universal_common.cpp b/src/env_universal_common.cpp
index 399c6d011..299e01465 100644
--- a/src/env_universal_common.cpp
+++ b/src/env_universal_common.cpp
@@ -16,10 +16,8 @@
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>  // IWYU pragma: keep
 #endif
-#include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/time.h>  // IWYU pragma: keep
-#include <sys/types.h>
 // We need the sys/file.h for the flock() declaration on Linux but not OS X.
 #include <sys/file.h>  // IWYU pragma: keep
 // We need the ioctl.h header so we can check if SIOCGIFHWADDR is defined by it so we know if we're
@@ -866,6 +864,7 @@ void env_universal_t::parse_message_internal(const wcstring &msgstr, var_table_t
 #ifdef SIOCGIFHWADDR
 
 // Linux
+#include <sys/socket.h>
 #include <net/if.h>
 static bool get_mac_address(unsigned char macaddr[MAC_ADDRESS_MAX_LEN],
                             const char *interface = "eth0") {