Credit John Beck's fixes.

[~andy/fetchmail] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6b433f6135d2b2894cfbe1840d67046d9e1a60de..e9c59472e3c337916b86483e6c7caa46b782eaa1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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)
 
@@ -50,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
@@ -135,6 +129,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 \
@@ -152,7 +149,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 \
                trio/CHANGES trio/README \
                strlcpy.3 bighand.png \
@@ -225,10 +222,6 @@ dist-hook:
        cd $(distdir) && find $(distdirs) po -name .git -type d -prune -exec rm -rf '{}' ';'
        cd $(distdir) && find $(distdirs) po -name '*~' -exec rm -f '{}' ';'
 
-.PHONY: lsm
-lsm: genlsm.sh dist
-       $(SHELL) genlsm.sh >$(PACKAGE)-$(VERSION).lsm
-
 # this target expects a .rsyncs file with lines of this format:
 # host:directory/
 # it will call rsync from its source directory to the destination for
@@ -245,6 +238,9 @@ SUFFIXES = .html .txt
 .txt.html:
        asciidoc --unsafe -a toc -a data-uri -o $@ $< || { rm -f $@ ; exit 1 ; }
 
+# default to some non-default options when using "make distcheck"
+AM_DISTCHECK_CONFIGURE_FLAGS=--with-ssl
+
 # The following sets edit modes for GNU EMACS.
 # Local Variables:
 # compile-command:"configure"