Merge remote-tracking branch 'origin' into xoauth

diff --combined test/common.sh.in
index 802679a1eee14353cb9afae6e55617e01943a74d,fc928134766c1d07b8576124fac9c6460a00df2f..1bf64c593812ce87030e443b401f5d9487a5739d
--- 1/test/common.sh.in
--- 2/test/common.sh.in
+++ b/test/common.sh.in
@@@ -6,8 -6,8 +6,9 @@@
  #### that they are set here so that individual tests can be run
  #### outside of make.  Requires that MH_OBJ_DIR be set on entry.
  test -z "$MH_TEST_DIR"  &&  MH_TEST_DIR="$MH_OBJ_DIR/test/testdir"
+ export MH_TEST_DIR
  test -z "$MH_INST_DIR"  &&  MH_INST_DIR="${MH_TEST_DIR}/inst"
 +test -z "$MH_VERSION"  &&  MH_VERSION="@VERSION@"
  test -z "$prefix"  &&  prefix=@prefix@
  test -z "$datarootdir"  &&  datarootdir=@datarootdir@
  test -z "$exec_prefix"  &&  exec_prefix=@exec_prefix@
@@@ -22,8 -22,6 +23,8 @@@ test -z "$supported_locks"  &&  support
  test -z "$default_locking"  &&  default_locking="@default_locking@"
  test -z "$MULTIBYTE_ENABLED"  &&  MULTIBYTE_ENABLED="@MULTIBYTE_ENABLED@"
  test -z "$ICONV_ENABLED"  &&  ICONV_ENABLED="@ICONV_ENABLED@"
 +test -z "$OAUTH_SUPPORT"  &&  OAUTH_SUPPORT="@OAUTH_SUPPORT@"
 +test -z "$CURL_USER_AGENT"  &&  CURL_USER_AGENT="@CURL_USER_AGENT@"
  
  unset MAILDROP MHBUILD MHCONTEXT MHMTSUSERCONF MHN MHSHOW MHSTORE
  unset MHLDEBUG MHPDEBUG MHWDEBUG PAGER