Permalink
Browse files

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.
  • Loading branch information...
1 parent 5eaccf9 commit 4bc220f3498ae88299dd7a557aa77d3df99e02f5 @zanchey zanchey committed Jan 9, 2017
Showing with 1 addition and 3 deletions.
  1. +0 −1 configure.ac
  2. +1 −2 src/env_universal_common.cpp
View
@@ -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.] )] )
@@ -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") {

0 comments on commit 4bc220f

Please sign in to comment.