X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=Makefile.am;h=03ee09182af0635ea1283c3d0ff5fc4142d76b3f;hb=910d5a2f852edb8c4e54c0e875da6a90385ab790;hp=42fd08900c31ea88563046b69f6a97b5571a5ec0;hpb=40fe452223b5cc0ff5dbae0efa8551d7e96c1a5c;p=~andy%2Ffetchmail

diff --git a/Makefile.am b/Makefile.am
index 42fd0890..03ee0918 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile for fetchmail
 
 SUBDIRS=		. po
-AUTOMAKE_OPTIONS=	1.11 foreign no-dist-gzip dist-xz
+AUTOMAKE_OPTIONS=	1.11 foreign no-dist-gzip dist-xz color-tests
 
 AM_CPPFLAGS=		-I$(srcdir)/libesmtp
 ACLOCAL_AMFLAGS=	-I m4 -I m4-local
@@ -21,7 +21,6 @@ CFLAGS += @libpwmd_CFLAGS@
 LDFLAGS += @libpwmd_LIBS@
 endif
 
-if HAVE_PYTHON
 nodist_bin_SCRIPTS=	fetchmailconf
 python_PYTHON=		$(pys)
 dist_man1_MANS+=	$(pym)
@@ -207,10 +206,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
@@ -227,6 +222,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"