From: Simon Wilkinson <sxw@your-file-system.com>
Date: Sat, 23 Apr 2011 15:28:49 +0000 (-0400)
Subject: autoconf: Add required headers to net/if.h test
X-Git-Tag: openafs-devel-1_7_1~579
X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=d7b1e6a1adff564db219e69b3a8eeb485c7dbb56

autoconf: Add required headers to net/if.h test

On Darwin, net/if.h is only usable if sys/socket.h is included first.
Do so, to stop autoconf from warning about this test.

Change-Id: I9e7a2642cce86c5ad6ebb3ae3cb60401dd9c26cf
Reviewed-on: http://gerrit.openafs.org/4535
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/acinclude.m4 b/acinclude.m4
index adc8667..1cddad1 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1229,7 +1229,6 @@ AC_CHECK_HEADERS([ \
 		   math.h \
 		   mntent.h \
 		   ncurses.h \
-		   net/if.h \
 		   netdb.h \
 		   netinet/in.h \
 		   pwd.h \
@@ -1276,10 +1275,16 @@ AC_CHECK_HEADERS([ \
 		   unistd.h \
 		   windows.h \
 		])
+AC_CHECK_HEADERS([net/if.h],[],[],[AC_INCLUDES_DEFAULT
+#ifdef HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif])
+
 AC_CHECK_HEADERS([netinet/if_ether.h],[],[],[AC_INCLUDES_DEFAULT
 #ifdef HAVE_NET_IF_H
 # include <net/if.h>
 #endif])
+
 AC_CHECK_HEADERS([security/pam_modules.h],[],[],[AC_INCLUDES_DEFAULT
 #ifdef HAVE_SECURITY_PAM_APPL_H
 # include <security/pam_appl.h>