2188. [contrib] queryperf: autoconf changes to make the seach for

                        libresolv or libbind more robust. [RT #16299]

diff --git a/CHANGES b/CHANGES
index b1f739ebbca164274764cedfd97f30a16d976d96..7ec4087421ba22c6f6da9cba9f64329a8c922f92 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2188.  [contrib]       queryperf: autoconf changes to make the seach for
+                       libresolv or libbind more robust. [RT #16299]
+
 2187.  [bug]           query_addds(), query_addwildcardproof() and
                        query_addnxrrsetnsec() should take a version
                        arguement. [RT #16368]

diff --git a/contrib/queryperf/configure.in b/contrib/queryperf/configure.in
index efbd9462c19ca6aa17daf173f22f6e72702096f4..2f0f7af8240fa2d805a133be5a8c059f1c6cb0e3 100644 (file)
--- a/contrib/queryperf/configure.in
+++ b/contrib/queryperf/configure.in
@@ -32,7 +32,7 @@ AC_DEFUN(AC_TYPE_SOCKLEN_T,
   ac_cv_type_socklen_t=no)
 ])
   if test $ac_cv_type_socklen_t != yes; then
-    AC_DEFINE(socklen_t, int)
+    AC_DEFINE(socklen_t, int, [Define to `int' if `socklen_t' does not exist.])
   fi
 ])
 
@@ -47,18 +47,22 @@ AC_DEFUN(AC_SA_LEN,
   ac_cv_sa_len=no)
 ])
   if test $ac_cv_sa_len = yes; then
-    AC_DEFINE(HAVE_SA_LEN)
+    AC_DEFINE(HAVE_SA_LEN, 1, [Define to 1 if `struct sockaddr' has element `sa_len'.])
   fi
 ])
 
+AC_CONFIG_HEADERS(config.h)
 AC_SEARCH_LIBS(res_mkquery, resolv bind)
+AC_SEARCH_LIBS(__res_mkquery, resolv bind)
 AC_CHECK_LIB(socket, socket)
 AC_CHECK_LIB(nsl, inet_ntoa)
 AC_CHECK_FUNCS(gethostbyname2)
 AC_CHECK_FUNC(getaddrinfo,
-    AC_DEFINE(HAVE_GETADDRINFO), AC_LIBOBJ(getaddrinfo))
+    AC_DEFINE(HAVE_GETADDRINFO, 1, [Define to 1 if you have the `getaddrinfo' function.]),
+    [AC_LIBOBJ(getaddrinfo)])
 AC_CHECK_FUNC(getnameinfo,
-    AC_DEFINE(HAVE_GETNAMEINFO), AC_LIBOBJ(getnameinfo))
+    AC_DEFINE(HAVE_GETNAMEINFO, 1, [Define to 1 if you have the `getnameinfo' function.]),
+    [AC_LIBOBJ(getnameinfo)])
 
 AC_TYPE_SOCKLEN_T
 AC_SA_LEN