From 4d81b015e788d5883ad3a58d198f6a7143382ed1 Mon Sep 17 00:00:00 2001
From: Ben Kibbey <bjk@luxsci.net>
Date: Tue, 20 Nov 2012 20:22:40 -0500
Subject: [PATCH] Portability fixes.

Corrects the previous Android fix and also fixes NetBSD builds.
---
 src/Makefile.am | 5 +++--
 src/libpwmd.c   | 5 +++--
 src/tls.c       | 8 ++++++++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 027b20fb..b566f0b7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -41,10 +41,11 @@ if NEED_GETOPT_LONG
 pwmc_SOURCES += getopt_long.c getopt_long.h
 endif
 pwmc_CFLAGS = -DLOCALEDIR=\"${prefix}/share/locale\" @GPG_ERROR_CFLAGS@ \
-	      @GNUTLS_CFLAGS@ @libssh2_CFLAGS@ @CFLAGS_ORIG@
-pwmc_LDFLAGS = @GPG_ERROR_LIBS@ @GNUTLS_LIBS@ @libssh2_LIBS@
+	      @GNUTLS_CFLAGS@ @libssh2_CFLAGS@ @LIBASSUAN_CFLAGS@ @CFLAGS_ORIG@
+pwmc_LDFLAGS = @GPG_ERROR_LIBS@ @LIBASSUAN_LIBS@ @GNUTLS_LIBS@ @libssh2_LIBS@
 pwmc_LDADD= -lpwmd
 pwmc_DEPENDENCIES= libpwmd.la
+
 if WITH_READLINE
 pwmc_LDFLAGS += @READLINE_LIBS@
 endif
diff --git a/src/libpwmd.c b/src/libpwmd.c
index 9cc1d310..59aab887 100644
--- a/src/libpwmd.c
+++ b/src/libpwmd.c
@@ -43,8 +43,8 @@
 #include <termios.h>
 #include <libpwmd.h>
 
-#ifdef HAVE_ASSUAN_H
-#include <assuan.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 
 #ifndef LINE_MAX
@@ -63,6 +63,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
+#include <netinet/in.h>
 #endif
 
 #define FINISH(rc) (gpg_err_source(rc) == GPG_ERR_SOURCE_UNKNOWN) \
diff --git a/src/tls.c b/src/tls.c
index 6f90df9f..824659be 100644
--- a/src/tls.c
+++ b/src/tls.c
@@ -17,12 +17,20 @@
     You should have received a copy of the GNU General Public License
     along with Libpwmd.  If not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
 #include <ctype.h>
 
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
 #include "types.h"
 #include "misc.h"
 
-- 
2.11.4.GIT