diff --git a/lib/bind/bsd/Makefile.in b/lib/bind/bsd/Makefile.in index 4d1c74e5b9..5571a8b86c 100644 --- a/lib/bind/bsd/Makefile.in +++ b/lib/bind/bsd/Makefile.in @@ -1,4 +1,6 @@ -OBJS= daemon.@O@ ftruncate.@O@ gettimeofday.@O@ mktemp.@O@ putenv.@O@ \ +DAEMON_OBJS=daemon.@O@ + +OBJS= @DAEMON_OBJS@ ftruncate.@O@ gettimeofday.@O@ mktemp.@O@ putenv.@O@ \ readv.@O@ setenv.@O@ setitimer.@O@ strcasecmp.@O@ strdup.@O@ \ strerror.@O@ strpbrk.@O@ strsep.@O@ strtoul.@O@ utimes.@O@ \ writev.@O@ diff --git a/lib/bind/configure.in b/lib/bind/configure.in index d805c192b2..268b2749f9 100644 --- a/lib/bind/configure.in +++ b/lib/bind/configure.in @@ -18,7 +18,7 @@ AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl esyscmd([sed "s/^/# /" COPYRIGHT])dnl AC_DIVERT_POP()dnl -AC_REVISION($Revision: 1.2 $) +AC_REVISION($Revision: 1.3 $) AC_INIT(resolv/herror.c) AC_PREREQ(2.13) @@ -195,7 +195,7 @@ AC_PROG_CC AC_HEADER_STDC -AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h sys/sockio.h sys/select.h) +AC_CHECK_HEADERS(fcntl.h paths.h sys/time.h unistd.h sys/sockio.h sys/select.h) AC_C_CONST AC_C_INLINE @@ -631,6 +631,14 @@ AC_SUBST(WANT_IRS_THREADS_OBJS) ISC_THREAD_DIR=$thread_dir AC_SUBST(ISC_THREAD_DIR) +AC_CHECK_FUNC(daemon, +[DAEMON_OBJS="" NEED_DAEMON="#undef NEED_DAEMON"] +, +[DAEMON_OBJS="\${DAEMON_OBJS}" NEED_DAEMON="#define NEED_DAEMON 1"] +) +AC_SUBST(DAEMON_OBJS) +AC_SUBST(NEED_DAEMON) + # # flockfile is usually provided by pthreads, but we may want to use it # even if compiled with --disable-threads. diff --git a/lib/bind/port_after.h.in b/lib/bind/port_after.h.in index c6925363f7..5c7771aa83 100644 --- a/lib/bind/port_after.h.in +++ b/lib/bind/port_after.h.in @@ -4,6 +4,7 @@ @NEED_PSELECT@ @HAVE_SA_LEN@ @HAVE_MINIMUM_IFREQ@ +@NEED_DAEMON@ /* XXX sunos and cygwin needs O_NDELAY */ #define PORT_NONBLOCK O_NONBLOCK