$NetBSD: patch-aa,v 1.9 2007/07/08 23:31:35 minskim Exp $

--- configure.ac.orig	2003-11-26 11:47:59.000000000 -0800
+++ configure.ac
@@ -31,7 +31,7 @@ AC_CHECK_LIB([rpcsvc], [pmap_set])
 # Checks for header files.
 AC_HEADER_STDC
 AC_HEADER_DIRENT
-AC_CHECK_HEADERS([fcntl.h limits.h linux/imon.h netinet/in.h rpc/rpc.h rpcsvc/mount.h stddef.h stdlib.h string.h syslog.h sys/imon.h sys/param.h sys/select.h sys/statvfs.h sys/syssgi.h sys/time.h sys/types.h sys/un.h unistd.h])
+AC_CHECK_HEADERS([fcntl.h limits.h linux/imon.h netinet/in.h rpc/rpc.h rpc/rpcent.h rpcsvc/mount.h stddef.h stdlib.h string.h syslog.h sys/filio.h sys/imon.h sys/param.h sys/select.h sys/statvfs.h sys/syssgi.h sys/time.h sys/types.h sys/un.h unistd.h mntent.h sys/mnttab.h sys/sysmacros.h])
 
 if test "$have_sys_imon_h"; then
 	MONITOR_FUNCS=IMonIRIX
@@ -51,12 +51,14 @@ AC_C_INLINE
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 AC_HEADER_TIME
-AC_CHECK_MEMBERS(struct sockaddr.sa_len, struct sockaddr_un.sun_len)
+AC_CHECK_MEMBERS(struct sockaddr.sa_len,,,[#include <sys/socket.h>])
+AC_CHECK_MEMBERS(struct sockaddr_un.sun_len,,,[#include <sys/types.h>
+#include <sys/un.h>])
 
 # Checks for library functions.
 AC_FUNC_ERROR_AT_LINE
 AC_FUNC_SELECT_ARGTYPES
-AC_CHECK_FUNCS([bindresvport _daemonize daemon getgrmember select])
+AC_CHECK_FUNCS([bindresvport _daemonize daemon getgrmember select sysctlbyname unsetenv])
 
 AC_CONFIG_FILES([Makefile
                  src/Makefile