add back check for sys/sockio.h but only use it if SIOCGIFCONF

is not defined

diff --git a/config.h.in b/config.h.in
index 187b8afc5dbbf8e3cec8cbac06a4b850406870af..1b3fdb58fdc84bb526db65bed8b7b170151162bf 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -316,6 +316,9 @@
 #undef HAVE_TERMIOS_H
 #endif /* HAVE_TCGETATTR */
 
+/* Define if you have the <sys/sockio.h> header file.  */
+#undef HAVE_SYS_SOCKIO_H
+
 /* Define if you have the <sys/bsdtypes.h> header file.  */
 #undef HAVE_SYS_BSDTYPES_H
 

diff --git a/configure.in b/configure.in
index c4f4eb9c2eabcc0efa97bfbbde7e9394a390d19d..469d20f2f4f74f94b1e021cb922e14dde2609933 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1249,7 +1249,7 @@ dnl Header file checks
 dnl
 AC_HEADER_STDC
 AC_HEADER_DIRENT
-AC_CHECK_HEADERS(string.h strings.h unistd.h malloc.h paths.h utime.h fnmatch.h netgroup.h sys/bsdtypes.h sys/select.h)
+AC_CHECK_HEADERS(string.h strings.h unistd.h malloc.h paths.h utime.h fnmatch.h netgroup.h sys/sockio.h sys/bsdtypes.h sys/select.h)
 dnl ultrix termio/termios are broken
 if test "$OS" != "ultrix"; then
     AC_CHECK_HEADERS(termio.h)

diff --git a/interfaces.c b/interfaces.c
index 48b50c3cd1eef6905f9b3f9da771925ee2c7a71c..c57e98c85295ec0fccb06e33cf5a9da0abc9847d 100644 (file)
--- a/interfaces.c
+++ b/interfaces.c
@@ -50,6 +50,9 @@
 #include <sys/socket.h>
 #include <sys/param.h>
 #include <sys/ioctl.h>
+#if defined(HAVE_SYS_SOCKIO_H) && !defined(SIOCGIFCONF)
+#include <sys/sockio.h>
+#endif
 #ifdef _ISC
 #include <sys/stream.h>
 #include <sys/sioctl.h>