nmh-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Nmh-commits] [SCM] The nmh Mail Handling System branch, posix, updated.


From: Lyndon Nerenberg
Subject: [Nmh-commits] [SCM] The nmh Mail Handling System branch, posix, updated. 15fb51211311e200cfe87497eb9e2407c56462ab
Date: Sat, 24 Dec 2011 23:48:08 +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, posix has been updated
       via  15fb51211311e200cfe87497eb9e2407c56462ab (commit)
       via  48e21cf90fbe047727891b2840635abf4485c8ee (commit)
       via  ea87f0d7f19467d86391e52c930bcd1549566354 (commit)
       via  b4a6ed7e54c2c307acfa64df1af14a5e661f91ce (commit)
       via  0df1534a6b03bd7f7389add4b982064c7d651af9 (commit)
       via  0bb5b742a897926152c1791186e4cfc493fb89bf (commit)
       via  c9b9d57b30cf2d094f64afb95878fcf7f935cdb9 (commit)
      from  cdfdb55ab2ad8f77517d155b81de43860b256ed3 (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=15fb51211311e200cfe87497eb9e2407c56462ab


commit 15fb51211311e200cfe87497eb9e2407c56462ab
Author: Lyndon Nerenberg <address@hidden>
Date:   Sat Dec 24 15:45:41 2011 -0800

    Remove autoconf Makefile templates.

diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index 598173f..0000000
--- a/Makefile.in
+++ /dev/null
@@ -1,217 +0,0 @@
-#
-# Makefile for top level of nmh distribution
-#
-
-# nmh version
-VERSION = @VERSION@
-
-SHELL = /bin/sh
address@hidden@
-
-srcdir = @srcdir@
-abs_srcdir = @abs_srcdir@
-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 aclocal.m4       \
-       acconfig.h config.h.in configure.in 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 *~
-
-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.in aclocal.m4
-       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.in acconfig.h aclocal.m4
-       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.  Assumes that configure had already
-# been run.  Otherwise, there wouldn't be a Makefile.
-# _topdir is the specified RPM build root.
-# _tmppath is TMP below _topdir.
-# srcdir is the top level nmh source directory.
-# tarfile and version are as specified in this file.  rpmbuild does
-#   not allow Version to contain any dashes.
-rpm: all nmhdist
-       @rpmbuild --define '_topdir $(rpmdir)' \
-          --define '_tmppath %{_topdir}/TMP' \
-          --define 'srcdir $(abs_srcdir)' \
-          --define 'tarfile $(tarfile)' \
-          --define 'version '`echo $(VERSION) | sed "s/-/_/g"` \
-          -ba nmh.spec
-       @$(RM) $(tarfile)
diff --git a/config/Makefile.in b/config/Makefile.in
deleted file mode 100644
index 23ded2a..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.. -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/docs/Makefile.in b/docs/Makefile.in
deleted file mode 100644
index c9c0346..0000000
--- a/docs/Makefile.in
+++ /dev/null
@@ -1,77 +0,0 @@
-#
-# Makefile for h subdirectory
-#
-
-SHELL = /bin/sh
-
-top_srcdir = @top_srcdir@
-srcdir = @srcdir@
-docdir = @docdir@
-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/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 7dcbb6f..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       \
-       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/man/Makefile.in b/man/Makefile.in
deleted file mode 100644
index c94ab00..0000000
--- a/man/Makefile.in
+++ /dev/null
@@ -1,207 +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@
-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))
-
-# Since vmh is not built or distributed, neither should vmh.1 be
-# MANEXTRA = vmh. 
-
-# 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 b2a4059..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../.. -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 581cc6d..0000000
--- a/sbr/Makefile.in
+++ /dev/null
@@ -1,157 +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@
-DEFS     = @DEFS@
-CONFIGDEFS = -DNMHETCDIR='"$(etcdir)"' -DMAILSPOOL='"$(mailspool)"' 
-DSENDMAILPATH='"$(sendmailpath)"'
-INCLUDES = -I.. -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@ 
-
-LIBOBJS = @LIBOBJS@
-
-mailspool    = @mailspool@
-sendmailpath = @sendmailpath@
-
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
-COMPILE2 = $(CC) -c $(DEFS) $(CONFIGDEFS) $(INCLUDES) $(CFLAGS)
-
-
-
-.SUFFIXES:
-.SUFFIXES: .c .o
-
-.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_scratch.c m_tmpfil.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
-
-# source for compatibility functions
-COMPAT = memmove.c snprintf.c strdup.c strerror.c
-
-OBJS = $(SRCS:.c=.o) $(LIBOBJS)
-
-# auxiliary files
-AUX = Makefile.in sigmsg.awk dtimep.lex
-
-# all files in this directory included in the distribution
-DIST = $(SRCS) $(COMPAT) $(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.c: dtimep.lex
-       $(LEX) -n -t $(srcdir)/dtimep.lex > 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/uip/Makefile.in b/uip/Makefile.in
deleted file mode 100644
index 370fc15..0000000
--- a/uip/Makefile.in
+++ /dev/null
@@ -1,339 +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@
-
-CC       = @CC@
-CFLAGS   = @CFLAGS@
-DEFS     = @DEFS@
-INCLUDES = -I.. -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
-
-## removed this from CMDS until I can fix it
-## OTHERCMDS = vmh
-
-# 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 ftpsbr.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     \
-       vmh.c vmhsbr.c vmhtest.c whatnow.c whatnowproc.c whatnowsbr.c     \
-       whom.c wmh.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 ftpsbr.o termsbr.o md5.o $(LOCALLIBS)
-       $(LINK) mhbuild.o mhbuildsbr.o mhcachesbr.o mhlistsbr.o mhoutsbr.o 
mhmisc.o mhfree.o mhparse.o ftpsbr.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 ftpsbr.o 
termsbr.o md5.o $(LOCALLIBS)
-       $(LINK) mhlist.o mhparse.o mhcachesbr.o mhlistsbr.o mhmisc.o mhfree.o 
ftpsbr.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 ftpsbr.o termsbr.o md5.o $(LOCALLIBS)
-       $(LINK) mhn.o mhparse.o mhcachesbr.o mhshowsbr.o mhlistsbr.o 
mhstoresbr.o mhmisc.o mhfree.o ftpsbr.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 ftpsbr.o termsbr.o md5.o $(LOCALLIBS)
-       $(LINK) mhshow.o mhparse.o mhcachesbr.o mhshowsbr.o mhlistsbr.o 
mhmisc.o mhfree.o ftpsbr.o termsbr.o md5.o $(LINKLIBS) $(TERMLIB)
-
-mhstore: mhstore.o mhparse.o mhcachesbr.o mhshowsbr.o mhlistsbr.o mhstoresbr.o 
mhmisc.o mhfree.o ftpsbr.o termsbr.o md5.o $(LOCALLIBS)
-       $(LINK) mhstore.o mhparse.o mhcachesbr.o mhshowsbr.o mhlistsbr.o 
mhstoresbr.o mhmisc.o mhfree.o ftpsbr.o termsbr.o md5.o $(LINKLIBS) $(TERMLIB)
-
-mhtest: mhtest.o mhparse.o mhcachesbr.o mhoutsbr.o mhmisc.o mhfree.o ftpsbr.o 
termsbr.o md5.o $(LOCALLIBS)
-       $(LINK) mhtest.o mhparse.o mhcachesbr.o mhoutsbr.o mhmisc.o mhfree.o 
ftpsbr.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)
-
-vmh: vmh.o vmhsbr.o $(LOCALLIBS)
-       $(LINK) vmh.o vmhsbr.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 $(DESTDIR)$(bindir)/$$cmd; \
-       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; \
-       else \
-         $(INSTALL_PROGRAM)                 inc $(DESTDIR)$(bindir)/$$cmd; \
-       fi
-
-uninstall:
-       for cmd in $(CMDS); do \
-         rm -f $(DESTDIR)$(bindir)/$$cmd; \
-       done
-       for lcmd in $(LCMDS); do \
-         rm -f $(DESTDIR)$(bindir)/$$lcmd; \
-       done
-       for misc in $(MISC); do \
-         rm -f $(DESTDIR)$(libdir)/$$misc; \
-       done
-       for cmd in $(SCMDS); do \
-         rm -f $(DESTDIR)$(bindir)/$$cmd; \
-       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
-

http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=48e21cf90fbe047727891b2840635abf4485c8ee


commit 48e21cf90fbe047727891b2840635abf4485c8ee
Author: Lyndon Nerenberg <address@hidden>
Date:   Sat Dec 24 15:43:40 2011 -0800

    Eliminate HAVE_CONFIG_H references.

diff --git a/Makefile b/Makefile
index b0778ca..f278d0d 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,6 @@ default_pager = /usr/bin/more
 
 CC       = gcc
 CPPFLAGS = 
-DEFS     = -DHAVE_CONFIG_H 
 CFLAGS   = -Wall -Wno-pointer-sign -O2
 LDFLAGS  = 
 LIBS     = -liconv 
diff --git a/config/Makefile b/config/Makefile
index 797cfc1..75f19f8 100644
--- a/config/Makefile
+++ b/config/Makefile
@@ -22,7 +22,6 @@ default_pager  = /usr/bin/more
 
 CC         = gcc
 CFLAGS     = -Wall -Wno-pointer-sign -O2
-DEFS       = -DHAVE_CONFIG_H
 INCLUDES   = -I.. -I$(top_srcdir) 
 CONFIGDEFS = -DNMHBINDIR='"$(bindir)"' -DNMHETCDIR='"$(etcdir)"' 
-DNMHLIBDIR='"$(libdir)"' \
              -DDEFAULT_EDITOR='"$(default_editor)"' 
-DDEFAULT_PAGER='"$(default_pager)"'
diff --git a/mts/smtp/Makefile b/mts/smtp/Makefile
index b824d8b..2e45130 100644
--- a/mts/smtp/Makefile
+++ b/mts/smtp/Makefile
@@ -16,7 +16,6 @@ etcdir      = ${prefix}/etc
 
 CC       = gcc
 CFLAGS   = -Wall -Wno-pointer-sign -O2
-DEFS     = -DHAVE_CONFIG_H
 INCLUDES = -I../.. -I$(srcdir) -I$(top_srcdir) 
 LINT   = echo 'No lint program found'
 LINTFLAGS = 
diff --git a/sbr/Makefile b/sbr/Makefile
index 8cea965..e77984f 100644
--- a/sbr/Makefile
+++ b/sbr/Makefile
@@ -16,7 +16,6 @@ etcdir      = ${prefix}/etc
 
 CC       = gcc
 CFLAGS   = -Wall -Wno-pointer-sign -O2
-DEFS     = -DHAVE_CONFIG_H
 CONFIGDEFS = -DNMHETCDIR='"$(etcdir)"' -DMAILSPOOL='"$(mailspool)"' 
-DSENDMAILPATH='"$(sendmailpath)"'
 INCLUDES = -I.. -I. -I$(top_srcdir) 
 
diff --git a/uip/Makefile b/uip/Makefile
index b983d10..9e0e057 100644
--- a/uip/Makefile
+++ b/uip/Makefile
@@ -16,7 +16,6 @@ etcdir      = ${prefix}/etc
 
 CC       = gcc
 CFLAGS   = -Wall -Wno-pointer-sign -O2
-DEFS     = -DHAVE_CONFIG_H
 INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir) 
 LDFLAGS  = 
 

http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=ea87f0d7f19467d86391e52c930bcd1549566354


commit ea87f0d7f19467d86391e52c930bcd1549566354
Author: Lyndon Nerenberg <address@hidden>
Date:   Sat Dec 24 15:40:48 2011 -0800

    Eliminate '#ifdef HAVE_FOO' for Posix-mandated FOOs.

diff --git a/h/nmh.h b/h/nmh.h
index f1711d5..c354482 100644
--- a/h/nmh.h
+++ b/h/nmh.h
@@ -5,11 +5,7 @@
 
 #include <config.h>
 
-#ifdef HAVE_UNISTD_H
-# include <sys/types.h>
-# include <unistd.h>
-#endif
-
+#include <unistd.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <sys/stat.h>
@@ -31,34 +27,16 @@
 # endif
 #endif
 
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-
+#include <stdlib.h>
 #include <stdarg.h>
-
-#if STDC_HEADERS || HAVE_STRING_H
-# include <string.h>
-/* An ANSI string.h and pre-ANSI memory.h might conflict.  */
-# if !STDC_HEADERS && HAVE_MEMORY_H
-#  include <memory.h>
-# endif /* not STDC_HEADERS and HAVE_MEMORY_H */
-#else   /* not STDC_HEADERS and not HAVE_STRING_H */
-# include <strings.h>
-/* memory.h and strings.h conflict on some systems.  */
-#endif /* not STDC_HEADERS and not HAVE_STRING_H */
+#include <string.h>
 
 #ifdef HAVE_SYS_PARAM_H
 # include <sys/param.h>
 #endif
 
-#ifdef HAVE_LOCALE_H
 # include <locale.h>
-#endif
-
-#ifdef HAVE_LIMITS_H
 # include <limits.h>
-#endif
 
 /*
  * symbolic constants for lseek and fseek
@@ -115,12 +93,6 @@
 #define bcpy(b1,b2,length)      memcmp (b1, b2, length)
 #define bzero(b,length)         memset (b, 0, length)
 
-#ifdef HAVE_KILLPG
-# define KILLPG(pgrp,sig) killpg(pgrp,sig);
-#else
-# define KILLPG(pgrp,sig) kill((-pgrp),sig);
-#endif
-
 /*
  * If your stat macros are broken,
  * we will just undefine them.
diff --git a/h/prototypes.h b/h/prototypes.h
index 1bc19d4..d88cf8e 100644
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -131,14 +131,6 @@ char *write_charset_8bit (void);
 int get_returnpath (char *, int, char *, int);
 #endif
 
-/*
- * prototypes for compatibility functions in library
- */
-#ifndef HAVE_SNPRINTF_PROTOTYPE
-int snprintf (char *, size_t, const char *, ...);
-int vsnprintf (char *, size_t, const char *, va_list);
-#endif
-
 int mh_strcasecmp (const char *s1, const char *s2);
 int strncasecmp (const char *s1, const char *s2, size_t n);
 
diff --git a/sbr/client.c b/sbr/client.c
index c558536..763b2a4 100644
--- a/sbr/client.c
+++ b/sbr/client.c
@@ -14,10 +14,7 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>
-
-#ifdef HAVE_ARPA_INET_H
-# include <arpa/inet.h>
-#endif
+#include <arpa/inet.h>
 
 #define        TRUE         1
 #define        FALSE        0
diff --git a/sbr/lock_file.c b/sbr/lock_file.c
index 7eaa0de..f831949 100644
--- a/sbr/lock_file.c
+++ b/sbr/lock_file.c
@@ -29,10 +29,7 @@
 #  include <time.h>
 # endif
 #endif
-
-#ifdef HAVE_ERRNO_H
-# include <errno.h>
-#endif
+#include <errno.h>
 
 #ifdef HAVE_FCNTL_H
 # include <fcntl.h>
diff --git a/uip/dropsbr.c b/uip/dropsbr.c
index 76bc00d..11ceba8 100644
--- a/uip/dropsbr.c
+++ b/uip/dropsbr.c
@@ -14,10 +14,7 @@
 #include <h/dropsbr.h>
 #include <h/mts.h>
 #include <h/tws.h>
-
-#ifdef HAVE_ERRNO_H
-# include <errno.h>
-#endif
+#include <errno.h>
 
 #ifdef NTOHLSWAP
 # include <netinet/in.h>
diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index 58b2978..d1204c7 100644
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -1515,10 +1515,7 @@ face_format (struct mcomp *c1)
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>
-
-#ifdef HAVE_ARPA_INET_H
-# include <arpa/inet.h>
-#endif
+#include <arpa/inet.h>
 
 static int
 doface (struct mcomp *c1)
diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index 8b04d61..219af22 100644
--- a/uip/rcvtty.c
+++ b/uip/rcvtty.c
@@ -263,7 +263,7 @@ message_fd (char **vec)
             * Ruthlessly kill the child and anything
             * else in its process group.
             */
-           KILLPG(child_id, SIGKILL);
+           killpg(child_id, SIGKILL);
        }
        close (fd);
        return header_fd ();
diff --git a/uip/slocal.c b/uip/slocal.c
index e6880fe..cf91737 100644
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -1206,7 +1206,7 @@ usr_pipe (int fd, char *cmd, char *pgm, char **vec, int 
suppress)
                 * Ruthlessly kill the child and anything
                 * else in its process group.
                 */
-               KILLPG(child_id, SIGKILL);
+               killpg(child_id, SIGKILL);
                if (verbose)
                    verbose_printf (", timed-out; terminated\n");
                return -1;

http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=b4a6ed7e54c2c307acfa64df1af14a5e661f91ce


commit b4a6ed7e54c2c307acfa64df1af14a5e661f91ce
Author: Lyndon Nerenberg <address@hidden>
Date:   Sat Dec 24 15:30:53 2011 -0800

    Deprecate uname() in favour of (Posix) gethostname().

diff --git a/sbr/mts.c b/sbr/mts.c
index 15f182c..37f6e23 100644
--- a/sbr/mts.c
+++ b/sbr/mts.c
@@ -20,10 +20,6 @@
 #include <sys/socket.h>
 #include <netdb.h>
 
-#ifdef HAVE_SYS_UTSNAME_H
-# include <sys/utsname.h>
-#endif
-
 #define        NOTOK   (-1)
 #define        OK        0
 
@@ -250,9 +246,6 @@ LocalName (void)
 {
     static char buffer[BUFSIZ] = "";
     struct addrinfo hints, *res;
-#ifdef HAVE_UNAME
-    struct utsname name;
-#endif
 
     /* check if we have cached the local name */
     if (buffer[0])
@@ -265,14 +258,8 @@ LocalName (void)
        strncpy (buffer, localname, sizeof(buffer));
     } else {
        memset(buffer, 0, sizeof(buffer));
-#ifdef HAVE_UNAME
-       /* first get our local name */
-       uname (&name);
-       strncpy (buffer, name.nodename, sizeof(buffer) - 1);
-#else
        /* first get our local name */
        gethostname (buffer, sizeof(buffer) - 1);
-#endif
        /* now fully qualify our name */
 
        memset(&hints, 0, sizeof(hints));
@@ -307,10 +294,6 @@ SystemName (void)
 {
     static char buffer[BUFSIZ] = "";
 
-#ifdef HAVE_UNAME
-    struct utsname name;
-#endif
-
     /* check if we have cached the system name */
     if (buffer[0])
        return buffer;
@@ -323,12 +306,7 @@ SystemName (void)
        return buffer;
     }
 
-#ifdef HAVE_UNAME
-    uname (&name);
-    strncpy (buffer, name.nodename, sizeof(buffer));
-#else
     gethostname (buffer, sizeof(buffer));
-#endif
 
     return buffer;
 }

http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=0df1534a6b03bd7f7389add4b982064c7d651af9


commit 0df1534a6b03bd7f7389add4b982064c7d651af9
Author: Lyndon Nerenberg <address@hidden>
Date:   Sat Dec 24 14:59:21 2011 -0800

    Unhook Makefiles from autoconf regeneration.

diff --git a/Makefile b/Makefile
index 0b8ed00..b0778ca 100644
--- a/Makefile
+++ b/Makefile
@@ -74,9 +74,7 @@ INSTALL_DATA    = ${INSTALL} -m 644
 
 # all files in this directory included in the distribution
 DIST = ChangeLog COPYRIGHT DATE INSTALL MACHINES README VERSION                
\
-       ChangeLog install-sh mkinstalldirs Makefile.in aclocal.m4       \
-       acconfig.h config.h.in configure.in configure stamp-h.in        \
-       config.sub config.guess
+       ChangeLog install-sh mkinstalldirs
 
 # subdirectories in distribution
 SUBDIRS = h config sbr mts uip etc man docs
@@ -87,7 +85,8 @@ SUBDIRS = h config sbr mts uip etc man docs
 all: config.h Makefile all-recursive
 
 all-recursive:
-       for subdir in $(SUBDIRS); do \
+       @for subdir in $(SUBDIRS); do \
+         echo "--> $$subdir"; \
          (cd $$subdir && $(MAKE) $(MAKEDEFS) all) || exit 1; \
        done
 
@@ -138,29 +137,6 @@ lint:
 
 # ========== DEPENDENCIES FOR MAINTENANCE ==========
 
-Makefile: Makefile.in config.status
-       ./config.status $@
-
-config.status: configure VERSION
-       ./config.status --recheck
-
-configure: configure.in aclocal.m4
-       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.in acconfig.h aclocal.m4
-       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
diff --git a/config/Makefile b/config/Makefile
index f80508f..797cfc1 100644
--- a/config/Makefile
+++ b/config/Makefile
@@ -83,9 +83,6 @@ superclean: realclean
 
 subdir = config
 
-Makefile: Makefile.in ../config.status
-       cd .. && ./config.status $(subdir)/$@
- 
 distdir = ../`cat ../distname`/$(subdir)
 nmhdist: $(DIST)
        @echo "Copying distribution files in $(subdir)"
diff --git a/docs/Makefile b/docs/Makefile
index 823e3c3..b5b5c40 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -66,9 +66,6 @@ superclean: realclean
 
 subdir = docs
 
-Makefile: Makefile.in ../config.status
-       cd .. && ./config.status $(subdir)/$@
-
 distdir = ../`cat ../distname`/$(subdir)
 nmhdist:
        @echo "Copying distribution files in $(subdir)"
diff --git a/etc/Makefile b/etc/Makefile
index c6b571d..2af57a7 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -141,9 +141,6 @@ superclean: realclean
 
 subdir = etc
 
-Makefile: Makefile.in ../config.status
-       cd .. && ./config.status $(subdir)/$@
- 
 distdir = ../`cat ../distname`/$(subdir)
 nmhdist: $(DIST)
        @echo "Copying distribution files in $(subdir)"
diff --git a/h/Makefile b/h/Makefile
index 0ecf3ef..974c3f4 100644
--- a/h/Makefile
+++ b/h/Makefile
@@ -47,9 +47,6 @@ superclean: realclean
 
 subdir = h
 
-Makefile: Makefile.in ../config.status
-       cd .. && ./config.status $(subdir)/$@
- 
 distdir = ../`cat ../distname`/$(subdir)
 nmhdist: $(DIST)
        @echo "Copying distribution files in $(subdir)"
diff --git a/man/Makefile b/man/Makefile
index 6fce0f1..a52b2ca 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -195,9 +195,6 @@ lint:
 
 subdir = man
 
-Makefile: Makefile.in ../config.status
-       cd .. && ./config.status $(subdir)/$@
- 
 distdir = ../`cat ../distname`/$(subdir)
 nmhdist: $(DIST)
        @echo "Copying distribution files in $(subdir)"
diff --git a/mts/Makefile b/mts/Makefile
index d86e9aa..35c0c7a 100644
--- a/mts/Makefile
+++ b/mts/Makefile
@@ -94,9 +94,6 @@ lint:
 
 subdir = mts
 
-Makefile: Makefile.in ../config.status
-       cd .. && ./config.status $(subdir)/$@
- 
 distdir = ../`cat ../distname`/$(subdir)
 nmhdist: $(DIST)
        @echo "Copying distribution files in $(subdir)"
diff --git a/mts/smtp/Makefile b/mts/smtp/Makefile
index 8a4e72e..b824d8b 100644
--- a/mts/smtp/Makefile
+++ b/mts/smtp/Makefile
@@ -75,9 +75,6 @@ lint:
 
 subdir = mts/smtp
 
-Makefile: Makefile.in ../../config.status
-       cd ../.. && ./config.status $(subdir)/$@
- 
 distdir = ../../`cat ../../distname`/$(subdir)
 nmhdist: $(DIST)
        @echo "Copying distribution files in $(subdir)"
diff --git a/sbr/Makefile b/sbr/Makefile
index 0eb6fb6..8cea965 100644
--- a/sbr/Makefile
+++ b/sbr/Makefile
@@ -145,9 +145,6 @@ superclean: realclean
 
 subdir = sbr
 
-Makefile: Makefile.in ../config.status
-       cd .. && ./config.status $(subdir)/$@
- 
 distdir = ../`cat ../distname`/$(subdir)
 nmhdist: $(DIST)
        @echo "Copying distribution files in $(subdir)"
diff --git a/uip/Makefile b/uip/Makefile
index 2ea34ed..b983d10 100644
--- a/uip/Makefile
+++ b/uip/Makefile
@@ -327,9 +327,6 @@ lint:
 
 subdir = uip
 
-Makefile: Makefile.in ../config.status
-       cd .. && ./config.status $(subdir)/$@
-
 distdir = ../`cat ../distname`/$(subdir)
 nmhdist: $(DIST)
        @echo "Copying distribution files in $(subdir)"

http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=0bb5b742a897926152c1791186e4cfc493fb89bf


commit 0bb5b742a897926152c1791186e4cfc493fb89bf
Author: Lyndon Nerenberg <address@hidden>
Date:   Sat Dec 24 14:51:46 2011 -0800

    Remove autoconf-related files.

diff --git a/acconfig.h b/acconfig.h
deleted file mode 100644
index 3649bf3..0000000
--- a/acconfig.h
+++ /dev/null
@@ -1,114 +0,0 @@
-
-/****** BEGIN USER CONFIGURATION SECTION *****/
-
-/*
- * IMPORTANT: You should no longer need to edit this file to handle
- * your operating system. That should be handled and set correctly by
- * configure now.
- *
- * These are slowly being phased out, but currently
- * not everyone is auto-configured.  Then decide if you
- * wish to change the features that are compiled into nmh.
- */
-
-/*
- * If you have defined DOT_LOCKING, then the default is to
- * place the lock files in the same directory as the file that
- * is to be locked.  Alternately, if you define LOCKDIR, you
- * can specify that all lock files go in a specific directory.
- * Don't define this unless you know you need it.
- */
-/* #define LOCKDIR "/usr/spool/locks" */
-
-/*
- * Define this if your passwords are stored in some type of
- * distributed name service, such as NIS, or NIS+.
- */
-#define DBMPWD  1
-
-/*
- * Directs nmh not to try and rewrite addresses
- * to their official form.  You probably don't
- * want to change this without good reason.
- */
-#define DUMB    1
-
-/*
- * Define this if you do not want nmh to attach the local hostname
- * to local addresses.  You must also define DUMB.  You probably
- * don't need this unless you are behind a firewall.
- */
-/* #define REALLYDUMB  1 */
-
-/*
- * Starting on January 1, 2000, some MUAs like ELM and Ultrix's DXmail started
- * generated bad dates ("00" or "100" for the year).  If this #define is 
active,
- * we use windowing to correct those dates to what we presume to be the 
intended
- * values.  About the only time this could get us into trouble would be if a 
MUA
- * was generating a year of "00" in 2001 or later, due to an unrelated bug.  In
- * this case we would "correct" the year to 2000, which could result in
- * inaccurate bug reports against the offending MUA.  A much more esoteric case
- * in which you might not want to #define this would be if you were OCR'ing in
- * old written correspondence and saving it in email format, and you had dates
- * of 1899 or earlier.
- */
-#define FIX_NON_Y2K_COMPLIANT_MUA_DATES 1
-
-/*
- * Directs inc/slocal to extract the envelope sender from "From "
- * line.  If inc/slocal is saving message to folder, then this
- * sender information is then used to create a Return-Path
- * header which is then added to the message.
- */
-#define RPATHS  1
-
-/*
- * If defined, slocal will use `mbox' format when saving to
- * your standard mail spool.  If not defined, it will use
- * mmdf format.
- */
-#define SLOCAL_MBOX  1
-
-/*
- * If this is defined, nmh will recognize the ~ construct.
- */
-#define MHRC    1
-
-/*
- * Compile simple ftp client into mhn.  This will be used by mhn
- * for ftp access unless you have specified another access method
- * in your .mh_profile or mhn.defaults.  Use the "mhn-access-ftp"
- * profile entry to override this.  Check mhn(1) man page for
- * details.
- */
-#define BUILTIN_FTP 1
-
-/*
- * If you enable POP support, this is the the port name that nmh will use.  
Make
- * sure this is defined in your /etc/services file (or its NIS/NIS+ 
equivalent).
- * If you are using KPOP, you will need to change this to "kpop" unless you 
want
- * to be able to use both POP3 _and_ Kerberized POP and plan to use inc and
- * msgchk's -kpop switch every time in the latter case.
- */
-#define POPSERVICE "pop3"
-
-/*
- * Define the default creation modes for folders and messages.
- */
-#define DEFAULT_FOLDER_MODE "700"
-#define DEFAULT_MESSAGE_MODE "600"
-
-/*
- * Name of link to file to which you are replying.
- */
-#define LINK "@"
-
-/*
- * Define to 1 if your vi has ATT bug, such that it returns
- * non-zero exit codes on `pseudo-errors'.
- */
-#undef ATTVIBUG
-
-
-/***** END USER CONFIGURATION SECTION *****/
address@hidden@
diff --git a/aclocal.m4 b/aclocal.m4
deleted file mode 100644
index 20d123f..0000000
--- a/aclocal.m4
+++ /dev/null
@@ -1,128 +0,0 @@
-
-#
-# Updated for more modern systems.  Check to see if we need to link against
-# optional libraries for networking functions.
-#
-
-AC_DEFUN([AC_CHECK_NETLIBS],
-[AC_SEARCH_LIBS([gethostbyname], [nsl], ,
-               [AC_MSG_ERROR([gethostbyname not found])])
- AC_SEARCH_LIBS([connect], [socket], , [AC_MSG_ERROR([connect not found])])
-])dnl
-
-dnl --------------
-dnl CHECK FOR NDBM
-dnl --------------
-dnl
-dnl NMH_CHECK_DBM(include,library,action-if-found,action-if-not)
-
-dnl Check for presence of dbm_open() in the specified library
-dnl and with the specified include file (if libname is the empty
-dnl string then don't try to link against any particular library).
-
-dnl We set nmh_ndbm_found to 'yes' or 'no'; if found we set
-dnl nmh_ndbmheader to the first arg and nmh_ndbm to the second.
-
-dnl If this macro accepted a list of include,library tuples
-dnl to test in order that would be cleaner than the current
-dnl nest of calls in configure.in.
-
-dnl We try to link our own code fragment (which includes the
-dnl headers in the same way slocal.c does) rather than
-dnl using AC_CHECK_LIB because on later versions of libdb
-dnl the dbm_open() function is provided via a #define and
-dnl we don't want to hardcode searching for the internal
-dnl function that lies behind it. (AC_CHECK_LIB works by
-dnl defining its own bogus prototype rather than pulling in
-dnl the right header files.)
-
-dnl An oddity (bug) of this macro is that if you haven't
-dnl done AC_PROG_CC or something that implies it before
-dnl using this macro autoconf complains about a recursive
-dnl expansion.
-
-AC_DEFUN(NMH_CHECK_NDBM,
-[
-if test "x$2" = "x"; then
-  nmh_libs=
-  AC_MSG_CHECKING([for dbm in $1])
-else
-  nmh_libs="-l$2 "
-  AC_MSG_CHECKING([for dbm in $1 and $2])
-fi
-
-dnl We don't try to cache the result, because that exceeds
-dnl my autoconf skills -- feel free to put it in :-> -- PMM
-
-nmh_saved_libs="$LIBS"
-LIBS="$nmh_libs $5 $LIBS"
-AC_LINK_IFELSE(AC_LANG_PROGRAM([[
-#define DB_DBM_HSEARCH 1
-#include <$1>
-]],
-[[dbm_open("",0,0);]]),[nmh_ndbm_found=yes],[nmh_ndbm_found=no])
-LIBS="$nmh_saved_libs"
-
-if test "$nmh_ndbm_found" = "yes"; then
-  AC_MSG_RESULT(yes)
-  nmh_ndbmheader="$1"
-  nmh_ndbm="$2"
-  $3
-else
-  AC_MSG_RESULT(no)
-  $4
-  :
-fi
-])dnl
-
-dnl ----------------
-dnl CHECK FOR d_type
-dnl ----------------
-dnl
-dnl From Jim Meyering.
-dnl
-dnl Check whether struct dirent has a member named d_type.
-dnl
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
-# Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([CHECK_TYPE_STRUCT_DIRENT_D_TYPE],
-  [AC_REQUIRE([AC_HEADER_DIRENT])dnl
-   AC_CACHE_CHECK([for d_type member in directory struct],
-                  jm_cv_struct_dirent_d_type,
-     [AC_TRY_LINK(dnl
-       [
-#include <sys/types.h>
-#ifdef HAVE_DIRENT_H
-# include <dirent.h>
-#else /* not HAVE_DIRENT_H */
-# define dirent direct
-# ifdef HAVE_SYS_NDIR_H
-#  include <sys/ndir.h>
-# endif /* HAVE_SYS_NDIR_H */
-# ifdef HAVE_SYS_DIR_H
-#  include <sys/dir.h>
-# endif /* HAVE_SYS_DIR_H */
-# ifdef HAVE_NDIR_H
-#  include <ndir.h>
-# endif /* HAVE_NDIR_H */
-#endif /* HAVE_DIRENT_H */
-       ],
-       [struct dirent dp; dp.d_type = 0;],
-
-       jm_cv_struct_dirent_d_type=yes,
-       jm_cv_struct_dirent_d_type=no)
-     ]
-   )
-   if test $jm_cv_struct_dirent_d_type = yes; then
-     AC_DEFINE(HAVE_STRUCT_DIRENT_D_TYPE, 1,
-       [Define if there is a member named d_type in the struct describing
-        directory headers.])
-   fi
-  ]
-)
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index 71a2912..0000000
--- a/autogen.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-#
-# Regenerate config.h.in, configure, etc.
-# Necessary if building from CVS; not needed if
-# building from a distributed tarball.
-
-set -e
-autoreconf
-date > stamp-h.in
diff --git a/config.guess b/config.guess
deleted file mode 100755
index 892833f..0000000
--- a/config.guess
+++ /dev/null
@@ -1,1459 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-
-timestamp='2005-02-10'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Per Bothner <address@hidden>.
-# Please send patches to <address@hidden>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <address@hidden>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 
2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )        # Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && 
exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 
;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n 
"$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) 
; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating 
insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } 
;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-       for c in cc gcc c89 c99 ; do
-         if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-            CC_FOR_BUILD="$c"; break ;
-         fi ;
-       done ;
-       if test x"$CC_FOR_BUILD" = x ; then
-         CC_FOR_BUILD=no_compiler_found ;
-       fi
-       ;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (address@hidden 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-       PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-       # NetBSD (nbsd) targets should (where applicable) match one or
-       # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-       # *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-       # switched to ELF, *-*-netbsd* would select the old
-       # object file format.  This provides both forward
-       # compatibility and a consistent mechanism for selecting the
-       # object file format.
-       #
-       # Note: NetBSD doesn't particularly care about the vendor
-       # portion of the name.  We always set it to "unknown".
-       sysctl="sysctl -n hw.machine_arch"
-       UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-           /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-       case "${UNAME_MACHINE_ARCH}" in
-           armeb) machine=armeb-unknown ;;
-           arm*) machine=arm-unknown ;;
-           sh3el) machine=shl-unknown ;;
-           sh3eb) machine=sh-unknown ;;
-           *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-       esac
-       # The Operating System including object format, if it has switched
-       # to ELF recently, or will in the future.
-       case "${UNAME_MACHINE_ARCH}" in
-           arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-               eval $set_cc_for_build
-               if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-                       | grep __ELF__ >/dev/null
-               then
-                   # Once all utilities can be ECOFF (netbsdecoff) or a.out 
(netbsdaout).
-                   # Return netbsd for either.  FIX?
-                   os=netbsd
-               else
-                   os=netbsdelf
-               fi
-               ;;
-           *)
-               os=netbsd
-               ;;
-       esac
-       # The OS release
-       # Debian GNU/NetBSD machines have a different userland, and
-       # thus, need a distinct triplet. However, they do not need
-       # kernel version information, so it can be replaced with a
-       # suitable tag, in the style of linux-gnu.
-       case "${UNAME_VERSION}" in
-           Debian*)
-               release='-gnu'
-               ;;
-           *)
-               release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-               ;;
-       esac
-       # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-       # contains redundant information, the shorter form:
-       # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-       echo "${machine}-${os}${release}"
-       exit 0 ;;
-    amd64:OpenBSD:*:*)
-       echo x86_64-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    amiga:OpenBSD:*:*)
-       echo m68k-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    cats:OpenBSD:*:*)
-       echo arm-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    hp300:OpenBSD:*:*)
-       echo m68k-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    luna88k:OpenBSD:*:*)
-       echo m88k-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    mac68k:OpenBSD:*:*)
-       echo m68k-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    macppc:OpenBSD:*:*)
-       echo powerpc-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-       echo m68k-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-       echo m88k-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    mvmeppc:OpenBSD:*:*)
-       echo powerpc-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    sgi:OpenBSD:*:*)
-       echo mips64-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    sun3:OpenBSD:*:*)
-       echo m68k-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    *:OpenBSD:*:*)
-       echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    *:ekkoBSD:*:*)
-       echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-       exit 0 ;;
-    macppc:MirBSD:*:*)
-       echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-       exit 0 ;;
-    *:MirBSD:*:*)
-       echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-       exit 0 ;;
-    alpha:OSF1:*:*)
-       case $UNAME_RELEASE in
-       *4.0)
-               UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-               ;;
-       *5.*)
-               UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-               ;;
-       esac
-       # According to Compaq, /usr/sbin/psrinfo has been available on
-       # OSF/1 and Tru64 systems produced since 1995.  I hope that
-       # covers most systems running today.  This code pipes the CPU
-       # types through head -n 1, so we only detect the type of CPU 0.
-       ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) 
processor.*$/\1/p' | head -n 1`
-       case "$ALPHA_CPU_TYPE" in
-           "EV4 (21064)")
-               UNAME_MACHINE="alpha" ;;
-           "EV4.5 (21064)")
-               UNAME_MACHINE="alpha" ;;
-           "LCA4 (21066/21068)")
-               UNAME_MACHINE="alpha" ;;
-           "EV5 (21164)")
-               UNAME_MACHINE="alphaev5" ;;
-           "EV5.6 (21164A)")
-               UNAME_MACHINE="alphaev56" ;;
-           "EV5.6 (21164PC)")
-               UNAME_MACHINE="alphapca56" ;;
-           "EV5.7 (21164PC)")
-               UNAME_MACHINE="alphapca57" ;;
-           "EV6 (21264)")
-               UNAME_MACHINE="alphaev6" ;;
-           "EV6.7 (21264A)")
-               UNAME_MACHINE="alphaev67" ;;
-           "EV6.8CB (21264C)")
-               UNAME_MACHINE="alphaev68" ;;
-           "EV6.8AL (21264B)")
-               UNAME_MACHINE="alphaev68" ;;
-           "EV6.8CX (21264D)")
-               UNAME_MACHINE="alphaev68" ;;
-           "EV6.9A (21264/EV69A)")
-               UNAME_MACHINE="alphaev69" ;;
-           "EV7 (21364)")
-               UNAME_MACHINE="alphaev7" ;;
-           "EV7.9 (21364A)")
-               UNAME_MACHINE="alphaev79" ;;
-       esac
-       # A Pn.n version is a patched version.
-       # A Vn.n version is a released version.
-       # A Tn.n version is a released field test version.
-       # A Xn.n version is an unreleased experimental baselevel.
-       # 1.2 uses "1.2" for uname -r.
-       echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 
's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-       exit 0 ;;
-    Alpha\ *:Windows_NT*:*)
-       # How do we know it's Interix rather than the generic POSIX subsystem?
-       # Should we change UNAME_MACHINE based on the output of uname instead
-       # of the specific Alpha model?
-       echo alpha-pc-interix
-       exit 0 ;;
-    21064:Windows_NT:50:3)
-       echo alpha-dec-winnt3.5
-       exit 0 ;;
-    Amiga*:UNIX_System_V:4.0:*)
-       echo m68k-unknown-sysv4
-       exit 0;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-       echo ${UNAME_MACHINE}-unknown-amigaos
-       exit 0 ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-       echo ${UNAME_MACHINE}-unknown-morphos
-       exit 0 ;;
-    *:OS/390:*:*)
-       echo i370-ibm-openedition
-       exit 0 ;;
-    *:z/VM:*:*)
-       echo s390-ibm-zvmoe
-       exit 0 ;;
-    *:OS400:*:*)
-        echo powerpc-ibm-os400
-       exit 0 ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-       echo arm-acorn-riscix${UNAME_RELEASE}
-       exit 0;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-       echo hppa1.1-hitachi-hiuxmpp
-       exit 0;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-       # address@hidden (Earle F. Ake) contributed MIS and NILE.
-       if test "`(/bin/universe) 2>/dev/null`" = att ; then
-               echo pyramid-pyramid-sysv3
-       else
-               echo pyramid-pyramid-bsd
-       fi
-       exit 0 ;;
-    NILE*:*:*:dcosx)
-       echo pyramid-pyramid-svr4
-       exit 0 ;;
-    DRS?6000:unix:4.0:6*)
-       echo sparc-icl-nx6
-       exit 0 ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-       case `/usr/bin/uname -p` in
-           sparc) echo sparc-icl-nx7 && exit 0 ;;
-       esac ;;
-    sun4H:SunOS:5.*:*)
-       echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-       exit 0 ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-       echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-       exit 0 ;;
-    i86pc:SunOS:5.*:*)
-       echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-       exit 0 ;;
-    sun4*:SunOS:6*:*)
-       # According to config.sub, this is the proper way to canonicalize
-       # SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-       # it's likely to be more like Solaris than SunOS4.
-       echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-       exit 0 ;;
-    sun4*:SunOS:*:*)
-       case "`/usr/bin/arch -k`" in
-           Series*|S4*)
-               UNAME_RELEASE=`uname -v`
-               ;;
-       esac
-       # Japanese Language versions have a version number like `4.1.3-JL'.
-       echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-       exit 0 ;;
-    sun3*:SunOS:*:*)
-       echo m68k-sun-sunos${UNAME_RELEASE}
-       exit 0 ;;
-    sun*:*:4.2BSD:*)
-       UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 
2>/dev/null`
-       test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-       case "`/bin/arch`" in
-           sun3)
-               echo m68k-sun-sunos${UNAME_RELEASE}
-               ;;
-           sun4)
-               echo sparc-sun-sunos${UNAME_RELEASE}
-               ;;
-       esac
-       exit 0 ;;
-    aushp:SunOS:*:*)
-       echo sparc-auspex-sunos${UNAME_RELEASE}
-       exit 0 ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-       exit 0 ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-       echo m68k-atari-mint${UNAME_RELEASE}
-        exit 0 ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-       exit 0 ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit 0 ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit 0 ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit 0 ;;
-    m68k:machten:*:*)
-       echo m68k-apple-machten${UNAME_RELEASE}
-       exit 0 ;;
-    powerpc:machten:*:*)
-       echo powerpc-apple-machten${UNAME_RELEASE}
-       exit 0 ;;
-    RISC*:Mach:*:*)
-       echo mips-dec-mach_bsd4.3
-       exit 0 ;;
-    RISC*:ULTRIX:*:*)
-       echo mips-dec-ultrix${UNAME_RELEASE}
-       exit 0 ;;
-    VAX*:ULTRIX*:*:*)
-       echo vax-dec-ultrix${UNAME_RELEASE}
-       exit 0 ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-       echo clipper-intergraph-clix${UNAME_RELEASE}
-       exit 0 ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-       eval $set_cc_for_build
-       sed 's/^        //' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-       int main (int argc, char *argv[]) {
-#else
-       int main (argc, argv) int argc; char *argv[]; {
-#endif
-       #if defined (host_mips) && defined (MIPSEB)
-       #if defined (SYSTYPE_SYSV)
-         printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-       #endif
-       #if defined (SYSTYPE_SVR4)
-         printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-       #endif
-       #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-         printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-       #endif
-       #endif
-         exit (-1);
-       }
-EOF
-       $CC_FOR_BUILD -o $dummy $dummy.c \
-         && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-         && exit 0
-       echo mips-mips-riscos${UNAME_RELEASE}
-       exit 0 ;;
-    Motorola:PowerMAX_OS:*:*)
-       echo powerpc-motorola-powermax
-       exit 0 ;;
-    Motorola:*:4.3:PL8-*)
-       echo powerpc-harris-powermax
-       exit 0 ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-       echo powerpc-harris-powermax
-       exit 0 ;;
-    Night_Hawk:Power_UNIX:*:*)
-       echo powerpc-harris-powerunix
-       exit 0 ;;
-    m88k:CX/UX:7*:*)
-       echo m88k-harris-cxux7
-       exit 0 ;;
-    m88k:*:4*:R4*)
-       echo m88k-motorola-sysv4
-       exit 0 ;;
-    m88k:*:3*:R3*)
-       echo m88k-motorola-sysv3
-       exit 0 ;;
-    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-       if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-       then
-           if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-              [ ${TARGET_BINARY_INTERFACE}x = x ]
-           then
-               echo m88k-dg-dgux${UNAME_RELEASE}
-           else
-               echo m88k-dg-dguxbcs${UNAME_RELEASE}
-           fi
-       else
-           echo i586-dg-dgux${UNAME_RELEASE}
-       fi
-       exit 0 ;;
-    M88*:DolphinOS:*:*)        # DolphinOS (SVR3)
-       echo m88k-dolphin-sysv3
-       exit 0 ;;
-    M88*:*:R3*:*)
-       # Delta 88k system running SVR3
-       echo m88k-motorola-sysv3
-       exit 0 ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-       echo m88k-tektronix-sysv3
-       exit 0 ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-       echo m68k-tektronix-bsd
-       exit 0 ;;
-    *:IRIX*:*:*)
-       echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-       exit 0 ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-       echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
-       exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-       echo i386-ibm-aix
-       exit 0 ;;
-    ia64:AIX:*:*)
-       if [ -x /usr/bin/oslevel ] ; then
-               IBM_REV=`/usr/bin/oslevel`
-       else
-               IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-       fi
-       echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-       exit 0 ;;
-    *:AIX:2:3)
-       if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-               eval $set_cc_for_build
-               sed 's/^                //' << EOF >$dummy.c
-               #include <sys/systemcfg.h>
-
-               main()
-                       {
-                       if (!__power_pc())
-                               exit(1);
-                       puts("powerpc-ibm-aix3.2.5");
-                       exit(0);
-                       }
-EOF
-               $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-               echo rs6000-ibm-aix3.2.5
-       elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-               echo rs6000-ibm-aix3.2.4
-       else
-               echo rs6000-ibm-aix3.2
-       fi
-       exit 0 ;;
-    *:AIX:*:[45])
-       IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk 
'{ print $1 }'`
-       if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; 
then
-               IBM_ARCH=rs6000
-       else
-               IBM_ARCH=powerpc
-       fi
-       if [ -x /usr/bin/oslevel ] ; then
-               IBM_REV=`/usr/bin/oslevel`
-       else
-               IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-       fi
-       echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-       exit 0 ;;
-    *:AIX:*:*)
-       echo rs6000-ibm-aix
-       exit 0 ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-       echo romp-ibm-bsd4.4
-       exit 0 ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-       echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-       exit 0 ;;                           # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-       echo rs6000-bull-bosx
-       exit 0 ;;
-    DPX/2?00:B.O.S.:*:*)
-       echo m68k-bull-sysv3
-       exit 0 ;;
-    9000/[34]??:4.3bsd:1.*:*)
-       echo m68k-hp-bsd
-       exit 0 ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-       echo m68k-hp-bsd4.4
-       exit 0 ;;
-    9000/[34678]??:HP-UX:*:*)
-       HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-       case "${UNAME_MACHINE}" in
-           9000/31? )            HP_ARCH=m68000 ;;
-           9000/[34]?? )         HP_ARCH=m68k ;;
-           9000/[678][0-9][0-9])
-               if [ -x /usr/bin/getconf ]; then
-                   sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 
2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-                         '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
-               fi
-               if [ "${HP_ARCH}" = "" ]; then
-                   eval $set_cc_for_build
-                   sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-               {
-               case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-               case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-               case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-                   switch (bits)
-                       {
-                       case 64: puts ("hppa2.0w"); break;
-                       case 32: puts ("hppa2.0n"); break;
-                       default: puts ("hppa2.0"); break;
-                       } break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-                   puts ("hppa2.0"); break;
-              #endif
-               default: puts ("hppa1.0"); break;
-               }
-                  exit (0);
-              }
-EOF
-                   (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && 
HP_ARCH=`$dummy`
-                   test -z "$HP_ARCH" && HP_ARCH=hppa
-               fi ;;
-       esac
-       if [ ${HP_ARCH} = "hppa2.0w" ]
-       then
-           # avoid double evaluation of $set_cc_for_build
-           test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
-           if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ 
>/dev/null
-           then
-               HP_ARCH="hppa2.0w"
-           else
-               HP_ARCH="hppa64"
-           fi
-       fi
-       echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-       exit 0 ;;
-    ia64:HP-UX:*:*)
-       HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-       echo ia64-hp-hpux${HPUX_REV}
-       exit 0 ;;
-    3050*:HI-UX:*:*)
-       eval $set_cc_for_build
-       sed 's/^        //' << EOF >$dummy.c
-       #include <unistd.h>
-       int
-       main ()
-       {
-         long cpu = sysconf (_SC_CPU_VERSION);
-         /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-            true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-            results, however.  */
-         if (CPU_IS_PA_RISC (cpu))
-           {
-             switch (cpu)
-               {
-                 case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-                 case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-                 case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-                 default: puts ("hppa-hitachi-hiuxwe2"); break;
-               }
-           }
-         else if (CPU_IS_HP_MC68K (cpu))
-           puts ("m68k-hitachi-hiuxwe2");
-         else puts ("unknown-hitachi-hiuxwe2");
-         exit (0);
-       }
-EOF
-       $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-       echo unknown-hitachi-hiuxwe2
-       exit 0 ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-       echo hppa1.1-hp-bsd
-       exit 0 ;;
-    9000/8??:4.3bsd:*:*)
-       echo hppa1.0-hp-bsd
-       exit 0 ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-       echo hppa1.0-hp-mpeix
-       exit 0 ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-       echo hppa1.1-hp-osf
-       exit 0 ;;
-    hp8??:OSF1:*:*)
-       echo hppa1.0-hp-osf
-       exit 0 ;;
-    i*86:OSF1:*:*)
-       if [ -x /usr/sbin/sysversion ] ; then
-           echo ${UNAME_MACHINE}-unknown-osf1mk
-       else
-           echo ${UNAME_MACHINE}-unknown-osf1
-       fi
-       exit 0 ;;
-    parisc*:Lites*:*:*)
-       echo hppa1.1-hp-lites
-       exit 0 ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-       echo c1-convex-bsd
-        exit 0 ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-       if getsysinfo -f scalar_acc
-       then echo c32-convex-bsd
-       else echo c2-convex-bsd
-       fi
-        exit 0 ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-       echo c34-convex-bsd
-        exit 0 ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-       echo c38-convex-bsd
-        exit 0 ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-       echo c4-convex-bsd
-        exit 0 ;;
-    CRAY*Y-MP:*:*:*)
-       echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-       exit 0 ;;
-    CRAY*[A-Z]90:*:*:*)
-       echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-       | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-             -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-             -e 's/\.[^.]*$/.X/'
-       exit 0 ;;
-    CRAY*TS:*:*:*)
-       echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-       exit 0 ;;
-    CRAY*T3E:*:*:*)
-       echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-       exit 0 ;;
-    CRAY*SV1:*:*:*)
-       echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-       exit 0 ;;
-    *:UNICOS/mp:*:*)
-       echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-       exit 0 ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-       FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 
'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 
'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
-    5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 
'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 
'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-       exit 0 ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-       echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-       exit 0 ;;
-    sparc*:BSD/OS:*:*)
-       echo sparc-unknown-bsdi${UNAME_RELEASE}
-       exit 0 ;;
-    *:BSD/OS:*:*)
-       echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-       exit 0 ;;
-    *:FreeBSD:*:*)
-       echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 
's/[-(].*//'`
-       exit 0 ;;
-    i*:CYGWIN*:*)
-       echo ${UNAME_MACHINE}-pc-cygwin
-       exit 0 ;;
-    i*:MINGW*:*)
-       echo ${UNAME_MACHINE}-pc-mingw32
-       exit 0 ;;
-    i*:PW*:*)
-       echo ${UNAME_MACHINE}-pc-pw32
-       exit 0 ;;
-    x86:Interix*:[34]*)
-       echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-       exit 0 ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-       echo i${UNAME_MACHINE}-pc-mks
-       exit 0 ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-       # How do we know it's Interix rather than the generic POSIX subsystem?
-       # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-       # UNAME_MACHINE based on the output of uname instead of i386?
-       echo i586-pc-interix
-       exit 0 ;;
-    i*:UWIN*:*)
-       echo ${UNAME_MACHINE}-pc-uwin
-       exit 0 ;;
-    amd64:CYGWIN*:*:*)
-       echo x86_64-unknown-cygwin
-       exit 0 ;;
-    p*:CYGWIN*:*)
-       echo powerpcle-unknown-cygwin
-       exit 0 ;;
-    prep*:SunOS:5.*:*)
-       echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 
's/[^.]*//'`
-       exit 0 ;;
-    *:GNU:*:*)
-       # the GNU system
-       echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo 
${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-       exit 0 ;;
-    *:GNU/*:*:*)
-       # other systems with GNU libc and userland
-       echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' 
| tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-       exit 0 ;;
-    i*86:Minix:*:*)
-       echo ${UNAME_MACHINE}-pc-minix
-       exit 0 ;;
-    arm*:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit 0 ;;
-    cris:Linux:*:*)
-       echo cris-axis-linux-gnu
-       exit 0 ;;
-    crisv32:Linux:*:*)
-       echo crisv32-axis-linux-gnu
-       exit 0 ;;
-    frv:Linux:*:*)
-       echo frv-unknown-linux-gnu
-       exit 0 ;;
-    ia64:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit 0 ;;
-    m32r*:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit 0 ;;
-    m68*:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit 0 ;;
-    mips:Linux:*:*)
-       eval $set_cc_for_build
-       sed 's/^        //' << EOF >$dummy.c
-       #undef CPU
-       #undef mips
-       #undef mipsel
-       #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || 
defined(MIPSEL)
-       CPU=mipsel
-       #else
-       #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || 
defined(MIPSEB)
-       CPU=mips
-       #else
-       CPU=
-       #endif
-       #endif
-EOF
-       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-       test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-       ;;
-    mips64:Linux:*:*)
-       eval $set_cc_for_build
-       sed 's/^        //' << EOF >$dummy.c
-       #undef CPU
-       #undef mips64
-       #undef mips64el
-       #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || 
defined(MIPSEL)
-       CPU=mips64el
-       #else
-       #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || 
defined(MIPSEB)
-       CPU=mips64
-       #else
-       CPU=
-       #endif
-       #endif
-EOF
-       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-       test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-       ;;
-    ppc:Linux:*:*)
-       echo powerpc-unknown-linux-gnu
-       exit 0 ;;
-    ppc64:Linux:*:*)
-       echo powerpc64-unknown-linux-gnu
-       exit 0 ;;
-    alpha:Linux:*:*)
-       case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-         EV5)   UNAME_MACHINE=alphaev5 ;;
-         EV56)  UNAME_MACHINE=alphaev56 ;;
-         PCA56) UNAME_MACHINE=alphapca56 ;;
-         PCA57) UNAME_MACHINE=alphapca56 ;;
-         EV6)   UNAME_MACHINE=alphaev6 ;;
-         EV67)  UNAME_MACHINE=alphaev67 ;;
-         EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-       objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-       if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-       echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-       exit 0 ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-       # Look for CPU level
-       case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-         PA7*) echo hppa1.1-unknown-linux-gnu ;;
-         PA8*) echo hppa2.0-unknown-linux-gnu ;;
-         *)    echo hppa-unknown-linux-gnu ;;
-       esac
-       exit 0 ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-       echo hppa64-unknown-linux-gnu
-       exit 0 ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-       echo ${UNAME_MACHINE}-ibm-linux
-       exit 0 ;;
-    sh64*:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit 0 ;;
-    sh*:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit 0 ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit 0 ;;
-    x86_64:Linux:*:*)
-       echo x86_64-unknown-linux-gnu
-       exit 0 ;;
-    i*86:Linux:*:*)
-       # The BFD linker knows what the default object file format is, so
-       # first see if it will tell us. cd to the root directory to prevent
-       # problems with other programs or directories called `ld' in the path.
-       # Set LC_ALL=C to ensure ld outputs messages in English.
-       ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-                        | sed -ne '/supported targets:/!d
-                                   s/[         ][      ]*/ /g
-                                   s/.*supported targets: *//
-                                   s/ .*//
-                                   p'`
-        case "$ld_supported_targets" in
-         elf32-i386)
-               TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-               ;;
-         a.out-i386-linux)
-               echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-               exit 0 ;;
-         coff-i386)
-               echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-               exit 0 ;;
-         "")
-               # Either a pre-BFD a.out linker (linux-gnuoldld) or
-               # one that does not give us useful --help.
-               echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-               exit 0 ;;
-       esac
-       # Determine whether the default compiler is a.out or elf
-       eval $set_cc_for_build
-       sed 's/^        //' << EOF >$dummy.c
-       #include <features.h>
-       #ifdef __ELF__
-       # ifdef __GLIBC__
-       #  if __GLIBC__ >= 2
-       LIBC=gnu
-       #  else
-       LIBC=gnulibc1
-       #  endif
-       # else
-       LIBC=gnulibc1
-       # endif
-       #else
-       #ifdef __INTEL_COMPILER
-       LIBC=gnu
-       #else
-       LIBC=gnuaout
-       #endif
-       #endif
-       #ifdef __dietlibc__
-       LIBC=dietlibc
-       #endif
-EOF
-       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-       test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && 
exit 0
-       test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-       ;;
-    i*86:DYNIX/ptx:4*:*)
-       # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-       # earlier versions are messed up and put the nodename in both
-       # sysname and nodename.
-       echo i386-sequent-sysv4
-       exit 0 ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
-       # I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
-       echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-       exit 0 ;;
-    i*86:OS/2:*:*)
-       # If we were able to find `uname', then EMX Unix compatibility
-       # is probably installed.
-       echo ${UNAME_MACHINE}-pc-os2-emx
-       exit 0 ;;
-    i*86:XTS-300:*:STOP)
-       echo ${UNAME_MACHINE}-unknown-stop
-       exit 0 ;;
-    i*86:atheos:*:*)
-       echo ${UNAME_MACHINE}-unknown-atheos
-       exit 0 ;;
-       i*86:syllable:*:*)
-       echo ${UNAME_MACHINE}-pc-syllable
-       exit 0 ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-       echo i386-unknown-lynxos${UNAME_RELEASE}
-       exit 0 ;;
-    i*86:*DOS:*:*)
-       echo ${UNAME_MACHINE}-pc-msdosdjgpp
-       exit 0 ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-       UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-       if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-               echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-       else
-               echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-       fi
-       exit 0 ;;
-    i*86:*:5:[78]*)
-       case `/bin/uname -X | grep "^Machine"` in
-           *486*)           UNAME_MACHINE=i486 ;;
-           *Pentium)        UNAME_MACHINE=i586 ;;
-           *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-       esac
-       echo 
${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-       exit 0 ;;
-    i*86:*:3.2:*)
-       if test -f /usr/options/cb.name; then
-               UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-               echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-       elif /bin/uname -X 2>/dev/null >/dev/null ; then
-               UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-               (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-               (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-                       && UNAME_MACHINE=i586
-               (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-                       && UNAME_MACHINE=i686
-               (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-                       && UNAME_MACHINE=i686
-               echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-       else
-               echo ${UNAME_MACHINE}-pc-sysv32
-       fi
-       exit 0 ;;
-    pc:*:*:*)
-       # Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-       echo i386-pc-msdosdjgpp
-        exit 0 ;;
-    Intel:Mach:3*:*)
-       echo i386-pc-mach3
-       exit 0 ;;
-    paragon:*:*:*)
-       echo i860-intel-osf1
-       exit 0 ;;
-    i860:*:4.*:*) # i860-SVR4
-       if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-         echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-       else # Add other i860-SVR4 vendors below as they are discovered.
-         echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-       fi
-       exit 0 ;;
-    mini*:CTIX:SYS*5:*)
-       # "miniframe"
-       echo m68010-convergent-sysv
-       exit 0 ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-       echo m68k-convergent-sysv
-       exit 0 ;;
-    M680?0:D-NIX:5.3:*)
-       echo m68k-diab-dnix
-       exit 0 ;;
-    M68*:*:R3V[5678]*:*)
-       test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 
3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | 
SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-       OS_REL=''
-       test -r /etc/.relid \
-       && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-       /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-         && echo i486-ncr-sysv4.3${OS_REL} && exit 0
-       /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-         && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4 && exit 0 ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-       echo m68k-unknown-lynxos${UNAME_RELEASE}
-       exit 0 ;;
-    mc68030:UNIX_System_V:4.*:*)
-       echo m68k-atari-sysv4
-       exit 0 ;;
-    TSUNAMI:LynxOS:2.*:*)
-       echo sparc-unknown-lynxos${UNAME_RELEASE}
-       exit 0 ;;
-    rs6000:LynxOS:2.*:*)
-       echo rs6000-unknown-lynxos${UNAME_RELEASE}
-       exit 0 ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-       echo powerpc-unknown-lynxos${UNAME_RELEASE}
-       exit 0 ;;
-    SM[BE]S:UNIX_SV:*:*)
-       echo mips-dde-sysv${UNAME_RELEASE}
-       exit 0 ;;
-    RM*:ReliantUNIX-*:*:*)
-       echo mips-sni-sysv4
-       exit 0 ;;
-    RM*:SINIX-*:*:*)
-       echo mips-sni-sysv4
-       exit 0 ;;
-    *:SINIX-*:*:*)
-       if uname -p 2>/dev/null >/dev/null ; then
-               UNAME_MACHINE=`(uname -p) 2>/dev/null`
-               echo ${UNAME_MACHINE}-sni-sysv4
-       else
-               echo ns32k-sni-sysv
-       fi
-       exit 0 ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <address@hidden>
-        echo i586-unisys-sysv4
-        exit 0 ;;
-    *:UNIX_System_V:4*:FTX*)
-       # From Gerald Hewes <address@hidden>.
-       # How about differentiating between stratus architectures? -djm
-       echo hppa1.1-stratus-sysv4
-       exit 0 ;;
-    *:*:*:FTX*)
-       # From address@hidden
-       echo i860-stratus-sysv4
-       exit 0 ;;
-    *:VOS:*:*)
-       # From address@hidden
-       echo hppa1.1-stratus-vos
-       exit 0 ;;
-    mc68*:A/UX:*:*)
-       echo m68k-apple-aux${UNAME_RELEASE}
-       exit 0 ;;
-    news*:NEWS-OS:6*:*)
-       echo mips-sony-newsos6
-       exit 0 ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-       if [ -d /usr/nec ]; then
-               echo mips-nec-sysv${UNAME_RELEASE}
-       else
-               echo mips-unknown-sysv${UNAME_RELEASE}
-       fi
-        exit 0 ;;
-    BeBox:BeOS:*:*)    # BeOS running on hardware made by Be, PPC only.
-       echo powerpc-be-beos
-       exit 0 ;;
-    BeMac:BeOS:*:*)    # BeOS running on Mac or Mac clone, PPC only.
-       echo powerpc-apple-beos
-       exit 0 ;;
-    BePC:BeOS:*:*)     # BeOS running on Intel PC compatible.
-       echo i586-pc-beos
-       exit 0 ;;
-    SX-4:SUPER-UX:*:*)
-       echo sx4-nec-superux${UNAME_RELEASE}
-       exit 0 ;;
-    SX-5:SUPER-UX:*:*)
-       echo sx5-nec-superux${UNAME_RELEASE}
-       exit 0 ;;
-    SX-6:SUPER-UX:*:*)
-       echo sx6-nec-superux${UNAME_RELEASE}
-       exit 0 ;;
-    Power*:Rhapsody:*:*)
-       echo powerpc-apple-rhapsody${UNAME_RELEASE}
-       exit 0 ;;
-    *:Rhapsody:*:*)
-       echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-       exit 0 ;;
-    *:Darwin:*:*)
-       UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-       case $UNAME_PROCESSOR in
-           *86) UNAME_PROCESSOR=i686 ;;
-           unknown) UNAME_PROCESSOR=powerpc ;;
-       esac
-       echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-       exit 0 ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-       UNAME_PROCESSOR=`uname -p`
-       if test "$UNAME_PROCESSOR" = "x86"; then
-               UNAME_PROCESSOR=i386
-               UNAME_MACHINE=pc
-       fi
-       echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-       exit 0 ;;
-    *:QNX:*:4*)
-       echo i386-pc-qnx
-       exit 0 ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
-       echo nse-tandem-nsk${UNAME_RELEASE}
-       exit 0 ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
-       echo nsr-tandem-nsk${UNAME_RELEASE}
-       exit 0 ;;
-    *:NonStop-UX:*:*)
-       echo mips-compaq-nonstopux
-       exit 0 ;;
-    BS2000:POSIX*:*:*)
-       echo bs2000-siemens-sysv
-       exit 0 ;;
-    DS/*:UNIX_System_V:*:*)
-       echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-       exit 0 ;;
-    *:Plan9:*:*)
-       # "uname -m" is not consistent, so use $cputype instead. 386
-       # is converted to i386 for consistency with other x86
-       # operating systems.
-       if test "$cputype" = "386"; then
-           UNAME_MACHINE=i386
-       else
-           UNAME_MACHINE="$cputype"
-       fi
-       echo ${UNAME_MACHINE}-unknown-plan9
-       exit 0 ;;
-    *:TOPS-10:*:*)
-       echo pdp10-unknown-tops10
-       exit 0 ;;
-    *:TENEX:*:*)
-       echo pdp10-unknown-tenex
-       exit 0 ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-       echo pdp10-dec-tops20
-       exit 0 ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-       echo pdp10-xkl-tops20
-       exit 0 ;;
-    *:TOPS-20:*:*)
-       echo pdp10-unknown-tops20
-       exit 0 ;;
-    *:ITS:*:*)
-       echo pdp10-unknown-its
-       exit 0 ;;
-    SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
-       exit 0 ;;
-    *:DragonFly:*:*)
-       echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 
's/[-(].*//'`
-       exit 0 ;;
-    *:*VMS:*:*)
-       UNAME_MACHINE=`(uname -p) 2>/dev/null`
-       case "${UNAME_MACHINE}" in
-           A*) echo alpha-dec-vms && exit 0 ;;
-           I*) echo ia64-dec-vms && exit 0 ;;
-           V*) echo vax-dec-vms && exit 0 ;;
-       esac ;;
-    *:XENIX:*:SysV)
-       echo i386-pc-xenix
-       exit 0 ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-         ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-       printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-       printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-       echo c1-convex-bsd
-       exit 0 ;;
-    c2*)
-       if getsysinfo -f scalar_acc
-       then echo c32-convex-bsd
-       else echo c2-convex-bsd
-       fi
-       exit 0 ;;
-    c34*)
-       echo c34-convex-bsd
-       exit 0 ;;
-    c38*)
-       echo c38-convex-bsd
-       exit 0 ;;
-    c4*)
-       echo c4-convex-bsd
-       exit 0 ;;
-    esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-    ftp://ftp.gnu.org/pub/gnu/config/
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <address@hidden> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/config.sub b/config.sub
deleted file mode 100755
index d8fd2f8..0000000
--- a/config.sub
+++ /dev/null
@@ -1,1566 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-
-timestamp='2005-02-10'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Please send patches to <address@hidden>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#      CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#      CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <address@hidden>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 
2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )        # Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit 0;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | 
uclinux-gnu* | \
-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | 
rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-       -sun*os*)
-               # Prevent following clause from handling this invalid input.
-               ;;
-       -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-       -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-       -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-       -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-       -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-       -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-       -apple | -axis | -knuth | -cray)
-               os=
-               basic_machine=$1
-               ;;
-       -sim | -cisco | -oki | -wec | -winbond)
-               os=
-               basic_machine=$1
-               ;;
-       -scout)
-               ;;
-       -wrs)
-               os=-vxworks
-               basic_machine=$1
-               ;;
-       -chorusos*)
-               os=-chorusos
-               basic_machine=$1
-               ;;
-       -chorusrdb)
-               os=-chorusrdb
-               basic_machine=$1
-               ;;
-       -hiux*)
-               os=-hiuxwe2
-               ;;
-       -sco5)
-               os=-sco3.2v5
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-               ;;
-       -sco4)
-               os=-sco3.2v4
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-               ;;
-       -sco3.2.[4-9]*)
-               os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-               ;;
-       -sco3.2v[4-9]*)
-               # Don't forget version if it is 3.2v4 or newer.
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-               ;;
-       -sco*)
-               os=-sco3.2v2
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-               ;;
-       -udk*)
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-               ;;
-       -isc)
-               os=-isc2.2
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-               ;;
-       -clix*)
-               basic_machine=clipper-intergraph
-               ;;
-       -isc*)
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-               ;;
-       -lynx*)
-               os=-lynxos
-               ;;
-       -ptx*)
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-               ;;
-       -windowsnt*)
-               os=`echo $os | sed -e 's/windowsnt/winnt/'`
-               ;;
-       -psos*)
-               os=-psos
-               ;;
-       -mint | -mint[0-9]*)
-               basic_machine=m68k-atari
-               os=-mint
-               ;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-       # Recognize the basic CPU types without company name.
-       # Some are omitted here because they have special meanings below.
-       1750a | 580 \
-       | a29k \
-       | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-       | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | 
alpha64pca5[67] \
-       | am33_2.0 \
-       | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-       | c4x | clipper \
-       | d10v | d30v | dlx | dsp16xx \
-       | fr30 | frv \
-       | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-       | i370 | i860 | i960 | ia64 \
-       | ip2k | iq2000 \
-       | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
-       | mips | mipsbe | mipseb | mipsel | mipsle \
-       | mips16 \
-       | mips64 | mips64el \
-       | mips64vr | mips64vrel \
-       | mips64orion | mips64orionel \
-       | mips64vr4100 | mips64vr4100el \
-       | mips64vr4300 | mips64vr4300el \
-       | mips64vr5000 | mips64vr5000el \
-       | mipsisa32 | mipsisa32el \
-       | mipsisa32r2 | mipsisa32r2el \
-       | mipsisa64 | mipsisa64el \
-       | mipsisa64r2 | mipsisa64r2el \
-       | mipsisa64sb1 | mipsisa64sb1el \
-       | mipsisa64sr71k | mipsisa64sr71kel \
-       | mipstx39 | mipstx39el \
-       | mn10200 | mn10300 \
-       | msp430 \
-       | ns16k | ns32k \
-       | openrisc | or32 \
-       | pdp10 | pdp11 | pj | pjl \
-       | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-       | pyramid \
-       | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | 
sh3ele \
-       | sh64 | sh64le \
-       | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 
| sparcv9b \
-       | strongarm \
-       | tahoe | thumb | tic4x | tic80 | tron \
-       | v850 | v850e \
-       | we32k \
-       | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
-       | z8k)
-               basic_machine=$basic_machine-unknown
-               ;;
-       m6811 | m68hc11 | m6812 | m68hc12)
-               # Motorola 68HC11/12.
-               basic_machine=$basic_machine-unknown
-               os=-none
-               ;;
-       m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-               ;;
-
-       # We use `pc' rather than `unknown'
-       # because (1) that's what they normally are, and
-       # (2) the word "unknown" tends to confuse beginning users.
-       i*86 | x86_64)
-         basic_machine=$basic_machine-pc
-         ;;
-       # Object if more than one company name word.
-       *-*-*)
-               echo Invalid configuration \`$1\': machine \`$basic_machine\' 
not recognized 1>&2
-               exit 1
-               ;;
-       # Recognize the basic CPU types with company name.
-       580-* \
-       | a29k-* \
-       | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-       | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-       | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-       | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-       | avr-* \
-       | bs2000-* \
-       | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-       | clipper-* | craynv-* | cydra-* \
-       | d10v-* | d30v-* | dlx-* \
-       | elxsi-* \
-       | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-       | h8300-* | h8500-* \
-       | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-       | i*86-* | i860-* | i960-* | ia64-* \
-       | ip2k-* | iq2000-* \
-       | m32r-* | m32rle-* \
-       | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-       | m88110-* | m88k-* | maxq-* | mcore-* \
-       | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-       | mips16-* \
-       | mips64-* | mips64el-* \
-       | mips64vr-* | mips64vrel-* \
-       | mips64orion-* | mips64orionel-* \
-       | mips64vr4100-* | mips64vr4100el-* \
-       | mips64vr4300-* | mips64vr4300el-* \
-       | mips64vr5000-* | mips64vr5000el-* \
-       | mipsisa32-* | mipsisa32el-* \
-       | mipsisa32r2-* | mipsisa32r2el-* \
-       | mipsisa64-* | mipsisa64el-* \
-       | mipsisa64r2-* | mipsisa64r2el-* \
-       | mipsisa64sb1-* | mipsisa64sb1el-* \
-       | mipsisa64sr71k-* | mipsisa64sr71kel-* \
-       | mipstx39-* | mipstx39el-* \
-       | mmix-* \
-       | msp430-* \
-       | none-* | np1-* | ns16k-* | ns32k-* \
-       | orion-* \
-       | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-       | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-       | pyramid-* \
-       | romp-* | rs6000-* \
-       | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-       | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-       | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-       | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-       | tahoe-* | thumb-* \
-       | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-       | tron-* \
-       | v850-* | v850e-* | vax-* \
-       | we32k-* \
-       | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-       | xstormy16-* | xtensa-* \
-       | ymp-* \
-       | z8k-*)
-               ;;
-       # Recognize the various machine names and aliases which stand
-       # for a CPU type and a company and sometimes even an OS.
-       386bsd)
-               basic_machine=i386-unknown
-               os=-bsd
-               ;;
-       3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-               basic_machine=m68000-att
-               ;;
-       3b*)
-               basic_machine=we32k-att
-               ;;
-       a29khif)
-               basic_machine=a29k-amd
-               os=-udi
-               ;;
-       abacus)
-               basic_machine=abacus-unknown
-               ;;
-       adobe68k)
-               basic_machine=m68010-adobe
-               os=-scout
-               ;;
-       alliant | fx80)
-               basic_machine=fx80-alliant
-               ;;
-       altos | altos3068)
-               basic_machine=m68k-altos
-               ;;
-       am29k)
-               basic_machine=a29k-none
-               os=-bsd
-               ;;
-       amd64)
-               basic_machine=x86_64-pc
-               ;;
-       amd64-*)
-               basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
-       amdahl)
-               basic_machine=580-amdahl
-               os=-sysv
-               ;;
-       amiga | amiga-*)
-               basic_machine=m68k-unknown
-               ;;
-       amigaos | amigados)
-               basic_machine=m68k-unknown
-               os=-amigaos
-               ;;
-       amigaunix | amix)
-               basic_machine=m68k-unknown
-               os=-sysv4
-               ;;
-       apollo68)
-               basic_machine=m68k-apollo
-               os=-sysv
-               ;;
-       apollo68bsd)
-               basic_machine=m68k-apollo
-               os=-bsd
-               ;;
-       aux)
-               basic_machine=m68k-apple
-               os=-aux
-               ;;
-       balance)
-               basic_machine=ns32k-sequent
-               os=-dynix
-               ;;
-       c90)
-               basic_machine=c90-cray
-               os=-unicos
-               ;;
-       convex-c1)
-               basic_machine=c1-convex
-               os=-bsd
-               ;;
-       convex-c2)
-               basic_machine=c2-convex
-               os=-bsd
-               ;;
-       convex-c32)
-               basic_machine=c32-convex
-               os=-bsd
-               ;;
-       convex-c34)
-               basic_machine=c34-convex
-               os=-bsd
-               ;;
-       convex-c38)
-               basic_machine=c38-convex
-               os=-bsd
-               ;;
-       cray | j90)
-               basic_machine=j90-cray
-               os=-unicos
-               ;;
-       craynv)
-               basic_machine=craynv-cray
-               os=-unicosmp
-               ;;
-       cr16c)
-               basic_machine=cr16c-unknown
-               os=-elf
-               ;;
-       crds | unos)
-               basic_machine=m68k-crds
-               ;;
-       crisv32 | crisv32-* | etraxfs*)
-               basic_machine=crisv32-axis
-               ;;
-       cris | cris-* | etrax*)
-               basic_machine=cris-axis
-               ;;
-       crx)
-               basic_machine=crx-unknown
-               os=-elf
-               ;;
-       da30 | da30-*)
-               basic_machine=m68k-da30
-               ;;
-       decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | 
decstatn)
-               basic_machine=mips-dec
-               ;;
-       decsystem10* | dec10*)
-               basic_machine=pdp10-dec
-               os=-tops10
-               ;;
-       decsystem20* | dec20*)
-               basic_machine=pdp10-dec
-               os=-tops20
-               ;;
-       delta | 3300 | motorola-3300 | motorola-delta \
-             | 3300-motorola | delta-motorola)
-               basic_machine=m68k-motorola
-               ;;
-       delta88)
-               basic_machine=m88k-motorola
-               os=-sysv3
-               ;;
-       djgpp)
-               basic_machine=i586-pc
-               os=-msdosdjgpp
-               ;;
-       dpx20 | dpx20-*)
-               basic_machine=rs6000-bull
-               os=-bosx
-               ;;
-       dpx2* | dpx2*-bull)
-               basic_machine=m68k-bull
-               os=-sysv3
-               ;;
-       ebmon29k)
-               basic_machine=a29k-amd
-               os=-ebmon
-               ;;
-       elxsi)
-               basic_machine=elxsi-elxsi
-               os=-bsd
-               ;;
-       encore | umax | mmax)
-               basic_machine=ns32k-encore
-               ;;
-       es1800 | OSE68k | ose68k | ose | OSE)
-               basic_machine=m68k-ericsson
-               os=-ose
-               ;;
-       fx2800)
-               basic_machine=i860-alliant
-               ;;
-       genix)
-               basic_machine=ns32k-ns
-               ;;
-       gmicro)
-               basic_machine=tron-gmicro
-               os=-sysv
-               ;;
-       go32)
-               basic_machine=i386-pc
-               os=-go32
-               ;;
-       h3050r* | hiux*)
-               basic_machine=hppa1.1-hitachi
-               os=-hiuxwe2
-               ;;
-       h8300hms)
-               basic_machine=h8300-hitachi
-               os=-hms
-               ;;
-       h8300xray)
-               basic_machine=h8300-hitachi
-               os=-xray
-               ;;
-       h8500hms)
-               basic_machine=h8500-hitachi
-               os=-hms
-               ;;
-       harris)
-               basic_machine=m88k-harris
-               os=-sysv3
-               ;;
-       hp300-*)
-               basic_machine=m68k-hp
-               ;;
-       hp300bsd)
-               basic_machine=m68k-hp
-               os=-bsd
-               ;;
-       hp300hpux)
-               basic_machine=m68k-hp
-               os=-hpux
-               ;;
-       hp3k9[0-9][0-9] | hp9[0-9][0-9])
-               basic_machine=hppa1.0-hp
-               ;;
-       hp9k2[0-9][0-9] | hp9k31[0-9])
-               basic_machine=m68000-hp
-               ;;
-       hp9k3[2-9][0-9])
-               basic_machine=m68k-hp
-               ;;
-       hp9k6[0-9][0-9] | hp6[0-9][0-9])
-               basic_machine=hppa1.0-hp
-               ;;
-       hp9k7[0-79][0-9] | hp7[0-79][0-9])
-               basic_machine=hppa1.1-hp
-               ;;
-       hp9k78[0-9] | hp78[0-9])
-               # FIXME: really hppa2.0-hp
-               basic_machine=hppa1.1-hp
-               ;;
-       hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | 
hp9k893 | hp893)
-               # FIXME: really hppa2.0-hp
-               basic_machine=hppa1.1-hp
-               ;;
-       hp9k8[0-9][13679] | hp8[0-9][13679])
-               basic_machine=hppa1.1-hp
-               ;;
-       hp9k8[0-9][0-9] | hp8[0-9][0-9])
-               basic_machine=hppa1.0-hp
-               ;;
-       hppa-next)
-               os=-nextstep3
-               ;;
-       hppaosf)
-               basic_machine=hppa1.1-hp
-               os=-osf
-               ;;
-       hppro)
-               basic_machine=hppa1.1-hp
-               os=-proelf
-               ;;
-       i370-ibm* | ibm*)
-               basic_machine=i370-ibm
-               ;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-       i*86v32)
-               basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-               os=-sysv32
-               ;;
-       i*86v4*)
-               basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-               os=-sysv4
-               ;;
-       i*86v)
-               basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-               os=-sysv
-               ;;
-       i*86sol2)
-               basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-               os=-solaris2
-               ;;
-       i386mach)
-               basic_machine=i386-mach
-               os=-mach
-               ;;
-       i386-vsta | vsta)
-               basic_machine=i386-unknown
-               os=-vsta
-               ;;
-       iris | iris4d)
-               basic_machine=mips-sgi
-               case $os in
-                   -irix*)
-                       ;;
-                   *)
-                       os=-irix4
-                       ;;
-               esac
-               ;;
-       isi68 | isi)
-               basic_machine=m68k-isi
-               os=-sysv
-               ;;
-       m88k-omron*)
-               basic_machine=m88k-omron
-               ;;
-       magnum | m3230)
-               basic_machine=mips-mips
-               os=-sysv
-               ;;
-       merlin)
-               basic_machine=ns32k-utek
-               os=-sysv
-               ;;
-       mingw32)
-               basic_machine=i386-pc
-               os=-mingw32
-               ;;
-       miniframe)
-               basic_machine=m68000-convergent
-               ;;
-       *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-               basic_machine=m68k-atari
-               os=-mint
-               ;;
-       mips3*-*)
-               basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-               ;;
-       mips3*)
-               basic_machine=`echo $basic_machine | sed -e 
's/mips3/mips64/'`-unknown
-               ;;
-       monitor)
-               basic_machine=m68k-rom68k
-               os=-coff
-               ;;
-       morphos)
-               basic_machine=powerpc-unknown
-               os=-morphos
-               ;;
-       msdos)
-               basic_machine=i386-pc
-               os=-msdos
-               ;;
-       mvs)
-               basic_machine=i370-ibm
-               os=-mvs
-               ;;
-       ncr3000)
-               basic_machine=i486-ncr
-               os=-sysv4
-               ;;
-       netbsd386)
-               basic_machine=i386-unknown
-               os=-netbsd
-               ;;
-       netwinder)
-               basic_machine=armv4l-rebel
-               os=-linux
-               ;;
-       news | news700 | news800 | news900)
-               basic_machine=m68k-sony
-               os=-newsos
-               ;;
-       news1000)
-               basic_machine=m68030-sony
-               os=-newsos
-               ;;
-       news-3600 | risc-news)
-               basic_machine=mips-sony
-               os=-newsos
-               ;;
-       necv70)
-               basic_machine=v70-nec
-               os=-sysv
-               ;;
-       next | m*-next )
-               basic_machine=m68k-next
-               case $os in
-                   -nextstep* )
-                       ;;
-                   -ns2*)
-                     os=-nextstep2
-                       ;;
-                   *)
-                     os=-nextstep3
-                       ;;
-               esac
-               ;;
-       nh3000)
-               basic_machine=m68k-harris
-               os=-cxux
-               ;;
-       nh[45]000)
-               basic_machine=m88k-harris
-               os=-cxux
-               ;;
-       nindy960)
-               basic_machine=i960-intel
-               os=-nindy
-               ;;
-       mon960)
-               basic_machine=i960-intel
-               os=-mon960
-               ;;
-       nonstopux)
-               basic_machine=mips-compaq
-               os=-nonstopux
-               ;;
-       np1)
-               basic_machine=np1-gould
-               ;;
-       nsr-tandem)
-               basic_machine=nsr-tandem
-               ;;
-       op50n-* | op60c-*)
-               basic_machine=hppa1.1-oki
-               os=-proelf
-               ;;
-       or32 | or32-*)
-               basic_machine=or32-unknown
-               os=-coff
-               ;;
-       os400)
-               basic_machine=powerpc-ibm
-               os=-os400
-               ;;
-       OSE68000 | ose68000)
-               basic_machine=m68000-ericsson
-               os=-ose
-               ;;
-       os68k)
-               basic_machine=m68k-none
-               os=-os68k
-               ;;
-       pa-hitachi)
-               basic_machine=hppa1.1-hitachi
-               os=-hiuxwe2
-               ;;
-       paragon)
-               basic_machine=i860-intel
-               os=-osf
-               ;;
-       pbd)
-               basic_machine=sparc-tti
-               ;;
-       pbb)
-               basic_machine=m68k-tti
-               ;;
-       pc532 | pc532-*)
-               basic_machine=ns32k-pc532
-               ;;
-       pentium | p5 | k5 | k6 | nexgen | viac3)
-               basic_machine=i586-pc
-               ;;
-       pentiumpro | p6 | 6x86 | athlon | athlon_*)
-               basic_machine=i686-pc
-               ;;
-       pentiumii | pentium2 | pentiumiii | pentium3)
-               basic_machine=i686-pc
-               ;;
-       pentium4)
-               basic_machine=i786-pc
-               ;;
-       pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-               basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
-       pentiumpro-* | p6-* | 6x86-* | athlon-*)
-               basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
-       pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-               basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
-       pentium4-*)
-               basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
-       pn)
-               basic_machine=pn-gould
-               ;;
-       power)  basic_machine=power-ibm
-               ;;
-       ppc)    basic_machine=powerpc-unknown
-               ;;
-       ppc-*)  basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
-       ppcle | powerpclittle | ppc-le | powerpc-little)
-               basic_machine=powerpcle-unknown
-               ;;
-       ppcle-* | powerpclittle-*)
-               basic_machine=powerpcle-`echo $basic_machine | sed 
's/^[^-]*-//'`
-               ;;
-       ppc64)  basic_machine=powerpc64-unknown
-               ;;
-       ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 
's/^[^-]*-//'`
-               ;;
-       ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-               basic_machine=powerpc64le-unknown
-               ;;
-       ppc64le-* | powerpc64little-*)
-               basic_machine=powerpc64le-`echo $basic_machine | sed 
's/^[^-]*-//'`
-               ;;
-       ps2)
-               basic_machine=i386-ibm
-               ;;
-       pw32)
-               basic_machine=i586-unknown
-               os=-pw32
-               ;;
-       rom68k)
-               basic_machine=m68k-rom68k
-               os=-coff
-               ;;
-       rm[46]00)
-               basic_machine=mips-siemens
-               ;;
-       rtpc | rtpc-*)
-               basic_machine=romp-ibm
-               ;;
-       s390 | s390-*)
-               basic_machine=s390-ibm
-               ;;
-       s390x | s390x-*)
-               basic_machine=s390x-ibm
-               ;;
-       sa29200)
-               basic_machine=a29k-amd
-               os=-udi
-               ;;
-       sb1)
-               basic_machine=mipsisa64sb1-unknown
-               ;;
-       sb1el)
-               basic_machine=mipsisa64sb1el-unknown
-               ;;
-       sei)
-               basic_machine=mips-sei
-               os=-seiux
-               ;;
-       sequent)
-               basic_machine=i386-sequent
-               ;;
-       sh)
-               basic_machine=sh-hitachi
-               os=-hms
-               ;;
-       sh64)
-               basic_machine=sh64-unknown
-               ;;
-       sparclite-wrs | simso-wrs)
-               basic_machine=sparclite-wrs
-               os=-vxworks
-               ;;
-       sps7)
-               basic_machine=m68k-bull
-               os=-sysv2
-               ;;
-       spur)
-               basic_machine=spur-unknown
-               ;;
-       st2000)
-               basic_machine=m68k-tandem
-               ;;
-       stratus)
-               basic_machine=i860-stratus
-               os=-sysv4
-               ;;
-       sun2)
-               basic_machine=m68000-sun
-               ;;
-       sun2os3)
-               basic_machine=m68000-sun
-               os=-sunos3
-               ;;
-       sun2os4)
-               basic_machine=m68000-sun
-               os=-sunos4
-               ;;
-       sun3os3)
-               basic_machine=m68k-sun
-               os=-sunos3
-               ;;
-       sun3os4)
-               basic_machine=m68k-sun
-               os=-sunos4
-               ;;
-       sun4os3)
-               basic_machine=sparc-sun
-               os=-sunos3
-               ;;
-       sun4os4)
-               basic_machine=sparc-sun
-               os=-sunos4
-               ;;
-       sun4sol2)
-               basic_machine=sparc-sun
-               os=-solaris2
-               ;;
-       sun3 | sun3-*)
-               basic_machine=m68k-sun
-               ;;
-       sun4)
-               basic_machine=sparc-sun
-               ;;
-       sun386 | sun386i | roadrunner)
-               basic_machine=i386-sun
-               ;;
-       sv1)
-               basic_machine=sv1-cray
-               os=-unicos
-               ;;
-       symmetry)
-               basic_machine=i386-sequent
-               os=-dynix
-               ;;
-       t3e)
-               basic_machine=alphaev5-cray
-               os=-unicos
-               ;;
-       t90)
-               basic_machine=t90-cray
-               os=-unicos
-               ;;
-       tic54x | c54x*)
-               basic_machine=tic54x-unknown
-               os=-coff
-               ;;
-       tic55x | c55x*)
-               basic_machine=tic55x-unknown
-               os=-coff
-               ;;
-       tic6x | c6x*)
-               basic_machine=tic6x-unknown
-               os=-coff
-               ;;
-       tx39)
-               basic_machine=mipstx39-unknown
-               ;;
-       tx39el)
-               basic_machine=mipstx39el-unknown
-               ;;
-       toad1)
-               basic_machine=pdp10-xkl
-               os=-tops20
-               ;;
-       tower | tower-32)
-               basic_machine=m68k-ncr
-               ;;
-       tpf)
-               basic_machine=s390x-ibm
-               os=-tpf
-               ;;
-       udi29k)
-               basic_machine=a29k-amd
-               os=-udi
-               ;;
-       ultra3)
-               basic_machine=a29k-nyu
-               os=-sym1
-               ;;
-       v810 | necv810)
-               basic_machine=v810-nec
-               os=-none
-               ;;
-       vaxv)
-               basic_machine=vax-dec
-               os=-sysv
-               ;;
-       vms)
-               basic_machine=vax-dec
-               os=-vms
-               ;;
-       vpp*|vx|vx-*)
-               basic_machine=f301-fujitsu
-               ;;
-       vxworks960)
-               basic_machine=i960-wrs
-               os=-vxworks
-               ;;
-       vxworks68)
-               basic_machine=m68k-wrs
-               os=-vxworks
-               ;;
-       vxworks29k)
-               basic_machine=a29k-wrs
-               os=-vxworks
-               ;;
-       w65*)
-               basic_machine=w65-wdc
-               os=-none
-               ;;
-       w89k-*)
-               basic_machine=hppa1.1-winbond
-               os=-proelf
-               ;;
-       xbox)
-               basic_machine=i686-pc
-               os=-mingw32
-               ;;
-       xps | xps100)
-               basic_machine=xps100-honeywell
-               ;;
-       ymp)
-               basic_machine=ymp-cray
-               os=-unicos
-               ;;
-       z8k-*-coff)
-               basic_machine=z8k-unknown
-               os=-sim
-               ;;
-       none)
-               basic_machine=none-none
-               os=-none
-               ;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-       w89k)
-               basic_machine=hppa1.1-winbond
-               ;;
-       op50n)
-               basic_machine=hppa1.1-oki
-               ;;
-       op60c)
-               basic_machine=hppa1.1-oki
-               ;;
-       romp)
-               basic_machine=romp-ibm
-               ;;
-       mmix)
-               basic_machine=mmix-knuth
-               ;;
-       rs6000)
-               basic_machine=rs6000-ibm
-               ;;
-       vax)
-               basic_machine=vax-dec
-               ;;
-       pdp10)
-               # there are many clones, so DEC is not a safe bet
-               basic_machine=pdp10-unknown
-               ;;
-       pdp11)
-               basic_machine=pdp11-dec
-               ;;
-       we32k)
-               basic_machine=we32k-att
-               ;;
-       sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
-               basic_machine=sh-unknown
-               ;;
-       sh64)
-               basic_machine=sh64-unknown
-               ;;
-       sparc | sparcv8 | sparcv9 | sparcv9b)
-               basic_machine=sparc-sun
-               ;;
-       cydra)
-               basic_machine=cydra-cydrome
-               ;;
-       orion)
-               basic_machine=orion-highlevel
-               ;;
-       orion105)
-               basic_machine=clipper-highlevel
-               ;;
-       mac | mpw | mac-mpw)
-               basic_machine=m68k-apple
-               ;;
-       pmac | pmac-mpw)
-               basic_machine=powerpc-apple
-               ;;
-       *-unknown)
-               # Make sure to match an already-canonicalized machine name.
-               ;;
-       *)
-               echo Invalid configuration \`$1\': machine \`$basic_machine\' 
not recognized 1>&2
-               exit 1
-               ;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-       *-digital*)
-               basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-               ;;
-       *-commodore*)
-               basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-               ;;
-       *)
-               ;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-       # -solaris* is a basic system type, with this one exception.
-       -solaris1 | -solaris1.*)
-               os=`echo $os | sed -e 's|solaris1|sunos4|'`
-               ;;
-       -solaris)
-               os=-solaris2
-               ;;
-       -svr4*)
-               os=-sysv4
-               ;;
-       -unixware*)
-               os=-sysv4.2uw
-               ;;
-       -gnu/linux*)
-               os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-               ;;
-       # First accept the basic system types.
-       # The portable systems comes first.
-       # Each alternative MUST END IN A *, to match a version number.
-       # -sysv* is not here because it comes later, after sysvr4.
-       -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-             | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-             | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-             | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-             | -aos* \
-             | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-             | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-             | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* 
\
-             | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-             | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-             | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-             | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-             | -chorusos* | -chorusrdb* \
-             | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-             | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | 
-mpeix* | -udk* \
-             | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-             | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-             | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-             | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-             | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-             | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
-       # Remember, each alternative MUST END IN *, to match a version number.
-               ;;
-       -qnx*)
-               case $basic_machine in
-                   x86-* | i*86-*)
-                       ;;
-                   *)
-                       os=-nto$os
-                       ;;
-               esac
-               ;;
-       -nto-qnx*)
-               ;;
-       -nto*)
-               os=`echo $os | sed -e 's|nto|nto-qnx|'`
-               ;;
-       -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-             | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-             | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-               ;;
-       -mac*)
-               os=`echo $os | sed -e 's|mac|macos|'`
-               ;;
-       -linux-dietlibc)
-               os=-linux-dietlibc
-               ;;
-       -linux*)
-               os=`echo $os | sed -e 's|linux|linux-gnu|'`
-               ;;
-       -sunos5*)
-               os=`echo $os | sed -e 's|sunos5|solaris2|'`
-               ;;
-       -sunos6*)
-               os=`echo $os | sed -e 's|sunos6|solaris3|'`
-               ;;
-       -opened*)
-               os=-openedition
-               ;;
-        -os400*)
-               os=-os400
-               ;;
-       -wince*)
-               os=-wince
-               ;;
-       -osfrose*)
-               os=-osfrose
-               ;;
-       -osf*)
-               os=-osf
-               ;;
-       -utek*)
-               os=-bsd
-               ;;
-       -dynix*)
-               os=-bsd
-               ;;
-       -acis*)
-               os=-aos
-               ;;
-       -atheos*)
-               os=-atheos
-               ;;
-       -syllable*)
-               os=-syllable
-               ;;
-       -386bsd)
-               os=-bsd
-               ;;
-       -ctix* | -uts*)
-               os=-sysv
-               ;;
-       -nova*)
-               os=-rtmk-nova
-               ;;
-       -ns2 )
-               os=-nextstep2
-               ;;
-       -nsk*)
-               os=-nsk
-               ;;
-       # Preserve the version number of sinix5.
-       -sinix5.*)
-               os=`echo $os | sed -e 's|sinix|sysv|'`
-               ;;
-       -sinix*)
-               os=-sysv4
-               ;;
-        -tpf*)
-               os=-tpf
-               ;;
-       -triton*)
-               os=-sysv3
-               ;;
-       -oss*)
-               os=-sysv3
-               ;;
-       -svr4)
-               os=-sysv4
-               ;;
-       -svr3)
-               os=-sysv3
-               ;;
-       -sysvr4)
-               os=-sysv4
-               ;;
-       # This must come after -sysvr4.
-       -sysv*)
-               ;;
-       -ose*)
-               os=-ose
-               ;;
-       -es1800*)
-               os=-ose
-               ;;
-       -xenix)
-               os=-xenix
-               ;;
-       -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-               os=-mint
-               ;;
-       -aros*)
-               os=-aros
-               ;;
-       -kaos*)
-               os=-kaos
-               ;;
-       -zvmoe)
-               os=-zvmoe
-               ;;
-       -none)
-               ;;
-       *)
-               # Get rid of the `-' at the beginning of $os.
-               os=`echo $os | sed 's/[^-]*-//'`
-               echo Invalid configuration \`$1\': system \`$os\' not 
recognized 1>&2
-               exit 1
-               ;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-       *-acorn)
-               os=-riscix1.2
-               ;;
-       arm*-rebel)
-               os=-linux
-               ;;
-       arm*-semi)
-               os=-aout
-               ;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
-       # This must come before the *-dec entry.
-       pdp10-*)
-               os=-tops20
-               ;;
-       pdp11-*)
-               os=-none
-               ;;
-       *-dec | vax-*)
-               os=-ultrix4.2
-               ;;
-       m68*-apollo)
-               os=-domain
-               ;;
-       i386-sun)
-               os=-sunos4.0.2
-               ;;
-       m68000-sun)
-               os=-sunos3
-               # This also exists in the configure program, but was not the
-               # default.
-               # os=-sunos4
-               ;;
-       m68*-cisco)
-               os=-aout
-               ;;
-       mips*-cisco)
-               os=-elf
-               ;;
-       mips*-*)
-               os=-elf
-               ;;
-       or32-*)
-               os=-coff
-               ;;
-       *-tti)  # must be before sparc entry or we get the wrong os.
-               os=-sysv3
-               ;;
-       sparc-* | *-sun)
-               os=-sunos4.1.1
-               ;;
-       *-be)
-               os=-beos
-               ;;
-       *-ibm)
-               os=-aix
-               ;;
-       *-knuth)
-               os=-mmixware
-               ;;
-       *-wec)
-               os=-proelf
-               ;;
-       *-winbond)
-               os=-proelf
-               ;;
-       *-oki)
-               os=-proelf
-               ;;
-       *-hp)
-               os=-hpux
-               ;;
-       *-hitachi)
-               os=-hiux
-               ;;
-       i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-               os=-sysv
-               ;;
-       *-cbm)
-               os=-amigaos
-               ;;
-       *-dg)
-               os=-dgux
-               ;;
-       *-dolphin)
-               os=-sysv3
-               ;;
-       m68k-ccur)
-               os=-rtu
-               ;;
-       m88k-omron*)
-               os=-luna
-               ;;
-       *-next )
-               os=-nextstep
-               ;;
-       *-sequent)
-               os=-ptx
-               ;;
-       *-crds)
-               os=-unos
-               ;;
-       *-ns)
-               os=-genix
-               ;;
-       i370-*)
-               os=-mvs
-               ;;
-       *-next)
-               os=-nextstep3
-               ;;
-       *-gould)
-               os=-sysv
-               ;;
-       *-highlevel)
-               os=-bsd
-               ;;
-       *-encore)
-               os=-bsd
-               ;;
-       *-sgi)
-               os=-irix
-               ;;
-       *-siemens)
-               os=-sysv4
-               ;;
-       *-masscomp)
-               os=-rtu
-               ;;
-       f30[01]-fujitsu | f700-fujitsu)
-               os=-uxpv
-               ;;
-       *-rom68k)
-               os=-coff
-               ;;
-       *-*bug)
-               os=-coff
-               ;;
-       *-apple)
-               os=-macos
-               ;;
-       *-atari*)
-               os=-mint
-               ;;
-       *)
-               os=-none
-               ;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-       *-unknown)
-               case $os in
-                       -riscix*)
-                               vendor=acorn
-                               ;;
-                       -sunos*)
-                               vendor=sun
-                               ;;
-                       -aix*)
-                               vendor=ibm
-                               ;;
-                       -beos*)
-                               vendor=be
-                               ;;
-                       -hpux*)
-                               vendor=hp
-                               ;;
-                       -mpeix*)
-                               vendor=hp
-                               ;;
-                       -hiux*)
-                               vendor=hitachi
-                               ;;
-                       -unos*)
-                               vendor=crds
-                               ;;
-                       -dgux*)
-                               vendor=dg
-                               ;;
-                       -luna*)
-                               vendor=omron
-                               ;;
-                       -genix*)
-                               vendor=ns
-                               ;;
-                       -mvs* | -opened*)
-                               vendor=ibm
-                               ;;
-                       -os400*)
-                               vendor=ibm
-                               ;;
-                       -ptx*)
-                               vendor=sequent
-                               ;;
-                       -tpf*)
-                               vendor=ibm
-                               ;;
-                       -vxsim* | -vxworks* | -windiss*)
-                               vendor=wrs
-                               ;;
-                       -aux*)
-                               vendor=apple
-                               ;;
-                       -hms*)
-                               vendor=hitachi
-                               ;;
-                       -mpw* | -macos*)
-                               vendor=apple
-                               ;;
-                       -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-                               vendor=atari
-                               ;;
-                       -vos*)
-                               vendor=stratus
-                               ;;
-               esac
-               basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-               ;;
-esac
-
-echo $basic_machine$os
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/configure.in b/configure.in
deleted file mode 100644
index 3bba22c..0000000
--- a/configure.in
+++ /dev/null
@@ -1,1031 +0,0 @@
-dnl
-dnl configure.in -- autoconf template for nmh
-dnl
-
-dnl Move this up a bit
-AC_PREREQ(2.61)
-
-AC_INIT(nmh, m4_normalize(m4_include([VERSION])))
-AC_CONFIG_SRCDIR(h/nmh.h)
-AC_CONFIG_HEADER(config.h)
-
-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
-] )
-  
-echo "configuring for AC_PACKAGE_NAME-AC_PACKAGE_VERSION"
-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
-
-dnl --------------------------
-dnl CHECK COMMAND LINE OPTIONS
-dnl --------------------------
-
-dnl Do you want to debug nmh?
-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
-  enable_debug=yes
-fi
-
-dnl Allow users to send email from addresses other than their default?
-AC_ARG_ENABLE(masquerade,
-  AS_HELP_STRING([--enable-masquerade='draft_from mmailid username_extension'],
-    [enable up to 3 types of address masquerading]),
-  [if test x"$enable_masquerade" = x"yes"; then
-    masquerade="draft_from mmailid username_extension"
-  else
-    masquerade="$enable_masquerade"
-  fi], [masquerade="draft_from mmailid username_extension"])
-AC_SUBST(masquerade)dnl
-
-dnl Do you want mhe support?
-AC_ARG_ENABLE(mhe,
-  AS_HELP_STRING([--disable-mhe],[disable mhe support]))
-
-dnl mhe support is on by default, so define it unless --disable-mhe or the
-dnl deprecated, undocumented --disable-nmh-mhe are specified.
-if test x"$enable_mhe" != x"no" -a x"$enable_nmh_mhe" != x"no"; then
-  AC_DEFINE(MHE, 1,
-    [Define to compile in support for the Emacs front-end mh-e.])dnl
-fi
-
-dnl Do you want client-side support for 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
-  enable_pop=yes
-fi
-
-dnl Do you want to disable use of locale functions
-AH_TEMPLATE([LOCALE],
-[Undefine if you don't want locale features.  By default this is defined.])
-AC_ARG_ENABLE([locale],
-AC_HELP_STRING([--disable-locale], [turn off locale features]),
-[if test x$enableval = xyes; then
-  AC_DEFINE(LOCALE)
-fi],
-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],
-  [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,
-    [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])
-    AC_MSG_WARN([Please pass the appropriate arguments to CPPFLAGS/LDFLAGS])
-  fi
-  sasl_support=yes
-else
-  sasl_support=no
-fi
-
-dnl Do you want client-side support for encryption with TLS?
-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
-  tls_support=yes
-else
-  tls_support=no
-fi
-
-dnl What should be the default editor?
-AC_ARG_WITH(editor,
-  AS_HELP_STRING([--with-editor=EDITOR],[specify the default editor]))
-
-if test -n "$with_editor"; then
-  editorpath="$with_editor"
-fi
-
-dnl Set the backup prefix
-AC_ARG_WITH([hash-backup],
-  AS_HELP_STRING([--with-hash-backup],[use # as the backup prefix (default: 
,)]))
-if test x"$with_hash_backup" != x -a x"$with_hash_backup" != x"no"; then
-  backup_prefix="#"
-else
-  backup_prefix=","
-fi
-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,
-    [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
-
-dnl What method of locking to use?
-AC_ARG_WITH(locking,
-  AS_HELP_STRING([--with-locking=@<:@dot|fcntl|flock|lockf@:>@],
-  [specify the file locking method]))
-
-if test x"$with_locking" = x"dot"; then
-  LOCKTYPE="dot"
-  AC_DEFINE(DOT_LOCKING, 1, [Define to use dot based file locking.])dnl
-elif test x"$with_locking" = x"flock"; then
-  LOCKTYPE="flock"
-  AC_DEFINE(FLOCK_LOCKING, 1, [Define to use flock() based locking.])dnl
-elif test x"$with_locking" = x"lockf"; then
-  LOCKTYPE="lockf"
-  AC_DEFINE(LOCKF_LOCKING, 1, [Define to use lockf() based locking.])dnl
-elif test x"$with_locking" = x"fcntl"; then
-  LOCKTYPE="fcntl"
-  AC_DEFINE(FCNTL_LOCKING, 1, [Define to use fnctl() based locking.])dnl
-else
-  LOCKTYPE="dot"
-  AC_DEFINE(DOT_LOCKING)dnl
-fi
-
-dnl What method of posting should post use?
-AC_ARG_WITH(mts,
-  AS_HELP_STRING([--with-mts=@<:@smtp|sendmail@:>@],
-  [specify the default mail transport agent/service]))
-
-if test x"$with_mts" = x"smtp"; then
-  MTS="smtp"
-elif test x"$with_mts" = x"sendmail"; then
-  MTS="sendmail"
-else
-  MTS="smtp"
-fi
-AC_SUBST(MTS)dnl
-
-dnl Both the smtp and sendmail mail transport services use the smtp code
-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,
-  AS_HELP_STRING([--with-pager=PAGER],[specify the default pager]))
-
-if test -n "$with_pager"; then
-  pagerpath="$with_pager"
-fi
-
-dnl What should be the default mail server(s)?
-AC_ARG_WITH(smtpservers,
-  AS_HELP_STRING([--with-smtpservers='SMTPSERVER1@<:@ SMTPSERVER2...@:>@'],
-  [specify the default SMTP server(s) @<:@localhost@:>@]))
-if test -n "$with_smtpservers"; then
-  smtpservers="$with_smtpservers"
-else
-  smtpservers="localhost"
-fi
-AC_SUBST(smtpservers)dnl
-
-dnl ----------------------------------------------------
-dnl Default location is /usr/local/nmh/{bin,etc,lib,man}
-dnl ----------------------------------------------------
-AC_PREFIX_DEFAULT(/usr/local/nmh)
-
-dnl ------------------
-dnl CHECK THE COMPILER
-dnl ------------------
-dnl We want these before the checks,
-dnl so the checks can modify their values.
-test -z "$CFLAGS" && CFLAGS= auto_cflags=1
-if test x"$enable_debug" = x"yes"; then
-  test -z "$LDFLAGS" && LDFLAGS=-g
-fi
-
-AC_PROG_CC
-
-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)
- CFLAGS="$nmh_saved_cflags"])
-
-dnl if the user hasn't specified CFLAGS, then
-dnl   if compiler is gcc, then
-dnl     use -O2 and some warning flags
-dnl   else use -O
-dnl We use -Wall; if the compiler supports it we also use -Wno-pointer-sign,
-dnl because gcc 4 now produces a lot of new warnings which are probably mostly
-dnl spurious and which in any case we don't want to deal with now.
-if test "$nmh_cv_has_noptrsign" = "yes"; then
-        nmh_gcc_warnflags="-Wall -Wno-pointer-sign"
-else
-        nmh_gcc_warnflags="-Wall"
-fi
-
-if test -n "$auto_cflags"; then
-  if test x"$enable_debug" = x"yes"; then
-    if test -n "$GCC"; then
-      test -z "$CFLAGS" && CFLAGS="$nmh_gcc_warnflags -g" || CFLAGS="$CFLAGS 
$nmh_gcc_warnflags -g"
-    else
-      test -z "$CFLAGS" && CFLAGS=-g || CFLAGS="$CFLAGS -g"
-    fi
-  else
-    if test -z "$LDFLAGS"; then
-      case "$build_os" in
-       darwin*)
-         LDFLAGS=
-          ;;
-       *)
-         LDFLAGS=-s
-         ;;
-      esac
-    fi
-    if test -n "$GCC"; then
-      test -z "$CFLAGS" && CFLAGS="$nmh_gcc_warnflags -O2" || CFLAGS="$CFLAGS 
$nmh_gcc_warnflags -O2"
-    else
-      test -z "$CFLAGS" && CFLAGS=-O  || CFLAGS="$CFLAGS -O"
-    fi
-  fi
-fi
-
-AC_C_CONST              dnl Does compiler support `const'.
-
-dnl ------------------
-dnl CHECK FOR PROGRAMS
-dnl ------------------
-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_LEX             dnl Check for lex/flex
-
-dnl Look for `cut'
-pathtmp=/usr/bin:/bin:/usr/local/bin:/usr/xpg4/bin:/usr/ucb
-AC_PATH_PROG(cutpath, cut, no, [$pathtmp])
-
-dnl ----------------------------------------------
-dnl check for lclint, and lint if it doesn't exist
-dnl ----------------------------------------------
-AC_CHECK_PROG(linttmp1, lclint, lclint, no)dnl
-if test x$ac_cv_prog_linttmp1 != xno ; then
-  LINT=$ac_cv_prog_linttmp1
-  LINTFLAGS="-weak +posixlib -macrovarprefixexclude"
-else
-  AC_CHECK_PROG(linttmp2, lint, lint, no)dnl
-  if test x$ac_cv_prog_linttmp2 != xno ; then
-    LINT=$ac_cv_prog_linttmp2
-    LINTFLAGS=""
-  else
-    LINT="echo 'No lint program found'"
-    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
-
-dnl Look for `ls'
-pathtmp=/usr/bin:/bin:/usr/local/bin:/usr/xpg4/bin:/usr/ucb
-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,
-  [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
-    dnl ls, -g makes _only_ the group be displayed (and not the user).
-    nmh_cv_ls_grpopt="-l"
-  else
-    dnl Looks like -l only gave us the user, so we need -g to get the group 
too.
-    nmh_cv_ls_grpopt="-lg"
-  fi])
-fi
-
-dnl Look for `more'
-pathtmp=/usr/bin:/bin:/usr/ucb:/usr/local/bin
-AC_PATH_PROG(morepath, more, no, [$pathtmp])
-
-dnl If pager is not specified yet,
-dnl then use `more' as the default.
-if test -z "$pagerpath"; then
-  pagerpath="$morepath"
-fi
-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])
-
-dnl Look for `vi'
-pathtmp=/usr/bin:/bin:/usr/ucb:/usr/local/bin
-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
-
-dnl ----------------------------------------------------------
-dnl FIND MAIL SPOOL AND SEE IF WE NEED TO MAKE inc SETGID MAIL
-dnl ----------------------------------------------------------
-AC_CACHE_CHECK(where mail spool is located, nmh_cv_mailspool,
-[for mailspool in /var/mail        dnl
-                  /var/spool/mail  dnl
-                  /usr/spool/mail  dnl
-                  /dev/null;       dnl Just in case we fall through
-do
-  test -d $mailspool && break
-done
-nmh_cv_mailspool=$mailspool
-])
-mailspool=$nmh_cv_mailspool
-AC_SUBST(mailspool)dnl
-
-dnl See whether the mail spool directory is world-writable.
-if test "$lspath" != "no" -a "$cutpath" != "no"; then
-  AC_CACHE_CHECK(whether the mail spool is world-writable, 
-                nmh_cv_mailspool_world_writable,
-  [if test "`$lspath -dlL $mailspool | $cutpath -c9`" = "-"; then
-    nmh_cv_mailspool_world_writable=no
-  else
-    nmh_cv_mailspool_world_writable=yes
-  fi])
-fi
-
-dnl Also, check for liblockfile (as found on Debian systems)
-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)
-if test "$ac_cv_lib_lockfile_lockfile_create" != "no" ; then
-  if test "$ac_cv_path_dotlockfilepath" != "no" ; then
-    AC_CACHE_CHECK(whether dotlockfile is setgid, nmh_cv_dotlockfile_setgid,
-    [ if test -g "$ac_cv_path_dotlockfilepath" ; then
-        nmh_cv_dotlockfile_setgid=yes
-      else
-        nmh_cv_dotlockfile_setgid=no
-      fi])
-  fi
-fi
-
-dnl If mailspool is not world-writable and dotlockfile is not setgid,
-dnl we need to #define MAILGROUP to 1 and make inc setgid.
-if test x"$LOCKTYPE" = x"dot" -a x"$nmh_cv_mailspool_world_writable" = x"no" 
-a x"$nmh_cv_dotlockfile_setgid" != x"yes" ; then
-  dnl do we really need both of these?
-  AC_DEFINE(MAILGROUP,1,
-    [Define to 1 if you need to make `inc' set-group-id because your mail 
spool is not world writable. There are no guarantees as to the safety of doing 
this, but this #define will add some extra security checks.])dnl
-  SETGID_MAIL=1
-fi
-AC_SUBST(SETGID_MAIL)dnl
-
-dnl Use ls to see which group owns the mail spool directory.
-AC_CACHE_CHECK(what group owns the mail spool, nmh_cv_ls_mail_grp,
-[nmh_cv_ls_mail_grp=`$lspath -dL $nmh_cv_ls_grpopt $mailspool|$AWK '{print 
$4}'`
-])
-MAIL_SPOOL_GRP=$nmh_cv_ls_mail_grp
-AC_SUBST(MAIL_SPOOL_GRP)dnl
-
-dnl ------------------
-dnl CHECK HEADER FILES
-dnl ------------------
-
-dnl On glibc we need to define at least the '_XOPEN_SOURCE' level of features,
-dnl or wchar.h doesn't declare a prototype for wcwidth(). But if we only define
-dnl that level then db.h won't compile. So we define _GNU_SOURCE which turns
-dnl on everything. Perhaps other OSes need some feature switch set to get 
wcwidth()
-dnl declared; if so they should have an entry added to this case statement.
-dnl NB that we must define this on the compiler command line, not in config.h,
-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
-  linux*)
-    # Like DEFS, but doesn't get stomped on by configure when using config.h:
-    OURDEFS="$OURDEFS -D_GNU_SOURCE"
-    ;;
-esac
-AC_SUBST(OURDEFS)
-
-AC_HEADER_DIRENT
-AC_HEADER_STDC
-AC_HEADER_TIME
-AC_HEADER_SYS_WAIT
-AC_HEADER_STAT
-AC_HEADER_TIOCGWINSZ
-AC_CHECK_HEADERS(string.h memory.h stdlib.h unistd.h errno.h fcntl.h \
-                 limits.h crypt.h termcap.h termio.h termios.h locale.h \
-                 langinfo.h wchar.h wctype.h iconv.h netdb.h \
-                 sys/param.h sys/time.h sys/utsname.h sys/stream.h \
-                 arpa/inet.h arpa/ftp.h)
- 
-dnl
-dnl Checks for _IO_write_ptr. A Linuxism used by nmh on linux. We
-dnl really use a whole set of them, but this check should be
-dnl sufficient.
-dnl
-AC_CHECK_HEADER(libio.h, [
-  AC_EGREP_HEADER(_IO_write_ptr, libio.h, [
-    AC_DEFINE(LINUX_STDIO,1,[Use the Linux _IO_*_ptr defines from <libio.h>.]) 
]) ]) 
-
-AC_CHECK_HEADER([sys/ptem.h], AC_DEFINE(WINSIZE_IN_PTEM,1,
-  [Define to 1 if `struct winsize' requires <sys/ptem.h>.]),,
-[[#if HAVE_SYS_STREAM_H
-#  include <sys/stream.h>
-#endif
-]])
-
-dnl ---------------
-dnl CHECK FUNCTIONS
-dnl ---------------
-AC_FUNC_VFORK
-AC_CHECK_LIB(mkstemp,mkstemp)
-AC_CHECK_FUNCS(waitpid wait3 sigaction sigprocmask sigblock sigsetmask \
-               sighold sigrelse writev lstat uname tzset killpg mkstemp \
-               getutent nl_langinfo mbtowc wcwidth)
-
-dnl sigsetjmp may be a macro
-AC_MSG_CHECKING(for sigsetjmp)
-AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <setjmp.h>]],
-  [[sigsetjmp((void *)0, 0);]])],[AC_DEFINE(HAVE_SIGSETJMP, 1,
-    [Define to 1 if you have the `sigsetjmp'.]) AC_MSG_RESULT(yes)],
-  [AC_MSG_RESULT(no)])
-
-AC_REPLACE_FUNCS(memmove snprintf strerror strdup)
-
-dnl Look for the initgroups() declaration.  On AIX 4.[13], Solaris 4.1.3, and
-dnl ULTRIX 4.2A the function is defined in libc but there's no declaration in
-dnl any system header.  
-dnl
-dnl On Solaris 2.[456], the declaration is in <grp.h>.  On HP-UX 9-11 and
-dnl (reportedly) FreeBSD 3.[23], it's in <unistd.h>.  Any other locations we
-dnl need to check?
-AH_TEMPLATE(INITGROUPS_HEADER, [Define to the header containing the 
declaration of `initgroups'.])
-AC_EGREP_HEADER(initgroups, grp.h, AC_DEFINE(INITGROUPS_HEADER, <grp.h>),
-                AC_EGREP_HEADER(initgroups, unistd.h, 
-                                AC_DEFINE(INITGROUPS_HEADER, <unistd.h>)))
-
-dnl On AIX 4.1, snprintf() is defined in libc.a but there's no prototype in
-dnl <stdio.h> or elsewhere.  Apparently it's not officially supported (though 
it
-dnl seems to work perfectly and IBM apparently uses it in internal code).
-dnl Anyhow, if we omit our own snprintf() and vsnprintf() prototypes when we
-dnl HAVE_SNPRINTF, we get a billion warnings at compile time.  Use the C
-dnl preprocessor to preprocess stdio.h and make sure that there's actually a 
-dnl prototype. 
-AC_EGREP_HEADER(snprintf, stdio.h, AC_DEFINE(HAVE_SNPRINTF_PROTOTYPE,1,
-  [Define to 1 if <stdio.h> has a prototype for snprintf().]))
-
-dnl Check for multibyte character set support
-if test "x$ac_cv_header_wchar_h" = "xyes" -a "x$ac_cv_header_wctype_h" = 
"xyes" \
-    -a "x$ac_cv_func_wcwidth" = "xyes" -a "x$ac_cv_func_mbtowc" = "xyes"; then
-  AC_DEFINE(MULTIBYTE_SUPPORT, 1,
-    [Define to enable support for multibyte character sets.])
-fi
-
-dnl -------------------
-dnl CHECK FOR LIBRARIES
-dnl -------------------
-dnl Check location of modf
-AC_CHECK_FUNC(modf, , AC_CHECK_LIB(m, modf))
-
-dnl Checks for network libraries (nsl, socket)
-AC_CHECK_NETLIBS
-
-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
-
-dnl ---------------
-dnl CHECK FOR ICONV
-dnl ---------------
-
-dnl Find iconv. It may be in libiconv and may be iconv() or libiconv()
-if test "x$ac_cv_header_iconv_h" = "xyes"; then
-  AC_CHECK_FUNC(iconv, ac_found_iconv=yes, ac_found_iconv=no)
-  if test "x$ac_found_iconv" = "xno"; then
-    AC_CHECK_LIB(iconv, iconv, ac_found_iconv=yes)
-    if test "x$ac_found_iconv" = "xno"; then
-      AC_CHECK_LIB(iconv, libiconv, ac_found_iconv=yes)
-    fi
-    if test "x$ac_found_iconv" != "xno"; then
-      LIBS="-liconv $LIBS"
-    fi
-  else
-    dnl Handle case where there is a native iconv but iconv.h is from libiconv
-    AC_CHECK_DECL(_libiconv_version,
-      [ AC_CHECK_LIB(iconv, libiconv, LIBS="-liconv $LIBS") ],,
-      [ #include <iconv.h> ])
-  fi
-fi
-if test "x$ac_found_iconv" = xyes; then
-  AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
-fi
-
-dnl Check if iconv uses const in prototype declaration
-if test "x$ac_found_iconv" = "xyes"; then
-  AC_CACHE_CHECK(for iconv declaration, ac_cv_iconv_const,
-    [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
-        #include <iconv.h>]],
-        [[#ifdef __cplusplus
-          "C"
-          #endif
-          #if defined(__STDC__) || defined(__cplusplus)
-          size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * 
*outbuf, size_t *outbytesleft);
-          #else
-          size_t iconv();
-          #endif]])],
-      [ac_cv_iconv_const=],
-      [ac_cv_iconv_const=const])])
-  AC_DEFINE_UNQUOTED([ICONV_CONST], $ac_cv_iconv_const,
-    [Define as const if the declaration of iconv() needs const.])
-fi
-
-dnl --------------
-dnl CHECK FOR NDBM
-dnl --------------
-
-AC_ARG_WITH([ndbm],AS_HELP_STRING([--with-ndbm=ARG],[use -lARG to link with 
ndbm]),
-            [nmh_ndbm=$withval],[nmh_ndbm=autodetect])
-AC_ARG_WITH([ndbmheader],AS_HELP_STRING([--with-ndbmheader=ARG],[#include 
<ARG> to use ndbm]),
-            [nmh_ndbmheader=$withval],[nmh_ndbmheader=autodetect])
-
-if test "$nmh_ndbm" = "autodetect"; then
-  if test "$nmh_ndbmheader" != "autodetect"; then
-    AC_MSG_ERROR([must specify both --with-ndbm and --with-ndbmheader or 
neither])
-  else
-
-    dnl There are at least four implementations of ndbm, and
-    dnl several of those can be in different places at the whim
-    dnl of the system integrator. A good summary of this mess
-    dnl can be found at http://www.unixpapa.com/incnote/dbm.html
-
-    dnl Classic ndbm with no library required (eg NetBSD): try this
-    dnl first so we don't accidentally link in a pointless but harmless
-    dnl library in one of the later ndbm.h+libfoo tests:
-    NMH_CHECK_NDBM(ndbm.h,,,
-    dnl Berkeley DBv2 emulating ndbm: header in db.h:
-      NMH_CHECK_NDBM(db.h,db,,
-    dnl Berkeley DBv1 emulating ndbm:
-        NMH_CHECK_NDBM(ndbm.h,db,,
-          NMH_CHECK_NDBM(ndbm.h,db1,,
-    dnl Classic ndbm:
-            NMH_CHECK_NDBM(ndbm.h,ndbm,,
-    dnl glibc2.1 systems put db1 in a subdir:
-              NMH_CHECK_NDBM(db1/ndbm.h,db1,,
-    dnl GNU gdbm emulating ndbm, with header possibly in gdbm/
-    dnl and possibly needing gbdm_compat library:
-                NMH_CHECK_NDBM(gdbm/ndbm.h,gdbm,,
-                  NMH_CHECK_NDBM(gdbm/ndbm.h,gdbm_compat -lgdbm,,
-                    NMH_CHECK_NDBM(ndbm.h,gdbm,,
-                      NMH_CHECK_NDBM(ndbm.h,gdbm_compat -lgdbm))))))))))
-
-  fi
-else
-  dnl We don't really need to check that the user-specified values work,
-  dnl but it is a convenience to the user to bomb out early rather than
-  dnl after configure and half the compile process.
-  NMH_CHECK_NDBM([$nmh_ndbmheader],[$nmh_ndbm])
-fi
-
-if test "$nmh_ndbm_found" = "no"; then
-  AC_MSG_ERROR([could not find a working ndbm library/header combination])
-else
-  dnl Now export the lib/header to our makefile/config.h:
-  if test x"$nmh_ndbmheader" != x; then
-    AC_DEFINE_UNQUOTED(NDBM_HEADER, <$nmh_ndbmheader>,
-      [Define to the header containing the ndbm API prototypes.])
-  fi
-  if test x"$nmh_ndbm" != x; then
-    NDBM_LIBS="-l$nmh_ndbm"
-  else
-    NDBM_LIBS=
-  fi
-  AC_SUBST(NDBM_LIBS)
-fi
-
-dnl ------------------
-dnl Set RPM build root
-dnl ------------------
-dnl nmhrpm is used in the final summary, see below.  The default value is
-dnl reported there as ./RPM, consistent with the reporting of the default
-dnl source code location as ., but its absolute path is used in the Makefile.
-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)
-
-
-dnl --------------------
-dnl CHECK FOR CYRUS-SASL
-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])])])
-
-dnl -----------------
-dnl CHECK FOR OPENSSL
-dnl -----------------
-
-AS_IF([test x"$tls_support" = x"yes"],[
-  AC_CHECK_HEADER([openssl/ssl.h], , [AC_MSG_ERROR([openssl/ssl.h not found])])
-  AC_CHECK_LIB([crypto], [BIO_write], ,
-    [AC_MSG_ERROR([OpenSSL crypto library not found])])
-  AC_CHECK_LIB([ssl], [SSL_library_init], ,
-    [AC_MSG_ERROR([OpenSSL library not found])])])
-
-dnl ---------------------
-dnl CHECK TERMCAP LIBRARY
-dnl ---------------------
-
-dnl Add the termcap library, so that the following configure
-dnl tests will find it when it tries to link test programs.
-nmh_save_LIBS="$LIBS"
-LIBS="$TERMLIB $LIBS"
-
-dnl Checks for external variable ospeed in the termcap library.
-AC_CACHE_CHECK(if an include file defines ospeed,
-nmh_cv_decl_ospeed_include_defines,
-[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
-#if HAVE_TERMIOS_H
-#include <termios.h>
-#endif
-#if HAVE_TERMCAP_H
-#include <termcap.h>
-#endif]], [[ospeed = 0;]])],
-nmh_cv_decl_ospeed_include_defines=yes,nmh_cv_decl_ospeed_include_defines=no)])
- 
-if test $nmh_cv_decl_ospeed_include_defines = no; then
-  AC_CACHE_CHECK(if you must define ospeed,
-  nmh_cv_decl_ospeed_must_define,
-  [AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
-  [[extern short ospeed; ospeed = 0;]])],
-  nmh_cv_decl_ospeed_must_define=yes,nmh_cv_decl_ospeed_must_define=no)])
-fi
- 
-AH_TEMPLATE(HAVE_OSPEED, [Define to 1 if your termcap library has the ospeed 
variable.])
-if test $nmh_cv_decl_ospeed_include_defines = yes; then
-  AC_DEFINE(HAVE_OSPEED)dnl
-elif test $nmh_cv_decl_ospeed_must_define = yes; then
-  AC_DEFINE(HAVE_OSPEED)
-  AC_DEFINE(MUST_DEFINE_OSPEED, 1,
-    [Define to 1 if you have ospeed, but it is not defined in termcap.h.])
-fi
-
-dnl Check if tgetent accepts NULL (and will allocate its own termcap buffer)
-dnl Some termcaps reportedly accept a zero buffer, but then dump core
-dnl in tgetstr().
-dnl Under Cygwin test program crashes but exit code is still 0. So,
-dnl we test for a file that porgram should create
-AH_TEMPLATE([TGETENT_ACCEPTS_NULL],
-[Define to 1 if tgetent() accepts NULL as a buffer.])
-AC_CACHE_CHECK(if tgetent accepts NULL,
-nmh_cv_func_tgetent_accepts_null,
-[AC_TRY_RUN([
-main()
-{
-    char buf[4096];
-    int r1 = tgetent(buf, "vt100");
-    int r2 = tgetent((char*)0,"vt100");
-    if (r1 >= 0 && r1 == r2) {
-        char tbuf[1024], *u;
-        u = tbuf;
-       tgetstr("cl", &u);
-       creat("conftest.tgetent", 0640);
-    }
-    exit((r1 != r2) || r2 == -1);
-}
-],
-  if test -f conftest.tgetent; then
-    nmh_cv_func_tgetent_accepts_null=yes
-  else
-    nmh_cv_func_tgetent_accepts_null=no
-  fi,
-  nmh_cv_func_tgetent_accepts_null=no,
-  nmh_cv_func_tgetent_accepts_null=no)])
-if test x$nmh_cv_func_tgetent_accepts_null = xyes; then
-  AC_DEFINE(TGETENT_ACCEPTS_NULL)
-fi
-AC_CACHE_CHECK(if tgetent returns 0 on success,
-nmh_cv_func_tgetent_zero_success,
-[AC_TRY_RUN([
-main()
-{
-    char buf[4096];
-    int r1 = tgetent(buf, "address@hidden&*");
-    int r2 = tgetent(buf, "vt100");
-    if (r1 < 0 && r2 == 0) {
-        char tbuf[1024], *u;
-        u = tbuf;
-       tgetstr("cl", &u);
-       creat("conftest.tgetent0", 0640);
-    }
-    exit(r1 == r2);
-}
-],
-  if test -f conftest.tgetent0; then
-    nmh_cv_func_tgetent_zero_success=yes
-  else
-    nmh_cv_func_tgetent_zero_success=no
-  fi,
-  nmh_cv_func_tgetent_zero_success=no,
-  nmh_cv_func_tgetent_zero_success=no)])
-AH_TEMPLATE([TGETENT_SUCCESS],
-[Define to what tgetent() returns on success (0 on HP-UX X/Open curses).])
-if test x$nmh_cv_func_tgetent_zero_success = xyes; then
-  AC_DEFINE(TGETENT_SUCCESS, 0)
-else
-  AC_DEFINE(TGETENT_SUCCESS, 1)
-fi
-
-dnl Now put the libraries back to what it was before we
-dnl starting checking the termcap library.
-LIBS="$nmh_save_LIBS"
-
-dnl --------------
-dnl CHECK TYPEDEFS
-dnl --------------
-AC_TYPE_SIGNAL
-AC_TYPE_PID_T
-AC_TYPE_OFF_T
-AC_TYPE_UID_T
-AC_TYPE_MODE_T
-AC_TYPE_SIZE_T
-
-dnl Check for sigset_t.  Currently I'm looking in
-dnl <sys/types.h> and <signal.h>.  Others might need
-dnl to be added.
-AC_CACHE_CHECK(for sigset_t, nmh_cv_type_sigset_t,
-[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
-#include <signal.h>]], [[sigset_t tempsigset;]])],
-nmh_cv_type_sigset_t=yes,nmh_cv_type_sigset_t=no)])
-if test $nmh_cv_type_sigset_t = no; then
-  AC_DEFINE(sigset_t, unsigned int,
-    [Define to `unsigned int' if <sys/types.h> or <signal.h> doesn't define.])
-fi
-
-dnl ----------------
-dnl CHECK STRUCTURES
-dnl ----------------
-AC_CHECK_MEMBERS(struct stat.st_blksize)
-
-AC_CHECK_MEMBERS(struct tm.tm_gmtoff,,,
-  [#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef TM_IN_SYS_TIME
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif])
-
-AC_CHECK_MEMBERS(struct utmp.ut_type,,,[#include <utmp.h>])
-
-AC_MSG_CHECKING(for union wait)
-AC_CACHE_VAL(nmh_cv_union_wait, [dnl
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
-#include <sys/wait.h>]],
-    [[union wait status; int pid; pid = wait (&status);
-#ifdef WEXITSTATUS
-/* Some POSIXoid systems have both the new-style macros and the old
-   union wait type, and they do not work together.  If union wait
-   conflicts with WEXITSTATUS et al, we don't want to use it at all.  */
-        if (WEXITSTATUS (status) != 0) pid = -1;
-#ifdef WTERMSIG
-        /* If we have WEXITSTATUS and WTERMSIG, just use them on ints.  */
-        -- blow chunks here --
-#endif
-#endif
-#ifdef HAVE_WAITPID
-        /* Make sure union wait works with waitpid.  */
-        pid = waitpid (-1, &status, 0);
-#endif
-      ]])],
-    [nmh_cv_union_wait=yes],
-    [nmh_cv_union_wait=no])])
-if test "$nmh_cv_union_wait" = yes; then
-  AC_DEFINE(HAVE_UNION_WAIT, 1,
-    [Define to 1 if you have the \`union wait' type in <sys/wait.h>.])
-fi
-AC_MSG_RESULT($nmh_cv_union_wait)
-
-CHECK_TYPE_STRUCT_DIRENT_D_TYPE()
-
-dnl -------------
-dnl CHECK SIGNALS
-dnl -------------
-dnl What style of signal do you have (POSIX, BSD, or SYSV)?
-AH_TEMPLATE(RELIABLE_SIGNALS, [Define to 1 if you have reliable signals.])
-AC_MSG_CHECKING(what style of signals to use)
-if test $ac_cv_func_sigaction = yes -a $ac_cv_func_sigprocmask = yes; then
-  signals_style=POSIX_SIGNALS
-  AC_DEFINE(POSIX_SIGNALS, 1,
-    [Define to 1 if you use POSIX style signal handling.])
-  AC_DEFINE(RELIABLE_SIGNALS)
-elif test $ac_cv_func_sigblock = yes -a $ac_cv_func_sigsetmask = yes; then
-  signals_style=BSD_SIGNALS
-  AC_DEFINE(BSD_SIGNALS,1,
-    [Define to 1 if you use BSD style signal handling (and can block 
signals).])
-  AC_DEFINE(RELIABLE_SIGNALS)
-elif test $ac_cv_func_sighold = yes -a $ac_cv_func_sigrelse = yes; then
-  signals_style=SYSV_SIGNALS
-  AC_DEFINE(SYSV_SIGNALS,1,
-    [Define to 1 if you use SYSV style signal handling (and can block 
signals).])
-else
-  signals_style=NO_SIGNAL_BLOCKING
-  AC_DEFINE(NO_SIGNAL_BLOCKING,1,
-    [Define to 1 if you have no signal blocking at all (bummer).])
-fi
-
-AC_MSG_RESULT($signals_style)
-
-dnl Where is <signal.h> located?  Needed as input for signames.awk
-AC_CACHE_CHECK(where signal.h is located, nmh_cv_path_signal_h,
-[for SIGNAL_H in /usr/include/bsd/sys/signal.h  dnl Next
-                 /usr/include/asm/signal.h      dnl Linux 1.3.0 and above
-                 /usr/include/asm/signum.h      dnl some versions of 
Linux/Alpha
-                 /usr/include/linux/signal.h    dnl Linux up to 1.2.11
-                 /usr/include/sys/signal.h      dnl Almost everybody else
-                 /dev/null;                     dnl Just in case we fall 
through
-do
-  test -f $SIGNAL_H && \
-  grep '#[     ]*define[       ][      ]*SIG[0-9A-Z]*[         ]*[0-9][0-9]*' 
$SIGNAL_H > /dev/null && \
-  break
-done
-nmh_cv_path_signal_h=$SIGNAL_H
-])
-SIGNAL_H=$nmh_cv_path_signal_h
-AC_SUBST(SIGNAL_H)dnl
-
-dnl ----------------
-dnl OS SPECIFIC DEFINES
-dnl ----------------
-AH_TEMPLATE(SYS5, [Defined for Solaris 2.x, Irix, OSF/1, HP-UX, AIX, SCO5; 
only used in vmh.c which is not built.])
-AH_TEMPLATE(SVR4, [Defined for Solaris 2.x, Irix, OSF/1, HP-UX, AIX; only used 
in vmh.c which is not built.])
-AH_TEMPLATE(BSD44, [Defined for SunOS 4, FreeBSD, NetBSD, OpenBSD, BSD/OS, Mac 
OS X/Rhapsody; only used in vmh.c which is not built.])
-AH_TEMPLATE(BSD42, [Defined for SunOS 4, FreeBSD, NetBSD, OpenBSD, BSD/OS, Mac 
OS X/Rhapsody -- does PicoBSD have uname?])
-AH_TEMPLATE(SCO_5_STDIO, [Defined for SCO5.])
-
-case "$target_os" in
-
-  solaris2*)
-    AC_DEFINE(SYS5)
-    AC_DEFINE(SVR4)
-    ;;
-  irix*)
-    AC_DEFINE(SYS5)
-    AC_DEFINE(SVR4)
-    ;;
-  osf*)
-    AC_DEFINE(SYS5)
-    AC_DEFINE(SVR4)
-    ;;
-  aix*)
-    AC_DEFINE(SYS5)
-    AC_DEFINE(SVR4)
-    ;;
-  sunos4*)
-    AC_DEFINE(BSD42)
-    ;;
-  freebsd*)  
-    AC_DEFINE(BSD42)
-    AC_DEFINE(BSD44)
-    ;;
-  netbsd*)
-    AC_DEFINE(BSD42)
-    AC_DEFINE(BSD44)
-    ;;
-  openbsd*)
-    AC_DEFINE(BSD42)
-    AC_DEFINE(BSD44)
-    ;;
-  bsd/os*)
-    AC_DEFINE(BSD42)
-    AC_DEFINE(BSD44)
-    ;;
-  sco5*)
-    AC_DEFINE(SYS5)
-    AC_DEFINE(SCO_5_STDIO)
-    ;;
-esac
-
-
-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
-dnl again to get the final answer.
-dnl We only use the expanded versions to print the install paths in
-dnl the final summary and should use them nowhere else (see the autoconf
-dnl docs for the rationale for bindir etc being unexpanded).
-eval "nmhbin=${bindir}";         eval "nmhbin=${nmhbin}"
-eval "nmhsysconf=${sysconfdir}"; eval "nmhsysconf=${nmhsysconf}"
-eval "nmhlib=${libdir}";         eval "nmhlib=${nmhlib}"
-eval "nmhman=${mandir}";         eval "nmhman=${nmhman}"
-eval "nmhrpm=${nmhrpm}";
-
-pop_kinds=no
-if test x"$enable_pop" = x"yes"; then
-  pop_kinds="yes ("
-
-  if test x"$enable_apop" = x"yes"; then
-    pop_kinds="${pop_kinds}APOP "
-  fi
-
-  pop_kinds="${pop_kinds}POP3)"
-fi
-
-echo "
-nmh configuration
------------------
-nmh version                : AC_PACKAGE_VERSION
-target os                  : ${target}
-compiler                   : ${CC}
-compiler flags             : ${CFLAGS}
-linker flags               : ${LDFLAGS}
-definitions                : ${OURDEFS}
-source code location       : ${srcdir}
-binary install path        : ${nmhbin}
-library install path       : ${nmhlib}
-config files install path  : ${nmhsysconf}
-man page install path      : ${nmhman}
-RPM build root             : ${nmhrpm}
-backup prefix              : ${backup_prefix}
-transport system           : ${MTS}
-file locking type          : ${LOCKTYPE}
-default smtp servers       : ${smtpservers}
-default editor             : ${editorpath}
-default pager              : ${pagerpath}
-email address masquerading : ${masquerade}
-pop is enabled             : ${pop_kinds}
-SASL support               : ${sasl_support}
-TLS support                : ${tls_support}"
-echo ""

http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=c9b9d57b30cf2d094f64afb95878fcf7f935cdb9


commit c9b9d57b30cf2d094f64afb95878fcf7f935cdb9
Author: Lyndon Nerenberg <address@hidden>
Date:   Sat Dec 24 14:48:52 2011 -0800

    Start tracking Makefiles.

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..0b8ed00
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,218 @@
+.POSIX:
+#
+# Makefile for top level of nmh distribution
+#
+
+# nmh version
+VERSION = posix-dev
+
+SHELL = /bin/sh
+
+
+srcdir = .
+abs_srcdir = /Users/lyndon/src/nmh/posix
+
+
+# ========== 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      = /usr/local/nmh
+exec_prefix = ${prefix}
+
+# location of standard commands
+bindir      = ${exec_prefix}/bin
+
+# location of support binaries and scripts
+libdir      = ${exec_prefix}/lib
+
+# location of nmh configuration and formats files
+etcdir      = ${prefix}/etc
+
+# location of man pages
+mandir      = ${prefix}/share/man
+
+# RPM build root
+rpmdir      = $(abs_srcdir)/RPM
+
+# location of incoming mail
+mailspool   = /var/mail
+
+# location of mail transport agent
+sendmailpath = /usr/sbin/sendmail
+
+# default editor
+default_editor = /usr/bin/vi
+
+# default pager
+default_pager = /usr/bin/more
+
+CC       = gcc
+CPPFLAGS = 
+DEFS     = -DHAVE_CONFIG_H 
+CFLAGS   = -Wall -Wno-pointer-sign -O2
+LDFLAGS  = 
+LIBS     = -liconv 
+
+# ========== 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         = /usr/bin/install -c
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_DATA    = ${INSTALL} -m 644
+
+.SUFFIXES:
+
+# all files in this directory included in the distribution
+DIST = ChangeLog COPYRIGHT DATE INSTALL MACHINES README VERSION                
\
+       ChangeLog install-sh mkinstalldirs Makefile.in aclocal.m4       \
+       acconfig.h config.h.in configure.in 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 *~
+
+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.in aclocal.m4
+       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.in acconfig.h aclocal.m4
+       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.  Assumes that configure had already
+# been run.  Otherwise, there wouldn't be a Makefile.
+# _topdir is the specified RPM build root.
+# _tmppath is TMP below _topdir.
+# srcdir is the top level nmh source directory.
+# tarfile and version are as specified in this file.  rpmbuild does
+#   not allow Version to contain any dashes.
+rpm: all nmhdist
+       @rpmbuild --define '_topdir $(rpmdir)' \
+          --define '_tmppath %{_topdir}/TMP' \
+          --define 'srcdir $(abs_srcdir)' \
+          --define 'tarfile $(tarfile)' \
+          --define 'version '`echo $(VERSION) | sed "s/-/_/g"` \
+          -ba nmh.spec
+       @$(RM) $(tarfile)
diff --git a/config/Makefile b/config/Makefile
new file mode 100644
index 0000000..f80508f
--- /dev/null
+++ b/config/Makefile
@@ -0,0 +1,95 @@
+#
+# Makefile for config subdirectory
+#
+
+# nmh version
+VERSION = posix-dev
+
+SHELL = /bin/sh
+
+top_srcdir = ..
+srcdir     = .
+
+
+prefix      = /usr/local/nmh
+exec_prefix = ${prefix}
+bindir      = ${exec_prefix}/bin
+libdir      = ${exec_prefix}/lib
+etcdir      = ${prefix}/etc
+
+default_editor = /usr/bin/vi
+default_pager  = /usr/bin/more
+
+CC         = gcc
+CFLAGS     = -Wall -Wno-pointer-sign -O2
+DEFS       = -DHAVE_CONFIG_H
+INCLUDES   = -I.. -I$(top_srcdir) 
+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/docs/Makefile b/docs/Makefile
new file mode 100644
index 0000000..823e3c3
--- /dev/null
+++ b/docs/Makefile
@@ -0,0 +1,77 @@
+#
+# Makefile for h subdirectory
+#
+
+SHELL = /bin/sh
+
+top_srcdir = ..
+srcdir = .
+docdir = ${prefix}/share/doc/${PACKAGE_TARNAME}
+
+
+# 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         = /usr/bin/install -c
+INSTALL_DATA    = ${INSTALL} -m 644
+
+# ========== 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/etc/Makefile b/etc/Makefile
new file mode 100644
index 0000000..c6b571d
--- /dev/null
+++ b/etc/Makefile
@@ -0,0 +1,153 @@
+#
+# Makefile for etc subdirectory
+#
+
+SHELL = /bin/sh
+
+top_srcdir = ..
+srcdir     = .
+
+
+prefix      = /usr/local/nmh
+exec_prefix = ${prefix}
+bindir      = ${exec_prefix}/bin
+libdir      = ${exec_prefix}/lib
+etcdir      = ${prefix}/etc
+
+MTS         = smtp
+mailspool   = /var/mail
+masquerade  = draft_from mmailid username_extension
+smtpservers = localhost
+
+INSTALL         = /usr/bin/install -c
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT  = ${INSTALL}
+INSTALL_DATA    = ${INSTALL} -m 644
+
+# 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 b/h/Makefile
new file mode 100644
index 0000000..0ecf3ef
--- /dev/null
+++ b/h/Makefile
@@ -0,0 +1,59 @@
+#
+# Makefile for h subdirectory
+#
+
+SHELL = /bin/sh
+
+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       \
+       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/man/Makefile b/man/Makefile
new file mode 100644
index 0000000..6fce0f1
--- /dev/null
+++ b/man/Makefile
@@ -0,0 +1,207 @@
+#
+# Makefile for man subdirectory
+#
+
+VERSION = posix-dev
+DATE = 27 April 2008
+
+SHELL = /bin/sh
+
+top_srcdir = ..
+srcdir     = .
+
+
+prefix      = /usr/local/nmh
+exec_prefix = ${prefix}
+bindir      = ${exec_prefix}/bin
+libdir      = ${exec_prefix}/lib
+etcdir      = ${prefix}/etc
+mandir      = ${prefix}/share/man
+manext1     = 1
+manext5     = 5
+manext8     = 8
+
+mailspool    = /var/mail
+sendmailpath = /usr/sbin/sendmail
+
+default_editor = /usr/bin/vi
+default_pager = /usr/bin/more
+
+INSTALL      = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+
+SED = sed
+SEDMAN = $(SED) -f man.sed $< > $@
+
+# sed line for editing pop information in man pages
+POPSED = /^%nmhbeginpop%/,/^%nmhendpop%/d
+
+.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))
+
+# Since vmh is not built or distributed, neither should vmh.1 be
+# MANEXTRA = vmh. 
+
+# 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 b/mts/Makefile
new file mode 100644
index 0000000..d86e9aa
--- /dev/null
+++ b/mts/Makefile
@@ -0,0 +1,111 @@
+#
+# Makefile for mts subdirectory
+#
+
+SHELL = /bin/sh
+
+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 = 
+
+# 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 b/mts/smtp/Makefile
new file mode 100644
index 0000000..8a4e72e
--- /dev/null
+++ b/mts/smtp/Makefile
@@ -0,0 +1,87 @@
+#
+# Makefile for mts/smtp subdirectory
+#
+
+SHELL = /bin/sh
+
+top_srcdir = ../..
+srcdir     = .
+
+
+prefix      = /usr/local/nmh
+exec_prefix = ${prefix}
+bindir      = ${exec_prefix}/bin
+libdir      = ${exec_prefix}/lib
+etcdir      = ${prefix}/etc
+
+CC       = gcc
+CFLAGS   = -Wall -Wno-pointer-sign -O2
+DEFS     = -DHAVE_CONFIG_H
+INCLUDES = -I../.. -I$(srcdir) -I$(top_srcdir) 
+LINT   = echo 'No lint program found'
+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 b/sbr/Makefile
new file mode 100644
index 0000000..0eb6fb6
--- /dev/null
+++ b/sbr/Makefile
@@ -0,0 +1,157 @@
+#
+# Makefile for sbr subdirectory
+#
+
+SHELL = /bin/sh
+
+top_srcdir = ..
+srcdir     = .
+
+
+prefix      = /usr/local/nmh
+exec_prefix = ${prefix}
+bindir      = ${exec_prefix}/bin
+libdir      = ${exec_prefix}/lib
+etcdir      = ${prefix}/etc
+
+CC       = gcc
+CFLAGS   = -Wall -Wno-pointer-sign -O2
+DEFS     = -DHAVE_CONFIG_H
+CONFIGDEFS = -DNMHETCDIR='"$(etcdir)"' -DMAILSPOOL='"$(mailspool)"' 
-DSENDMAILPATH='"$(sendmailpath)"'
+INCLUDES = -I.. -I. -I$(top_srcdir) 
+
+LEX    = flex
+AWK    = awk
+LORDER = lorder
+TSORT  = tsort
+RANLIB = ranlib
+LIBTOOL = libtool
+GNU_LIBTOOL = 
+LINT   = echo 'No lint program found'
+LINTFLAGS =  
+
+LIBOBJS = 
+
+mailspool    = /var/mail
+sendmailpath = /usr/sbin/sendmail
+
+COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
+COMPILE2 = $(CC) -c $(DEFS) $(CONFIGDEFS) $(INCLUDES) $(CFLAGS)
+
+
+
+.SUFFIXES:
+.SUFFIXES: .c .o
+
+.c.o:
+       $(COMPILE) $<
+
+# this header file is parsed to generate signal messages (sigmsg.h)
+SIGNAL_H = /usr/include/sys/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_scratch.c m_tmpfil.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
+
+# source for compatibility functions
+COMPAT = memmove.c snprintf.c strdup.c strerror.c
+
+OBJS = $(SRCS:.c=.o) $(LIBOBJS)
+
+# auxiliary files
+AUX = Makefile.in sigmsg.awk dtimep.lex
+
+# all files in this directory included in the distribution
+DIST = $(SRCS) $(COMPAT) $(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.c: dtimep.lex
+       $(LEX) -n -t $(srcdir)/dtimep.lex > 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/uip/Makefile b/uip/Makefile
new file mode 100644
index 0000000..2ea34ed
--- /dev/null
+++ b/uip/Makefile
@@ -0,0 +1,339 @@
+#
+# Makefile for uip subdirectory
+#
+
+SHELL = /bin/sh
+
+top_srcdir = ..
+srcdir     = .
+
+
+prefix      = /usr/local/nmh
+exec_prefix = ${prefix}
+bindir      = ${exec_prefix}/bin
+libdir      = ${exec_prefix}/lib
+etcdir      = ${prefix}/etc
+
+CC       = gcc
+CFLAGS   = -Wall -Wno-pointer-sign -O2
+DEFS     = -DHAVE_CONFIG_H
+INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir) 
+LDFLAGS  = 
+
+LIBS     = -liconv 
+MTSLIB   = ../mts/libmts.a
+NDBM_LIBS = 
+LOCALLIBS = ../config/version.o ../config/config.o $(MTSLIB) ../sbr/libmh.a
+LINKLIBS = $(LOCALLIBS) $(LIBS)
+
+LINT   = echo 'No lint program found'
+LINTFLAGS = 
+
+TERMLIB = -ltermcap
+LEXLIB  = -lfl
+POPLIB  = 
+
+COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
+LINK    = $(CC) $(LDFLAGS) -o $@
+LN = ln
+
+INSTALL         = /usr/bin/install -c
+INSTALL_PROGRAM = ${INSTALL}
+
+MAIL_SPOOL_GRP = mail
+SETGID_MAIL    = 1
+
+.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
+
+## removed this from CMDS until I can fix it
+## OTHERCMDS = vmh
+
+# 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 ftpsbr.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     \
+       vmh.c vmhsbr.c vmhtest.c whatnow.c whatnowproc.c whatnowsbr.c     \
+       whom.c wmh.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 ftpsbr.o termsbr.o md5.o $(LOCALLIBS)
+       $(LINK) mhbuild.o mhbuildsbr.o mhcachesbr.o mhlistsbr.o mhoutsbr.o 
mhmisc.o mhfree.o mhparse.o ftpsbr.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 ftpsbr.o 
termsbr.o md5.o $(LOCALLIBS)
+       $(LINK) mhlist.o mhparse.o mhcachesbr.o mhlistsbr.o mhmisc.o mhfree.o 
ftpsbr.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 ftpsbr.o termsbr.o md5.o $(LOCALLIBS)
+       $(LINK) mhn.o mhparse.o mhcachesbr.o mhshowsbr.o mhlistsbr.o 
mhstoresbr.o mhmisc.o mhfree.o ftpsbr.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 ftpsbr.o termsbr.o md5.o $(LOCALLIBS)
+       $(LINK) mhshow.o mhparse.o mhcachesbr.o mhshowsbr.o mhlistsbr.o 
mhmisc.o mhfree.o ftpsbr.o termsbr.o md5.o $(LINKLIBS) $(TERMLIB)
+
+mhstore: mhstore.o mhparse.o mhcachesbr.o mhshowsbr.o mhlistsbr.o mhstoresbr.o 
mhmisc.o mhfree.o ftpsbr.o termsbr.o md5.o $(LOCALLIBS)
+       $(LINK) mhstore.o mhparse.o mhcachesbr.o mhshowsbr.o mhlistsbr.o 
mhstoresbr.o mhmisc.o mhfree.o ftpsbr.o termsbr.o md5.o $(LINKLIBS) $(TERMLIB)
+
+mhtest: mhtest.o mhparse.o mhcachesbr.o mhoutsbr.o mhmisc.o mhfree.o ftpsbr.o 
termsbr.o md5.o $(LOCALLIBS)
+       $(LINK) mhtest.o mhparse.o mhcachesbr.o mhoutsbr.o mhmisc.o mhfree.o 
ftpsbr.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)
+
+vmh: vmh.o vmhsbr.o $(LOCALLIBS)
+       $(LINK) vmh.o vmhsbr.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 $(DESTDIR)$(bindir)/$$cmd; \
+       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; \
+       else \
+         $(INSTALL_PROGRAM)                 inc $(DESTDIR)$(bindir)/$$cmd; \
+       fi
+
+uninstall:
+       for cmd in $(CMDS); do \
+         rm -f $(DESTDIR)$(bindir)/$$cmd; \
+       done
+       for lcmd in $(LCMDS); do \
+         rm -f $(DESTDIR)$(bindir)/$$lcmd; \
+       done
+       for misc in $(MISC); do \
+         rm -f $(DESTDIR)$(libdir)/$$misc; \
+       done
+       for cmd in $(SCMDS); do \
+         rm -f $(DESTDIR)$(bindir)/$$cmd; \
+       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:
 Makefile.in => Makefile            |   82 +--
 acconfig.h                         |  114 ---
 aclocal.m4                         |  128 ---
 autogen.sh                         |    9 -
 config.guess                       | 1459 ---------------------------------
 config.sub                         | 1566 ------------------------------------
 config/{Makefile.in => Makefile}   |   34 +-
 configure.in                       | 1031 ------------------------
 docs/{Makefile.in => Makefile}     |   17 +-
 etc/{Makefile.in => Makefile}      |   43 +-
 h/{Makefile.in => Makefile}        |    9 +-
 h/nmh.h                            |   34 +-
 h/prototypes.h                     |    8 -
 man/{Makefile.in => Makefile}      |   41 +-
 mts/{Makefile.in => Makefile}      |   19 +-
 mts/smtp/{Makefile.in => Makefile} |   36 +-
 sbr/{Makefile.in => Makefile}      |   58 +-
 sbr/client.c                       |    5 +-
 sbr/lock_file.c                    |    5 +-
 sbr/mts.c                          |   22 -
 uip/{Makefile.in => Makefile}      |   58 +-
 uip/dropsbr.c                      |    5 +-
 uip/mhlsbr.c                       |    5 +-
 uip/rcvtty.c                       |    2 +-
 uip/slocal.c                       |    2 +-
 25 files changed, 180 insertions(+), 4612 deletions(-)
 rename Makefile.in => Makefile (76%)
 delete mode 100644 acconfig.h
 delete mode 100644 aclocal.m4
 delete mode 100755 autogen.sh
 delete mode 100755 config.guess
 delete mode 100755 config.sub
 rename config/{Makefile.in => Makefile} (72%)
 delete mode 100644 configure.in
 rename docs/{Makefile.in => Makefile} (86%)
 rename etc/{Makefile.in => Makefile} (87%)
 rename h/{Makefile.in => Makefile} (87%)
 rename man/{Makefile.in => Makefile} (89%)
 rename mts/{Makefile.in => Makefile} (91%)
 rename mts/smtp/{Makefile.in => Makefile} (69%)
 rename sbr/{Makefile.in => Makefile} (83%)
 rename uip/{Makefile.in => Makefile} (93%)


hooks/post-receive
-- 
The nmh Mail Handling System



reply via email to

[Prev in Thread] Current Thread [Next in Thread]