Index: Makefile.in
===================================================================
RCS file: /cvs/mauve/mauve/Makefile.in,v
retrieving revision 1.32
diff -p -r1.32 Makefile.in
*** Makefile.in	8 Mar 2004 14:08:58 -0000	1.32
--- Makefile.in	11 Aug 2004 13:52:43 -0000
*************** LDFLAGS = @LDFLAGS@
*** 72,77 ****
--- 72,78 ----
  LIBOBJS = @LIBOBJS@
  LIBS = @LIBS@
  LTLIBOBJS = @LTLIBOBJS@
+ MAIL_HOST = @MAIL_HOST@
  MAKEINFO = @MAKEINFO@
  OBJEXT = @OBJEXT@
  PACKAGE = @PACKAGE@
Index: aclocal.m4
===================================================================
RCS file: /cvs/mauve/mauve/aclocal.m4,v
retrieving revision 1.17
diff -p -r1.17 aclocal.m4
*** aclocal.m4	8 Mar 2004 14:08:58 -0000	1.17
--- aclocal.m4	11 Aug 2004 13:52:46 -0000
*************** dnl Modified by Brian Jones <cbj@gnu.org
*** 17,23 ****
  dnl acx_check_pathname_style.m4 
  dnl http://research.cys.de/autoconf-archive/
  
! AC_DEFUN(ACX_CHECK_PATHNAME_STYLE_DOS,
  [AC_MSG_CHECKING(for Windows and DOS and OS/2 style pathnames)
  AC_CACHE_VAL(acx_cv_pathname_style_dos, 
    [AC_REQUIRE([AC_CANONICAL_HOST])
--- 17,23 ----
  dnl acx_check_pathname_style.m4 
  dnl http://research.cys.de/autoconf-archive/
  
! AC_DEFUN([ACX_CHECK_PATHNAME_STYLE_DOS],
  [AC_MSG_CHECKING(for Windows and DOS and OS/2 style pathnames)
  AC_CACHE_VAL(acx_cv_pathname_style_dos, 
    [AC_REQUIRE([AC_CANONICAL_HOST])
Index: configure
===================================================================
RCS file: /cvs/mauve/mauve/configure,v
retrieving revision 1.23
diff -p -r1.23 configure
*** configure	8 Mar 2004 14:08:58 -0000	1.23
--- configure	11 Aug 2004 13:52:57 -0000
*************** PACKAGE_STRING=
*** 272,278 ****
  PACKAGE_BUGREPORT=
  
  ac_unique_file="gnu/testlet/Testlet.java"
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot build build_cpu build_vendor build_os host host_cpu host_vendor host_os CHECK_PATH_SEPARATOR CHECK_FILE_SEPARATOR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE USE_GCJ_TRUE USE_GCJ_FALSE CLASS_FILES_TRUE CLASS_FILES_FALSE JAVA JAVAC GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE SRCDIR TMPDIR LIBOBJS L!
 TLIBOBJS'
  ac_subst_files=''
  
  # Initialize some variables set by options.
--- 272,278 ----
  PACKAGE_BUGREPORT=
  
  ac_unique_file="gnu/testlet/Testlet.java"
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot build build_cpu build_vendor build_os host host_cpu host_vendor host_os CHECK_PATH_SEPARATOR CHECK_FILE_SEPARATOR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE USE_GCJ_TRUE USE_GCJ_FALSE CLASS_FILES_TRUE CLASS_FILES_FALSE JAVA JAVAC GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE SRCDIR TMPDIR MAIL_HOST!
  LIBOBJS LTLIBOBJS'
  ac_subst_files=''
  
  # Initialize some variables set by options.
*************** Optional Packages:
*** 820,825 ****
--- 820,827 ----
  
    --with-tmpdir=DIR                Put temporary files in DIR /tmp
  
+   --with-mailhost=hostname         Server for socket tests mx10.gnu.org
+ 
  Some influential environment variables:
    CC          C compiler command
    CFLAGS      C compiler flags
*************** fi;
*** 3158,3163 ****
--- 3160,3176 ----
  TMPDIR=${TMPDIR-/tmp}
  
  
+ 
+ # Check whether --with-mailhost or --without-mailhost was given.
+ if test "${with_mailhost+set}" = set; then
+   withval="$with_mailhost"
+ 
+ MAIL_HOST="$with_mailhost"
+ fi;
+ 
+ MAIL_HOST=${MAIL_HOST-/tmp}
+ 
+ 
  if test ! -d gnu; then
    mkdir gnu
  fi
*************** s,@am__fastdepGCJ_TRUE@,$am__fastdepGCJ_
*** 3907,3912 ****
--- 3920,3926 ----
  s,@am__fastdepGCJ_FALSE@,$am__fastdepGCJ_FALSE,;t t
  s,@SRCDIR@,$SRCDIR,;t t
  s,@TMPDIR@,$TMPDIR,;t t
+ s,@MAIL_HOST@,$MAIL_HOST,;t t
  s,@LIBOBJS@,$LIBOBJS,;t t
  s,@LTLIBOBJS@,$LTLIBOBJS,;t t
  CEOF
Index: configure.in
===================================================================
RCS file: /cvs/mauve/mauve/configure.in,v
retrieving revision 1.12
diff -p -r1.12 configure.in
*** configure.in	13 May 2002 23:24:23 -0000	1.12
--- configure.in	11 Aug 2004 13:52:57 -0000
*************** TMPDIR="$with_tmpdir")
*** 58,63 ****
--- 58,74 ----
  TMPDIR=${TMPDIR-/tmp}
  AC_SUBST(TMPDIR)
  
+ dnl Specify a mail server host for socket testing.  This allows you to
+ dnl choose a different server if 'mx10.gnu.org' is blocked by your firewall
+ AC_ARG_WITH(mailhost,
+ changequote(<<,>>)
+ <<  --with-mailhost=hostname         Server for socket tests [mx10.gnu.org]>>,
+ changequote([,])
+ MAIL_HOST="$with_mailhost")
+ 
+ MAIL_HOST=${MAIL_HOST-/tmp}
+ AC_SUBST(MAIL_HOST)
+ 
  if test ! -d gnu; then
    mkdir gnu
  fi
Index: gnu/testlet/SimpleTestHarness.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/SimpleTestHarness.java,v
retrieving revision 1.39
diff -p -r1.39 SimpleTestHarness.java
*** gnu/testlet/SimpleTestHarness.java	13 Apr 2004 17:44:44 -0000	1.39
--- gnu/testlet/SimpleTestHarness.java	11 Aug 2004 13:52:58 -0000
*************** public class SimpleTestHarness
*** 107,112 ****
--- 107,117 ----
      return separator;
    }
    
+   public String getMailHost ()
+   {
+     return mailHost;
+   }
+   
    public Reader getResourceReader (String name)
      throws ResourceNotFoundException
    {
Index: gnu/testlet/config.java.in
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/config.java.in,v
retrieving revision 1.3
diff -p -r1.3 config.java.in
*** gnu/testlet/config.java.in	18 Feb 2002 01:43:07 -0000	1.3
--- gnu/testlet/config.java.in	11 Aug 2004 13:52:58 -0000
*************** public interface config 
*** 25,34 ****
    public static final String srcdir = "@SRCDIR@";
    public static final String tmpdir = "@TMPDIR@";
    public static final String pathSeparator = "@CHECK_PATH_SEPARATOR@";
!   public static final String separator =     "@CHECK_FILE_SEPARATOR@";
  
    public abstract String getSourceDirectory ();
    public abstract String getTempDirectory ();
    public abstract String getPathSeparator ();
    public abstract String getSeparator ();
  }
--- 25,36 ----
    public static final String srcdir = "@SRCDIR@";
    public static final String tmpdir = "@TMPDIR@";
    public static final String pathSeparator = "@CHECK_PATH_SEPARATOR@";
!   public static final String separator = "@CHECK_FILE_SEPARATOR@";
!   public static final String mailHost = "@MAIL_HOST@";
  
    public abstract String getSourceDirectory ();
    public abstract String getTempDirectory ();
    public abstract String getPathSeparator ();
    public abstract String getSeparator ();
+   public abstract String getMailHost ();
  }
Index: gnu/testlet/java/net/Socket/SocketTest.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/java/net/Socket/SocketTest.java,v
retrieving revision 1.20
diff -p -r1.20 SocketTest.java
*** gnu/testlet/java/net/Socket/SocketTest.java	3 May 2004 03:21:15 -0000	1.20
--- gnu/testlet/java/net/Socket/SocketTest.java	11 Aug 2004 13:53:03 -0000
***************
*** 25,37 ****
  package gnu.testlet.java.net.Socket;
  import gnu.testlet.Testlet;
  import gnu.testlet.TestHarness;
  import java.net.*;
  import java.io.*;
  
  
  public class SocketTest implements Testlet
  {
!   protected static TestHarness harness;
    
    public void test_BasicServer()
    {
--- 25,38 ----
  package gnu.testlet.java.net.Socket;
  import gnu.testlet.Testlet;
  import gnu.testlet.TestHarness;
+ import gnu.testlet.SimpleTestHarness;
  import java.net.*;
  import java.io.*;
  
  
  public class SocketTest implements Testlet
  {
!   protected static SimpleTestHarness harness;
    
    public void test_BasicServer()
    {
*************** public class SocketTest implements Testl
*** 193,199 ****
  
    public void test_params()
    {
!     String host = "mx10.gnu.org";
      int port = 25;
  
      harness.checkPoint("params");
--- 194,200 ----
  
    public void test_params()
    {
!     String host = harness.getMailHost();
      int port = 25;
  
      harness.checkPoint("params");
*************** public class SocketTest implements Testl
*** 329,335 ****
      try {
        // This is host / port that is unlikely to be blocked.  (Outgoing
        // port 80 connections are often blocked.)
!       s = new Socket ("mx10.gnu.org", 25);
        harness.check(true);
      }
      catch (Exception e) {
--- 330,336 ----
      try {
        // This is host / port that is unlikely to be blocked.  (Outgoing
        // port 80 connections are often blocked.)
!       s = new Socket (harness.getMailHost(), 25);
        harness.check(true);
      }
      catch (Exception e) {
*************** public class SocketTest implements Testl
*** 497,503 ****
  
    public void test (TestHarness the_harness)
    {
!     harness = the_harness;
      testall ();
    }
  }
--- 498,504 ----
  
    public void test (TestHarness the_harness)
    {
!     harness = (SimpleTestHarness) the_harness;
      testall ();
    }
  }
Index: gnu/testlet/java/net/Socket/jdk12.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/java/net/Socket/jdk12.java,v
retrieving revision 1.2
diff -p -r1.2 jdk12.java
*** gnu/testlet/java/net/Socket/jdk12.java	18 Apr 2004 15:47:59 -0000	1.2
--- gnu/testlet/java/net/Socket/jdk12.java	11 Aug 2004 13:53:03 -0000
*************** import java.io.IOException;
*** 27,39 ****
  import java.net.*;
  
  import gnu.testlet.Testlet;
  import gnu.testlet.TestHarness;
  
  public class jdk12 implements Testlet
  {
    public void test (TestHarness harness)
    {
!     String host = "mx10.gnu.org";
      int port = 25;
      Socket sock = null;
      try 
--- 27,40 ----
  import java.net.*;
  
  import gnu.testlet.Testlet;
+ import gnu.testlet.SimpleTestHarness;
  import gnu.testlet.TestHarness;
  
  public class jdk12 implements Testlet
  {
    public void test (TestHarness harness)
    {
!     String host = ((SimpleTestHarness) harness).getMailHost();
      int port = 25;
      Socket sock = null;
      try 
Index: gnu/testlet/java/net/Socket/jdk13.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/java/net/Socket/jdk13.java,v
retrieving revision 1.3
diff -p -r1.3 jdk13.java
*** gnu/testlet/java/net/Socket/jdk13.java	18 Apr 2004 15:47:59 -0000	1.3
--- gnu/testlet/java/net/Socket/jdk13.java	11 Aug 2004 13:53:03 -0000
*************** import java.io.IOException;
*** 27,39 ****
  import java.net.*;
  
  import gnu.testlet.Testlet;
  import gnu.testlet.TestHarness;
  
  public class jdk13 implements Testlet
  {
    public void test (TestHarness harness)
    {
!     String host = "mx10.gnu.org";
      int port = 25;
      Socket sock = null;
      try 
--- 27,40 ----
  import java.net.*;
  
  import gnu.testlet.Testlet;
+ import gnu.testlet.SimpleTestHarness;
  import gnu.testlet.TestHarness;
  
  public class jdk13 implements Testlet
  {
    public void test (TestHarness harness)
    {
!     String host = ((SimpleTestHarness) harness).getMailHost();
      int port = 25;
      Socket sock = null;
      try 
Index: gnu/testlet/java/net/Socket/jdk14.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/java/net/Socket/jdk14.java,v
retrieving revision 1.2
diff -p -r1.2 jdk14.java
*** gnu/testlet/java/net/Socket/jdk14.java	18 Apr 2004 15:47:59 -0000	1.2
--- gnu/testlet/java/net/Socket/jdk14.java	11 Aug 2004 13:53:03 -0000
*************** import java.io.IOException;
*** 27,39 ****
  import java.net.*;
  
  import gnu.testlet.Testlet;
  import gnu.testlet.TestHarness;
  
  public class jdk14 implements Testlet
  {
    public void test (TestHarness harness)
    {
!     String host = "mx10.gnu.org";
      int port = 25;
      Socket sock = null;
      try 
--- 27,40 ----
  import java.net.*;
  
  import gnu.testlet.Testlet;
+ import gnu.testlet.SimpleTestHarness;
  import gnu.testlet.TestHarness;
  
  public class jdk14 implements Testlet
  {
    public void test (TestHarness harness)
    {
!     String host = ((SimpleTestHarness) harness).getMailHost();
      int port = 25;
      Socket sock = null;
      try