From 8c71da6b2e09ec7c3e5c5ff7ca91c09f1569584c Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Thu, 5 Apr 2001 06:31:02 +0000
Subject: [PATCH] solaris/posix

---
 lib/bind/config.h.in      |  6 ++++++
 lib/bind/configure.in     | 17 +++--------------
 lib/bind/port_before.h.in |  2 +-
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/lib/bind/config.h.in b/lib/bind/config.h.in
index e69de29bb2..e67eb53da4 100644
--- a/lib/bind/config.h.in
+++ b/lib/bind/config.h.in
@@ -0,0 +1,6 @@
+#undef HAVE_FCNTL_H
+#undef HAVE_PATHS_H
+#undef SYS_CDEFS_H
+#undef _POSIX_PTHREAD_SEMANTICS
+#undef POSIX_GETGRGID_R
+#undef POSIX_GETGRNAM_R
diff --git a/lib/bind/configure.in b/lib/bind/configure.in
index 31328f0c02..a78d39078e 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.21 $)
+AC_REVISION($Revision: 1.22 $)
 
 AC_INIT(resolv/herror.c)
 AC_PREREQ(2.13)
@@ -465,6 +465,8 @@ then
 			AC_DEFINE(_POSIX_PTHREAD_SEMANTICS)
 			AC_CHECK_FUNC(pthread_setconcurrency,
 				      AC_DEFINE(CALL_PTHREAD_SETCONCURRENCY))
+			AC_DEFINE(POSIX_GETGRGID_R)
+			AC_DEFINE(POSIX_GETGRNAM_R)
 			;;
 		#
 		# UnixWare does things its own way.
@@ -521,7 +523,6 @@ then
 	WANT_IRS_THREADSGR_OBJS="\${WANT_IRS_THREADSGR_OBJS}"
 	WANT_IRS_THREADSPW_OBJS="\${WANT_IRS_THREADSPW_OBJS}"
 	WANT_IRS_THREADS_OBJS="\${WANT_IRS_THREADS_OBJS}"
-	hack_POSIX_PTHREAD_SEMANTICS="#define _POSIX_PTHREAD_SEMANTICS"
 	thread_dir=pthreads
 else
 	ALWAYS_DEFINES=""
@@ -529,7 +530,6 @@ else
 	WANT_IRS_THREADSGR_OBJS=""
 	WANT_IRS_THREADSPW_OBJS=""
 	WANT_IRS_THREADS_OBJS=""
-	hack_POSIX_PTHREAD_SEMANTICS=""
 	thread_dir=nothreads
 fi
 
@@ -1480,17 +1480,6 @@ SETPWENT_VOID="#undef SETGRENT_VOID"
 )
 AC_SUBST(SETGRENT_VOID)
 
-AC_TRY_COMPILE([
-${hack_POSIX_PTHREAD_SEMANTICS}
-#include <grp.h>
-struct group *
-getgrgid_r(gid_t gid, struct group *gptr, char *buf, int buflen) {}
-],[return (0);],
-[POSIX_GETGRGID_R="#define POSIX_GETGRGID_R 1"],
-[POSIX_GETGRGID_R="#undef POSIX_GETGRGID_R"])
-AC_SUBST(POSIX_GETGRGID_R)
-
-
 AC_CHECK_FUNC(getnetgrent_r,
 AC_TRY_COMPILE(
 [
diff --git a/lib/bind/port_before.h.in b/lib/bind/port_before.h.in
index 25b376cd48..563c41ec43 100644
--- a/lib/bind/port_before.h.in
+++ b/lib/bind/port_before.h.in
@@ -1,5 +1,6 @@
 #ifndef port_before_h
 #define port_before_h
+#include <config.h>
 
 @WANT_IRS_GR@
 @WANT_IRS_NIS@
@@ -13,7 +14,6 @@
 @GETNETBYADDR_ADDR_T@
 @SETPWENT_VOID@
 @SETGRENT_VOID@
-@POSIX_GETGRGID_R@
 
 @NET_R_ARGS@
 @NET_R_BAD@