Attempt merging from 6.3.24.

[~andy/fetchmail] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3947e84ea9d916fc588b49616f0915bd92b6fa38..34fe6caf66b2bfda63584ea5e571d9a800034f43 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-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)
 
@@ -50,35 +49,21 @@ 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
-noinst_LIBRARIES+=     libtrio.a
-libtrio_a_SOURCES=     trio/triostr.c trio/trio.c trio/trionan.c \
-                       trio/trio.h trio/triop.h trio/triodef.h \
-                       trio/trionan.h trio/triostr.h
-check_PROGRAMS+=       regression
-regression_SOURCES=    trio/regression.c
-LDADD+=                        libtrio.a -lm
-TESTS+=                        t.regression
-endif
-
 fetchmail_SOURCES=     fetchmail.h getopt.h \
-               i18n.h kerberos.h fm_md5.h mx.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 mxget.c md5ify.c cram.c gssapi.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
-if POP2_ENABLE
-fetchmail_SOURCES += pop2.c
-endif
 if POP3_ENABLE
 fetchmail_SOURCES += pop3.c
 endif
@@ -91,9 +76,6 @@ endif
 if ODMR_ENABLE
 fetchmail_SOURCES += odmr.c
 endif
-if KERBEROS_V4_ENABLE
-fetchmail_SOURCES += kerberos.c
-endif
 if RPA_ENABLE
 fetchmail_SOURCES += rpa.c
 endif
@@ -104,7 +86,7 @@ if NEED_GETADDRINFO
 fetchmail_SOURCES += libesmtp/getaddrinfo.h libesmtp/getaddrinfo.c
 endif
 
-check_PROGRAMS +=      rfc822 unmime netrc rfc2047e mxget rfc822valid \
+check_PROGRAMS +=      rfc822 unmime netrc rfc2047e rfc822valid \
                        x509_name_match
 
 rfc2047e_CFLAGS=       -DTEST
@@ -121,9 +103,6 @@ unmime_CFLAGS=      -DSTANDALONE -DHAVE_CONFIG_H -I$(builddir)
 netrc_SOURCES= netrc.c xmalloc.c report.c
 netrc_CFLAGS=  -DSTANDALONE -DHAVE_CONFIG_H -I$(builddir)
 
-mxget_SOURCES= mxget.c
-mxget_CFLAGS=  -DSTANDALONE -DHAVE_CONFIG_H -I$(builddir)
-
 @SET_MAKE@
 
 fetchmail.spec: Makefile.in specgen.sh
@@ -135,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 \
@@ -152,9 +134,8 @@ 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 \
@@ -218,17 +199,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