[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Nmh-commits] [SCM] The nmh Mail Handling System branch, master, updated
|
From: |
Ken Hornstein |
|
Subject: |
[Nmh-commits] [SCM] The nmh Mail Handling System branch, master, updated. da04deaf832ac32974a5bb9499a0ba8321eaf86b |
|
Date: |
Fri, 20 Jan 2012 19:06:24 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The nmh Mail Handling System".
The branch, master has been updated
via da04deaf832ac32974a5bb9499a0ba8321eaf86b (commit)
from 88b27ae07f694e90637c2a852b754539c2f70172 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=da04deaf832ac32974a5bb9499a0ba8321eaf86b
commit da04deaf832ac32974a5bb9499a0ba8321eaf86b
Author: Ken Hornstein <address@hidden>
Date: Fri Jan 20 14:05:26 2012 -0500
Convert the build system over to the use of Automake.
diff --git a/.gitignore b/.gitignore
index 5d5d4db..59bd997 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
/autom4te.cache/
+/compile
/config.h
/config.h.in
/config.h.in~
@@ -6,26 +7,22 @@
/config.status
/configure
/Makefile
-/stamp-h
-/stamp-h.in
-/config/Makefile
+/Makefile.in
+/stamp-h1
/config/version.c
+/config/libmhconfig.a
+/depcomp
/docs/Makefile
-/etc/Makefile
/etc/mhn.defaults
/etc/mts.conf
/etc/sendfiles
-/h/Makefile
-/man/Makefile
+/install-sh
/man/man.sed
-/mts/Makefile
+/missing
/mts/libmts.a
-/mts/smtp/Makefile
-/sbr/Makefile
/sbr/dtimep.c
/sbr/libmh.a
/sbr/sigmsg.h
-/uip/Makefile
/uip/ali
/uip/anno
/uip/ap
@@ -77,10 +74,13 @@
/uip/whom
/nmh-*.tar.gz
/aclocal.m4
+/ylwrap
*.o
*.1
*.5
*.8
a.out.DSYM
.DS_Store
+.deps
+.dirstamp
RPM/
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..4972b3b
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,484 @@
+##
+## Our Makefile.am template for Makefile.in (and, eventually, Makefile)
+##
+## Process this with automake to generate Makefile.in
+##
+
+## We set this to get our autoconf macros in the m4 directory
+ACLOCAL_AMFLAGS = -I m4
+
+##
+## This is the default set of libraries all programs link against. Some
+## programs add extra libraries to this set, so they override this with
+## a program-specific LDADD variable. Note that in all of the cases today
+## LDADD is included in the program-specific LDADD since we want to add
+## to this list of libraries, not replace it.
+##
+LDADD = config/libmhconfig.a sbr/libmh.a
+
+##
+## These are used to create the default mhn.defaults config file
+## MHNSEARCHPATH is the default path to look for MIME content handlers
+## MHNSEARCHPROG is the script used to find the support programs
+##
+MHNSEARCHPATH = "$(PATH):/usr/demo/SOUND"
+MHNSEARCHPROG = $(srcdir)/etc/mhn.find.sh
+
+##
+## Automake doesn't let us install programs in $(libdir), so we create our
+## own directory prefix to use in the primary variable.
+##
+auxexecdir = @libdir@
+
+##
+## Stuff that should be cleaned via "make clean"
+##
+CLEANFILES = config/version.c sbr/sigmsg.h etc/mts.conf etc/sendfiles \
+ etc/mhn.defaults man/man.sed $(man_MANS)
+
+##
+## Files that need to be built before everything else
+##
+BUILT_SOURCES = sbr/sigmsg.h
+
+##
+## This is a list of all programs that get installed in the "bin" directory
+## Note that primary difference between "PROGRAMS" and "SCRIPTS" is that
+## the latter do not have $(EXEEXT) added on the end.
+##
+bin_PROGRAMS = uip/ali uip/anno uip/burst uip/comp uip/dist uip/flist \
+ uip/folder uip/forw uip/inc uip/install-mh uip/mark \
+ uip/mhbuild uip/mhlist uip/mhmail uip/mhn uip/mhparam \
+ uip/mhpath uip/mhshow uip/mhstore uip/msgchk uip/msh uip/new \
+ uip/packf uip/pick uip/prompter uip/refile uip/repl uip/rmf \
+ uip/rmm uip/scan uip/send uip/show uip/sortm uip/whatnow \
+ uip/whom
+
+bin_SCRIPTS = etc/sendfiles
+
+##
+## This is all programs that get installed in the "lib" directory
+##
+auxexec_PROGRAMS = uip/ap uip/conflict uip/dp uip/fmtdump uip/mhl uip/post \
+ uip/rcvdist uip/rcvpack uip/rcvstore uip/rcvtty uip/slocal \
+ uip/spost uip/viamail uip/mhtest
+
+##
+## Internal libraries that we don't create as part of the build process
+## but do not install
+##
+noinst_LIBRARIES = config/libmhconfig.a sbr/libmh.a mts/libmts.a
+
+##
+## These are all of our header files. Right now we don't install any of
+## them, but that might change in the future.
+##
+noinst_HEADERS = h/addrsbr.h h/aliasbr.h h/crawl_folders.h h/dropsbr.h \
+ h/fmt_compile.h h/fmt_scan.h h/m_setjmp.h h/md5.h h/mf.h \
+ h/mh.h h/mhcachesbr.h h/mhparse.h h/mime.h h/msh.h \
+ h/mts.h h/nmh.h h/picksbr.h h/popsbr.h h/prototypes.h \
+ h/rcvmail.h h/scansbr.h h/signals.h h/tws.h h/utils.h \
+ h/vmhsbr.h mts/smtp/smtp.h
+
+##
+## Extra files we need to install in various places
+##
+dist_sysconf_DATA = etc/MailAliases etc/components etc/digestcomps \
+ etc/distcomps etc/forwcomps etc/mhl.body etc/mhl.digest \
+ etc/mhl.format etc/mhl.forward etc/mhl.headers \
+ etc/mhl.reply etc/rcvdistcomps etc/rcvdistcomps.outbox \
+ etc/replcomps etc/replgroupcomps etc/scan.MMDDYY \
+ etc/scan.YYYYMMDD etc/scan.default etc/scan.mailx \
+ etc/scan.nomime etc/scan.size etc/scan.time \
+ etc/scan.timely etc/scan.unseen
+
+##
+## The same as above, but we don't include these in the distribution
+## (because they're generated at compile time)
+##
+sysconf_DATA = etc/mhn.defaults etc/mts.conf
+
+dist_doc_DATA = COPYRIGHT VERSION docs/COMPLETION-BASH docs/COMPLETION-TCSH \
+ docs/COMPLETION-ZSH docs/DIFFERENCES docs/FAQ \
+ docs/MAIL.FILTERING docs/MAILING-LISTS docs/README-ATTACHMENTS \
+ docs/README-HOOKS docs/README.about docs/README.SASL \
+ docs/README.developers docs/README.manpages docs/TODO
+
+##
+## Our man pages
+##
+
+man_MANS = man/ali.1 man/anno.1 man/ap.8 man/burst.1 man/comp.1 \
+ man/conflict.8 man/dist.1 man/dp.8 man/flist.1 man/flists.1 \
+ man/fmtdump.8 man/fnext.1 man/folder.1 man/folders.1 \
+ man/forw.1 man/fprev.1 man/inc.1 man/install-mh.1 man/mark.1 \
+ man/mh-alias.5 man/mh-chart.1 man/mh-draft.5 man/mh-format.5 \
+ man/mh-mail.5 man/mh-profile.5 man/mh-sequence.5 \
+ man/mh-tailor.5 man/mhbuild.1 man/mhl.1 man/mhlist.1 \
+ man/mhmail.1 man/mhn.1 man/mhparam.1 man/mhpath.1 \
+ man/mhshow.1 man/mhstore.1 man/msgchk.1 man/msh.1 \
+ man/mts.conf.5 man/new.1 man/next.1 man/nmh.1 man/packf.1 \
+ man/pick.1 man/post.8 man/prev.1 man/prompter.1 man/rcvdist.1 \
+ man/rcvpack.1 man/rcvstore.1 man/rcvtty.1 man/refile.1 \
+ man/repl.1 man/rmf.1 man/rmm.1 man/scan.1 man/send.1 \
+ man/sendfiles.1 man/show.1 man/slocal.1 man/sortm.1 man/unseen.1 \
+ man/whatnow.1 man/whom.1
+
+##
+## Files we need to include in the distribution which aren't found by
+## Automake using the automatic rules
+##
+
+EXTRA_DIST = config/version.sh sbr/sigmsg.awk etc/mts.conf.in etc/sendfiles.in
\
+ etc/mhn.defaults.sh $(MHNSEARCHPROG) nmh.spec DATE \
+ docs/ChangeLog_MH-3_to_MH-6.6 \
+ docs/ChangeLog_MH-6.7.0_to_MH-6.8.4.html \
+ man/ali.man man/anno.man man/ap.man man/burst.man man/comp.man \
+ man/conflict.man man/dist.man man/dp.man man/flist.man \
+ man/flists.man man/fmtdump.man man/fnext.man man/folder.man \
+ man/folders.man man/forw.man man/fprev.man man/inc.man \
+ man/install-mh.man man/mark.man man/mh-alias.man man/mh-chart.man \
+ man/mh-draft.man man/mh-format.man man/mh-mail.man \
+ man/mh-profile.man man/mh-sequence.man man/mh-tailor.man \
+ man/mhbuild.man man/mhl.man man/mhlist.man man/mhmail.man \
+ man/mhn.man man/mhparam.man man/mhpath.man man/mhshow.man \
+ man/mhstore.man man/msgchk.man man/msh.man man/mts.conf.man \
+ man/new.man man/next.man man/nmh.man man/packf.man man/pick.man \
+ man/post.man man/prev.man man/prompter.man man/rcvdist.man \
+ man/rcvpack.man man/rcvstore.man man/rcvtty.man man/refile.man \
+ man/repl.man man/rmf.man man/rmm.man man/scan.man man/send.man \
+ man/sendfiles.man man/show.man man/slocal.man man/sortm.man \
+ man/unseen.man man/whatnow.man man/whom.man
+
+##
+## These are all of the definitions for each of the programs listed above.
+## They describe the source files that make up the programs and any particular
+## overrides that are used to select different library options from the
+## default.
+##
+## Note that a few programs link in extra files (specifically, popsbr.c)
+## if POP3 support is compiled in. An Automake conditional is used for
+## this purpose.
+##
+
+uip_ali_SOURCES = uip/ali.c uip/aliasbr.c
+
+uip_anno_SOURCES = uip/anno.c uip/annosbr.c
+
+uip_burst_SOURCES = uip/burst.c
+
+uip_comp_SOURCES = uip/comp.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c
\
+ uip/annosbr.c uip/distsbr.c
+
+uip_dist_SOURCES = uip/dist.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c
\
+ uip/annosbr.c uip/distsbr.c
+
+uip_flist_SOURCES = uip/flist.c
+
+uip_folder_SOURCES = uip/folder.c
+
+uip_forw_SOURCES = uip/forw.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c
\
+ uip/annosbr.c uip/distsbr.c
+uip_forw_LDADD = $(LDADD) $(ICONVLIB)
+
+uip_inc_SOURCES = uip/inc.c uip/scansbr.c uip/dropsbr.c uip/termsbr.c
+if POP_SUPPORT
+uip_inc_SOURCES += uip/popsbr.c
+endif
+uip_inc_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(SASLLIB)
+
+uip_install_mh_SOURCES = uip/install-mh.c
+
+uip_mark_SOURCES = uip/mark.c
+
+uip_mhbuild_SOURCES = uip/mhbuild.c uip/mhbuildsbr.c uip/mhcachesbr.c \
+ uip/mhlistsbr.c uip/mhoutsbr.c uip/mhmisc.c \
+ uip/mhfree.c uip/mhparse.c uip/termsbr.c uip/md5.c
+uip_mhbuild_LDADD = $(LDADD) $(TERMLIB)
+
+uip_mhlist_SOURCES = uip/mhlist.c uip/mhparse.c uip/mhcachesbr.c \
+ uip/mhlistsbr.c uip/mhmisc.c uip/mhfree.c uip/termsbr.c \
+ uip/md5.c
+uip_mhlist_LDADD = $(LDADD) $(TERMLIB)
+
+uip_mhmail_SOURCES = uip/mhmail.c
+
+uip_mhn_SOURCES = uip/mhn.c uip/mhparse.c uip/mhcachesbr.c uip/mhshowsbr.c \
+ uip/mhlistsbr.c uip/mhstoresbr.c uip/mhmisc.c uip/mhfree.c \
+ uip/termsbr.c uip/md5.c
+uip_mhn_LDADD = $(LDADD) $(TERMLIB)
+
+uip_mhparam_SOURCES = uip/mhparam.c
+
+uip_mhpath_SOURCES = uip/mhpath.c
+
+uip_mhshow_SOURCES = uip/mhshow.c uip/mhparse.c uip/mhcachesbr.c \
+ uip/mhshowsbr.c uip/mhlistsbr.c uip/mhmisc.c \
+ uip/mhfree.c uip/termsbr.c uip/md5.c
+uip_mhshow_LDADD = $(LDADD) $(TERMLIB)
+
+uip_mhstore_SOURCES = uip/mhstore.c uip/mhparse.c uip/mhcachesbr.c \
+ uip/mhshowsbr.c uip/mhlistsbr.c uip/mhstoresbr.c \
+ uip/mhmisc.c uip/mhfree.c uip/termsbr.c uip/md5.c
+uip_mhstore_LDADD = $(LDADD) $(TERMLIB)
+
+uip_msgchk_SOURCES = uip/msgchk.c
+if POP_SUPPORT
+uip_msgchk_SOURCES += uip/popsbr.c
+endif
+uip_msgchk_LDADD = $(LDADD) $(SASLLIB)
+
+uip_msh_SOURCES = uip/msh.c uip/mshcmds.c uip/vmhsbr.c uip/picksbr.c \
+ uip/scansbr.c uip/dropsbr.c uip/mhlsbr.c uip/termsbr.c
+uip_msh_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB)
+
+uip_new_SOURCES = uip/new.c
+
+uip_packf_SOURCES = uip/packf.c uip/dropsbr.c
+
+uip_pick_SOURCES = uip/pick.c uip/picksbr.c
+
+uip_prompter_SOURCES = uip/prompter.c
+
+uip_refile_SOURCES = uip/refile.c
+
+uip_repl_SOURCES = uip/repl.c uip/replsbr.c uip/whatnowproc.c \
+ uip/whatnowsbr.c uip/sendsbr.c uip/annosbr.c uip/distsbr.c
+uip_repl_LDADD = $(LDADD) $(ICONVLIB)
+
+uip_rmf_SOURCES = uip/rmf.c
+
+uip_rmm_SOURCES = uip/rmm.c
+
+uip_scan_SOURCES = uip/scan.c uip/scansbr.c uip/termsbr.c
+uip_scan_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB)
+
+uip_send_SOURCES = uip/send.c uip/sendsbr.c uip/annosbr.c uip/distsbr.c
+
+uip_show_SOURCES = uip/show.c uip/mhlsbr.c uip/termsbr.c
+uip_show_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB)
+
+uip_sortm_SOURCES = uip/sortm.c
+
+uip_whatnow_SOURCES = uip/whatnow.c uip/whatnowsbr.c uip/sendsbr.c \
+ uip/annosbr.c uip/distsbr.c
+
+uip_whom_SOURCES = uip/whom.c uip/distsbr.c
+
+##
+## Programs definitions for all utilities that end up in $(libdir)
+##
+
+uip_ap_SOURCES = uip/ap.c uip/termsbr.c
+uip_ap_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB)
+
+uip_conflict_SOURCES = uip/conflict.c uip/aliasbr.c
+
+uip_dp_SOURCES = uip/dp.c uip/termsbr.c
+uip_dp_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB)
+
+uip_fmtdump_SOURCES = uip/fmtdump.c
+uip_fmtdump_LDADD = $(LDADD) $(ICONVLIB)
+
+uip_mhl_SOURCES = uip/mhl.c uip/mhlsbr.c uip/termsbr.c
+uip_mhl_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB)
+
+uip_mhtest_SOURCES = uip/mhtest.c uip/mhparse.c uip/mhcachesbr.c \
+ uip/mhoutsbr.c uip/mhmisc.c uip/mhfree.c \
+ uip/termsbr.c uip/md5.c
+uip_mhtest_LDFLAGS = $(LDADD) $(TERMLIB)
+
+uip_post_SOURCES = uip/post.c uip/aliasbr.c
+uip_post_LDFLAGS = $(LDADD) mts/libmts.a $(SASLLIB)
+
+uip_rcvdist_SOURCES = uip/rcvdist.c uip/distsbr.c
+uip_rcvdist_LDADD = $(LDADD) $(ICONVLIB)
+
+uip_rcvpack_SOURCES = uip/rcvpack.c uip/dropsbr.c
+
+uip_rcvstore_SOURCES = uip/rcvstore.c
+
+uip_rcvtty_SOURCES = uip/rcvtty.c uip/scansbr.c uip/termsbr.c
+uip_rcvtty_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB)
+
+uip_slocal_SOURCES = uip/slocal.c uip/aliasbr.c uip/dropsbr.c
+
+uip_spost_SOURCES = uip/spost.c uip/aliasbr.c
+
+uip_viamail_SOURCES = uip/viamail.c uip/mhmisc.c uip/mhoutsbr.c uip/sendsbr.c \
+ uip/annosbr.c uip/distsbr.c
+
+##
+## Our rebuild rules for files that aren't built via the normal mechanisms
+##
+config/version.c: Makefile
+ sh $(srcdir)/config/version.sh $(VERSION) > $@
+
+sbr/sigmsg.h: Makefile $(srcdir)/sbr/sigmsg.awk $(SIGNAL_H)
+ $(AWK) -f $(srcdir)/sbr/sigmsg.awk $(SIGNAL_H) > $@
+
+etc/mts.conf: $(srcdir)/etc/mts.conf.in Makefile
+ rm -f $@
+ $(SED) -e 's,%mts%,$(MTS),' \
+ -e 's,%mailspool%,$(mailspool),' \
+ -e 's,%etcdir%,$(etcdir),' \
+ -e 's,%masquerade%,$(masquerade),' \
+ -e 's,%smtpservers%,$(smtpservers),' \
+ < $(srcdir)/etc/mts.conf.in > $@
+
+etc/mhn.defaults: $(srcdir)/etc/mhn.defaults.sh $(MHNSEARCHPROG)
+ rm -f $@
+ $(srcdir)/etc/mhn.defaults.sh $(MHNSEARCHPATH) $(MHNSEARCHPROG) > $@
+
+etc/sendfiles: $(srcdir)/etc/sendfiles.in Makefile
+ rm -f $@
+ $(SED) -e 's,%libdir%,$(libdir),' < $(srcdir)/etc/sendfiles.in > $@
+
+##
+## This rule gets called at "make install" time; we use it to create links
+## between different programs.
+##
+install-exec-hook:
+ rm -f $(DESTDIR)/$(bindir)/flists$(EXEEXT)
+ rm -f $(DESTDIR)/$(bindir)/folders$(EXEEXT)
+ rm -f $(DESTDIR)/$(bindir)/fnext$(EXEEXT)
+ rm -f $(DESTDIR)/$(bindir)/fprev$(EXEEXT)
+ rm -f $(DESTDIR)/$(bindir)/unseen$(EXEEXT)
+ rm -f $(DESTDIR)/$(bindir)/prev$(EXEEXT)
+ rm -f $(DESTDIR)/$(bindir)/next$(EXEEXT)
+ ln $(DESTDIR)/$(bindir)/flist$(EXEEXT)
$(DESTDIR)/$(bindir)/flists$(EXEEXT)
+ ln $(DESTDIR)/$(bindir)/folder$(EXEEXT)
$(DESTDIR)/$(bindir)/folders$(EXEEXT)
+ ln $(DESTDIR)/$(bindir)/new$(EXEEXT) $(DESTDIR)/$(bindir)/fnext$(EXEEXT)
+ ln $(DESTDIR)/$(bindir)/new$(EXEEXT) $(DESTDIR)/$(bindir)/fprev$(EXEEXT)
+ ln $(DESTDIR)/$(bindir)/new$(EXEEXT)
$(DESTDIR)/$(bindir)/unseen$(EXEEXT)
+ ln $(DESTDIR)/$(bindir)/show$(EXEEXT) $(DESTDIR)/$(bindir)/prev$(EXEEXT)
+ ln $(DESTDIR)/$(bindir)/show$(EXEEXT) $(DESTDIR)/$(bindir)/next$(EXEEXT)
+
+##
+## Make sure we remove those links at uninstall time
+##
+uninstall-local:
+ rm -f $(DESTDIR)/$(bindir)/flists$(EXEEXT)
+ rm -f $(DESTDIR)/$(bindir)/folders$(EXEEXT)
+ rm -f $(DESTDIR)/$(bindir)/fnext$(EXEEXT)
+ rm -f $(DESTDIR)/$(bindir)/fprev$(EXEEXT)
+ rm -f $(DESTDIR)/$(bindir)/unseen$(EXEEXT)
+ rm -f $(DESTDIR)/$(bindir)/prev$(EXEEXT)
+ rm -f $(DESTDIR)/$(bindir)/next$(EXEEXT)
+
+##
+## Our rules to build our internal libraries (libmh.a, libmhconfig.a, libmts.a)
+## No, I'm not quite sure why the first two aren't simply combined into one
+## library. Maybe in the future.
+##
+sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/brkstring.c \
+ sbr/check_charset.c sbr/client.c sbr/closefds.c \
+ sbr/concat.c sbr/context_del.c sbr/context_find.c \
+ sbr/context_foil.c sbr/context_read.c \
+ sbr/context_replace.c sbr/context_save.c \
+ sbr/copy.c sbr/copyip.c sbr/cpydata.c \
+ sbr/cpydgst.c sbr/crawl_folders.c sbr/discard.c \
+ sbr/done.c sbr/dtime.c sbr/dtimep.l \
+ sbr/error.c sbr/ext_hook.c sbr/fdcompare.c \
+ sbr/folder_addmsg.c sbr/folder_delmsgs.c \
+ sbr/folder_free.c sbr/folder_pack.c \
+ sbr/folder_read.c sbr/folder_realloc.c sbr/gans.c \
+ sbr/getans.c sbr/getanswer.c sbr/getarguments.c \
+ sbr/getcpy.c sbr/getfolder.c sbr/getpass.c \
+ sbr/fmt_addr.c sbr/fmt_compile.c sbr/fmt_new.c \
+ sbr/fmt_rfc2047.c sbr/fmt_scan.c sbr/lock_file.c \
+ sbr/m_atoi.c sbr/m_backup.c sbr/m_convert.c \
+ sbr/m_draft.c sbr/m_getfld.c sbr/m_gmprot.c \
+ sbr/m_maildir.c sbr/m_name.c sbr/m_setjmp.c \
+ sbr/makedir.c sbr/mts.c sbr/norm_charmap.c sbr/path.c \
+ sbr/peekc.c sbr/pidwait.c sbr/pidstatus.c \
+ sbr/print_help.c sbr/print_sw.c sbr/print_version.c \
+ sbr/push.c sbr/putenv.c sbr/refile.c sbr/remdir.c \
+ sbr/r1bindex.c sbr/readconfig.c sbr/ruserpass.c \
+ sbr/seq_add.c sbr/seq_bits.c sbr/seq_del.c \
+ sbr/seq_getnum.c sbr/seq_list.c sbr/seq_nameok.c \
+ sbr/seq_print.c sbr/seq_read.c sbr/seq_save.c \
+ sbr/seq_setcur.c sbr/seq_setprev.c sbr/seq_setunseen.c \
+ sbr/showfile.c sbr/signals.c sbr/smatch.c \
+ sbr/snprintb.c sbr/ssequal.c sbr/strcasecmp.c \
+ sbr/strindex.c sbr/trimcpy.c sbr/uprf.c sbr/vfgets.c \
+ sbr/fmt_def.c sbr/m_msgdef.c sbr/mf.c sbr/utils.c \
+ sbr/m_mktemp.c
+
+sbr_libmh_a_CPPFLAGS = -I./sbr -DNMHETCDIR='"$(sysconfdir)"' \
+ -DMAILSPOOL='"$(mailspool)"' -DSENDMAILPATH='"$(sendmailpath)"'
+
+mts_libmts_a_SOURCES = mts/smtp/hosts.c mts/smtp/smtp.c
+
+config_libmhconfig_a_SOURCES = config/config.c config/version.c
+config_libmhconfig_a_CPPFLAGS = -DNMHBINDIR='"$(bindir)"' \
+ -DNMHETCDIR='"$(sysconfdir)"' -DNMHLIBDIR='"$(libdir)"' \
+ -DDEFAULT_EDITOR='"$(default_editor)"' \
+ -DDEFAULT_PAGER='"$(default_pager)"'
+
+##
+## Our rules for generating man pages (both the rule for man.sed and
+## the implicit rules for man page generation).
+##
+
+manext1 = 1
+manext5 = 5
+manext8 = 8
+
+$(man_MANS): man/man.sed
+
+man/man.sed: Makefile
+ echo 's,%nmhwarning%,THIS FILE HAS BEEN AUTOMATICALLY GENERATED. DO
NOT EDIT.,g' > $@
+ echo 's,%nmhversion%,nmh-$(VERSION),g' >> $@
+ echo 's,%nmhdate%,$(DATE),g' >> $@
+ echo 's,%bindir%,$(bindir),g' >> $@
+ echo 's,%etcdir%,$(etcdir),g' >> $@
+ echo 's,%libdir%,$(libdir),g' >> $@
+ echo 's,%mandir%,$(mandir),g' >> $@
+ echo 's,%mailspool%,$(mailspool),g' >> $@
+ echo 's,%sendmailpath%,$(sendmailpath),g' >> $@
+ echo 's,%default_editor%,$(default_editor),g' >> $@
+ echo 's,%default_pager%,$(default_pager),g' >> $@
+ echo 's,%manext1%,$(manext1),g' >> $@
+ echo 's,%manext5%,$(manext5),g' >> $@
+ echo 's,%manext8%,$(manext8),g' >> $@
+if POP_SUPPORT
+ echo '/^%nmhbeginpop%/d;/^%nmhendpop%/d' >> $@
+else
+ echo '/^%nmhbeginpop%/,/^%nmhendpop%/d' >> $@
+endif
+ echo '/%components%/r $(top_srcdir)/etc/components' >> $@
+ echo ' s,%components%,,g' >> $@
+ echo '/%distcomps%/r $(top_srcdir)/etc/distcomps' >> $@
+ echo ' s,%distcomps%,,g' >> $@
+ echo '/%forwcomps%/r $(top_srcdir)/etc/forwcomps' >> $@
+ echo ' s,%forwcomps%,,g' >> $@
+ echo '/%mhl_forward%/r $(top_srcdir)/etc/mhl.forward' >> $@
+ echo ' s,%mhl_forward%,,g' >> $@
+ echo '/%mhl_format%/r $(top_srcdir)/etc/mhl.format' >> $@
+ echo ' s,%mhl_format%,,g' >> $@
+ echo '/%mhl_reply%/r $(top_srcdir)/etc/mhl.reply' >> $@
+ echo ' s,%mhl_reply%,,g' >> $@
+
+.man.$(manext1):
+ $(SED) -f man/man.sed $< > $@
+
+.man.$(manext5):
+ $(SED) -f man/man.sed $< > $@
+
+.man.$(manext8):
+ $(SED) -f man/man.sed $< > $@
+
+##
+## Our RPM build target
+##
+
+rpm: $(DIST_ARCHIVES)
+ @test -d $(rpmdir)/SOURCES || $(MKDIR_P) $(rpmdir)/SOURCES
+ @test -d $(rpmdir)/SPECS || $(MKDIR_P) $(rpmdir)/SPECS
+ @mv -f $(DIST_ARCHIVES) $(rpmdir)/SOURCES
+ @cp -p VERSION $(rpmdir)/SOURCES
+ @cp -p nmh.spec $(rpmdir)/SPECS
+ @rpmbuild --define '_topdir $(rpmdir)' \
+ --define '_tmppath %{_topdir}/TMP' \
+ -ba $(rpmdir)/SPECS/nmh.spec
diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index 753cb5e..0000000
--- a/Makefile.in
+++ /dev/null
@@ -1,216 +0,0 @@
-#
-# Makefile for top level of nmh distribution
-#
-
-# nmh version
-VERSION = @VERSION@
-
-SHELL = /bin/sh
address@hidden@
-
-srcdir = @srcdir@
-abs_srcdir = @abs_srcdir@
-datarootdir = @datarootdir@
-VPATH = @srcdir@
-
-# ========== USER CONFIGURATION SECTION ==========
-#
-# If `make' is executed in the directory containing this Makefile,
-# any changes made in this section will override the values of
-# these parameters in makefiles in any of the subdirectories.
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-# location of standard commands
-bindir = @bindir@
-
-# location of support binaries and scripts
-libdir = @libdir@
-
-# location of nmh configuration and formats files
-etcdir = @sysconfdir@
-
-# location of man pages
-mandir = @mandir@
-
-# RPM build root
-rpmdir = @rpmdir@
-
-# location of incoming mail
-mailspool = @mailspool@
-
-# location of mail transport agent
-sendmailpath = @sendmailpath@
-
-# default editor
-default_editor = @editorpath@
-
-# default pager
-default_pager = @pagerpath@
-
-CC = @CC@
-CPPFLAGS = @CPPFLAGS@
-DEFS = @DEFS@ @OURDEFS@
-CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-
-# ========== YOU SHOULDN'T HAVE TO CHANGE ANYTHING BELOW HERE ==========
-
-# flags passed to recursive makes in subdirectories
-MAKEDEFS = CC='$(CC)' CPPFLAGS='$(CPPFLAGS)' DEFS='$(DEFS)' \
-CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' LIBS='$(LIBS)' \
-prefix='$(prefix)' exec_prefix='$(exec_prefix)' bindir='$(bindir)' \
-etcdir='$(etcdir)' libdir='$(libdir)' mandir='$(mandir)' \
-mailspool='$(mailspool)' sendmailpath='$(sendmailpath)' \
-default_editor='$(default_editor)' default_pager='$(default_pager)'
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-
-.SUFFIXES:
-
-# all files in this directory included in the distribution
-DIST = ChangeLog COPYRIGHT DATE INSTALL MACHINES README VERSION
\
- ChangeLog install-sh mkinstalldirs Makefile.in \
- config.h.in configure.ac configure stamp-h.in \
- config.sub config.guess
-
-# subdirectories in distribution
-SUBDIRS = h config sbr mts uip etc man docs
-
-# ========== DEPENDENCIES FOR BUILDING AND INSTALLING ==========
-
-# default target
-all: config.h Makefile all-recursive
-
-all-recursive:
- for subdir in $(SUBDIRS); do \
- (cd $$subdir && $(MAKE) $(MAKEDEFS) all) || exit 1; \
- done
-
-install: all
- for subdir in $(SUBDIRS); do \
- (cd $$subdir && $(MAKE) $(MAKEDEFS) $@) || exit 1; \
- done
-
-uninstall:
- for subdir in $(SUBDIRS); do \
- (cd $$subdir && $(MAKE) $(MAKEDEFS) $@) || exit 1; \
- done
-
-# ========== DEPENDENCIES FOR CLEANUP ==========
-
-mostlyclean: mostlyclean-recursive mostlyclean-local
-clean: clean-recursive clean-local
-distclean: distclean-recursive distclean-local
-realclean: realclean-recursive realclean-local
-superclean: superclean-recursive superclean-local
-
-mostlyclean-local:
- rm -f *~
- $(RM) -r autom4te.cache
-
-clean-local: mostlyclean-local
-
-distclean-local: clean-local
- rm -f Makefile config.h config.status config.log config.cache stamp-h
distname
- $(RM) -r RPM
-
-realclean-local: distclean-local
-
-superclean-local: realclean-local
- cd $(srcdir) && rm -f config.h.in stamp-h.in configure
-
-mostlyclean-recursive clean-recursive distclean-recursive realclean-recursive
superclean-recursive:
- for subdir in $(SUBDIRS); do \
- target=`echo $@ | sed 's/-recursive//'`; \
- (cd $$subdir && $(MAKE) $(MAKEDEFS) $$target) || exit 1; \
- done
-
-# ========== DEPENDENCIES FOR MAINTENANCE ==========
-
-lint:
- for subdir in $(SUBDIRS); do \
- ( cd $$subdir && $(MAKE) $(MAKEDEFS) lint ) || exit 1; \
- done
-
-# ========== DEPENDENCIES FOR MAINTENANCE ==========
-
-Makefile: Makefile.in config.status
- ./config.status $@
-
-config.status: configure VERSION
- ./config.status --recheck
-
-configure: configure.ac
- cd $(srcdir) && autoconf
-
-config.h: stamp-h
-stamp-h: config.h.in config.status
- ./config.status config.h stamp
-
-config.h.in: stamp-h.in
-stamp-h.in: configure.ac
- cd $(srcdir) && autoheader
- date > $@
-
-# rebuild all autoconf files
-reset:
- cd $(srcdir) && autoheader
- cd $(srcdir) && autoconf
- cd $(srcdir) && date > stamp-h.in
-
-# name of new nmh distribution tar file
-tarfile = nmh-$(VERSION).tar.gz
-
-# ftp directory location
-ftpdir = /ftp/nmh
-
-# file containing name of new nmh distribution
-distname:
- @echo nmh-$(VERSION) > distname
-
-# build nmh distribution
-distdir = `cat distname`
-nmhdist: $(DIST) distname
- @echo "Begin building nmh-$(VERSION) distribution"
- rm -rf $(distdir)
- mkdir $(distdir)
- @chmod 755 $(distdir)
- @echo "Copying distribution files in main directory"
- @for file in $(DIST); do \
- cp -p $(srcdir)/$$file $(distdir); \
- done
- @for subdir in $(SUBDIRS); do \
- mkdir $(distdir)/$$subdir; \
- chmod 755 $(distdir)/$$subdir; \
- (cd $$subdir && $(MAKE) $@) || exit 1; \
- done
- chmod -R a+r $(distdir)
- tar chf - $(distdir) | gzip -c > $(tarfile)
- rm -rf $(distdir) distname
- @echo "Done building nmh-$(VERSION) distribution"
-
-# release a new nmh distribution into ftp directory
-nmhrelease:
- rm -f $(ftpdir)/$(tarfile)
- rm -f $(ftpdir)/nmh.tar.gz
- mv $(tarfile) $(ftpdir)/$(tarfile)
- cd $(ftpdir) && ln -s $(tarfile) nmh.tar.gz
- cd $(ftpdir) && md5sum *.gz > MD5SUM
-
-# Create binary and source RPMs.
-# _topdir is the specified RPM build root.
-# _tmppath is TMP below _topdir.
-rpm: nmhdist
- @test -d $(rpmdir)/SOURCES || mkdir -p $(rpmdir)/SOURCES
- @test -d $(rpmdir)/SPECS || mkdir -p $(rpmdir)/SPECS
- @mv -f $(tarfile) $(rpmdir)/SOURCES
- @cp -p VERSION $(rpmdir)/SOURCES
- @cp -p nmh.spec $(rpmdir)/SPECS
- @rpmbuild --define '_topdir $(rpmdir)' \
- --define '_tmppath %{_topdir}/TMP' \
- -ba $(rpmdir)/SPECS/nmh.spec
diff --git a/autogen.sh b/autogen.sh
index fd544c2..9d4ef13 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,6 +5,6 @@
# building from a distributed tarball.
set -e
-aclocal -I m4
-autoreconf
+# aclocal -I m4
+autoreconf -v -i
date > stamp-h.in
diff --git a/config/Makefile.in b/config/Makefile.in
deleted file mode 100644
index 4d2d5db..0000000
--- a/config/Makefile.in
+++ /dev/null
@@ -1,95 +0,0 @@
-#
-# Makefile for config subdirectory
-#
-
-# nmh version
-VERSION = @VERSION@
-
-SHELL = /bin/sh
-
-top_srcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-libdir = @libdir@
-etcdir = @sysconfdir@
-
-default_editor = @editorpath@
-default_pager = @pagerpath@
-
-CC = @CC@
-CFLAGS = @CFLAGS@
-DEFS = @DEFS@
-INCLUDES = -I$(top_srcdir) @CPPFLAGS@
-CONFIGDEFS = -DNMHBINDIR='"$(bindir)"' -DNMHETCDIR='"$(etcdir)"'
-DNMHLIBDIR='"$(libdir)"' \
- -DDEFAULT_EDITOR='"$(default_editor)"'
-DDEFAULT_PAGER='"$(default_pager)"'
-
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
-COMPILE2 = $(CC) -c $(DEFS) $(CONFIGDEFS) $(INCLUDES) $(CFLAGS)
-
-.SUFFIXES:
-.SUFFIXES: .c .o
-
-.c.o:
- $(COMPILE) $<
-
-# source files
-SRCS = config.c
-
-# object files
-OBJS = config.o version.o
-
-# auxiliary files
-AUX = Makefile.in version.sh
-
-# all files in this directory included in the distribution
-DIST = $(SRCS) $(AUX)
-
-# ========= DEPENDENCIES FOR BUILDING ==========
-
-all: $(OBJS)
-
-version.c:
- ${srcdir}/version.sh $(VERSION) > version.c
-
-config.o: config.c
- $(COMPILE2) $(srcdir)/config.c
-
-install:
-
-uninstall:
-
-lint:
-
-# ========== DEPENDENCIES FOR CLEANUP ==========
-
-mostlyclean:
- rm -f *.o *~
-
-clean: mostlyclean
- rm -f version.c
-
-distclean: clean
- rm -f Makefile
-
-realclean: distclean
-
-superclean: realclean
-
-# ========== DEPENDENCIES FOR MAINTENANCE ==========
-
-subdir = config
-
-Makefile: Makefile.in ../config.status
- cd .. && ./config.status $(subdir)/$@
-
-distdir = ../`cat ../distname`/$(subdir)
-nmhdist: $(DIST)
- @echo "Copying distribution files in $(subdir)"
- @for file in $(DIST); do \
- cp -p $(srcdir)/$$file $(distdir); \
- done
-
diff --git a/configure.ac b/configure.ac
index 707322c..0756158 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,27 +3,14 @@ dnl configure.ac -- autoconf template for nmh
dnl
dnl Move this up a bit
-AC_PREREQ(2.61)
+AC_PREREQ([2.61])
-AC_INIT(nmh, m4_normalize(m4_include([VERSION])))
-AC_CONFIG_SRCDIR(h/nmh.h)
-AC_CONFIG_HEADER(config.h)
+AC_INIT([nmh], m4_normalize(m4_include([VERSION])), address@hidden)
+AC_CONFIG_SRCDIR([h/nmh.h])
+AC_CONFIG_HEADER([config.h])
+AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
-AC_CANONICAL_TARGET
-
-dnl ---------------------
-dnl define a macro or two
-dnl ---------------------
-
-AC_DEFUN([NMH_PROG_GNU_LIBTOOL], [
-if test -n "$LIBTOOL" ; then
- tmptest=`$LIBTOOL --version 2>&1 | grep GNU`
- if test x"$tmptest" != x ; then
- GNU_LIBTOOL=1
- AC_SUBST(GNU_LIBTOOL)dnl
- fi
-fi
-] )
+AC_CANONICAL_HOST
echo "configuring for AC_PACKAGE_NAME-AC_PACKAGE_VERSION"
AC_SUBST(VERSION,AC_PACKAGE_VERSION)dnl
@@ -31,14 +18,14 @@ AC_SUBST(VERSION,AC_PACKAGE_VERSION)dnl
dnl What date of nmh are we building?
DATE=`cat ${srcdir}/DATE`
echo "configuring for nmh dated $DATE"
-AC_SUBST(DATE)dnl
+AC_SUBST([DATE])dnl
dnl --------------------------
dnl CHECK COMMAND LINE OPTIONS
dnl --------------------------
dnl Do you want to debug nmh?
-AC_ARG_ENABLE(debug,
+AC_ARG_ENABLE([debug],
AS_HELP_STRING([--enable-debug],[enable nmh code debugging]))
dnl The old redundant --enable-nmh-debug is deprecated and undocumented.
if test x"$enable_nmh_debug" = x"yes"; then
@@ -57,7 +44,7 @@ AC_ARG_ENABLE(masquerade,
AC_SUBST(masquerade)dnl
dnl Do you want client-side support for pop?
-AC_ARG_ENABLE(pop,
+AC_ARG_ENABLE([pop],
AS_HELP_STRING([--enable-pop], [enable client-side support for plain POP3]))
dnl The old redundant --enable-nmh-pop is deprecated and undocumented.
if test x"$enable_nmh_pop" = x"yes"; then
@@ -77,10 +64,10 @@ AC_DEFINE(LOCALE)
dnl Do you want client-side support for using SASL for authentication?
dnl Note that this code will be enabled for both POP and SMTP
-AC_ARG_WITH(cyrus-sasl, AS_HELP_STRING([--with-cyrus-sasl],
+AC_ARG_WITH([cyrus-sasl], AS_HELP_STRING([--with-cyrus-sasl],
[Enable SASL support via the Cyrus SASL library]))
if test x"$with_cyrus_sasl" != x -a x"$with_cyrus_sasl" != x"no"; then
- AC_DEFINE(CYRUS_SASL, 1,
+ AC_DEFINE([CYRUS_SASL], [1],
[Define to use the Cyrus SASL library for authentication of POP and
SMTP.])dnl
if test x"$with_cyrus_sasl" != xyes; then
AC_MSG_WARN([Arguments to --with-cyrus-sasl now ignored])
@@ -92,16 +79,16 @@ else
fi
dnl Do you want client-side support for encryption with TLS?
-AC_ARG_WITH(tls, AS_HELP_STRING([--with-tls], [Enable TLS support]))
+AC_ARG_WITH([tls], AS_HELP_STRING([--with-tls], [Enable TLS support]))
if test x"$with_tls" != x -a x"$with_tls" != x"no"; then
- AC_DEFINE(TLS_SUPPORT, 1, [Support TLS for session encryption.])dnl
+ AC_DEFINE([TLS_SUPPORT], [1], [Support TLS for session encryption.])dnl
tls_support=yes
else
tls_support=no
fi
dnl What should be the default editor?
-AC_ARG_WITH(editor,
+AC_ARG_WITH([editor],
AS_HELP_STRING([--with-editor=EDITOR],[specify the default editor]))
if test -n "$with_editor"; then
@@ -116,20 +103,15 @@ if test x"$with_hash_backup" != x -a x"$with_hash_backup"
!= x"no"; then
else
backup_prefix=","
fi
-AC_DEFINE_UNQUOTED(BACKUP_PREFIX, "$backup_prefix",
+AC_DEFINE_UNQUOTED([BACKUP_PREFIX], "$backup_prefix",
[The prefix that is prepended to the name of message files when they are
"removed" by rmm. This should typically be `,' or `#'.])dnl
dnl After we know if we're including apop and kpop support, do pop stuff
if test x"$enable_pop" = x"yes"; then
- AC_DEFINE(POP, 1,
+ AC_DEFINE([POP], 1,
[Define this to compile client-side support for pop into inc and
msgchk.])dnl
- POPLIB=popsbr.o
- POPSED='/^%nmhbeginpop%/d;/^%nmhendpop%/d'
-else
- POPSED='/^%nmhbeginpop%/,/^%nmhendpop%/d'
fi
-AC_SUBST(POPLIB)dnl
-AC_SUBST(POPSED)dnl
+AM_CONDITIONAL([POP_SUPPORT], [test x"$enable_pop" = x"yes"])
dnl What method of locking to use?
AC_ARG_WITH(locking,
@@ -165,7 +147,7 @@ AC_ARG_ENABLE([lockdir], [
])
dnl What method of posting should post use?
-AC_ARG_WITH(mts,
+AC_ARG_WITH([mts],
AS_HELP_STRING([--with-mts=@<:@smtp|sendmail@:>@],
[specify the default mail transport agent/service]))
@@ -176,14 +158,14 @@ elif test x"$with_mts" = x"sendmail"; then
else
MTS="smtp"
fi
-AC_SUBST(MTS)dnl
+AC_SUBST([MTS])dnl
dnl Both the smtp and sendmail mail transport services use the smtp code
-AC_DEFINE(SMTPMTS, 1,
+AC_DEFINE([SMTPMTS], [1],
[Define if you want SMTP (simple mail transport protocol) support.])dnl
dnl What should be the default pager?
-AC_ARG_WITH(pager,
+AC_ARG_WITH([pager],
AS_HELP_STRING([--with-pager=PAGER],[specify the default pager]))
if test -n "$with_pager"; then
@@ -199,12 +181,12 @@ if test -n "$with_smtpservers"; then
else
smtpservers="localhost"
fi
-AC_SUBST(smtpservers)dnl
+AC_SUBST([smtpservers])dnl
dnl ----------------------------------------------------
dnl Default location is /usr/local/nmh/{bin,etc,lib,man}
dnl ----------------------------------------------------
-AC_PREFIX_DEFAULT(/usr/local/nmh)
+AC_PREFIX_DEFAULT([/usr/local/nmh])
dnl ------------------
dnl CHECK THE COMPILER
@@ -217,11 +199,10 @@ if test x"$enable_debug" = x"yes"; then
fi
AC_PROG_CC
+AM_PROG_CC_C_O
-AC_SUBST(EXEEXT)dnl
-
-AC_CACHE_CHECK(whether preprocessor supports -Wunused-macros,
- nmh_cv_has_unusedmacros,
+AC_CACHE_CHECK([whether preprocessor supports -Wunused-macros],
+ [nmh_cv_has_unusedmacros],
[nmh_saved_cppflags="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -Wunused-macros -Wno-unused-macros"
AC_TRY_COMPILE([],[],nmh_cv_has_unusedmacros=yes,nmh_cv_has_unusedmacros=no)
@@ -234,13 +215,14 @@ if test "$nmh_cv_has_unusedmacros" = 'yes'; then
fi
AC_SUBST(DISABLE_UNUSED_MACROS_WARNING)dnl
-AC_CACHE_CHECK(whether compiler supports -Wextra, nmh_cv_wextra,
+AC_CACHE_CHECK([whether compiler supports -Wextra], [nmh_cv_wextra],
[nmh_saved_cflags="$CFLAGS"
CFLAGS="$CFLAGS -Wextra -Wno-clobbered"
- AC_TRY_COMPILE([],[],nmh_cv_wextra=' -Wextra -Wno-clobbered',echo -n no)
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
+ [nmh_cv_wextras=' -Wextra -Wno-clobbered'], [echo $ECHO_N "no$ECHO_C"])
CFLAGS="$nmh_saved_cflags"])
-AC_CACHE_CHECK(whether compiler supports -Wno-pointer-sign,
nmh_cv_has_noptrsign,
+AC_CACHE_CHECK([whether compiler supports -Wno-pointer-sign],
[nmh_cv_has_noptrsign],
[nmh_saved_cflags="$CFLAGS"
CFLAGS="$CFLAGS -Wno-pointer-sign"
AC_TRY_COMPILE([],[],nmh_cv_has_noptrsign=yes,nmh_cv_has_noptrsign=no)
@@ -295,6 +277,7 @@ AC_PROG_MAKE_SET dnl Does make define $MAKE
AC_PROG_INSTALL dnl Check for BSD compatible `install'
AC_PROG_RANLIB dnl Check for `ranlib'
AC_PROG_AWK dnl Check for mawk,gawk,nawk, then awk
+AC_PROG_SED dnl Check for Posix-compliant sed
AC_PROG_LEX dnl Check for lex/flex
dnl Look for `cut'
@@ -318,53 +301,17 @@ else
LINTFLAGS=""
fi
fi
-AC_SUBST(LINT)dnl
-AC_SUBST(LINTFLAGS)dnl
-
-dnl try to figure out which one we've got
-AC_CHECK_PROG(LIBTOOL, libtool, libtool, , [$pathtmp])
-NMH_PROG_GNU_LIBTOOL
-
-dnl Check for lorder and tsort commands
-AC_CHECK_PROG(LORDER, lorder, lorder, no)dnl
-AC_CHECK_PROG(TSORT, tsort, tsort, no)dnl
-
-dnl If either doesn't exist, replace them with echo and cat
-if test x$ac_cv_prog_LORDER != xlorder -o x$ac_cv_prog_TSORT != xtsort; then
- LORDER=echo
- TSORT=cat
- AC_SUBST(LORDER)dnl
- AC_SUBST(TSORT)dnl
-dnl Mac OS X has lorder, but sh is too broken for it to work
-dnl elif test -z "`lorder config/config.c 2>&1 | grep config/config.c`" ; then
-dnl LORDER=echo
-dnl TSORT=cat
-dnl AC_SUBST(LORDER)dnl
-dnl AC_SUBST(TSORT)dnl
-fi
-
-dnl Check whether tsort can deal with loops
-AC_CACHE_CHECK(whether tsort can deal with loops, nmh_cv_tsort_loop,
- [if test -z "`echo a b b a | tsort 2>/dev/null | grep a`" ; then
- nmh_cv_tsort_loop=no
- else
- nmh_cv_tsort_loop=yes
- fi])
-if test x$nmh_cv_tsort_loop = xno ; then
- LORDER=echo
- TSORT=cat
- AC_SUBST(LORDER)dnl
- AC_SUBST(TSORT)dnl
-fi
+AC_SUBST([LINT])dnl
+AC_SUBST([LINTFLAGS])dnl
dnl Look for `ls'
pathtmp=/usr/bin:/bin:/usr/local/bin:/usr/xpg4/bin:/usr/ucb
-AC_PATH_PROG(lspath, ls, no, [$pathtmp])
+AC_PATH_PROG([lspath], [ls], [no], [$pathtmp])
dnl See how we get ls to display the owner and the group
if test "$lspath" != "no"; then
- AC_CACHE_CHECK(how to get ls to show us the group ownership of a file,
- nmh_cv_ls_grpopt,
+ AC_CACHE_CHECK([how to get ls to show us the group ownership of a file],
+ [nmh_cv_ls_grpopt],
[if test x"`$lspath -dl / | $AWK '{print $9}'`" = x"/"; then
dnl There were 9 parameters, so unless this is a really bizarre,
nonstandard
dnl ls, it would seem -l gave us both the user and group. On this type of
@@ -378,7 +325,7 @@ fi
dnl Look for `more'
pathtmp=/usr/bin:/bin:/usr/ucb:/usr/local/bin
-AC_PATH_PROG(morepath, more, no, [$pathtmp])
+AC_PATH_PROG([morepath], [more], [no], [$pathtmp])
dnl If pager is not specified yet,
dnl then use `more' as the default.
@@ -389,18 +336,18 @@ AC_SUBST(pagerpath)dnl
dnl Look for `sendmail'
pathtmp=/usr/lib:/usr/sbin:/usr/etc:/usr/ucblib:/usr/bin:/bin
-AC_PATH_PROG(sendmailpath, sendmail, /usr/sbin/sendmail, [$pathtmp])
+AC_PATH_PROG([sendmailpath], [sendmail], [/usr/sbin/sendmail], [$pathtmp])
dnl Look for `vi'
pathtmp=/usr/bin:/bin:/usr/ucb:/usr/local/bin
-AC_PATH_PROG(vipath, vi, /bin/vi, [$pathtmp])
+AC_PATH_PROG([vipath], [vi], [/bin/vi], [$pathtmp])
dnl If editor is not specified yet,
dnl then use `vi' as the default.
if test -z "$editorpath"; then
editorpath="$vipath"
fi
-AC_SUBST(editorpath)dnl
+AC_SUBST([editorpath])dnl
dnl ----------------------------------------------------------
dnl FIND MAIL SPOOL AND SEE IF WE NEED TO MAKE inc SETGID MAIL
@@ -430,7 +377,7 @@ if test "$lspath" != "no" -a "$cutpath" != "no"; then
fi
dnl Also, check for liblockfile (as found on Debian systems)
-AC_CHECK_HEADER(lockfile.h, AC_CHECK_LIB(lockfile, lockfile_create) )
+AC_CHECK_HEADER([lockfile.h], AC_CHECK_LIB(lockfile, lockfile_create) )
dnl and whether its companion program dotlockfile is setgid
AC_PATH_PROG(dotlockfilepath, dotlockfile, no)
@@ -476,7 +423,7 @@ dnl because it must be set before any system header is
included and there's no
dnl portable way to make sure that files generated by lex include config.h
dnl before system header files.
-case "$target_os" in
+case "$host_os" in
linux*)
# Like DEFS, but doesn't get stomped on by configure when using config.h:
test -z "$OURDEFS" && OURDEFS="-D_GNU_SOURCE" \
@@ -532,7 +479,7 @@ termcap_curses_order="termcap curses ncurses"
for lib in $termcap_curses_order; do
AC_CHECK_LIB(${lib}, tgetent, [TERMLIB="-l$lib"; break])
done
-AC_SUBST(TERMLIB)dnl
+AC_SUBST([TERMLIB])dnl
dnl ---------------
dnl CHECK FOR ICONV
@@ -547,7 +494,7 @@ if test "x$ac_cv_header_iconv_h" = "xyes"; then
AC_CHECK_LIB(iconv, libiconv, ac_found_iconv=yes)
fi
if test "x$ac_found_iconv" != "xno"; then
- LIBS="-liconv $LIBS"
+ ICONVLIB="-liconv"
fi
else
dnl Handle case where there is a native iconv but iconv.h is from libiconv
@@ -557,8 +504,9 @@ if test "x$ac_cv_header_iconv_h" = "xyes"; then
fi
fi
if test "x$ac_found_iconv" = xyes; then
- AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
+ AC_DEFINE([HAVE_ICONV], [1], [Define if you have the iconv() function.])
fi
+AC_SUBST([ICONVLIB])
dnl Check if iconv uses const in prototype declaration
if test "x$ac_found_iconv" = "xyes"; then
@@ -639,7 +587,7 @@ else
else
NDBM_LIBS=
fi
- AC_SUBST(NDBM_LIBS)
+ AC_SUBST([NDBM_LIBS])
fi
dnl ------------------
@@ -652,7 +600,7 @@ AC_ARG_WITH(rpmdir,
AS_HELP_STRING([--with-rpmdir=RPMDIR], [RPM build directory @<:@RPM@:>@]))
AS_IF([test x"$with_rpmdir" = x], [rpmdir='$(abs_srcdir)/RPM'; nmhrpm=./RPM],
[rpmdir="$with_rpmdir"; eval "nmhrpm=${rpmdir}"])
-AC_SUBST(rpmdir)
+AC_SUBST([rpmdir])
dnl --------------------
@@ -661,8 +609,9 @@ dnl --------------------
AS_IF([test x"$sasl_support" = x"yes"],[
AC_CHECK_HEADER([sasl/sasl.h], , [AC_MSG_ERROR([sasl.h not found])])
- AC_CHECK_LIB([sasl2], [sasl_client_new], ,
- [AC_MSG_ERROR([Cyrus SASL library not found])])])
+ AC_CHECK_LIB([sasl2], [sasl_client_new], [SASLLIB="-lsasl2"],
+ [AC_MSG_ERROR([Cyrus SASL library not found])])],[SASLLIB=""])
+AC_SUBST([SASLLIB])
dnl -----------------
dnl CHECK FOR OPENSSL
@@ -787,15 +736,6 @@ nmh_cv_path_signal_h=$SIGNAL_H
SIGNAL_H=$nmh_cv_path_signal_h
AC_SUBST(SIGNAL_H)dnl
-dnl ----------------
-dnl OUTPUT MAKEFILES
-dnl ----------------
-AC_CONFIG_FILES(Makefile config/Makefile h/Makefile sbr/Makefile uip/Makefile \
- mts/Makefile mts/smtp/Makefile \
- etc/Makefile docs/Makefile man/Makefile)
-AC_CONFIG_COMMANDS([stamp],[test -z "$CONFIG_HEADERS" || echo > stamp-h])
-AC_OUTPUT
-
dnl These odd looking assignments are done to expand out unexpanded
dnl variables in bindir et al (for instance mandir is '${datarootdir}/man',
dnl but expanding that gives '${prefix}/share/man', so we need to expand
@@ -811,20 +751,26 @@ eval "nmhrpm=${nmhrpm}";
pop_kinds=no
if test x"$enable_pop" = x"yes"; then
- pop_kinds="yes ("
+ pop_kinds="yes (POP3)"
+fi
- if test x"$enable_apop" = x"yes"; then
- pop_kinds="${pop_kinds}APOP "
- fi
+dnl
+dnl Sigh, this is required because under the new world order autoconf has
+dnl nothing to create in a few of the build directories when doing an object
+dnl tree build. So make sure we created certain directories if they don't
+dnl exist.
+dnl
- pop_kinds="${pop_kinds}POP3)"
-fi
+AC_CONFIG_COMMANDS([build-directories],
+[test -d etc || ${MKDIR_P} etc
+test -d man || ${MKDIR_P} man])
+AC_CONFIG_COMMANDS_POST([
echo "
nmh configuration
-----------------
nmh version : AC_PACKAGE_VERSION
-target os : ${target}
+host os : ${host}
compiler : ${CC}
compiler flags : ${CFLAGS}
linker flags : ${LDFLAGS}
@@ -845,4 +791,10 @@ email address masquerading : ${masquerade}
pop is enabled : ${pop_kinds}
SASL support : ${sasl_support}
TLS support : ${tls_support}"
-echo ""
+echo ""])
+
+dnl ---------------
+dnl OUTPUT MAKEFILE
+dnl ---------------
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
diff --git a/docs/Makefile.in b/docs/Makefile.in
deleted file mode 100644
index 5fb1341..0000000
--- a/docs/Makefile.in
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-# Makefile for h subdirectory
-#
-
-SHELL = /bin/sh
-
-top_srcdir = @top_srcdir@
-srcdir = @srcdir@
-docdir = @docdir@
-datarootdir = @datarootdir@
-VPATH = @srcdir@
-
-# files included in distribution
-TOPDIR_FILES_TO_INSTALL = COPYRIGHT VERSION
-FILES_TO_INSTALL = COMPLETION-BASH COMPLETION-TCSH COMPLETION-ZSH \
- DIFFERENCES FAQ MAIL.FILTERING MAILING-LISTS \
- README-ATTACHMENTS README-HOOKS README.about \
- README.SASL README.developers README.manpages \
- TODO
-FILES = $(FILES_TO_INSTALL) \
- ChangeLog_MH-3_to_MH-6.6 ChangeLog_MH-6.7.0_to_MH-6.8.4.html
-
-# auxiliary files
-AUX = Makefile.in
-
-# all files in this directory included in the distribution
-DIST = $(FILES) $(AUX)
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-
-# ========== DEPENDENCIES FOR BUILDING AND INSTALLING ==========
-
-all:
-
-install: all
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
- for file in $(TOPDIR_FILES_TO_INSTALL); do \
- $(INSTALL_DATA) $(top_srcdir)/$$file $(DESTDIR)$(docdir); \
- done
- for file in $(FILES_TO_INSTALL); do \
- $(INSTALL_DATA) $$file $(DESTDIR)$(docdir); \
- done
-
-uninstall:
- for file in $(TOPDIR_FILES_TO_INSTALL) $(FILES_TO_INSTALL); do \
- $(RM) $(DESTDIR)$(docdir)/$$file; \
- done
-
-lint:
-
-# ========== DEPENDENCIES FOR CLEANUP ==========
-
-mostlyclean:
- rm -f *~
-
-clean: mostlyclean
-
-distclean: clean
- rm -f Makefile
-
-realclean: distclean
-
-superclean: realclean
-
-# ========== DEPENDENCIES FOR MAINTENANCE ==========
-
-subdir = docs
-
-Makefile: Makefile.in ../config.status
- cd .. && ./config.status $(subdir)/$@
-
-distdir = ../`cat ../distname`/$(subdir)
-nmhdist:
- @echo "Copying distribution files in $(subdir)"
- @for file in $(DIST); do \
- cp -p $(srcdir)/$$file $(distdir); \
- done
diff --git a/docs/README.developers b/docs/README.developers
index 2946d8c..cba9f46 100644
--- a/docs/README.developers
+++ b/docs/README.developers
@@ -9,23 +9,34 @@ local info best encoded in a comment) are encouraged to share
their wisdom here.
The topics are organized alphabetically.
---------------
-autoconf files
---------------
-
-If you wish to change the `configure' script or its related files, you'll need
-to first install GNU m4, available from <ftp://ftp.gnu.org/pub/gnu/m4/> and
then
-GNU autoconf (<ftp://ftp.gnu.org/pub/gnu/autoconf/>). Nmh is currently using
-a minimum of autoconf 2.61.
-
-Most of the configure-related files are automatically generated. The only
files
-you should need to manually edit are configure.ac and aclocal.m4. Don't, for
-instance, edit config.h.in. Though it is an input file from the point of view
-of the users (and the configure script) it is an output file from the point of
-view of the developers (and the autoconf script).
-
-Note that the automatically generated autoconf files (such as config.h.in,
-stamp-h.in, and configure), are NOT kept in git. Thus, when you check out
+-------------------------
+autoconf & automake files
+-------------------------
+
+If you wish to change the `configure' script, the generated Makefile
+or other related files, you'll need to first install GNU m4, available
+from <ftp://ftp.gnu.org/pub/gnu/m4/>, then GNU autoconf
+(<ftp://ftp.gnu.org/pub/gnu/autoconf/>) and GNU automake
+(<ftp://ftp.gnu.org/pub/gnu/automake/>). Nmh is currently using a
+minimum of autoconf 2.61 and automake 1.10.
+
+Most of the configure-related files are automatically generated.
+The only files you should need to manually edit are configure.ac
+and any autoconf macros in the m4 directory. Don't, for instance,
+edit config.h.in. Though it is an input file from the point of
+view of the users (and the configure script) it is an output file
+from the point of view of the developers (and the autoconf script).
+
+If you wish to add a new autoconf macro, it should be placed in it's
+own file and put in the m4 directory; aclocal will automatically pick
+it up and automake will add it to the distribution target automatically.
+
+If you wish to make changes to the Makefile, you will need to edit
+Makefile.am. See the automake documentation if you need further help.
+You should always check changes to Makefile.am by using "make distcheck".
+
+Note that the automatically generated autotools files (such as config.h.in,
+Makefile.in, and configure), are NOT kept in git. Thus, when you check out
a git tree, you need to run the autogen.sh script before you can build
anything:
diff --git a/etc/Makefile.in b/etc/Makefile.in
deleted file mode 100644
index 4bec6a1..0000000
--- a/etc/Makefile.in
+++ /dev/null
@@ -1,153 +0,0 @@
-#
-# Makefile for etc subdirectory
-#
-
-SHELL = /bin/sh
-
-top_srcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-libdir = @libdir@
-etcdir = @sysconfdir@
-
-MTS = @MTS@
-mailspool = @mailspool@
-masquerade = @masquerade@
-smtpservers = @smtpservers@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_DATA = @INSTALL_DATA@
-
-# Path to search for programs to handle MIME
-# content. Used to create mhn.defaults
-MHNSEARCHPATH = "$(PATH):/usr/demo/SOUND"
-
-# Program used to search path for various programs to
-# handle MIME content. Used to create mhn.defaults
-MHNSEARCHPROG = $(srcdir)/mhn.find.sh
-
-SED = sed
-
-.SUFFIXES:
-
-# static configuration, format, and components files
-STATIC_FILES = MailAliases components digestcomps distcomps forwcomps \
- mhl.body mhl.digest mhl.format mhl.forward mhl.headers \
- mhl.reply rcvdistcomps rcvdistcomps.outbox \
- replcomps replgroupcomps scan.MMDDYY scan.YYYYMMDD \
- scan.default scan.mailx scan.nomime scan.size scan.time \
- scan.timely scan.unseen
-
-# templates and scripts from which non-static files are generated
-GENERATED_FILE_SRCS = mhn.defaults.sh mhn.find.sh mts.conf.in sendfiles.in
-
-# scripts generated using above GENERATED_FILE_SRCs; don't add binaries
-# to this list, as they'll get installed with INSTALL_SCRIPT and won't
-# be stripped.
-GENERATED_BIN_FILES = sendfiles
-
-# non-scripts generated using above GENERATED_FILE_SRCs
-GENERATED_ETC_FILES = mhn.defaults mts.conf
-
-# auxiliary files (included in distribution but not installed)
-AUX = Makefile.in
-
-# all non-generated files in this directory are included in the distribution
-DIST = $(STATIC_FILES) $(GENERATED_FILE_SRCS) $(AUX)
-
-# ========= DEPENDENCIES FOR BUILDING ==========
-
-all: $(GENERATED_BIN_FILES) $(GENERATED_ETC_FILES)
-
-mhn.defaults: $(srcdir)/mhn.defaults.sh $(MHNSEARCHPROG)
- rm -f $@
- $(srcdir)/mhn.defaults.sh $(MHNSEARCHPATH) $(MHNSEARCHPROG) > $@
-
-mts.conf: $(srcdir)/mts.conf.in Makefile
- rm -f $@
- $(SED) -e 's,%mts%,$(MTS),' \
- -e 's,%mailspool%,$(mailspool),' \
- -e 's,%etcdir%,$(etcdir),' \
- -e 's,%masquerade%,$(masquerade),' \
- -e 's,%smtpservers%,$(smtpservers),' < $(srcdir)/mts.conf.in > $@
-
-sendfiles: $(srcdir)/sendfiles.in Makefile
- rm -f $@
- $(SED) -e 's,%libdir%,$(libdir),' < $(srcdir)/sendfiles.in > $@
-
-install: install-bin-files install-etc-files
-
-install-bin-files:
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
- for script in $(GENERATED_BIN_FILES); do \
- $(INSTALL_SCRIPT) $$script $(DESTDIR)$(bindir)/$$script; \
- done
-
-install-etc-files:
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(etcdir)
- INSTALL_FILES="$(GENERATED_ETC_FILES)"; \
- for file in $(STATIC_FILES); do \
- INSTALL_FILES="$$INSTALL_FILES $(srcdir)/$$file"; \
- done; \
- for path in $$INSTALL_FILES; do \
- file=`basename $$path`; \
- echo "Installing $$file..."; \
- if [ -f "$(DESTDIR)$(etcdir)/$$file" ]; then \
- if cmp -s "$$path" "$(DESTDIR)$(etcdir)/$$file"; then \
- echo "$(DESTDIR)$(etcdir)/$$file unchanged, skipped"; \
- else \
- $(INSTALL_DATA) "$$path" "$(DESTDIR)$(etcdir)/$$file.dist"; \
- echo "INFO: $(DESTDIR)$(etcdir)/$$file installed with .dist
extension"; \
- fi; \
- else \
- $(INSTALL_DATA) $$path $(DESTDIR)$(etcdir)/$$file; \
- fi; \
- done
-
-uninstall: uninstall-bin-files uninstall-etc-files
-
-uninstall-bin-files:
- for script in $(GENERATED_BIN_FILES); do \
- rm -f $(DESTDIR)$(bindir)/$$script; \
- done
-
-uninstall-etc-files:
- for file in $(STATIC_FILES) $(GENERATED_ETC_FILES); do \
- rm -f $(DESTDIR)$(etcdir)/$$file; \
- done
-
-# ========== DEPENDENCIES FOR CLEANUP ==========
-
-mostlyclean:
- rm -f *~
-
-clean: mostlyclean
- rm -f $(GENERATED_ETC_FILES) $(GENERATED_BIN_FILES)
-
-distclean: clean
- rm -f Makefile
-
-realclean: distclean
-
-superclean: realclean
-
-# ========== DEPENDENCIES FOR MAINTENANCE ==========
-
-subdir = etc
-
-Makefile: Makefile.in ../config.status
- cd .. && ./config.status $(subdir)/$@
-
-distdir = ../`cat ../distname`/$(subdir)
-nmhdist: $(DIST)
- @echo "Copying distribution files in $(subdir)"
- @for file in $(DIST); do \
- cp -p $(srcdir)/$$file $(distdir); \
- done
-
diff --git a/h/Makefile.in b/h/Makefile.in
deleted file mode 100644
index 865df96..0000000
--- a/h/Makefile.in
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# Makefile for h subdirectory
-#
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-# header files included in distribution
-HDRS = addrsbr.h aliasbr.h crawl_folders.h dropsbr.h fmt_compile.h
fmt_scan.h \
- md5.h mf.h mh.h mhcachesbr.h mhparse.h mime.h msh.h mts.h \
- m_setjmp.h nmh.h picksbr.h popsbr.h prototypes.h rcvmail.h \
- scansbr.h signals.h tws.h vmhsbr.h utils.h
-
-# auxiliary files
-AUX = Makefile.in
-
-# all files in this directory included in the distribution
-DIST = $(HDRS) $(AUX)
-
-# ========== DEPENDENCIES FOR BUILDING AND INSTALLING ==========
-
-all:
-
-install:
-
-uninstall:
-
-lint:
-
-# ========== DEPENDENCIES FOR CLEANUP ==========
-
-mostlyclean:
- rm -f *~
-
-clean: mostlyclean
-
-distclean: clean
- rm -f Makefile
-
-realclean: distclean
-
-superclean: realclean
-
-# ========== DEPENDENCIES FOR MAINTENANCE ==========
-
-subdir = h
-
-Makefile: Makefile.in ../config.status
- cd .. && ./config.status $(subdir)/$@
-
-distdir = ../`cat ../distname`/$(subdir)
-nmhdist: $(DIST)
- @echo "Copying distribution files in $(subdir)"
- @for file in $(DIST); do \
- cp -p $(srcdir)/$$file $(distdir); \
- done
-
diff --git a/install-sh b/install-sh
deleted file mode 100755
index 0d02bf2..0000000
--- a/install-sh
+++ /dev/null
@@ -1,237 +0,0 @@
-#! /bin/sh
-#
-# install -- install a program, script, or datafile
-# This comes from X11R5.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-#
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
- case $1 in
- -c) instcmd="$cpprog"
- shift
- continue;;
-
- -d) dir_arg=true
- shift
- continue;;
-
- -m) chmodcmd="$chmodprog $2"
- shift
- shift
- continue;;
-
- -o) chowncmd="$chownprog $2"
- shift
- shift
- continue;;
-
- -g) chgrpcmd="$chgrpprog $2"
- shift
- shift
- continue;;
-
- -s) stripcmd="$stripprog"
- shift
- continue;;
-
- -t=*) transformarg=`echo $1 | sed 's/-t=//'`
- shift
- continue;;
-
- -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
- shift
- continue;;
-
- *) if [ x"$src" = x ]
- then
- src=$1
- else
- # this colon is to work around a 386BSD /bin/sh bug
- :
- dst=$1
- fi
- shift
- continue;;
- esac
-done
-
-if [ x"$src" = x ]
-then
- echo "install: no input file specified"
- exit 1
-else
- true
-fi
-
-if [ x"$dir_arg" != x ]; then
- dst=$src
- src=""
-
- if [ -d $dst ]; then
- instcmd=:
- else
- instcmd=mkdir
- fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad
-# if $src (and thus $dsttmp) contains '*'.
-
- if [ -f $src -o -d $src ]
- then
- true
- else
- echo "install: $src does not exist"
- exit 1
- fi
-
- if [ x"$dst" = x ]
- then
- echo "install: no destination specified"
- exit 1
- else
- true
- fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
- if [ -d $dst ]
- then
- dst="$dst"/`basename $src`
- else
- true
- fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-# this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='
-'
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@address@hidden' -e 'address@hidden@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
- pathcomp="${pathcomp}${1}"
- shift
-
- if [ ! -d "${pathcomp}" ] ;
- then
- $mkdirprog "${pathcomp}"
- else
- true
- fi
-
- pathcomp="${pathcomp}/"
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
- $doit $instcmd $dst &&
-
- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
- if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
- if [ x"$transformarg" = x ]
- then
- dstfile=`basename $dst`
- else
- dstfile=`basename $dst $transformbasename |
- sed $transformarg`$transformbasename
- fi
-
-# don't allow the sed command to completely eliminate the filename
-
- if [ x"$dstfile" = x ]
- then
- dstfile=`basename $dst`
- else
- true
- fi
-
-# Make a temp file name in the proper directory.
-
- dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
- $doit $instcmd $src $dsttmp &&
-
- trap "rm -f ${dsttmp}" 0 &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing. If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
- if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-
-# Now rename the file to the real destination.
-
- $doit $rmcmd -f $dstdir/$dstfile &&
- $doit $mvcmd $dsttmp $dstdir/$dstfile
-
-fi &&
-
-
-exit 0
diff --git a/man/Makefile.in b/man/Makefile.in
deleted file mode 100644
index c489f5f..0000000
--- a/man/Makefile.in
+++ /dev/null
@@ -1,205 +0,0 @@
-#
-# Makefile for man subdirectory
-#
-
-VERSION = @VERSION@
-DATE = @DATE@
-
-SHELL = /bin/sh
-
-top_srcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-libdir = @libdir@
-datarootdir = @datarootdir@
-etcdir = @sysconfdir@
-mandir = @mandir@
-manext1 = 1
-manext5 = 5
-manext8 = 8
-
-mailspool = @mailspool@
-sendmailpath = @sendmailpath@
-
-default_editor = @editorpath@
-default_pager = @pagerpath@
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-
-SED = sed
-SEDMAN = $(SED) -f man.sed $< > $@
-
-# sed line for editing pop information in man pages
-POPSED = @POPSED@
-
-.SUFFIXES:
-.SUFFIXES: .man .$(manext1) .$(manext5) .$(manext8)
-
-.man.$(manext1):
- $(SEDMAN)
-
-.man.$(manext5):
- $(SEDMAN)
-
-.man.$(manext8):
- $(SEDMAN)
-
-# man pages to install in $(mandir)/$(manext1)
-MAN1SRC = ali. anno. burst. comp. \
- dist. flist. flists. folder. folders. \
- forw. inc. install-mh. mark. mh-chart. \
- nmh. mhbuild. mhl. mhlist. mhmail. \
- mhn. mhparam. mhpath. mhshow. \
- mhstore. msgchk. msh. \
- new. fnext. fprev. unseen. \
- next. packf. pick. prev. \
- prompter. rcvdist. rcvpack. \
- rcvstore. rcvtty. refile. \
- repl. rmf. rmm. scan. \
- send. sendfiles. show. slocal. \
- sortm. whatnow. whom.
-
-MAN5SRC = mh-alias. mh-draft. mh-format. \
- mh-mail. mh-profile. mh-sequence. \
- mh-tailor. mts.conf.
-
-MAN8SRC = ap. conflict. dp. fmtdump. \
- post.
-
-MAN1 = $(MAN1SRC:.=.$(manext1))
-MAN5 = $(MAN5SRC:.=.$(manext5))
-MAN8 = $(MAN8SRC:.=.$(manext8))
-
-# source for man pages
-DIST_MANSRC = $(MAN1SRC) $(MAN5SRC) $(MAN8SRC)
-DIST_MAN = $(DIST_MANSRC:.=.man)
-
-# auxiliary files
-AUX = Makefile.in
-
-# all files in this directory included in the distribution
-DIST = $(DIST_MAN) $(AUX)
-
-# ========= DEFAULT TARGET ==========
-
-all: $(MAN1) $(MAN5) $(MAN8)
-
-$(MAN1) $(MAN5) $(MAN8): man.sed
-
-# create the sed file for building man pages
-man.sed: Makefile
- echo 's,%nmhwarning%,THIS FILE HAS BEEN AUTOMATICALLY GENERATED. DO
NOT EDIT.,g' > $@
- echo 's,%nmhversion%,nmh-$(VERSION),g' >> $@
- echo 's,%nmhdate%,$(DATE),g' >> $@
- echo 's,%bindir%,$(bindir),g' >> $@
- echo 's,%etcdir%,$(etcdir),g' >> $@
- echo 's,%libdir%,$(libdir),g' >> $@
- echo 's,%mandir%,$(mandir),g' >> $@
- echo 's,%mailspool%,$(mailspool),g' >> $@
- echo 's,%sendmailpath%,$(sendmailpath),g' >> $@
- echo 's,%default_editor%,$(default_editor),g' >> $@
- echo 's,%default_pager%,$(default_pager),g' >> $@
- echo 's,%manext1%,$(manext1),g' >> $@
- echo 's,%manext5%,$(manext5),g' >> $@
- echo 's,%manext8%,$(manext8),g' >> $@
- echo '$(POPSED)' >> $@
- echo '/%components%/r $(top_srcdir)/etc/components' >> $@
- echo ' s,%components%,,g' >> $@
- echo '/%distcomps%/r $(top_srcdir)/etc/distcomps' >> $@
- echo ' s,%distcomps%,,g' >> $@
- echo '/%forwcomps%/r $(top_srcdir)/etc/forwcomps' >> $@
- echo ' s,%forwcomps%,,g' >> $@
- echo '/%mhl_forward%/r $(top_srcdir)/etc/mhl.forward' >> $@
- echo ' s,%mhl_forward%,,g' >> $@
- echo '/%mhl_format%/r $(top_srcdir)/etc/mhl.format' >> $@
- echo ' s,%mhl_format%,,g' >> $@
- echo '/%mhl_reply%/r $(top_srcdir)/etc/mhl.reply' >> $@
- echo ' s,%mhl_reply%,,g' >> $@
-
-# ========= INSTALL TARGETS =========
-
-install: install-man1 install-man5 install-man8
-
-# install the man pages in man1
-install-man1:
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man$(manext1)
- for file in $(MAN1); do \
- $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man$(manext1) ; \
- done
-
-# install the man pages in man5
-install-man5:
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man$(manext5)
- for file in $(MAN5); do \
- $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man$(manext5) ; \
- done
- if [ ! -f $(DESTDIR)$(mandir)/man$(manext5)/mh_profile.$(manext5) ] ;
then \
- ( cd $(DESTDIR)$(mandir)/man$(manext5) ; ln mh-profile.$(manext5) \
- mh_profile.$(manext5) ) \
- fi
-
-# install the man pages in man8
-install-man8:
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man$(manext8)
- for file in $(MAN8); do \
- $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man$(manext8) ; \
- done
-
-# ========= UNINSTALL TARGETS =========
-
-uninstall: uninstall-man1 uninstall-man5 uninstall-man8
-
-# uninstall the man pages in man1
-uninstall-man1:
- for file in $(MAN1); do \
- rm -f $(DESTDIR)$(mandir)/man$(manext1)/$$file; \
- done
-
-# uninstall the man pages in man5
-uninstall-man5:
- for file in $(MAN5); do \
- rm -f $(DESTDIR)$(mandir)/man$(manext5)/$$file; \
- done
-
-# uninstall the man pages in man8
-uninstall-man8:
- for file in $(MAN8); do \
- rm -f $(DESTDIR)$(mandir)/man$(manext8)/$$file; \
- done
-
-# ========== DEPENDENCIES FOR CLEANUP ==========
-
-mostlyclean:
- rm -f *~
-
-clean: mostlyclean
- rm -f man.sed *.$(manext1) *.$(manext5) *.$(manext8)
-
-distclean: clean
- rm -f Makefile
-
-realclean: distclean
-
-superclean: realclean
-
-lint:
-
-# ========== DEPENDENCIES FOR MAINTENANCE ==========
-
-subdir = man
-
-Makefile: Makefile.in ../config.status
- cd .. && ./config.status $(subdir)/$@
-
-distdir = ../`cat ../distname`/$(subdir)
-nmhdist: $(DIST)
- @echo "Copying distribution files in $(subdir)"
- @for file in $(DIST); do \
- cp -p $(srcdir)/$$file $(distdir); \
- done
-
diff --git a/mts/Makefile.in b/mts/Makefile.in
deleted file mode 100644
index dd2a18f..0000000
--- a/mts/Makefile.in
+++ /dev/null
@@ -1,111 +0,0 @@
-#
-# Makefile for mts subdirectory
-#
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-# flags passed to recursive makes in subdirectories
-MAKEDEFS = CC='$(CC)' CPPFLAGS='$(CPPFLAGS)' DEFS='$(DEFS)' \
-CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' LIBS='$(LIBS)' \
-prefix='$(prefix)' exec_prefix='$(exec_prefix)' bindir='$(bindir)' \
-etcdir='$(etcdir)' libdir='$(libdir)' mandir='$(mandir)' \
-mailspool='$(mailspool)' sendmailpath='$(sendmailpath)' \
-default_editor='$(default_editor)' default_pager='$(default_pager)'
-
-LORDER = @LORDER@
-TSORT = @TSORT@
-RANLIB = @RANLIB@
-LIBTOOL = @LIBTOOL@
-GNU_LIBTOOL = @GNU_LIBTOOL@
-
-# object files that go into libmts.a
-OBJS = smtp/hosts.o smtp/smtp.o
-
-# auxiliary files
-AUX = Makefile.in
-
-# all files in this directory included in the distribution
-DIST = $(AUX)
-
-# subdirectories
-SUBDIRS = smtp
-
-# mail transport agent we are using (currently always smtp)
-# MTS = smtp
-# DEPRECATED: smtp/sendmail functionality handled by mts.conf
-
-# ========= DEPENDENCIES FOR BUILDING AND INSTALLING ==========
-
-all: all-recursive libmts.a
-
-all-recursive:
- for subdir in $(SUBDIRS); do \
- (cd $$subdir && $(MAKE) $(MAKEDEFS) all) || exit 1; \
- done
-
-libmts.a: $(OBJS)
- rm -f $@
- if test x$(LIBTOOL) != x -a x$(GNU_LIBTOOL) = x ; then \
- $(LIBTOOL) -static -c $(OBJS) -o $@ ; \
- else \
- ar cr $@ `$(LORDER) $(OBJS) | $(TSORT) 2>/dev/null` ; \
- $(RANLIB) $@ ; \
- fi
-
-install uninstall:
-
-# ========== DEPENDENCIES FOR CLEANUP ==========
-
-mostlyclean: mostlyclean-recursive mostlyclean-local
-clean: clean-recursive clean-local
-distclean: distclean-recursive distclean-local
-realclean: realclean-recursive realclean-local
-superclean: superclean-recursive superclean-local
-
-mostlyclean-local:
- rm -f *~
-
-clean-local: mostlyclean-local
- rm -f libmts.a
-distclean-local: clean-local
- rm -f Makefile
-
-realclean-local: distclean-local
-
-superclean-local: realclean-local
-
-mostlyclean-recursive clean-recursive distclean-recursive realclean-recursive
superclean-recursive:
- for subdir in $(SUBDIRS); do \
- target=`echo $@ | sed 's/-recursive//'`; \
- (cd $$subdir && $(MAKE) $(MAKEDEFS) $$target) || exit 1; \
- done
-
-# ========== DEPENDENCIES FOR LINT =================
-
-lint:
- for subdir in $(SUBDIRS); do \
- ( cd $$subdir && $(MAKE) $(MAKEDEFS) lint ) || exit 1; \
- done
-
-# ========== DEPENDENCIES FOR MAINTENANCE ==========
-
-subdir = mts
-
-Makefile: Makefile.in ../config.status
- cd .. && ./config.status $(subdir)/$@
-
-distdir = ../`cat ../distname`/$(subdir)
-nmhdist: $(DIST)
- @echo "Copying distribution files in $(subdir)"
- @for file in $(DIST); do \
- cp -p $(srcdir)/$$file $(distdir); \
- done
- @for subdir in $(SUBDIRS); do \
- mkdir $(distdir)/$$subdir; \
- chmod 755 $(distdir)/$$subdir; \
- (cd $$subdir && $(MAKE) $@) || exit 1; \
- done
-
diff --git a/mts/smtp/Makefile.in b/mts/smtp/Makefile.in
deleted file mode 100644
index 730909d..0000000
--- a/mts/smtp/Makefile.in
+++ /dev/null
@@ -1,87 +0,0 @@
-#
-# Makefile for mts/smtp subdirectory
-#
-
-SHELL = /bin/sh
-
-top_srcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-libdir = @libdir@
-etcdir = @sysconfdir@
-
-CC = @CC@
-CFLAGS = @CFLAGS@
-DEFS = @DEFS@
-INCLUDES = -I$(srcdir) -I$(top_srcdir) @CPPFLAGS@
-LINT = @LINT@
-LINTFLAGS = @LINTFLAGS@
-
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
-
-.SUFFIXES:
-.SUFFIXES: .c .o
-
-.c.o:
- $(COMPILE) $<
-
-# header files
-HDRS = smtp.h
-
-# source
-SRCS = hosts.c smtp.c
-
-# object files in libsmtp.a
-OBJS = hosts.o smtp.o
-
-# auxiliary files
-AUX = Makefile.in
-
-# all files in this directory included in the distribution
-DIST = $(HDRS) $(SRCS) $(AUX)
-
-# ========= DEPENDENCIES FOR BUILDING AND INSTALLING ==========
-
-all: $(OBJS)
-
-install:
-
-uninstall:
-
-# ========== DEPENDENCIES FOR CLEANUP ==========
-
-mostlyclean:
- rm -f *.o *~
-
-clean: mostlyclean
-
-distclean: clean
- rm -f Makefile
-
-realclean: distclean
-
-superclean: realclean
-
-# ========== DEPENDENCIES FOR LINT =================
-
-lint:
- $(LINT) $(LINTFLAGS) $(INCLUDES) $(DEFS) $(SRCS)
-
-# ========== DEPENDENCIES FOR MAINTENANCE ==========
-
-subdir = mts/smtp
-
-Makefile: Makefile.in ../../config.status
- cd ../.. && ./config.status $(subdir)/$@
-
-distdir = ../../`cat ../../distname`/$(subdir)
-nmhdist: $(DIST)
- @echo "Copying distribution files in $(subdir)"
- @for file in $(DIST); do \
- cp -p $(srcdir)/$$file $(distdir); \
- done
-
diff --git a/sbr/Makefile.in b/sbr/Makefile.in
deleted file mode 100644
index f5f7414..0000000
--- a/sbr/Makefile.in
+++ /dev/null
@@ -1,154 +0,0 @@
-#
-# Makefile for sbr subdirectory
-#
-
-SHELL = /bin/sh
-
-top_srcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-libdir = @libdir@
-etcdir = @sysconfdir@
-
-CC = @CC@
-CFLAGS = @CFLAGS@
-DISABLE_UNUSED_MACROS_WARNING = @DISABLE_UNUSED_MACROS_WARNING@
-DEFS = @DEFS@
-CONFIGDEFS = -DNMHETCDIR='"$(etcdir)"' -DMAILSPOOL='"$(mailspool)"'
-DSENDMAILPATH='"$(sendmailpath)"'
-INCLUDES = -I. -I$(top_srcdir) @CPPFLAGS@
-
-LEX = @LEX@
-AWK = @AWK@
-LORDER = @LORDER@
-TSORT = @TSORT@
-RANLIB = @RANLIB@
-LIBTOOL = @LIBTOOL@
-GNU_LIBTOOL = @GNU_LIBTOOL@
-LINT = @LINT@
-LINTFLAGS = @LINTFLAGS@
-
-mailspool = @mailspool@
-sendmailpath = @sendmailpath@
-
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
-COMPILE2 = $(CC) -c $(DEFS) $(CONFIGDEFS) $(INCLUDES) $(CFLAGS)
-
-
-
-.SUFFIXES:
-.SUFFIXES: .c .o .lex
-
-.c.o:
- $(COMPILE) $<
-
-# this header file is parsed to generate signal messages (sigmsg.h)
-SIGNAL_H = @SIGNAL_H@
-
-# source for library functions
-SRCS = addrsbr.c ambigsw.c atooi.c brkstring.c \
- check_charset.c client.c closefds.c concat.c context_del.c \
- context_find.c context_foil.c context_read.c \
- context_replace.c context_save.c copy.c \
- copyip.c cpydata.c cpydgst.c crawl_folders.c \
- discard.c done.c dtime.c dtimep.c \
- error.c ext_hook.c fdcompare.c folder_addmsg.c folder_delmsgs.c \
- folder_free.c folder_pack.c folder_read.c \
- folder_realloc.c gans.c getans.c getanswer.c \
- getarguments.c getcpy.c getfolder.c getpass.c \
- fmt_addr.c fmt_compile.c fmt_new.c fmt_rfc2047.c \
- fmt_scan.c lock_file.c m_atoi.c m_backup.c \
- m_convert.c m_draft.c m_getfld.c m_gmprot.c \
- m_maildir.c m_name.c m_setjmp.c \
- makedir.c mts.c norm_charmap.c \
- path.c peekc.c pidwait.c pidstatus.c \
- print_help.c print_sw.c print_version.c push.c \
- putenv.c refile.c remdir.c r1bindex.c \
- readconfig.c ruserpass.c seq_add.c seq_bits.c \
- seq_del.c seq_getnum.c seq_list.c seq_nameok.c \
- seq_print.c seq_read.c seq_save.c seq_setcur.c \
- seq_setprev.c seq_setunseen.c showfile.c signals.c \
- smatch.c snprintb.c ssequal.c strcasecmp.c \
- strindex.c trimcpy.c uprf.c vfgets.c fmt_def.c \
- m_msgdef.c mf.c utils.c m_mktemp.c
-
-OBJS = $(SRCS:.c=.o)
-
-# auxiliary files
-AUX = Makefile.in sigmsg.awk dtimep.lex
-
-# all files in this directory included in the distribution
-DIST = $(SRCS) $(AUX)
-
-# ========= DEPENDENCIES FOR BUILDING ==========
-
-# default target
-all: libmh.a
-
-sigmsg.h: sigmsg.awk
- $(AWK) -f $(srcdir)/sigmsg.awk $(SIGNAL_H) > $@
-
-lint: sigmsg.h
- $(LINT) $(LINTFLAGS) $(INCLUDES) $(DEFS) $(SRCS)
-
-# Note that not all lexes support -o (it is not POSIX); also
-# some lexes will only accept '-n -t', not '-nt'.
-# Also, not all makes accept $< in non-pattern rules,
-# hence the explicit filenames here.
-dtimep.o: dtimep.lex
- $(LEX) -n -t $(srcdir)/dtimep.lex > dtimep.c
- $(COMPILE) $(DISABLE_UNUSED_MACROS_WARNING) dtimep.c
-
-client.o: client.c
- $(COMPILE2) $(srcdir)/client.c
-
-mts.o: mts.c
- $(COMPILE2) $(srcdir)/mts.c
-
-pidstatus.o: sigmsg.h
-
-libmh.a: $(OBJS)
- rm -f $@
- if test x$(LIBTOOL) != x -a x$(GNU_LIBTOOL) = x ; then \
- $(LIBTOOL) -static -c -o libmh.a $(OBJS) ; \
- else \
- ar cr libmh.a `$(LORDER) $(OBJS) | $(TSORT) 2>/dev/null` ; \
- $(RANLIB) libmh.a ; \
- fi
-
-install:
-
-uninstall:
-
-# ========== DEPENDENCIES FOR CLEANUP ==========
-
-mostlyclean:
- rm -f *.o *~
-
-clean: mostlyclean
- rm -f libmh.a sigmsg.h dtimep.c
-
-distclean: clean
- rm -f Makefile
-
-realclean: distclean
-
-superclean: realclean
-
-# ========== DEPENDENCIES FOR MAINTENANCE ==========
-
-subdir = sbr
-
-Makefile: Makefile.in ../config.status
- cd .. && ./config.status $(subdir)/$@
-
-distdir = ../`cat ../distname`/$(subdir)
-nmhdist: $(DIST)
- @echo "Copying distribution files in $(subdir)"
- @for file in $(DIST); do \
- cp -p $(srcdir)/$$file $(distdir); \
- done
-
diff --git a/sbr/dtimep.lex b/sbr/dtimep.l
similarity index 100%
rename from sbr/dtimep.lex
rename to sbr/dtimep.l
diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 9c1eb16..89023cb 100644
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -33,7 +33,8 @@ struct msgs *fmt_current_folder; /* current folder (set by
main program) */
#endif
extern int fmt_norm; /* defined in sbr/fmt_def.c = AD_NAME */
-struct mailname fmt_mnull;
+struct mailname fmt_mnull = { NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0,
+ NULL, NULL };
/*
* static prototypes
diff --git a/uip/Makefile.in b/uip/Makefile.in
deleted file mode 100644
index f11b532..0000000
--- a/uip/Makefile.in
+++ /dev/null
@@ -1,333 +0,0 @@
-#
-# Makefile for uip subdirectory
-#
-
-SHELL = /bin/sh
-
-top_srcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-libdir = @libdir@
-etcdir = @sysconfdir@
-EXEEXT = @EXEEXT@
-
-CC = @CC@
-CFLAGS = @CFLAGS@
-DEFS = @DEFS@
-INCLUDES = -I$(srcdir) -I$(top_srcdir) @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-
-LIBS = @LIBS@
-MTSLIB = ../mts/libmts.a
-NDBM_LIBS = @NDBM_LIBS@
-LOCALLIBS = ../config/version.o ../config/config.o $(MTSLIB) ../sbr/libmh.a
-LINKLIBS = $(LOCALLIBS) $(LIBS)
-
-LINT = @LINT@
-LINTFLAGS = @LINTFLAGS@
-
-TERMLIB = @TERMLIB@
-LEXLIB = @LEXLIB@
-POPLIB = @POPLIB@
-
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
-LINK = $(CC) $(LDFLAGS) -o $@
-LN = ln
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-
-MAIL_SPOOL_GRP = @MAIL_SPOOL_GRP@
-SETGID_MAIL = @SETGID_MAIL@
-
-.SUFFIXES:
-.SUFFIXES: .c .o
-
-.c.o:
- $(COMPILE) $<
-
-# commands to build
-CMDS = ali anno burst comp dist flist folder forw install-mh mark mhbuild \
- mhlist mhmail mhn mhparam mhpath mhshow mhstore msgchk \
- msh new packf pick prompter refile repl rmf rmm scan send show \
- sortm whatnow whom
-
-# commands that are links to other commands
-LCMDS = flists folders next prev
-
-# misc support binaries
-MISC = ap conflict dp fmtdump mhl post rcvdist rcvpack \
- rcvstore rcvtty slocal spost viamail mhtest
-
-# commands with 'S'pecial installation needs
-SCMDS = inc
-
-# source files
-SRCS = ali.c aliasbr.c anno.c annosbr.c ap.c burst.c comp.c \
- conflict.c dist.c distsbr.c dp.c dropsbr.c flist.c fmtdump.c \
- folder.c forw.c inc.c install-mh.c mark.c md5.c mhbuild.c \
- mhbuildsbr.c mhcachesbr.c mhfree.c mhl.c mhlist.c mhlistsbr.c \
- mhlsbr.c mhmail.c mhmisc.c mhn.c mhoutsbr.c mhparam.c mhparse.c \
- mhpath.c mhshow.c mhshowsbr.c mhstore.c mhstoresbr.c mhtest.c \
- msgchk.c msh.c mshcmds.c new.c packf.c pick.c picksbr.c popsbr.c \
- post.c prompter.c rcvdist.c rcvpack.c rcvstore.c rcvtty.c \
- refile.c repl.c replsbr.c rmf.c rmm.c scan.c scansbr.c send.c \
- sendsbr.c show.c slocal.c sortm.c spost.c termsbr.c viamail.c \
- vmhsbr.c whatnow.c whatnowproc.c whatnowsbr.c whom.c
-
-# auxiliary files
-AUX = Makefile.in
-
-# all files in this directory included in the distribution
-DIST = $(SRCS) $(AUX)
-
-# ========== DEFAULT TARGET ==========
-
-all: $(CMDS) $(MISC) $(SCMDS)
-
-# ========= DEPENDENCIES FOR BUILDING ==========
-
-ali: ali.o aliasbr.o $(LOCALLIBS)
- $(LINK) ali.o aliasbr.o $(LINKLIBS)
-
-ap: ap.o termsbr.o $(LOCALLIBS)
- $(LINK) ap.o termsbr.o $(LINKLIBS) $(TERMLIB)
-
-anno: anno.o annosbr.o $(LOCALLIBS)
- $(LINK) anno.o annosbr.o $(LINKLIBS)
-
-burst: burst.o $(LOCALLIBS)
- $(LINK) burst.o $(LINKLIBS)
-
-comp: comp.o whatnowproc.o whatnowsbr.o sendsbr.o annosbr.o distsbr.o
$(LOCALLIBS)
- $(LINK) comp.o whatnowproc.o whatnowsbr.o sendsbr.o annosbr.o distsbr.o
$(LINKLIBS)
-
-conflict: conflict.o aliasbr.o $(LOCALLIBS)
- $(LINK) conflict.o aliasbr.o $(LINKLIBS)
-
-dist: dist.o whatnowproc.o whatnowsbr.o sendsbr.o annosbr.o distsbr.o
$(LOCALLIBS)
- $(LINK) dist.o whatnowproc.o whatnowsbr.o sendsbr.o annosbr.o distsbr.o
$(LINKLIBS)
-
-dp: dp.o termsbr.o $(LOCALLIBS)
- $(LINK) dp.o termsbr.o $(LINKLIBS) $(TERMLIB)
-
-flist: flist.o $(LOCALLIBS)
- $(LINK) flist.o $(LINKLIBS)
-
-fmtdump: fmtdump.o $(LOCALLIBS)
- $(LINK) fmtdump.o $(LINKLIBS)
-
-folder: folder.o $(LOCALLIBS)
- $(LINK) folder.o $(LINKLIBS)
-
-forw: forw.o whatnowproc.o whatnowsbr.o sendsbr.o annosbr.o distsbr.o
$(LOCALLIBS)
- $(LINK) forw.o whatnowproc.o whatnowsbr.o sendsbr.o annosbr.o distsbr.o
$(LINKLIBS)
-
-inc: inc.o scansbr.o dropsbr.o termsbr.o $(POPLIB) $(LOCALLIBS)
- $(LINK) inc.o scansbr.o dropsbr.o termsbr.o $(POPLIB) $(LINKLIBS)
$(TERMLIB)
-
-install-mh: install-mh.o $(LOCALLIBS)
- $(LINK) install-mh.o $(LINKLIBS)
-
-mark: mark.o $(LOCALLIBS)
- $(LINK) mark.o $(LINKLIBS)
-
-mhbuild: mhbuild.o mhbuildsbr.o mhcachesbr.o mhlistsbr.o mhoutsbr.o mhmisc.o
mhfree.o mhparse.o termsbr.o md5.o $(LOCALLIBS)
- $(LINK) mhbuild.o mhbuildsbr.o mhcachesbr.o mhlistsbr.o mhoutsbr.o
mhmisc.o mhfree.o mhparse.o md5.o $(LINKLIBS) $(TERMLIB)
-
-mhl: mhl.o mhlsbr.o termsbr.o $(LOCALLIBS)
- $(LINK) mhl.o mhlsbr.o termsbr.o $(LINKLIBS) $(TERMLIB)
-
-mhlist: mhlist.o mhparse.o mhcachesbr.o mhlistsbr.o mhmisc.o mhfree.o
termsbr.o md5.o $(LOCALLIBS)
- $(LINK) mhlist.o mhparse.o mhcachesbr.o mhlistsbr.o mhmisc.o mhfree.o
termsbr.o md5.o $(LINKLIBS) $(TERMLIB)
-
-mhmail: mhmail.o $(LOCALLIBS)
- $(LINK) mhmail.o $(LINKLIBS)
-
-mhn: mhn.o mhparse.o mhcachesbr.o mhshowsbr.o mhlistsbr.o mhstoresbr.o
mhmisc.o mhfree.o termsbr.o md5.o $(LOCALLIBS)
- $(LINK) mhn.o mhparse.o mhcachesbr.o mhshowsbr.o mhlistsbr.o
mhstoresbr.o mhmisc.o mhfree.o termsbr.o md5.o $(LINKLIBS) $(TERMLIB)
-
-mhparam: mhparam.o $(LOCALLIBS)
- $(LINK) mhparam.o $(LINKLIBS)
-
-mhpath: mhpath.o $(LOCALLIBS)
- $(LINK) mhpath.o $(LINKLIBS)
-
-mhshow: mhshow.o mhparse.o mhcachesbr.o mhshowsbr.o mhlistsbr.o mhmisc.o
mhfree.o termsbr.o md5.o $(LOCALLIBS)
- $(LINK) mhshow.o mhparse.o mhcachesbr.o mhshowsbr.o mhlistsbr.o
mhmisc.o mhfree.o termsbr.o md5.o $(LINKLIBS) $(TERMLIB)
-
-mhstore: mhstore.o mhparse.o mhcachesbr.o mhshowsbr.o mhlistsbr.o mhstoresbr.o
mhmisc.o mhfree.o termsbr.o md5.o $(LOCALLIBS)
- $(LINK) mhstore.o mhparse.o mhcachesbr.o mhshowsbr.o mhlistsbr.o
mhstoresbr.o mhmisc.o mhfree.o termsbr.o md5.o $(LINKLIBS) $(TERMLIB)
-
-mhtest: mhtest.o mhparse.o mhcachesbr.o mhoutsbr.o mhmisc.o mhfree.o termsbr.o
md5.o $(LOCALLIBS)
- $(LINK) mhtest.o mhparse.o mhcachesbr.o mhoutsbr.o mhmisc.o mhfree.o
termsbr.o md5.o $(LINKLIBS) $(TERMLIB)
-
-msgchk: msgchk.o $(POPLIB) $(LOCALLIBS)
- $(LINK) msgchk.o $(POPLIB) $(LINKLIBS)
-
-msh: msh.o mshcmds.o vmhsbr.o picksbr.o scansbr.o dropsbr.o mhlsbr.o termsbr.o
$(LOCALLIBS)
- $(LINK) msh.o mshcmds.o vmhsbr.o picksbr.o scansbr.o dropsbr.o mhlsbr.o
termsbr.o $(LINKLIBS) $(TERMLIB)
-
-new: new.o $(LOCALLIBS)
- $(LINK) new.o $(LINKLIBS)
-
-packf: packf.o dropsbr.o $(LOCALLIBS)
- $(LINK) packf.o dropsbr.o $(LINKLIBS)
-
-pick: pick.o picksbr.o $(LOCALLIBS)
- $(LINK) pick.o picksbr.o $(LINKLIBS)
-
-post: post.o aliasbr.o $(LOCALLIBS)
- $(LINK) post.o aliasbr.o $(LINKLIBS)
-
-prompter: prompter.o $(LOCALLIBS)
- $(LINK) prompter.o $(LINKLIBS)
-
-rcvdist: rcvdist.o distsbr.o $(LOCALLIBS)
- $(LINK) rcvdist.o distsbr.o $(LINKLIBS)
-
-rcvpack: rcvpack.o dropsbr.o $(LOCALLIBS)
- $(LINK) rcvpack.o dropsbr.o $(LINKLIBS)
-
-rcvstore: rcvstore.o $(LOCALLIBS)
- $(LINK) rcvstore.o $(LINKLIBS)
-
-rcvtty: rcvtty.o scansbr.o termsbr.o $(LOCALLIBS)
- $(LINK) rcvtty.o scansbr.o termsbr.o $(LINKLIBS) $(TERMLIB)
-
-refile: refile.o $(LOCALLIBS)
- $(LINK) refile.o $(LINKLIBS)
-
-repl: repl.o replsbr.o whatnowproc.o whatnowsbr.o sendsbr.o annosbr.o
distsbr.o $(LOCALLIBS)
- $(LINK) repl.o replsbr.o whatnowproc.o whatnowsbr.o sendsbr.o annosbr.o
distsbr.o $(LINKLIBS)
-
-rmf: rmf.o $(LOCALLIBS)
- $(LINK) rmf.o $(LINKLIBS)
-
-rmm: rmm.o $(LOCALLIBS)
- $(LINK) rmm.o $(LINKLIBS)
-
-scan: scan.o scansbr.o termsbr.o $(LOCALLIBS)
- $(LINK) scan.o scansbr.o termsbr.o $(LINKLIBS) $(TERMLIB)
-
-send: send.o sendsbr.o annosbr.o distsbr.o $(LOCALLIBS)
- $(LINK) send.o sendsbr.o annosbr.o distsbr.o $(LINKLIBS)
-
-show: show.o mhlsbr.o termsbr.o $(LOCALLIBS)
- $(LINK) show.o mhlsbr.o termsbr.o $(LINKLIBS) $(TERMLIB)
-
-slocal: slocal.o aliasbr.o dropsbr.o $(LOCALLIBS)
- $(LINK) slocal.o aliasbr.o dropsbr.o $(NDBM_LIBS) $(LINKLIBS)
-
-sortm: sortm.o $(LOCALLIBS)
- $(LINK) sortm.o $(LINKLIBS)
-
-spost: spost.o aliasbr.o $(LOCALLIBS)
- $(LINK) spost.o aliasbr.o $(LINKLIBS)
-
-viamail: viamail.o mhmisc.o mhoutsbr.o sendsbr.o annosbr.o distsbr.o
$(LOCALLIBS)
- $(LINK) viamail.o mhmisc.o mhoutsbr.o sendsbr.o annosbr.o distsbr.o
$(LINKLIBS) $(TERMLIB)
-
-whatnow: whatnow.o whatnowsbr.o sendsbr.o annosbr.o distsbr.o $(LOCALLIBS)
- $(LINK) whatnow.o whatnowsbr.o sendsbr.o annosbr.o distsbr.o $(LINKLIBS)
-
-whom: whom.o distsbr.o $(LOCALLIBS)
- $(LINK) whom.o distsbr.o $(LINKLIBS)
-
-# ========== DEPENDENCIES FOR INSTALLING ==========
-
-# install everything
-install: install-cmds install-misc install-lcmds install-scmds
-
-# install commands
-install-cmds:
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
- for cmd in $(CMDS); do \
- $(INSTALL_PROGRAM) $$cmd$(EXEEXT) $(DESTDIR)$(bindir)/$$cmd$(EXEEXT);
\
- done
-
-# install links
-install-lcmds:
- rm -f $(DESTDIR)$(bindir)/flists
- rm -f $(DESTDIR)$(bindir)/folders
- rm -f $(DESTDIR)$(bindir)/fnext
- rm -f $(DESTDIR)$(bindir)/fprev
- rm -f $(DESTDIR)$(bindir)/unseen
- rm -f $(DESTDIR)$(bindir)/prev
- rm -f $(DESTDIR)$(bindir)/next
- rm -f $(DESTDIR)$(libdir)/install-mh
- $(LN) $(DESTDIR)$(bindir)/flist $(DESTDIR)$(bindir)/flists
- $(LN) $(DESTDIR)$(bindir)/folder $(DESTDIR)$(bindir)/folders
- $(LN) $(DESTDIR)$(bindir)/new $(DESTDIR)$(bindir)/fnext
- $(LN) $(DESTDIR)$(bindir)/new $(DESTDIR)$(bindir)/fprev
- $(LN) $(DESTDIR)$(bindir)/new $(DESTDIR)$(bindir)/unseen
- $(LN) $(DESTDIR)$(bindir)/show $(DESTDIR)$(bindir)/prev
- $(LN) $(DESTDIR)$(bindir)/show $(DESTDIR)$(bindir)/next
-
-# install misc support binaries
-install-misc:
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
- for misc in $(MISC); do \
- $(INSTALL_PROGRAM) $$misc $(DESTDIR)$(libdir)/$$misc; \
- done
-
-# install commands with special installation needs (thus no $(SCMDS) use here)
-install-scmds:
- if test x$(SETGID_MAIL) != x; then \
- $(INSTALL_PROGRAM) -g $(MAIL_SPOOL_GRP) -m 2755 inc
$(DESTDIR)$(bindir)/$$cmd$(EXEEXT); \
- else \
- $(INSTALL_PROGRAM) inc $(DESTDIR)$(bindir)/$$cmd$(EXEEXT); \
- fi
-
-uninstall:
- for cmd in $(CMDS); do \
- rm -f $(DESTDIR)$(bindir)/$$cmd$(EXEEXT); \
- done
- for lcmd in $(LCMDS); do \
- rm -f $(DESTDIR)$(bindir)/$$lcmd$(EXEEXT); \
- done
- for misc in $(MISC); do \
- rm -f $(DESTDIR)$(libdir)/$$misc$(EXEEXT); \
- done
- for cmd in $(SCMDS); do \
- rm -f $(DESTDIR)$(bindir)/$$cmd$(EXEEXT); \
- done
-
-# ========== DEPENDENCIES FOR CLEANUP ==========
-
-mostlyclean:
- rm -f *.o *~
-
-clean: mostlyclean
- rm -f $(CMDS) $(MISC) $(SCMDS)
-
-distclean: clean
- rm -f Makefile
-
-realclean: distclean
-
-superclean: realclean
-
-# ========== DEPENDENCIES FOR LINT ================
-
-lint:
- $(LINT) $(LINTFLAGS) $(INCLUDES) $(DEFS) $(SRCS)
-
-# ========== DEPENDENCIES FOR MAINTENANCE ==========
-
-subdir = uip
-
-Makefile: Makefile.in ../config.status
- cd .. && ./config.status $(subdir)/$@
-
-distdir = ../`cat ../distname`/$(subdir)
-nmhdist: $(DIST)
- @echo "Copying distribution files in $(subdir)"
- @for file in $(DIST); do \
- cp -p $(srcdir)/$$file $(distdir); \
- done
-
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 20 +-
Makefile.am | 484 ++++++++++++++++++++++++++++++++++++++++++
Makefile.in | 216 -------------------
autogen.sh | 4 +-
config/Makefile.in | 95 --------
configure.ac | 190 ++++++-----------
docs/Makefile.in | 78 -------
docs/README.developers | 45 +++--
etc/Makefile.in | 153 -------------
h/Makefile.in | 59 -----
install-sh | 237 ---------------------
man/Makefile.in | 205 ------------------
mts/Makefile.in | 111 ----------
mts/smtp/Makefile.in | 87 --------
sbr/Makefile.in | 154 -------------
sbr/{dtimep.lex => dtimep.l} | 0
sbr/fmt_scan.c | 3 +-
uip/Makefile.in | 333 -----------------------------
18 files changed, 597 insertions(+), 1877 deletions(-)
create mode 100644 Makefile.am
delete mode 100644 Makefile.in
delete mode 100644 config/Makefile.in
delete mode 100644 docs/Makefile.in
delete mode 100644 etc/Makefile.in
delete mode 100644 h/Makefile.in
delete mode 100755 install-sh
delete mode 100644 man/Makefile.in
delete mode 100644 mts/Makefile.in
delete mode 100644 mts/smtp/Makefile.in
delete mode 100644 sbr/Makefile.in
rename sbr/{dtimep.lex => dtimep.l} (100%)
delete mode 100644 uip/Makefile.in
hooks/post-receive
--
The nmh Mail Handling System
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Nmh-commits] [SCM] The nmh Mail Handling System branch, master, updated. da04deaf832ac32974a5bb9499a0ba8321eaf86b,
Ken Hornstein <=