>From b065d8427bc51a795f7ae144bb2bc99880ab415c Mon Sep 17 00:00:00 2001
From: Ken Brown <address@hidden>
Date: Sun, 26 Mar 2017 12:56:26 -0400
Subject: [PATCH] Fix "undefined symbols" errors on Cygwin

* lib/Makefile.am (libmuaux_la_LIBADD):
* pop3d/Makefile.am (pop3d_LDADD):
* imap4d/Makefile.am (imap4d_LDADD):
* maidag/Makefile.am (maidag_LDADD): Add libmailutils.la
---
 imap4d/Makefile.am | 3 ++-
 lib/Makefile.am    | 2 +-
 maidag/Makefile.am | 3 ++-
 pop3d/Makefile.am  | 3 ++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/imap4d/Makefile.am b/imap4d/Makefile.am
index e62c34dfb..edaa5e92d 100644
--- a/imap4d/Makefile.am
+++ b/imap4d/Makefile.am
@@ -79,7 +79,8 @@ imap4d_LDADD = \
  ${MU_LIB_AUTH}\
  @MU_AUTHLIBS@ \
  ${MU_LIB_MAILUTILS}\
- @SERV_AUTHLIBS@ @MU_COMMON_LIBRARIES@ @MU_TCPWRAP_LIBRARIES@
+ @SERV_AUTHLIBS@ @MU_COMMON_LIBRARIES@ @address@hidden
+ ../libmailutils/libmailutils.la
 
 ## This kludge is necessary to correctly establish imap4d -> MU_AUTHLIBS
 ## dependencies. Automake stupidly refuses to include them.
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 94e9593ed..a9f12f533 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -35,7 +35,7 @@ libmuaux_la_SOURCES = \
  strexit.c\
  mu_umaxtostr.c\
  mu_umaxtostr.h
-libmuaux_la_LIBADD=gnu/libgnu.la
+libmuaux_la_LIBADD=gnu/libgnu.la ../libmailutils/libmailutils.la
 libmuaux_la_LDFLAGS = -no-undefined -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
 
 libmutcpwrap_a_SOURCES = tcpwrap.c
diff --git a/maidag/Makefile.am b/maidag/Makefile.am
index 1a4940a63..6fa7df6a8 100644
--- a/maidag/Makefile.am
+++ b/maidag/Makefile.am
@@ -53,7 +53,8 @@ maidag_LDADD = \
  @address@hidden
  @address@hidden
  @address@hidden
- @MU_TCPWRAP_LIBRARIES@
+ @address@hidden
+ ../libmailutils/libmailutils.la
 
 AM_CPPFLAGS = -I${top_srcdir} @MU_APP_COMMON_INCLUDES@ @GUILE_INCLUDES@ \
  @PYTHON_INCLUDES@
diff --git a/pop3d/Makefile.am b/pop3d/Makefile.am
index ba21c9ae9..611e3ee6b 100644
--- a/pop3d/Makefile.am
+++ b/pop3d/Makefile.am
@@ -61,7 +61,8 @@ pop3d_LDADD = \
  @address@hidden
  ${LIBMU_DBM}\
  @address@hidden
- @MU_TCPWRAP_LIBRARIES@
+ @address@hidden
+ ../libmailutils/libmailutils.la
 
 popauth_SOURCES = popauth.c
 popauth_LDADD = \
-- 
2.12.2