Fix build of user-space on nbsd50 and greater

[openafs.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index 84669f0..adc8667 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  ;;
@@ -1230,12 +1231,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 +1276,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>])
 
@@ -1370,7 +1378,6 @@ AC_CHECK_FUNCS([ \
        chown \
        fchown \
        gethostname \
-       gettimeofday \
        lstat \
        inet_aton \
        inet_ntop \
@@ -1407,6 +1414,7 @@ AC_REPLACE_FUNCS([ \
        getdtablesize \
        getopt \
        getprogname \
+       gettimeofday \
        localtime_r \
        mkstemp \
        strcasecmp \
@@ -1414,6 +1422,10 @@ AC_REPLACE_FUNCS([ \
        strnlen \
        strlcpy \
        strsep \
+       tdelete \
+       tfind \
+       tsearch \
+       twalk \
        verr \
        verrx \
        vsyslog \
@@ -1426,6 +1438,7 @@ AC_REPLACE_FUNCS([ \
 dnl Headers that we're going to try and get from libroken
 AC_CHECK_HEADERS([ \
        err.h \
+       search.h \
 ])
 
 AC_CHECK_DECLS([h_errno], [], [], [