Minor bug fixes for socket.c

[~andy/fetchmail] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3947beafef3a7f3fcabaaa9df453ea3abd2f6915..e9c59472e3c337916b86483e6c7caa46b782eaa1 100644 (file)
--- 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,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,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,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 \
@@ -151,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 \
@@ -216,17 +215,13 @@ 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:
        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
@@ -243,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"