X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=Makefile.am;h=5e72668a7a801fd25878679d573934dac5576619;hb=d7c26e1e430ee83cc65d4eae52ad86101bfad197;hp=796ad00b58410abef48b5c6c612fc6918e33ec75;hpb=c4148424b71a25ec79005361dc2363b800b10ada;p=~andy%2Ffetchmail

diff --git a/Makefile.am b/Makefile.am
index 796ad00b..5e72668a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile for fetchmail
 
 SUBDIRS=		. po
-AUTOMAKE_OPTIONS=	1.8 foreign no-dist-gzip dist-bzip2
+AUTOMAKE_OPTIONS=	1.11 foreign no-dist-gzip dist-xz color-tests
 
 AM_CPPFLAGS=		-I$(srcdir)/libesmtp
 ACLOCAL_AMFLAGS=	-I m4 -I m4-local
@@ -16,15 +16,14 @@ dist_man1_MANS=		fetchmail.man
 pys=			fetchmailconf.py
 pym=			fetchmailconf.man
 
-if HAVE_PYTHON
+if HAVE_LIBPWMD
+CFLAGS += @libpwmd_CFLAGS@
+LDFLAGS += @libpwmd_LIBS@
+endif
+
 nodist_bin_SCRIPTS=	fetchmailconf
 python_PYTHON=		$(pys)
 dist_man1_MANS+=	$(pym)
-EXTRA_DIST=
-else
-noinst_PYTHON=		$(pys)
-EXTRA_DIST=		$(pym)
-endif
 
 CLEANFILES=		$(nodist_bin_SCRIPTS)
 
@@ -39,7 +38,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
@@ -50,18 +49,18 @@ DEPENDENCIES=		libfm.a $(LIBOBJS)
 
 check_PROGRAMS=
 
-TESTS=			t.smoke t.validate-xhtml t.x509_name_match
+TESTS=			t.smoke t.validate-xhtml10 t.validate-xhtml t.x509_name_match
 TESTS_ENVIRONMENT=	srcdir="$(srcdir)" LC_ALL=C TZ=UTC SHELL="$(SHELL)" $(SHELL)
 
 fetchmail_SOURCES=	fetchmail.h getopt.h \
-		i18n.h kerberos.h fm_md5.h netrc.h smtp.h \
+		gettext.h kerberos.h fm_md5.h netrc.h smtp.h \
 		socket.h tunable.h \
 		socket.c getpass.c \
 		fetchmail.c env.c idle.c options.c daemon.c \
 		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
@@ -115,6 +114,9 @@ DISTDOCS=	FAQ FEATURES NOTES OLDNEWS fetchmail-man.html \
 		README.packaging README.SSL-SERVER \
 		fetchmail-FAQ.book fetchmail-FAQ.pdf fetchmail-FAQ.html \
 		Mailbox-Names-UTF7.txt Mailbox-Names-UTF7.html \
+		fetchmail-SA-2012-02.txt \
+		fetchmail-SA-2012-01.txt \
+		fetchmail-SA-2011-01.txt \
 		fetchmail-EN-2010-03.txt \
 		fetchmail-SA-2010-02.txt \
 		fetchmail-SA-2010-01.txt \
@@ -132,7 +134,7 @@ DISTDOCS=	FAQ FEATURES NOTES OLDNEWS fetchmail-man.html \
 # extra directories to ship
 distdirs = rh-config contrib beos
 
-EXTRA_DIST+=	$(DISTDOCS) $(distdirs) \
+EXTRA_DIST=	$(DISTDOCS) $(distdirs) \
 		fetchmail.spec fetchmail.xpm \
 		strlcpy.3 bighand.png \
 		m4/codeset.m4 \
@@ -197,7 +199,7 @@ TODO: todo.html $(srcdir)/dist-tools/html2txt
 	AWK=$(AWK) $(SHELL) $(srcdir)/dist-tools/html2txt $(srcdir)/todo.html >$@ || { rm -f $@ ; exit 1 ; }
 
 fetchmail-man.html: fetchmail.man $(srcdir)/dist-tools/manServer.pl
-	env - "PATH=$$PATH" $(srcdir)/dist-tools/manServer.pl $(srcdir)/fetchmail.man >$@ \
+	env - "PATH=$$PATH" perl -T $(srcdir)/dist-tools/manServer.pl $(srcdir)/fetchmail.man >$@ \
 	|| { rm -f $@ ; exit 1 ; }
 
 dist-hook: