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 6b34911..eb158ed 100644 (file)
--- 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>])