[SCM] GNU shishi branch, master, updated. shishi-1-0-1-9-g63023d7

[Simon Josefsson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU shishi".

http://git.savannah.gnu.org/cgit/shishi.git/commit/?id=63023d749f4f75a67e2445e8ede88854b952bebc

The branch, master has been updated
       via  63023d749f4f75a67e2445e8ede88854b952bebc (commit)
      from  c25d03c0413a0ddc847cbaae670d0abb44bcc148 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 63023d749f4f75a67e2445e8ede88854b952bebc
Author: Mats Erik Andersson <address@hidden>
Date:   Mon Jul 2 20:36:25 2012 +0200

    Issues with libresolv.
    
    Some BSD variants must use <netinet/in.h> before
    including <resolv.h>.  Additionally, res_query()
    is present in libc on most BSD systems.
    
    Signed-off-by: Simon Josefsson <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 configure.ac |    6 ++++--
 lib/resolv.c |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 06b70d5..40d8a3c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,7 +41,9 @@ gl_EARLY
 gl2_EARLY
 gl3_EARLY
 AC_HEADER_STDC
-AC_CHECK_HEADERS(termios.h pwd.h syslog.h resolv.h arpa/nameser.h 
netinet/in6.h)
+AC_CHECK_HEADERS(termios.h pwd.h syslog.h arpa/nameser.h netinet/in6.h)
+AC_CHECK_HEADERS(resolv.h, , , [#include <sys/types.h>
+#include <netinet/in.h>])
 
 # Used when creating libshishi-XX.def.
 SOVERSION=`expr ${LT_CURRENT} - ${LT_AGE}`
@@ -81,7 +83,7 @@ if test "$ac_cv_libgcrypt" != yes; then
 fi
 
 # Checks for library functions.
-AC_CHECK_FUNCS(signal select ngettext gethostbyname getpwnam getuid)
+AC_CHECK_FUNCS(signal select ngettext gethostbyname getpwnam getuid res_query)
 AC_CHECK_LIB(resolv, res_query,, AC_MSG_WARN([[no libresolv, SRV RRs not 
used]]))
 AC_SEARCH_LIBS(socket, socket)
 AC_SEARCH_LIBS(gethostbyname, nsl)
diff --git a/lib/resolv.c b/lib/resolv.c
index d2eff5c..61062b4 100644
--- a/lib/resolv.c
+++ b/lib/resolv.c
@@ -30,7 +30,7 @@
 
 #include "internal.h"
 
-#ifdef HAVE_LIBRESOLV
+#if defined HAVE_LIBRESOLV || defined HAVE_RES_QUERY
 
 /* the largest packet we'll send and receive */
 #if PACKETSZ > 1024


hooks/post-receive
-- 
GNU shishi