Rather than checking for <sys/sockio.h>, just include it if our other

attempts at finding SIOCATMARK have failed.  This removes one of our
Autoconf tests, which is always nice.

[originally from svn r5690]

diff --git a/unix/configure.ac b/unix/configure.ac
index 0cbd5ceeb8b9782a86f94860b2afab2d9d08900c..699e6ef8aea627b36e597882029ca9c1eb37a1c5 100644 (file)
--- a/unix/configure.ac
+++ b/unix/configure.ac
@@ -14,7 +14,6 @@ if test "X$GCC" = Xyes; then
     CFLAGS="$CFLAGS -Wall -Werror"
 fi
 
-AC_CHECK_HEADERS([sys/sockio.h],,,[ ])
 AC_CHECK_HEADERS([utmpx.h],,,[
 #include <sys/types.h>
 #include <utmp.h>])

diff --git a/unix/uxnet.c b/unix/uxnet.c
index 5d4ace44cb241044ce3dca8584f44d3d16ae1a0d..a43adcb12fdde800d63cce02d1c2285854d731b9 100644 (file)
--- a/unix/uxnet.c
+++ b/unix/uxnet.c
@@ -23,7 +23,7 @@
 #include "tree234.h"
 
 /* Solaris needs <sys/sockio.h> for SIOCATMARK. */
-#ifdef HAVE_SYS_SOCKIO_H
+#ifndef SOCKATMARK
 #include <sys/sockio.h>
 #endif