Windows: avoid preprocessor symbols redefinitions

[openafs.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index eb158ed..1cddad1 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -695,6 +695,7 @@ case $AFS_SYSNAME in
     *_nbsd30)   AFS_PARAM_COMMON=param.nbsd30.h  ;;
     *_nbsd40)   AFS_PARAM_COMMON=param.nbsd40.h  ;;
     *_nbsd50)   AFS_PARAM_COMMON=param.nbsd50.h  ;;
+    *_nbsd60)   AFS_PARAM_COMMON=param.nbsd60.h  ;;
     *_obsd31)   AFS_PARAM_COMMON=param.obsd31.h  ;;
     *_obsd32)   AFS_PARAM_COMMON=param.obsd32.h  ;;
     *_obsd33)   AFS_PARAM_COMMON=param.obsd33.h  ;;
@@ -1228,7 +1229,6 @@ AC_CHECK_HEADERS([ \
                   math.h \
                   mntent.h \
                   ncurses.h \
-                  net/if.h \
                   netdb.h \
                   netinet/in.h \
                   pwd.h \
@@ -1275,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>