# HG changeset patch
# User mcabber <lm@freakysoft.de>
# Date 1452547403 -3600
# Node ID 2ea00984a49909d71e05fa235bd4a62d8fe8537a
# Parent  4a092b834996ac3322bf185b313f37fd3388538a# Parent  e3370fbe0a255cea4e44bd7d7ac9fb42c15224cf
Merge pull request #22 from moench-tegeder/build_20160111

assorted minor build fixes

diff -r 4a092b834996 -r 2ea00984a499 configure.ac
--- a/configure.ac	Mon Jan 11 21:35:19 2016 +0100
+++ b/configure.ac	Mon Jan 11 22:23:23 2016 +0100
@@ -38,7 +38,7 @@
   LDFLAGS="$LDFLAGS -no-undefined"
 fi
 
-AC_PROG_CC
+AC_PROG_CC([cc gcc])
 AC_ISC_POSIX
 AC_HEADER_STDC
 AC_LIBTOOL_WIN32_DLL
diff -r 4a092b834996 -r 2ea00984a499 loudmouth/Makefile.am
--- a/loudmouth/Makefile.am	Mon Jan 11 21:35:19 2016 +0100
+++ b/loudmouth/Makefile.am	Mon Jan 11 22:23:23 2016 +0100
@@ -111,8 +111,7 @@
 libloudmouth_1_la_LIBADD =              \
 	$(LOUDMOUTH_LIBS)                   \
 	$(LIBIDN_LIBS)                      \
-	$(ASYNCNS_LIBS)                     \
-	-lresolv
+	$(ASYNCNS_LIBS)
 
 libloudmouth_1_la_LDFLAGS =                                 \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)    \
diff -r 4a092b834996 -r 2ea00984a499 loudmouth/lm-blocking-resolver.c
--- a/loudmouth/lm-blocking-resolver.c	Mon Jan 11 21:35:19 2016 +0100
+++ b/loudmouth/lm-blocking-resolver.c	Mon Jan 11 22:23:23 2016 +0100
@@ -29,6 +29,7 @@
 #include <arpa/nameser_compat.h>
 #endif
 
+#include <netinet/in.h>
 #include <arpa/nameser.h>
 #include <resolv.h>
 
diff -r 4a092b834996 -r 2ea00984a499 loudmouth/lm-resolver.c
--- a/loudmouth/lm-resolver.c	Mon Jan 11 21:35:19 2016 +0100
+++ b/loudmouth/lm-resolver.c	Mon Jan 11 22:23:23 2016 +0100
@@ -27,6 +27,7 @@
 #include <arpa/nameser_compat.h>
 #endif
 
+#include <netinet/in.h>
 #include <arpa/nameser.h>
 #include <resolv.h>
 
diff -r 4a092b834996 -r 2ea00984a499 loudmouth/lm-sasl.c
--- a/loudmouth/lm-sasl.c	Mon Jan 11 21:35:19 2016 +0100
+++ b/loudmouth/lm-sasl.c	Mon Jan 11 22:23:23 2016 +0100
@@ -25,7 +25,7 @@
 #include <glib.h>
 
 #ifdef HAVE_GSSAPI
-#include <gssapi.h>
+#include <gssapi/gssapi.h>
 #endif
 
 #include "lm-sock.h"
diff -r 4a092b834996 -r 2ea00984a499 loudmouth/lm-sha.c
--- a/loudmouth/lm-sha.c	Mon Jan 11 21:35:19 2016 +0100
+++ b/loudmouth/lm-sha.c	Mon Jan 11 22:23:23 2016 +0100
@@ -75,11 +75,6 @@
 }
 #endif
 
-#ifndef lint
-static const char rcsid[] =
-"$Id$";
-#endif /* !lint */
-
 #define ROTL(x, n) (((x) << (n)) | ((x) >> (32 - (n))))
 #define ROTR(x, n) (((x) >> (n)) | ((x) << (32 - (n))))