[Pkg-gnupg-commit] [gnupg2] 54/292: build: Fix check for resolver library on macOS.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit 2e64ccb0f96d615b1eb87e37f230a5d761aa9c36
Author: Justus Winter <justus at g10code.com>
Date:   Tue Sep 27 17:18:15 2016 +0200

    build: Fix check for resolver library on macOS.
    
    * configure.ac: Check for the mangled name of 'dn_skipname' first.
    
    Signed-off-by: Justus Winter <justus at g10code.com>
---
 configure.ac | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index b16f837..fe432e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1074,8 +1074,15 @@ if test x"$use_dns_srv" = xyes || test x"$use_dns_cert" = xyes; then
                    AC_SEARCH_LIBS(__res_query,resolv bind,,have_resolver=no))
     AC_SEARCH_LIBS(dn_expand,resolv bind,,
                    AC_SEARCH_LIBS(__dn_expand,resolv bind,,have_resolver=no))
-    AC_SEARCH_LIBS(dn_skipname,resolv bind,,
-                   AC_SEARCH_LIBS(__dn_skipname,resolv bind,,have_resolver=no))
+
+    # macOS renames dn_skipname into res_9_dn_skipname in <resolv.h>,
+    # and for some reason fools us into believing we don't need
+    # -lresolv even if we do.  Since the test program checking for the
+    # symbol does not include <resolv.h>, we need to check for the
+    # renamed symbol explicitly.
+    AC_SEARCH_LIBS(res_9_dn_skipname,resolv bind,,
+        AC_SEARCH_LIBS(dn_skipname,resolv bind,,
+            AC_SEARCH_LIBS(__dn_skipname,resolv bind,,have_resolver=no)))
 
     if test x"$have_resolver" != xno ; then
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git