X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=Makefile.am;h=6f247daec90fa12bb11c033fc3093b857003b4a6;hb=d31db10231e9ed89f64fdf6e0fb7cae182aa377e;hp=973bf4007298a667002313a7b3586a2c63043c2e;hpb=269cba9b00fa7ecb0d707ef5b6f10d34e049327c;p=~andy%2Ffetchmail

diff --git a/Makefile.am b/Makefile.am
index 973bf400..6f247dae 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-bzip2 dist-xz
 
 AM_CPPFLAGS=		-I$(srcdir)/libesmtp
 ACLOCAL_AMFLAGS=	-I m4 -I m4-local
@@ -16,15 +16,9 @@ dist_man1_MANS=		fetchmail.man
 pys=			fetchmailconf.py
 pym=			fetchmailconf.man
 
-if HAVE_PYTHON
 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 +33,10 @@ 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 ntlmsubr.c
+			fm_strl.h md5c.c
+if NTLM_ENABLE
+libfm_a_SOURCES += ntlmsubr.c
+endif
 libfm_a_LIBADD=		$(EXTRAOBJ)
 libfm_a_DEPENDENCIES=	$(EXTRAOBJ)
 LDADD	=		libfm.a @LIBINTL@ $(LIBOBJS)
@@ -47,7 +44,7 @@ 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)
 
 if NEED_TRIO
@@ -132,6 +129,10 @@ 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 \
 		fetchmail-SA-2009-01.txt \
@@ -148,35 +149,36 @@ 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 \
 		trio/CHANGES trio/README \
 		strlcpy.3 bighand.png \
 		m4/codeset.m4 \
 		m4/gettext.m4 \
+		m4/glibc2.m4 \
 		m4/glibc21.m4 \
 		m4/iconv.m4 \
 		m4/intdiv0.m4 \
+		m4/intl.m4 \
+		m4/intldir.m4 \
+		m4/intlmacosx.m4 \
 		m4/intmax.m4 \
 		m4/inttypes-pri.m4 \
-		m4/inttypes.m4 \
 		m4/inttypes_h.m4 \
-		m4/isc-posix.m4 \
 		m4/lcmessage.m4 \
 		m4/lib-ld.m4 \
 		m4/lib-link.m4 \
 		m4/lib-prefix.m4 \
-		m4/longdouble.m4 \
+		m4/lock.m4 \
 		m4/longlong.m4 \
 		m4/nls.m4 \
 		m4/po.m4 \
 		m4/printf-posix.m4 \
 		m4/progtest.m4 \
-		m4/signed.m4 \
 		m4/size_max.m4 \
 		m4/stdint_h.m4 \
 		m4/uintmax_t.m4 \
-		m4/ulonglong.m4 \
+		m4/visibility.m4 \
 		m4/wchar_t.m4 \
 		m4/wint_t.m4 \
 		m4/xsize.m4 \
@@ -213,7 +215,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: