X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/98c792e2effa2656e4fce979d6f6eec44d64131c..5f781decc669fd72d79b8fb471d86cb6ad1dd71f:/Makefile.am?ds=sidebyside

diff --git a/Makefile.am b/Makefile.am
index f16aaeb8..d8a57eaa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,7 +36,10 @@ nmhlibexecdir = @libexecdir@/nmh
 ## nmh _does_ have a test suite!
 ##
 TESTS_ENVIRONMENT = MH_OBJ_DIR="@abs_builddir@" \
-		    MH_TEST_DIR="@abs_builddir@/test/testdir" \
+		    MH_VERSION="$(VERSION)" \
+		    OAUTH_SUPPORT='@OAUTH_SUPPORT@' \
+		    CURL_USER_AGENT='@CURL_USER_AGENT@' \
+		    MH_TEST_DIR=`cd "@abs_builddir@" && pwd -P`/test/testdir \
 		    nmhlibexecdir="$(nmhlibexecdir)" bindir="$(bindir)" \
 		    mandir="$(mandir)" nmhetcdir="$(nmhetcdir)" \
 		    nmhetcdirinst="@nmhetcdirinst@$(nmhetcdir)" \
@@ -52,9 +55,9 @@ TESTS = test/ali/test-ali test/anno/test-anno \
 	test/bad-input/test-header \
 	test/burst/test-burst test/burst/test-burst-mime \
 	test/comp/test-comp-format test/dist/test-dist \
-	test/folder/test-create test/folder/test-packf \
-	test/folder/test-recurse test/folder/test-sortm \
-	test/folder/test-total \
+	test/folder/test-create test/folder/test-nocreate \
+	test/folder/test-packf test/folder/test-recurse \
+	test/folder/test-sortm test/folder/test-total \
 	test/format/test-curses test/format/test-dp \
 	test/format/test-fmtdump test/format/test-functions \
 	test/format/test-localmbox test/format/test-myname \
@@ -84,6 +87,8 @@ TESTS = test/ali/test-ali test/anno/test-anno \
 	test/mhshow/test-subpart test/mhshow/test-msg-buffer-boundaries \
 	test/mhstore/test-mhstore test/mkstemp/test-mkstemp \
 	test/new/test-basic test/pick/test-pick test/pick/test-stderr \
+	test/oauth/test-mhlogin test/oauth/test-mhparam test/oauth/test-send \
+	test/oauth/test-sendfrom test/oauth/test-inc test/oauth/test-share \
 	test/post/test-post-aliases test/post/test-post-basic \
 	test/post/test-post-multiple test/post/test-post-bcc \
 	test/post/test-post-dcc test/post/test-post-fcc \
@@ -106,7 +111,7 @@ TESTS = test/ali/test-ali test/anno/test-anno \
 
 check_SCRIPTS = test/common.sh
 check_PROGRAMS = test/getfullname test/getcanon test/fakepop test/fakesmtp \
-		 test/getcwidth
+		 test/getcwidth test/fakehttp
 
 ## The location of installed nmhetcdir is, for all purposes except
 ## distcheck, $nmhetcdir.  For distcheck, prepend $MH_INST_DIR (from
@@ -137,7 +142,8 @@ MAINTAINERCLEANFILES = atags cscope.files cscope.out cscope.in.out cscope.po.out
 ##
 SUPERCLEANFILES = ChangeLog Makefile.in aclocal.m4 compile config.guess \
 		  config.h.in config.h.in~ config.sub configure depcomp \
-		  install-sh missing ylwrap nmh-*.tar.gz nmh-*.tar.gz.sig
+		  install-sh missing test-driver ylwrap nmh-*.tar.gz \
+		  nmh-*.tar.gz.sig
 superclean: maintainer-clean
 	@rm -f $(SUPERCLEANFILES)
 .PHONY: superclean
@@ -145,7 +151,7 @@ superclean: maintainer-clean
 ##
 ## Files that need to be built before everything else
 ##
-BUILT_SOURCES = sbr/sigmsg.h sbr/ctype-checked.c
+BUILT_SOURCES = sbr/ctype-checked.c
 
 ##
 ## This is a list of all programs that get installed in the "bin" directory
@@ -158,7 +164,7 @@ bin_PROGRAMS = uip/ali uip/anno uip/burst uip/comp uip/dist uip/flist \
 	       uip/mhparam uip/mhpath uip/mhshow uip/mhstore uip/msgchk \
 	       uip/new uip/packf uip/pick uip/prompter uip/refile \
 	       uip/repl uip/rmf uip/rmm uip/scan uip/send uip/show uip/sortm \
-	       uip/whatnow uip/whom
+	       uip/whatnow uip/whom uip/mhlogin
 
 bin_SCRIPTS = uip/mhmail etc/sendfiles
 
@@ -191,9 +197,10 @@ noinst_LIBRARIES = sbr/libmh.a mts/libmts.a
 noinst_HEADERS = h/addrsbr.h h/aliasbr.h h/crawl_folders.h h/dropsbr.h \
 		 h/fmt_compile.h h/fmt_scan.h h/icalendar.h h/md5.h h/mf.h \
 		 h/mh.h h/mhcachesbr.h h/mhparse.h h/mime.h \
-		 h/mts.h h/nmh.h h/picksbr.h h/popsbr.h h/prototypes.h \
-		 h/rcvmail.h h/scansbr.h h/signals.h h/tws.h h/utils.h \
-		 mts/smtp/smtp.h sbr/ctype-checked.h
+		 h/mts.h h/nmh.h h/netsec.h h/picksbr.h h/popsbr.h
+		 h/prototypes.h h/rcvmail.h h/scansbr.h h/signals.h h/tws.h
+		 h/utils.h mts/smtp/smtp.h sbr/ctype-checked.h h/oauth.h \
+		 thirdparty/jsmn/jsmn.h
 
 ##
 ## Extra files we need to install in various places
@@ -253,7 +260,7 @@ man_MANS = man/ali.1 man/anno.1 man/ap.8 man/burst.1 man/comp.1 \
 	   man/prompter.1 man/rcvdist.1 man/rcvpack.1 man/rcvstore.1 \
 	   man/rcvtty.1 man/refile.1 man/repl.1 man/rmf.1 man/rmm.1 \
 	   man/scan.1 man/send.1 man/sendfiles.1 man/show.1 man/slocal.1 \
-	   man/sortm.1 man/unseen.1 man/whatnow.1 man/whom.1
+	   man/sortm.1 man/unseen.1 man/whatnow.1 man/whom.1 man/mhlogin.1
 
 ##
 ## Sources for our man pages
@@ -275,13 +282,13 @@ man_SRCS = man/ali.man man/anno.man man/ap.man man/burst.man man/comp.man \
 	   man/rcvstore.man man/rcvtty.man man/refile.man man/repl.man \
 	   man/rmf.man man/rmm.man man/scan.man man/send.man \
 	   man/sendfiles.man man/show.man man/slocal.man man/sortm.man \
-	   man/unseen.man man/whatnow.man man/whom.man
+	   man/unseen.man man/whatnow.man man/whom.man man/mhlogin.man
 
 ##
 ## Files we need to include in the distribution which aren't found by
 ## Automake using the automatic rules
 ##
-EXTRA_DIST = autogen.sh config/version.sh sbr/sigmsg.awk sbr/icalparse.h \
+EXTRA_DIST = autogen.sh config/version.sh sbr/icalparse.h \
 	     etc/mts.conf.in etc/mhn.defaults.sh etc/sendfiles \
 	     $(MHNSEARCHPROG) DATE MACHINES \
 	     docs/ChangeLog_MH-3_to_MH-6.6 \
@@ -294,6 +301,7 @@ EXTRA_DIST = autogen.sh config/version.sh sbr/sigmsg.awk sbr/icalparse.h \
 	     test/mhbuild/nulls \
 	     test/mhbuild/textplain \
 	     test/post/test-post-common.sh test/send/README \
+	     test/oauth/common.sh \
 	     test/valgrind.supp uip/mhmail \
 	     SPECS/nmh.spec SPECS/build-nmh-cygwin $(man_SRCS)
 
@@ -334,7 +342,8 @@ uip_forw_SOURCES = uip/forw.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c \
 uip_forw_LDADD = $(LDADD) $(READLINELIB) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
 
 uip_inc_SOURCES = uip/inc.c uip/scansbr.c uip/dropsbr.c uip/popsbr.c
-uip_inc_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(SASLLIB) $(POSTLINK)
+uip_inc_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(SASLLIB) $(CURLLIB) \
+		$(TLSLIB) $(POSTLINK)
 
 uip_install_mh_SOURCES = uip/install-mh.c
 uip_install_mh_LDADD = $(LDADD) $(POSTLINK)
@@ -381,7 +390,7 @@ uip_mhstore_SOURCES = uip/mhstore.c uip/mhparse.c uip/mhcachesbr.c \
 uip_mhstore_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
 
 uip_msgchk_SOURCES = uip/msgchk.c uip/popsbr.c
-uip_msgchk_LDADD = $(LDADD) $(SASLLIB) $(POSTLINK)
+uip_msgchk_LDADD = $(LDADD) $(SASLLIB) $(CURLLIB) $(TLSLIB) $(POSTLINK)
 
 uip_new_SOURCES = uip/new.c
 uip_new_LDADD = $(LDADD) $(POSTLINK)
@@ -413,7 +422,7 @@ uip_scan_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
 
 uip_send_SOURCES = uip/send.c uip/sendsbr.c uip/annosbr.c \
 		   uip/distsbr.c
-uip_send_LDADD = $(LDADD) $(TERMLIB) $(POSTLINK)
+uip_send_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
 
 uip_show_SOURCES = uip/show.c uip/mhlsbr.c
 uip_show_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
@@ -423,7 +432,7 @@ uip_sortm_LDADD = $(LDADD) $(POSTLINK)
 
 uip_whatnow_SOURCES = uip/whatnow.c uip/whatnowsbr.c uip/sendsbr.c \
 		      uip/annosbr.c uip/distsbr.c
-uip_whatnow_LDADD = $(LDADD) $(READLINELIB) $(TERMLIB) $(POSTLINK)
+uip_whatnow_LDADD = $(LDADD) $(READLINELIB) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
 
 uip_whom_SOURCES = uip/whom.c uip/distsbr.c
 uip_whom_LDADD = $(LDADD) $(POSTLINK)
@@ -447,11 +456,15 @@ uip_fmttest_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
 uip_mhl_SOURCES = uip/mhl.c uip/mhlsbr.c
 uip_mhl_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
 
+uip_mhlogin_SOURCES = uip/mhlogin.c
+uip_mhlogin_LDADD = mts/libmts.a $(LDADD) $(CURLLIB) $(POSTLINK)
+
 uip_mkstemp_SOURCES = uip/mkstemp.c
 uip_mkstemp_LDADD = $(LDADD) $(POSTLINK)
 
 uip_post_SOURCES = uip/post.c uip/aliasbr.c
-uip_post_LDADD = mts/libmts.a $(LDADD) $(SASLLIB) $(TLSLIB) $(POSTLINK)
+uip_post_LDADD = mts/libmts.a $(LDADD) $(SASLLIB) $(CURLLIB) $(TLSLIB) \
+		 $(POSTLINK)
 
 uip_rcvdist_SOURCES = uip/rcvdist.c uip/distsbr.c
 uip_rcvdist_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
@@ -470,24 +483,27 @@ uip_slocal_LDADD = $(LDADD) $(NDBM_LIBS) $(POSTLINK)
 
 uip_viamail_SOURCES = uip/viamail.c uip/mhmisc.c uip/sendsbr.c \
 		      uip/annosbr.c uip/distsbr.c
-uip_viamail_LDADD = $(LDADD) $(TERMLIB) $(POSTLINK)
-
-test_getfullname_SOURCES = test/getfullname.c
-test_getfullname_LDADD = $(LDADD) $(POSTLINK)
+uip_viamail_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
 
 ##
 ## Other program definitions
 ##
 
+test_getfullname_SOURCES = test/getfullname.c
+test_getfullname_LDADD = $(LDADD) $(POSTLINK)
+
 test_getcanon_SOURCES = test/getcanon.c
 test_getcanon_LDADD = $(POSTLINK)
 
-test_fakepop_SOURCES = test/fakepop.c
+test_fakepop_SOURCES = test/fakepop.c test/server.c
 test_fakepop_LDADD = $(POSTLINK)
 
-test_fakesmtp_SOURCES = test/fakesmtp.c
+test_fakesmtp_SOURCES = test/fakesmtp.c test/server.c
 test_fakesmtp_LDADD = $(POSTLINK)
 
+test_fakehttp_SOURCES = test/fakehttp.c test/server.c
+test_fakehttp_LDADD = $(POSTLINK)
+
 test_getcwidth_SOURCES = test/getcwidth.c
 test_getcwidth_LDADD = $(POSTLINK)
 
@@ -504,9 +520,6 @@ etc_gen_ctype_checked_LDADD = $(POSTLINK)
 config/version.c: Makefile $(srcdir)/config/version.sh
 	env srcdir="$(srcdir)" sh $(srcdir)/config/version.sh $(VERSION) > ./config/version.c
 
-sbr/sigmsg.h: $(srcdir)/sbr/sigmsg.awk $(SIGNAL_H)
-	$(AWK) -f $(srcdir)/sbr/sigmsg.awk $(SIGNAL_H) > $@
-
 sbr/ctype-checked.h: etc/gen-ctype-checked
 	etc/gen-ctype-checked
 
@@ -585,7 +598,8 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/arglist.c \
 		      sbr/folder_addmsg.c sbr/folder_delmsgs.c \
 		      sbr/folder_free.c sbr/folder_pack.c \
 		      sbr/folder_read.c sbr/folder_realloc.c sbr/read_switch.c \
-		      sbr/read_switch_multiword.c sbr/read_yes_or_no_if_tty.c sbr/getarguments.c \
+		      sbr/read_switch_multiword.c sbr/read_switch_multiword_via_readline.c \
+		      sbr/read_yes_or_no_if_tty.c sbr/getarguments.c \
 		      sbr/getcpy.c sbr/geteditor.c sbr/getfolder.c \
 		      sbr/getpass.c sbr/read_line.c \
 		      sbr/fmt_addr.c sbr/fmt_compile.c sbr/fmt_new.c \
@@ -596,7 +610,8 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/arglist.c \
 		      sbr/m_draft.c sbr/m_getfld.c sbr/m_gmprot.c \
 		      sbr/m_maildir.c sbr/m_name.c sbr/m_popen.c sbr/m_rand.c \
 		      sbr/makedir.c sbr/md5.c sbr/message_id.c \
-		      sbr/mime_type.c sbr/mts.c sbr/norm_charmap.c sbr/path.c \
+		      sbr/mime_type.c sbr/mts.c sbr/netsec.c \
+		      sbr/norm_charmap.c sbr/path.c \
 		      sbr/peekc.c sbr/pidwait.c sbr/pidstatus.c \
 		      sbr/print_help.c sbr/print_sw.c sbr/print_version.c \
 		      sbr/push.c sbr/putenv.c sbr/refile.c sbr/remdir.c \
@@ -611,8 +626,9 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/arglist.c \
 		      sbr/trimcpy.c sbr/unquote.c \
 		      sbr/uprf.c sbr/vfgets.c \
 		      sbr/mf.c sbr/utils.c sbr/ctype-checked.c \
-		      sbr/m_mktemp.c sbr/read_switch_multiword_via_readline.c sbr/vector.c \
-		      config/config.c config/version.c
+		      sbr/m_mktemp.c sbr/vector.c sbr/oauth.c sbr/oauth_prof.c \
+		      config/config.c config/version.c \
+		      thirdparty/jsmn/jsmn.c
 
 ##
 ## Because these files use the definitions in the libmh rule below,