Merge branch 'integration-libpwmd' into next

[~andy/fetchmail] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c9ddb9964b96085607ead4476e96fe2601604811..7213254de50c6acee0f70520c21d452e7faef77a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,6 +16,11 @@ dist_man1_MANS=              fetchmail.man
 pys=                   fetchmailconf.py
 pym=                   fetchmailconf.man
 
+if HAVE_LIBPWMD
+CFLAGS += @libpwmd_CFLAGS@
+LDFLAGS += @libpwmd_LIBS@
+endif
+
 if HAVE_PYTHON
 nodist_bin_SCRIPTS=    fetchmailconf
 python_PYTHON=         $(pys)
@@ -39,7 +44,7 @@ libfm_a_SOURCES=      xmalloc.c base64.c rfc822.c report.c rfc2047e.c \
                        libesmtp/gethostbyname.h libesmtp/gethostbyname.c \
                        smbtypes.h fm_getaddrinfo.c tls.c rfc822valid.c \
                        xmalloc.h sdump.h sdump.c x509_name_match.c \
-                       fm_strl.h
+                       fm_strl.h md5c.c
 if NTLM_ENABLE
 libfm_a_SOURCES += ntlmsubr.c
 endif
@@ -61,7 +66,7 @@ fetchmail_SOURCES=    fetchmail.h getopt.h \
                driver.c transact.c sink.c smtp.c \
                idlist.c uid.c md5ify.c cram.c gssapi.c \
                opie.c interface.c netrc.c \
-               unmime.c conf.c checkalias.c \
+               unmime.c conf.c checkalias.c uid_db.h uid_db.c\
                lock.h lock.c \
                rcfile_l.l rcfile_y.y \
                ucs/norm_charmap.c ucs/norm_charmap.h