From 4ccc6085bc0f65b9accddc396b493e58d175d3ca Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 20 Jun 2011 11:30:55 +0100 Subject: [PATCH 08/14] Remove check for abstract sockets, not relevant to dbus-glib --- configure.ac | 67 ---------------------------------------------------------- 1 files changed, 0 insertions(+), 67 deletions(-) diff --git a/configure.ac b/configure.ac index 42c45b5..9f6be68 100644 --- a/configure.ac +++ b/configure.ac @@ -242,73 +242,6 @@ if test "x$dbus_have_socklen_t" = "xyes"; then AC_DEFINE(HAVE_SOCKLEN_T,1,[Have socklen_t type]) fi -#### Abstract sockets - -AC_LANG_PUSH(C) -AC_CACHE_CHECK([abstract socket namespace], - ac_cv_have_abstract_sockets, - [AC_RUN_IFELSE([AC_LANG_PROGRAM( -[[ -#include -#include -#include -#include -#include -#include -#include -]], -[[ - int listen_fd; - struct sockaddr_un addr; - - listen_fd = socket (PF_UNIX, SOCK_STREAM, 0); - - if (listen_fd < 0) - { - fprintf (stderr, "socket() failed: %s\n", strerror (errno)); - exit (1); - } - - memset (&addr, '\0', sizeof (addr)); - addr.sun_family = AF_UNIX; - strcpy (addr.sun_path, "X/tmp/dbus-fake-socket-path-used-in-configure-test"); - addr.sun_path[0] = '\0'; /* this is what makes it abstract */ - - if (bind (listen_fd, (struct sockaddr*) &addr, SUN_LEN (&addr)) < 0) - { - fprintf (stderr, "Abstract socket namespace bind() failed: %s\n", - strerror (errno)); - exit (1); - } - else - exit (0); -]])], - [ac_cv_have_abstract_sockets=yes], - [ac_cv_have_abstract_sockets=no] -)]) -AC_LANG_POP(C) - -if test x$enable_abstract_sockets = xyes; then - if test x$ac_cv_have_abstract_sockets = xno; then - AC_MSG_ERROR([Abstract sockets explicitly required, and support not detected.]) - fi -fi - -if test x$enable_abstract_sockets = xno; then - ac_cv_have_abstract_sockets=no; -fi - -if test x$ac_cv_have_abstract_sockets = xyes ; then - DBUS_PATH_OR_ABSTRACT=abstract - AC_DEFINE(HAVE_ABSTRACT_SOCKETS,1,[Have abstract socket namespace]) -else - DBUS_PATH_OR_ABSTRACT=path -fi - -# this is used in addresses to prefer abstract, e.g. -# unix:path=/foo or unix:abstract=/foo -AC_SUBST(DBUS_PATH_OR_ABSTRACT) - #### Sort out XML library # see what we have -- 1.7.5.4