From: Andrew Deason <adeason@sinenomine.net>
Date: Wed, 13 Apr 2011 15:34:37 +0000 (-0500)
Subject: Fix some configure header prereqs
X-Git-Tag: upstream/1.8.0_pre1^2~3864
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=80df5096e7179ab9c7562614180e2e90c083ff7c;p=packages%2Fo%2Fopenafs.git

Fix some configure header prereqs

On at least Solaris, the configure tests for netinet/if_ether.h and
security/pam_modules.h issued warnings because they existed but were
not compilable. Perform the tests with the prerequisite headers of
net/if.h and security/pam_appl.h, respectively, so autoconf will stop
yelling at us.

Change-Id: I05d637784954c10af468b6065acd78139fc45245
Reviewed-on: http://gerrit.openafs.org/4467
Reviewed-by: Simon Wilkinson <sxw@inf.ed.ac.uk>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/acinclude.m4 b/acinclude.m4
index 6b3491122..eb158ed63 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1230,12 +1230,11 @@ AC_CHECK_HEADERS([ \
 		   ncurses.h \
 		   net/if.h \
 		   netdb.h \
-		   netinet/if_ether.h \
 		   netinet/in.h \
 		   pwd.h \
 		   regex.h \
 		   resolv.h \
-		   security/pam_modules.h \
+		   security/pam_appl.h \
 		   signal.h \
 		   stdint.h \
 		   stdio_ext.h \
@@ -1276,6 +1275,14 @@ AC_CHECK_HEADERS([ \
 		   unistd.h \
 		   windows.h \
 		])
+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>
+#endif])
 
 AC_CHECK_HEADERS(linux/errqueue.h,,,[#include <linux/types.h>])