* Merged mts/sendmail functionality into mts/smtp; switching between

smtp and sendmail delivery method is now controlled by mts.conf.
* If tsort cannot deal with loops, in addition to defining tsort as
cat, also define lorder as echo.
* Removed uip/popi.c from list of sources.

diff --git a/ChangeLog b/ChangeLog
index 86ecc80..96618bb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Sat Jun 10 18:37:59 CEST 2000 Ruud de Rooij <ruud@ruud.org>
+
+       * Merged mts/sendmail functionality into mts/smtp; switching between
+       smtp and sendmail delivery method is now controlled by mts.conf.
+
+       * If tsort cannot deal with loops, in addition to defining tsort as
+       cat, also define lorder as echo.
+       
+       * Removed uip/popi.c from list of sources.
+

 Thu Jun 08 19:36:57 2000 Dan Harkless <dan-nmh@dilvish.speed.net>
 
        * New dtimep.lex didn't parse day names properly.  Fixed.  Also
 Thu Jun 08 19:36:57 2000 Dan Harkless <dan-nmh@dilvish.speed.net>
 
        * New dtimep.lex didn't parse day names properly.  Fixed.  Also

diff --git a/INSTALL b/INSTALL
index ca45be7..1147641 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -209,20 +209,23 @@ Options for configure
      config.h for details.
 
 --with-mts=MTS   (DEFAULT is smtp)
      config.h for details.
 
 --with-mts=MTS   (DEFAULT is smtp)

-     Specify the mail transport system you want to use.  The two
+     Specify the default mail transport system you want to use.  The two

      acceptable options are "smtp" (which is the default), and
      acceptable options are "smtp" (which is the default), and

-     "sendmail".
-
-     If you use "smtp", this will enable a direct SMTP (simple
-     mail transport protocol) interface in nmh.  When sending
-     mail, instead of passing the message to the mail transport
-     agent, `post' will open a socket connection to the mail
-     port on the machine specified in the `mts.conf' file
-     (default is localhost), and speak SMTP directly.
-
-     If you use "sendmail", then `post' will send messages by
-     passing forking a local copy of sendmail.  Currently it
-     will still speak SMTP with this local copy of sendmail.
+     "sendmail".  This value will be put into the mts.conf file.  You
+     may find it convenient to specify a value at configure-time,
+     however, so that each time nmh is reinstalled, the right value will
+     be there.
+
+     If you use "smtp", this will enable a direct SMTP (simple mail
+     transport protocol) interface in nmh.  When sending mail, instead
+     of passing the message to the mail transport agent, `post' will
+     open a socket connection to the mail port on the machine specified
+     in the `mts.conf' file (default is localhost), and speak SMTP
+     directly.
+
+     If you use "sendmail", then `post' will send messages by forking a
+     local copy of sendmail.  Currently it will still speak SMTP with
+     this local copy of sendmail.

 
      If you wish to use a transport agent other than sendmail, you will
      need to use a `sendmail wrapper'.
 
      If you wish to use a transport agent other than sendmail, you will
      need to use a `sendmail wrapper'.

diff --git a/acconfig.h b/acconfig.h
index 612c9ec..5fdea1b 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -158,21 +158,11 @@
 /***** END USER CONFIGURATION SECTION *****/
 @TOP@
 
 /***** END USER CONFIGURATION SECTION *****/
 @TOP@
 

-

 /*
  * Define this if you want SMTP (simple mail transport protocol)
 /*
  * Define this if you want SMTP (simple mail transport protocol)

- * support.  When sending mail, instead of passing the message to
- * the mail transport agent (typically sendmail), nmh will open a
- * socket connection to the mail port on the machine specified in
- * the `mts.conf' file (default is localhost), and speak SMTP directly.
- */
-#undef SMTPMTS
-
-/*
- * Use sendmail as transport agent.  Post messages by piping
- * them directly to sendmail.
+ * support.  This is currently always enabled.

  */
  */

-#undef SENDMTS
+#define SMTPMTS 1

 
 /*
  * Define this to compile client-side support for pop into
 
 /*
  * Define this to compile client-side support for pop into

diff --git a/config.h.in b/config.h.in
index 4f3b78d..7b1c3fd 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -208,18 +208,9 @@
 
 /*
  * Define this if you want SMTP (simple mail transport protocol)
 
 /*
  * Define this if you want SMTP (simple mail transport protocol)

- * support.  When sending mail, instead of passing the message to
- * the mail transport agent (typically sendmail), nmh will open a
- * socket connection to the mail port on the machine specified in
- * the `mts.conf' file (default is localhost), and speak SMTP directly.
+ * support.  This is currently always enabled.

  */
  */

-#undef SMTPMTS
-
-/*
- * Use sendmail as transport agent.  Post messages by piping
- * them directly to sendmail.
- */
-#undef SENDMTS
+#define SMTPMTS 1

 
 /*
  * Define this to compile client-side support for pop into
 
 /*
  * Define this to compile client-side support for pop into

diff --git a/configure b/configure
index c644274..443a38b 100755 (executable)
--- a/configure
+++ b/configure
@@ -29,7 +29,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --with-editor=EDITOR    specify the default editor"
 ac_help="$ac_help
 ac_help="$ac_help
   --with-editor=EDITOR    specify the default editor"
 ac_help="$ac_help

-  --with-mts=MTS          specify the mail transport agent/service"
+  --with-mts=MTS          specify the default mail transport agent/service"

 ac_help="$ac_help
   --with-pager=PAGER      specify the default pager"
 ac_help="$ac_help
 ac_help="$ac_help
   --with-pager=PAGER      specify the default pager"
 ac_help="$ac_help

@@ -781,24 +781,15 @@ fi
 
 if test x"$with_mts" = x"smtp"; then
   MTS="smtp"
 
 if test x"$with_mts" = x"smtp"; then
   MTS="smtp"

-  MTSLIB="mts/smtp/libsmtp.a"
-  cat >> confdefs.h <<\EOF
-#define SMTPMTS 1
-EOF

 elif test x"$with_mts" = x"sendmail"; then
   MTS="sendmail"
 elif test x"$with_mts" = x"sendmail"; then
   MTS="sendmail"

-  MTSLIB="mts/sendmail/libsend.a"
-  cat >> confdefs.h <<\EOF
-#define SENDMTS 1
-EOF

 else
   MTS="smtp"
 else
   MTS="smtp"

-  MTSLIB="mts/smtp/libsmtp.a"
-  cat >> confdefs.h <<\EOF
-#define SMTPMTS 1
-EOF

 fi
 
 fi
 

+cat >> confdefs.h <<\EOF
+#define SMTPMTS 1
+EOF

 
 # Check whether --with-pager or --without-pager was given.
 if test "${with_pager+set}" = set; then
 
 # Check whether --with-pager or --without-pager was given.
 if test "${with_pager+set}" = set; then

@@ -833,7 +824,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

-echo "configure:837: checking for $ac_word" >&5
+echo "configure:828: checking for $ac_word" >&5

 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else

@@ -863,7 +854,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

-echo "configure:867: checking for $ac_word" >&5
+echo "configure:858: checking for $ac_word" >&5

 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else

@@ -914,7 +905,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

-echo "configure:918: checking for $ac_word" >&5
+echo "configure:909: checking for $ac_word" >&5

 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else

@@ -946,7 +937,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6

-echo "configure:950: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:941: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5

 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.

@@ -957,12 +948,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
 
 cat > conftest.$ac_ext << EOF
 

-#line 961 "configure"
+#line 952 "configure"

 #include "confdefs.h"
 
 main(){return(0);}
 EOF
 #include "confdefs.h"
 
 main(){return(0);}
 EOF

-if { (eval echo configure:966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then

@@ -988,12 +979,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6

-echo "configure:992: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:983: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5

 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6

-echo "configure:997: checking whether we are using GNU C" >&5
+echo "configure:988: checking whether we are using GNU C" >&5

 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else

@@ -1002,7 +993,7 @@ else
   yes;
 #endif
 EOF
   yes;
 #endif
 EOF

-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1006: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:997: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then

   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no

@@ -1021,7 +1012,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6

-echo "configure:1025: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1016: checking whether ${CC-cc} accepts -g" >&5

 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else

@@ -1071,12 +1062,12 @@ if test -n "$auto_cflags"; then
 fi
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6

-echo "configure:1075: checking for working const" >&5
+echo "configure:1066: checking for working const" >&5

 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 1080 "configure"
+#line 1071 "configure"

 #include "confdefs.h"
 
 int main() {
 #include "confdefs.h"
 
 int main() {

@@ -1125,7 +1116,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:1129: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1120: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   ac_cv_c_const=yes
 else
   rm -rf conftest*
   ac_cv_c_const=yes
 else

@@ -1146,7 +1137,7 @@ EOF
 fi
               
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
 fi
               
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6

-echo "configure:1150: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:1141: checking whether ${MAKE-make} sets \${MAKE}" >&5

 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6

@@ -1183,7 +1174,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6

-echo "configure:1187: checking for a BSD compatible install" >&5
+echo "configure:1178: checking for a BSD compatible install" >&5

 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6

@@ -1237,7 +1228,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
                # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
                # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

-echo "configure:1241: checking for $ac_word" >&5
+echo "configure:1232: checking for $ac_word" >&5

 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else

@@ -1268,7 +1259,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

-echo "configure:1272: checking for $ac_word" >&5
+echo "configure:1263: checking for $ac_word" >&5

 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else

@@ -1299,7 +1290,7 @@ done
              # Extract the first word of "flex", so it can be a program name with args.
 set dummy flex; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
              # Extract the first word of "flex", so it can be a program name with args.
 set dummy flex; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

-echo "configure:1303: checking for $ac_word" >&5
+echo "configure:1294: checking for $ac_word" >&5

 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else

@@ -1333,7 +1324,7 @@ then
   *) ac_lib=l ;;
   esac
   echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
   *) ac_lib=l ;;
   esac
   echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6

-echo "configure:1337: checking for yywrap in -l$ac_lib" >&5
+echo "configure:1328: checking for yywrap in -l$ac_lib" >&5

 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6

@@ -1341,7 +1332,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$ac_lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-l$ac_lib  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 1345 "configure"
+#line 1336 "configure"

 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2

@@ -1352,7 +1343,7 @@ int main() {
 yywrap()
 ; return 0; }
 EOF
 yywrap()
 ; return 0; }
 EOF

-if { (eval echo configure:1356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -1378,7 +1369,7 @@ pathtmp=/usr/bin:/bin:/usr/local/bin:/usr/xpg4/bin:/usr/ucb
 # Extract the first word of "cut", so it can be a program name with args.
 set dummy cut; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 # Extract the first word of "cut", so it can be a program name with args.
 set dummy cut; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

-echo "configure:1382: checking for $ac_word" >&5
+echo "configure:1373: checking for $ac_word" >&5

 if eval "test \"`echo '$''{'ac_cv_path_cutpath'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'ac_cv_path_cutpath'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else

@@ -1415,7 +1406,7 @@ fi
 # Extract the first word of "lclint", so it can be a program name with args.
 set dummy lclint; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 # Extract the first word of "lclint", so it can be a program name with args.
 set dummy lclint; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

-echo "configure:1419: checking for $ac_word" >&5
+echo "configure:1410: checking for $ac_word" >&5

 if eval "test \"`echo '$''{'ac_cv_prog_linttmp1'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'ac_cv_prog_linttmp1'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else

@@ -1448,7 +1439,7 @@ else
   # Extract the first word of "lint", so it can be a program name with args.
 set dummy lint; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
   # Extract the first word of "lint", so it can be a program name with args.
 set dummy lint; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

-echo "configure:1452: checking for $ac_word" >&5
+echo "configure:1443: checking for $ac_word" >&5

 if eval "test \"`echo '$''{'ac_cv_prog_linttmp2'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'ac_cv_prog_linttmp2'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else

@@ -1488,7 +1479,7 @@ fi
 # Extract the first word of "libtool", so it can be a program name with args.
 set dummy libtool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 # Extract the first word of "libtool", so it can be a program name with args.
 set dummy libtool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

-echo "configure:1492: checking for $ac_word" >&5
+echo "configure:1483: checking for $ac_word" >&5

 if eval "test \"`echo '$''{'ac_cv_prog_LIBTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'ac_cv_prog_LIBTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else

@@ -1524,7 +1515,7 @@ fi
 # Extract the first word of "lorder", so it can be a program name with args.
 set dummy lorder; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 # Extract the first word of "lorder", so it can be a program name with args.
 set dummy lorder; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

-echo "configure:1528: checking for $ac_word" >&5
+echo "configure:1519: checking for $ac_word" >&5

 if eval "test \"`echo '$''{'ac_cv_prog_LORDER'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'ac_cv_prog_LORDER'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else

@@ -1553,7 +1544,7 @@ fi
 # Extract the first word of "tsort", so it can be a program name with args.
 set dummy tsort; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 # Extract the first word of "tsort", so it can be a program name with args.
 set dummy tsort; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

-echo "configure:1557: checking for $ac_word" >&5
+echo "configure:1548: checking for $ac_word" >&5

 if eval "test \"`echo '$''{'ac_cv_prog_TSORT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'ac_cv_prog_TSORT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else

@@ -1586,7 +1577,7 @@ if test x$ac_cv_prog_LORDER != xlorder -o x$ac_cv_prog_TSORT != xtsort; then
     fi
 
 echo $ac_n "checking whether tsort can deal with loops""... $ac_c" 1>&6
     fi
 
 echo $ac_n "checking whether tsort can deal with loops""... $ac_c" 1>&6

-echo "configure:1590: checking whether tsort can deal with loops" >&5
+echo "configure:1581: checking whether tsort can deal with loops" >&5

 if eval "test \"`echo '$''{'nmh_cv_tsort_loop'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'nmh_cv_tsort_loop'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else

@@ -1599,14 +1590,15 @@ fi
 
 echo "$ac_t""$nmh_cv_tsort_loop" 1>&6
 if test x$nmh_cv_tsort_loop = xno ; then
 
 echo "$ac_t""$nmh_cv_tsort_loop" 1>&6
 if test x$nmh_cv_tsort_loop = xno ; then

+  LORDER=echo

   TSORT=cat
   TSORT=cat

-  fi
+    fi

 
 pathtmp=/usr/bin:/bin:/usr/local/bin:/usr/xpg4/bin:/usr/ucb
 # Extract the first word of "ls", so it can be a program name with args.
 set dummy ls; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 
 pathtmp=/usr/bin:/bin:/usr/local/bin:/usr/xpg4/bin:/usr/ucb
 # Extract the first word of "ls", so it can be a program name with args.
 set dummy ls; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

-echo "configure:1610: checking for $ac_word" >&5
+echo "configure:1602: checking for $ac_word" >&5

 if eval "test \"`echo '$''{'ac_cv_path_lspath'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'ac_cv_path_lspath'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else

@@ -1642,7 +1634,7 @@ fi
 
 if test "$lspath" != "no"; then
   echo $ac_n "checking how to get ls to show us the group ownership of a file""... $ac_c" 1>&6
 
 if test "$lspath" != "no"; then
   echo $ac_n "checking how to get ls to show us the group ownership of a file""... $ac_c" 1>&6

-echo "configure:1646: checking how to get ls to show us the group ownership of a file" >&5
+echo "configure:1638: checking how to get ls to show us the group ownership of a file" >&5

 if eval "test \"`echo '$''{'nmh_cv_ls_grpopt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'nmh_cv_ls_grpopt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else

@@ -1660,7 +1652,7 @@ pathtmp=/usr/bin:/bin:/usr/ucb:/usr/local/bin
 # Extract the first word of "more", so it can be a program name with args.
 set dummy more; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 # Extract the first word of "more", so it can be a program name with args.
 set dummy more; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

-echo "configure:1664: checking for $ac_word" >&5
+echo "configure:1656: checking for $ac_word" >&5

 if eval "test \"`echo '$''{'ac_cv_path_morepath'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'ac_cv_path_morepath'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else

@@ -1702,7 +1694,7 @@ pathtmp=/usr/lib:/usr/sbin:/usr/etc:/usr/ucblib:/usr/bin:/bin
 # Extract the first word of "sendmail", so it can be a program name with args.
 set dummy sendmail; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 # Extract the first word of "sendmail", so it can be a program name with args.
 set dummy sendmail; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

-echo "configure:1706: checking for $ac_word" >&5
+echo "configure:1698: checking for $ac_word" >&5

 if eval "test \"`echo '$''{'ac_cv_path_sendmailpath'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'ac_cv_path_sendmailpath'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else

@@ -1740,7 +1732,7 @@ pathtmp=/usr/bin:/bin:/usr/ucb:/usr/local/bin
 # Extract the first word of "vi", so it can be a program name with args.
 set dummy vi; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 # Extract the first word of "vi", so it can be a program name with args.
 set dummy vi; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

-echo "configure:1744: checking for $ac_word" >&5
+echo "configure:1736: checking for $ac_word" >&5

 if eval "test \"`echo '$''{'ac_cv_path_vipath'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'ac_cv_path_vipath'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else

@@ -1779,7 +1771,7 @@ if test -z "$editorpath"; then
 fi
 
 echo $ac_n "checking for broken vi""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking for broken vi""... $ac_c" 1>&6

-echo "configure:1783: checking for broken vi" >&5
+echo "configure:1775: checking for broken vi" >&5

 if eval "test \"`echo '$''{'nmh_cv_attvibug'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'nmh_cv_attvibug'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else

@@ -1801,7 +1793,7 @@ EOF
 fi
 
 echo $ac_n "checking where mail spool is located""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking where mail spool is located""... $ac_c" 1>&6

-echo "configure:1805: checking where mail spool is located" >&5
+echo "configure:1797: checking where mail spool is located" >&5

 if eval "test \"`echo '$''{'nmh_cv_mailspool'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'nmh_cv_mailspool'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else

@@ -1817,7 +1809,7 @@ mailspool=$nmh_cv_mailspool
 
 if test "$lspath" != "no" -a "$cutpath" != "no"; then
   echo $ac_n "checking whether the mail spool is world-writable""... $ac_c" 1>&6
 
 if test "$lspath" != "no" -a "$cutpath" != "no"; then
   echo $ac_n "checking whether the mail spool is world-writable""... $ac_c" 1>&6

-echo "configure:1821: checking whether the mail spool is world-writable" >&5
+echo "configure:1813: checking whether the mail spool is world-writable" >&5

 if eval "test \"`echo '$''{'nmh_cv_mailspool_world_writable'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'nmh_cv_mailspool_world_writable'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else

@@ -1832,7 +1824,7 @@ echo "$ac_t""$nmh_cv_mailspool_world_writable" 1>&6
 fi
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6

-echo "configure:1836: checking how to run the C preprocessor" >&5
+echo "configure:1828: checking how to run the C preprocessor" >&5

 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=

@@ -1847,13 +1839,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF

-#line 1851 "configure"
+#line 1843 "configure"

 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:1857: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1849: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :

@@ -1864,13 +1856,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF

-#line 1868 "configure"
+#line 1860 "configure"

 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:1874: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1866: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :

@@ -1881,13 +1873,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF

-#line 1885 "configure"
+#line 1877 "configure"

 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:1891: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1883: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :

@@ -1913,17 +1905,17 @@ echo "$ac_t""$CPP" 1>&6
 
 ac_safe=`echo "lockfile.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for lockfile.h""... $ac_c" 1>&6
 
 ac_safe=`echo "lockfile.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for lockfile.h""... $ac_c" 1>&6

-echo "configure:1917: checking for lockfile.h" >&5
+echo "configure:1909: checking for lockfile.h" >&5

 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 1922 "configure"
+#line 1914 "configure"

 #include "confdefs.h"
 #include <lockfile.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <lockfile.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:1927: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1919: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*

@@ -1940,7 +1932,7 @@ fi
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for lockfile_create in -llockfile""... $ac_c" 1>&6
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for lockfile_create in -llockfile""... $ac_c" 1>&6

-echo "configure:1944: checking for lockfile_create in -llockfile" >&5
+echo "configure:1936: checking for lockfile_create in -llockfile" >&5

 ac_lib_var=`echo lockfile'_'lockfile_create | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 ac_lib_var=`echo lockfile'_'lockfile_create | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6

@@ -1948,7 +1940,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-llockfile  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-llockfile  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 1952 "configure"
+#line 1944 "configure"

 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2

@@ -1959,7 +1951,7 @@ int main() {
 lockfile_create()
 ; return 0; }
 EOF
 lockfile_create()
 ; return 0; }
 EOF

-if { (eval echo configure:1963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -1994,7 +1986,7 @@ fi
 # Extract the first word of "dotlockfile", so it can be a program name with args.
 set dummy dotlockfile; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 # Extract the first word of "dotlockfile", so it can be a program name with args.
 set dummy dotlockfile; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

-echo "configure:1998: checking for $ac_word" >&5
+echo "configure:1990: checking for $ac_word" >&5

 if eval "test \"`echo '$''{'ac_cv_path_dotlockfilepath'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'ac_cv_path_dotlockfilepath'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else

@@ -2030,7 +2022,7 @@ fi
 if test "$ac_cv_lib_lockfile_lockfile_create" != "no" ; then
   if test "$ac_cv_path_dotlockfilepath" != "no" ; then
     echo $ac_n "checking whether dotlockfile is setgid""... $ac_c" 1>&6
 if test "$ac_cv_lib_lockfile_lockfile_create" != "no" ; then
   if test "$ac_cv_path_dotlockfilepath" != "no" ; then
     echo $ac_n "checking whether dotlockfile is setgid""... $ac_c" 1>&6

-echo "configure:2034: checking whether dotlockfile is setgid" >&5
+echo "configure:2026: checking whether dotlockfile is setgid" >&5

 if eval "test \"`echo '$''{'nmh_cv_dotlockfile_setgid'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'nmh_cv_dotlockfile_setgid'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else

@@ -2053,7 +2045,7 @@ EOF
 fi
 
 echo $ac_n "checking what group owns the mail spool""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking what group owns the mail spool""... $ac_c" 1>&6

-echo "configure:2057: checking what group owns the mail spool" >&5
+echo "configure:2049: checking what group owns the mail spool" >&5

 if eval "test \"`echo '$''{'nmh_cv_ls_mail_grp'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'nmh_cv_ls_mail_grp'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else

@@ -2069,12 +2061,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6

-echo "configure:2073: checking for $ac_hdr that defines DIR" >&5
+echo "configure:2065: checking for $ac_hdr that defines DIR" >&5

 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 2078 "configure"
+#line 2070 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>

@@ -2082,7 +2074,7 @@ int main() {
 DIR *dirp = 0;
 ; return 0; }
 EOF
 DIR *dirp = 0;
 ; return 0; }
 EOF

-if { (eval echo configure:2086: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2078: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   eval "ac_cv_header_dirent_$ac_safe=yes"
 else
   rm -rf conftest*
   eval "ac_cv_header_dirent_$ac_safe=yes"
 else

@@ -2107,7 +2099,7 @@ done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
 echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
 echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6

-echo "configure:2111: checking for opendir in -ldir" >&5
+echo "configure:2103: checking for opendir in -ldir" >&5

 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6

@@ -2115,7 +2107,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 2119 "configure"
+#line 2111 "configure"

 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2

@@ -2126,7 +2118,7 @@ int main() {
 opendir()
 ; return 0; }
 EOF
 opendir()
 ; return 0; }
 EOF

-if { (eval echo configure:2130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -2148,7 +2140,7 @@ fi
 
 else
 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
 
 else
 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6

-echo "configure:2152: checking for opendir in -lx" >&5
+echo "configure:2144: checking for opendir in -lx" >&5

 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6

@@ -2156,7 +2148,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 2160 "configure"
+#line 2152 "configure"

 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2

@@ -2167,7 +2159,7 @@ int main() {
 opendir()
 ; return 0; }
 EOF
 opendir()
 ; return 0; }
 EOF

-if { (eval echo configure:2171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -2190,12 +2182,12 @@ fi
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6

-echo "configure:2194: checking for ANSI C header files" >&5
+echo "configure:2186: checking for ANSI C header files" >&5

 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 2199 "configure"
+#line 2191 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>

@@ -2203,7 +2195,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:2207: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2199: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*

@@ -2220,7 +2212,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF

-#line 2224 "configure"
+#line 2216 "configure"

 #include "confdefs.h"
 #include <string.h>
 EOF
 #include "confdefs.h"
 #include <string.h>
 EOF

@@ -2238,7 +2230,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF

-#line 2242 "configure"
+#line 2234 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 EOF
 #include "confdefs.h"
 #include <stdlib.h>
 EOF

@@ -2259,7 +2251,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
   :
 else
   cat > conftest.$ac_ext <<EOF

-#line 2263 "configure"
+#line 2255 "configure"

 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')

@@ -2270,7 +2262,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
 exit (0); }
 
 EOF

-if { (eval echo configure:2274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

 then
   :
 else
 then
   :
 else

@@ -2294,12 +2286,12 @@ EOF
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6

-echo "configure:2298: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:2290: checking whether time.h and sys/time.h may both be included" >&5

 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 2303 "configure"
+#line 2295 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>

@@ -2308,7 +2300,7 @@ int main() {
 struct tm *tp;
 ; return 0; }
 EOF
 struct tm *tp;
 ; return 0; }
 EOF

-if { (eval echo configure:2312: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2304: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   ac_cv_header_time=yes
 else
   rm -rf conftest*
   ac_cv_header_time=yes
 else

@@ -2329,12 +2321,12 @@ EOF
 fi
 
 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6

-echo "configure:2333: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:2325: checking for sys/wait.h that is POSIX.1 compatible" >&5

 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 2338 "configure"
+#line 2330 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>

@@ -2350,7 +2342,7 @@ wait (&s);
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF

-if { (eval echo configure:2354: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2346: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
 else
   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
 else

@@ -2371,12 +2363,12 @@ EOF
 fi
 
 echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6

-echo "configure:2375: checking whether stat file-mode macros are broken" >&5
+echo "configure:2367: checking whether stat file-mode macros are broken" >&5

 if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 2380 "configure"
+#line 2372 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>

@@ -2433,17 +2425,17 @@ for ac_hdr in string.h memory.h stdlib.h unistd.h errno.h fcntl.h \
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

-echo "configure:2437: checking for $ac_hdr" >&5
+echo "configure:2429: checking for $ac_hdr" >&5

 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 2442 "configure"
+#line 2434 "configure"

 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:2447: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2439: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*

@@ -2472,12 +2464,12 @@ done
 
 
 echo $ac_n "checking POSIX termios""... $ac_c" 1>&6
 
 
 echo $ac_n "checking POSIX termios""... $ac_c" 1>&6

-echo "configure:2476: checking POSIX termios" >&5
+echo "configure:2468: checking POSIX termios" >&5

 if eval "test \"`echo '$''{'nmh_cv_sys_posix_termios'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'nmh_cv_sys_posix_termios'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 2481 "configure"
+#line 2473 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #include <unistd.h>
 #include "confdefs.h"
 #include <sys/types.h>
 #include <unistd.h>

@@ -2487,7 +2479,7 @@ int main() {
 tcgetattr(0, 0);
 ; return 0; }
 EOF
 tcgetattr(0, 0);
 ; return 0; }
 EOF

-if { (eval echo configure:2491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   nmh_cv_sys_posix_termios=yes
 else
   rm -rf conftest*
   nmh_cv_sys_posix_termios=yes
 else

@@ -2503,12 +2495,12 @@ echo "$ac_t""$nmh_cv_sys_posix_termios" 1>&6
  
 if test $nmh_cv_sys_posix_termios = yes; then
   echo $ac_n "checking TIOCGWINSZ in termios.h""... $ac_c" 1>&6
  
 if test $nmh_cv_sys_posix_termios = yes; then
   echo $ac_n "checking TIOCGWINSZ in termios.h""... $ac_c" 1>&6

-echo "configure:2507: checking TIOCGWINSZ in termios.h" >&5
+echo "configure:2499: checking TIOCGWINSZ in termios.h" >&5

 if eval "test \"`echo '$''{'nmh_cv_header_termios_h_tiocgwinsz'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'nmh_cv_header_termios_h_tiocgwinsz'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 2512 "configure"
+#line 2504 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #include <termios.h>
 #include "confdefs.h"
 #include <sys/types.h>
 #include <termios.h>

@@ -2516,7 +2508,7 @@ int main() {
 int x = TIOCGWINSZ;
 ; return 0; }
 EOF
 int x = TIOCGWINSZ;
 ; return 0; }
 EOF

-if { (eval echo configure:2520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   nmh_cv_header_termios_h_tiocgwinsz=yes
 else
   rm -rf conftest*
   nmh_cv_header_termios_h_tiocgwinsz=yes
 else

@@ -2535,12 +2527,12 @@ fi
  
 if test $nmh_cv_header_termios_h_tiocgwinsz = no; then
   echo $ac_n "checking TIOCGWINSZ in sys/ioctl.h""... $ac_c" 1>&6
  
 if test $nmh_cv_header_termios_h_tiocgwinsz = no; then
   echo $ac_n "checking TIOCGWINSZ in sys/ioctl.h""... $ac_c" 1>&6

-echo "configure:2539: checking TIOCGWINSZ in sys/ioctl.h" >&5
+echo "configure:2531: checking TIOCGWINSZ in sys/ioctl.h" >&5

 if eval "test \"`echo '$''{'nmh_cv_header_sys_ioctl_h_tiocgwinsz'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'nmh_cv_header_sys_ioctl_h_tiocgwinsz'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 2544 "configure"
+#line 2536 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/ioctl.h>

@@ -2548,7 +2540,7 @@ int main() {
 int x = TIOCGWINSZ;
 ; return 0; }
 EOF
 int x = TIOCGWINSZ;
 ; return 0; }
 EOF

-if { (eval echo configure:2552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   nmh_cv_header_sys_ioctl_h_tiocgwinsz=yes
 else
   rm -rf conftest*
   nmh_cv_header_sys_ioctl_h_tiocgwinsz=yes
 else

@@ -2571,17 +2563,17 @@ fi
  
 ac_safe=`echo "libio.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for libio.h""... $ac_c" 1>&6
  
 ac_safe=`echo "libio.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for libio.h""... $ac_c" 1>&6

-echo "configure:2575: checking for libio.h" >&5
+echo "configure:2567: checking for libio.h" >&5

 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 2580 "configure"
+#line 2572 "configure"

 #include "confdefs.h"
 #include <libio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <libio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:2585: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2577: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*

@@ -2599,7 +2591,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   
   cat > conftest.$ac_ext <<EOF
   echo "$ac_t""yes" 1>&6
   
   cat > conftest.$ac_ext <<EOF

-#line 2603 "configure"
+#line 2595 "configure"

 #include "confdefs.h"
 #include <libio.h>
 EOF
 #include "confdefs.h"
 #include <libio.h>
 EOF

@@ -2621,17 +2613,17 @@ fi
 
 ac_safe=`echo "sys/ptem.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/ptem.h""... $ac_c" 1>&6
 
 ac_safe=`echo "sys/ptem.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/ptem.h""... $ac_c" 1>&6

-echo "configure:2625: checking for sys/ptem.h" >&5
+echo "configure:2617: checking for sys/ptem.h" >&5

 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 2630 "configure"
+#line 2622 "configure"

 #include "confdefs.h"
 #include <sys/ptem.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <sys/ptem.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:2635: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2627: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*

@@ -2657,12 +2649,12 @@ fi
 
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
 
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6

-echo "configure:2661: checking for pid_t" >&5
+echo "configure:2653: checking for pid_t" >&5

 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 2666 "configure"
+#line 2658 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS

@@ -2691,17 +2683,17 @@ fi
 
 ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
 
 ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for vfork.h""... $ac_c" 1>&6

-echo "configure:2695: checking for vfork.h" >&5
+echo "configure:2687: checking for vfork.h" >&5

 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 2700 "configure"
+#line 2692 "configure"

 #include "confdefs.h"
 #include <vfork.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <vfork.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:2705: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2697: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*

@@ -2726,18 +2718,18 @@ else
 fi
 
 echo $ac_n "checking for working vfork""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking for working vfork""... $ac_c" 1>&6

-echo "configure:2730: checking for working vfork" >&5
+echo "configure:2722: checking for working vfork" >&5

 if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test "$cross_compiling" = yes; then
   echo $ac_n "checking for vfork""... $ac_c" 1>&6
 if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test "$cross_compiling" = yes; then
   echo $ac_n "checking for vfork""... $ac_c" 1>&6

-echo "configure:2736: checking for vfork" >&5
+echo "configure:2728: checking for vfork" >&5

 if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 2741 "configure"
+#line 2733 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vfork(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vfork(); below.  */

@@ -2760,7 +2752,7 @@ vfork();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:2764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_func_vfork=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_vfork=yes"
 else

@@ -2782,7 +2774,7 @@ fi
 ac_cv_func_vfork_works=$ac_cv_func_vfork
 else
   cat > conftest.$ac_ext <<EOF
 ac_cv_func_vfork_works=$ac_cv_func_vfork
 else
   cat > conftest.$ac_ext <<EOF

-#line 2786 "configure"
+#line 2778 "configure"

 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>

@@ -2877,7 +2869,7 @@ main() {
   }
 }
 EOF
   }
 }
 EOF

-if { (eval echo configure:2881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

 then
   ac_cv_func_vfork_works=yes
 else
 then
   ac_cv_func_vfork_works=yes
 else

@@ -2900,7 +2892,7 @@ EOF
 fi
 
 echo $ac_n "checking for mkstemp in -lmkstemp""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking for mkstemp in -lmkstemp""... $ac_c" 1>&6

-echo "configure:2904: checking for mkstemp in -lmkstemp" >&5
+echo "configure:2896: checking for mkstemp in -lmkstemp" >&5

 ac_lib_var=`echo mkstemp'_'mkstemp | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 ac_lib_var=`echo mkstemp'_'mkstemp | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6

@@ -2908,7 +2900,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lmkstemp  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lmkstemp  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 2912 "configure"
+#line 2904 "configure"

 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2

@@ -2919,7 +2911,7 @@ int main() {
 mkstemp()
 ; return 0; }
 EOF
 mkstemp()
 ; return 0; }
 EOF

-if { (eval echo configure:2923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -2951,12 +2943,12 @@ for ac_func in waitpid wait3 sigaction sigprocmask sigblock sigsetmask \
                sethostent getutent
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
                sethostent getutent
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:2955: checking for $ac_func" >&5
+echo "configure:2947: checking for $ac_func" >&5

 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 2960 "configure"
+#line 2952 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */

@@ -2979,7 +2971,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:2983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else

@@ -3005,12 +2997,12 @@ done
 
 
 echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
 
 
 echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6

-echo "configure:3009: checking for gethostbyname" >&5
+echo "configure:3001: checking for gethostbyname" >&5

 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 3014 "configure"
+#line 3006 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */

@@ -3033,7 +3025,7 @@ gethostbyname();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:3037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else

@@ -3054,7 +3046,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6

-echo "configure:3058: checking for gethostbyname in -lnsl" >&5
+echo "configure:3050: checking for gethostbyname in -lnsl" >&5

 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6

@@ -3062,7 +3054,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 3066 "configure"
+#line 3058 "configure"

 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2

@@ -3073,7 +3065,7 @@ int main() {
 gethostbyname()
 ; return 0; }
 EOF
 gethostbyname()
 ; return 0; }
 EOF

-if { (eval echo configure:3077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -3100,16 +3092,16 @@ fi
 
 
 echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
 
 
 echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6

-echo "configure:3104: checking for sigsetjmp" >&5
+echo "configure:3096: checking for sigsetjmp" >&5

 cat > conftest.$ac_ext <<EOF
 cat > conftest.$ac_ext <<EOF

-#line 3106 "configure"
+#line 3098 "configure"

 #include "confdefs.h"
 #include <setjmp.h>
 int main() {
 sigsetjmp((void *)0, 0);
 ; return 0; }
 EOF
 #include "confdefs.h"
 #include <setjmp.h>
 int main() {
 sigsetjmp((void *)0, 0);
 ; return 0; }
 EOF

-if { (eval echo configure:3113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define HAVE_SIGSETJMP 1
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define HAVE_SIGSETJMP 1

@@ -3126,12 +3118,12 @@ rm -f conftest*
 for ac_func in snprintf strerror strdup
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 for ac_func in snprintf strerror strdup
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:3130: checking for $ac_func" >&5
+echo "configure:3122: checking for $ac_func" >&5

 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 3135 "configure"
+#line 3127 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */

@@ -3154,7 +3146,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:3158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else

@@ -3182,7 +3174,7 @@ done
 
 
 cat > conftest.$ac_ext <<EOF
 
 
 cat > conftest.$ac_ext <<EOF

-#line 3186 "configure"
+#line 3178 "configure"

 #include "confdefs.h"
 #include <grp.h>
 EOF
 #include "confdefs.h"
 #include <grp.h>
 EOF

@@ -3196,7 +3188,7 @@ EOF
 else
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
 else
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF

-#line 3200 "configure"
+#line 3192 "configure"

 #include "confdefs.h"
 #include <unistd.h>
 EOF
 #include "confdefs.h"
 #include <unistd.h>
 EOF

@@ -3215,7 +3207,7 @@ rm -f conftest*
 
 
 cat > conftest.$ac_ext <<EOF
 
 
 cat > conftest.$ac_ext <<EOF

-#line 3219 "configure"
+#line 3211 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 EOF
 #include "confdefs.h"
 #include <stdio.h>
 EOF

@@ -3231,12 +3223,12 @@ rm -f conftest*
 
 
 echo $ac_n "checking for modf""... $ac_c" 1>&6
 
 
 echo $ac_n "checking for modf""... $ac_c" 1>&6

-echo "configure:3235: checking for modf" >&5
+echo "configure:3227: checking for modf" >&5

 if eval "test \"`echo '$''{'ac_cv_func_modf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_func_modf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 3240 "configure"
+#line 3232 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char modf(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char modf(); below.  */

@@ -3259,7 +3251,7 @@ modf();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:3263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_func_modf=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_modf=yes"
 else

@@ -3277,7 +3269,7 @@ if eval "test \"`echo '$ac_cv_func_'modf`\" = yes"; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for modf in -lm""... $ac_c" 1>&6
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for modf in -lm""... $ac_c" 1>&6

-echo "configure:3281: checking for modf in -lm" >&5
+echo "configure:3273: checking for modf in -lm" >&5

 ac_lib_var=`echo m'_'modf | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 ac_lib_var=`echo m'_'modf | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6

@@ -3285,7 +3277,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 3289 "configure"
+#line 3281 "configure"

 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2

@@ -3296,7 +3288,7 @@ int main() {
 modf()
 ; return 0; }
 EOF
 modf()
 ; return 0; }
 EOF

-if { (eval echo configure:3300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -3327,12 +3319,12 @@ fi
 
 
 echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
 
 
 echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6

-echo "configure:3331: checking for gethostbyname" >&5
+echo "configure:3323: checking for gethostbyname" >&5

 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 3336 "configure"
+#line 3328 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */

@@ -3355,7 +3347,7 @@ gethostbyname();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:3359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else

@@ -3373,7 +3365,7 @@ if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6

-echo "configure:3377: checking for gethostbyname in -lnsl" >&5
+echo "configure:3369: checking for gethostbyname in -lnsl" >&5

 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6

@@ -3381,7 +3373,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 3385 "configure"
+#line 3377 "configure"

 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2

@@ -3392,7 +3384,7 @@ int main() {
 gethostbyname()
 ; return 0; }
 EOF
 gethostbyname()
 ; return 0; }
 EOF

-if { (eval echo configure:3396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -3418,7 +3410,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for gethostbyname in -lresolv""... $ac_c" 1>&6
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for gethostbyname in -lresolv""... $ac_c" 1>&6

-echo "configure:3422: checking for gethostbyname in -lresolv" >&5
+echo "configure:3414: checking for gethostbyname in -lresolv" >&5

 ac_lib_var=`echo resolv'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 ac_lib_var=`echo resolv'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6

@@ -3426,7 +3418,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 3430 "configure"
+#line 3422 "configure"

 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2

@@ -3437,7 +3429,7 @@ int main() {
 gethostbyname()
 ; return 0; }
 EOF
 gethostbyname()
 ; return 0; }
 EOF

-if { (eval echo configure:3441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -3469,12 +3461,12 @@ fi
 fi
 
 echo $ac_n "checking for socket""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking for socket""... $ac_c" 1>&6

-echo "configure:3473: checking for socket" >&5
+echo "configure:3465: checking for socket" >&5

 if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 3478 "configure"
+#line 3470 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */

@@ -3497,7 +3489,7 @@ socket();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:3501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_func_socket=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_socket=yes"
 else

@@ -3515,7 +3507,7 @@ if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6

-echo "configure:3519: checking for socket in -lsocket" >&5
+echo "configure:3511: checking for socket in -lsocket" >&5

 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6

@@ -3523,7 +3515,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 3527 "configure"
+#line 3519 "configure"

 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2

@@ -3534,7 +3526,7 @@ int main() {
 socket()
 ; return 0; }
 EOF
 socket()
 ; return 0; }
 EOF

-if { (eval echo configure:3538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -3568,7 +3560,7 @@ fi
 termcap_curses_order="termcap curses ncurses"
 for lib in $termcap_curses_order; do
   echo $ac_n "checking for tgetent in -l${lib}""... $ac_c" 1>&6
 termcap_curses_order="termcap curses ncurses"
 for lib in $termcap_curses_order; do
   echo $ac_n "checking for tgetent in -l${lib}""... $ac_c" 1>&6

-echo "configure:3572: checking for tgetent in -l${lib}" >&5
+echo "configure:3564: checking for tgetent in -l${lib}" >&5

 ac_lib_var=`echo ${lib}'_'tgetent | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 ac_lib_var=`echo ${lib}'_'tgetent | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6

@@ -3576,7 +3568,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l${lib}  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-l${lib}  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 3580 "configure"
+#line 3572 "configure"

 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2

@@ -3587,7 +3579,7 @@ int main() {
 tgetent()
 ; return 0; }
 EOF
 tgetent()
 ; return 0; }
 EOF

-if { (eval echo configure:3591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -3610,12 +3602,12 @@ fi
 done
 
 echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
 done
 
 echo $ac_n "checking for dbm_open""... $ac_c" 1>&6

-echo "configure:3614: checking for dbm_open" >&5
+echo "configure:3606: checking for dbm_open" >&5

 if eval "test \"`echo '$''{'ac_cv_func_dbm_open'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_func_dbm_open'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 3619 "configure"
+#line 3611 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dbm_open(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dbm_open(); below.  */

@@ -3638,7 +3630,7 @@ dbm_open();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:3642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_func_dbm_open=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_dbm_open=yes"
 else

@@ -3656,7 +3648,7 @@ if eval "test \"`echo '$ac_cv_func_'dbm_open`\" = yes"; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dbm_open in -lndbm""... $ac_c" 1>&6
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dbm_open in -lndbm""... $ac_c" 1>&6

-echo "configure:3660: checking for dbm_open in -lndbm" >&5
+echo "configure:3652: checking for dbm_open in -lndbm" >&5

 ac_lib_var=`echo ndbm'_'dbm_open | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 ac_lib_var=`echo ndbm'_'dbm_open | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6

@@ -3664,7 +3656,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lndbm  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lndbm  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 3668 "configure"
+#line 3660 "configure"

 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2

@@ -3675,7 +3667,7 @@ int main() {
 dbm_open()
 ; return 0; }
 EOF
 dbm_open()
 ; return 0; }
 EOF

-if { (eval echo configure:3679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -3701,7 +3693,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6

-echo "configure:3705: checking for dbm_open in -ldbm" >&5
+echo "configure:3697: checking for dbm_open in -ldbm" >&5

 ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6

@@ -3709,7 +3701,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldbm  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-ldbm  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 3713 "configure"
+#line 3705 "configure"

 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2

@@ -3720,7 +3712,7 @@ int main() {
 dbm_open()
 ; return 0; }
 EOF
 dbm_open()
 ; return 0; }
 EOF

-if { (eval echo configure:3724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -3756,17 +3748,17 @@ for ac_hdr in db1/ndbm.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

-echo "configure:3760: checking for $ac_hdr" >&5
+echo "configure:3752: checking for $ac_hdr" >&5

 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 3765 "configure"
+#line 3757 "configure"

 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:3770: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3762: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*

@@ -3799,12 +3791,12 @@ if test x"$with_hesiod" != x -a x"$with_hesiod" != x"no"; then
     HESIOD_LIBS="-L$with_hesiod/lib"
   fi
   echo $ac_n "checking for res_send""... $ac_c" 1>&6
     HESIOD_LIBS="-L$with_hesiod/lib"
   fi
   echo $ac_n "checking for res_send""... $ac_c" 1>&6

-echo "configure:3803: checking for res_send" >&5
+echo "configure:3795: checking for res_send" >&5

 if eval "test \"`echo '$''{'ac_cv_func_res_send'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_func_res_send'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 3808 "configure"
+#line 3800 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char res_send(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char res_send(); below.  */

@@ -3827,7 +3819,7 @@ res_send();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:3831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_func_res_send=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_res_send=yes"
 else

@@ -3845,7 +3837,7 @@ if eval "test \"`echo '$ac_cv_func_'res_send`\" = yes"; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for res_send in -lresolv""... $ac_c" 1>&6
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for res_send in -lresolv""... $ac_c" 1>&6

-echo "configure:3849: checking for res_send in -lresolv" >&5
+echo "configure:3841: checking for res_send in -lresolv" >&5

 ac_lib_var=`echo resolv'_'res_send | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 ac_lib_var=`echo resolv'_'res_send | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6

@@ -3853,7 +3845,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 3857 "configure"
+#line 3849 "configure"

 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2

@@ -3864,7 +3856,7 @@ int main() {
 res_send()
 ; return 0; }
 EOF
 res_send()
 ; return 0; }
 EOF

-if { (eval echo configure:3868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -3894,7 +3886,7 @@ fi
 fi
 
   echo $ac_n "checking for hes_resolve in -lhesiod""... $ac_c" 1>&6
 fi
 
   echo $ac_n "checking for hes_resolve in -lhesiod""... $ac_c" 1>&6

-echo "configure:3898: checking for hes_resolve in -lhesiod" >&5
+echo "configure:3890: checking for hes_resolve in -lhesiod" >&5

 ac_lib_var=`echo hesiod'_'hes_resolve | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 ac_lib_var=`echo hesiod'_'hes_resolve | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6

@@ -3902,7 +3894,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lhesiod $HESIOD_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lhesiod $HESIOD_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 3906 "configure"
+#line 3898 "configure"

 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2

@@ -3913,7 +3905,7 @@ int main() {
 hes_resolve()
 ; return 0; }
 EOF
 hes_resolve()
 ; return 0; }
 EOF

-if { (eval echo configure:3917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -3947,7 +3939,7 @@ if test x"$with_krb4" != x -a x"$with_krb4" != x"no"; then
     KRB4_INCLUDES="-I/usr/include/kerberosIV"
   fi
   echo $ac_n "checking for krb_rd_req in -lkrb4""... $ac_c" 1>&6
     KRB4_INCLUDES="-I/usr/include/kerberosIV"
   fi
   echo $ac_n "checking for krb_rd_req in -lkrb4""... $ac_c" 1>&6

-echo "configure:3951: checking for krb_rd_req in -lkrb4" >&5
+echo "configure:3943: checking for krb_rd_req in -lkrb4" >&5

 ac_lib_var=`echo krb4'_'krb_rd_req | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 ac_lib_var=`echo krb4'_'krb_rd_req | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6

@@ -3955,7 +3947,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lkrb4 $KRB4_LIBS -ldes425 -lkrb5 -lcrypto -lcom_err $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lkrb4 $KRB4_LIBS -ldes425 -lkrb5 -lcrypto -lcom_err $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 3959 "configure"
+#line 3951 "configure"

 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2

@@ -3966,7 +3958,7 @@ int main() {
 krb_rd_req()
 ; return 0; }
 EOF
 krb_rd_req()
 ; return 0; }
 EOF

-if { (eval echo configure:3970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -3985,7 +3977,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for krb_rd_req in -lkrb""... $ac_c" 1>&6
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for krb_rd_req in -lkrb""... $ac_c" 1>&6

-echo "configure:3989: checking for krb_rd_req in -lkrb" >&5
+echo "configure:3981: checking for krb_rd_req in -lkrb" >&5

 ac_lib_var=`echo krb'_'krb_rd_req | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 ac_lib_var=`echo krb'_'krb_rd_req | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6

@@ -3993,7 +3985,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lkrb $KRB4_LIBS -ldes $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lkrb $KRB4_LIBS -ldes $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 3997 "configure"
+#line 3989 "configure"

 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2

@@ -4004,7 +3996,7 @@ int main() {
 krb_rd_req()
 ; return 0; }
 EOF
 krb_rd_req()
 ; return 0; }
 EOF

-if { (eval echo configure:4008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

@@ -4034,12 +4026,12 @@ nmh_save_LIBS="$LIBS"
 LIBS="$TERMLIB $LIBS"
 
 echo $ac_n "checking if an include file defines ospeed""... $ac_c" 1>&6
 LIBS="$TERMLIB $LIBS"
 
 echo $ac_n "checking if an include file defines ospeed""... $ac_c" 1>&6

-echo "configure:4038: checking if an include file defines ospeed" >&5
+echo "configure:4030: checking if an include file defines ospeed" >&5

 if eval "test \"`echo '$''{'nmh_cv_decl_ospeed_include_defines'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'nmh_cv_decl_ospeed_include_defines'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 4043 "configure"
+#line 4035 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #if HAVE_TERMIOS_H
 #include "confdefs.h"
 #include <sys/types.h>
 #if HAVE_TERMIOS_H

@@ -4052,7 +4044,7 @@ int main() {
 ospeed = 0;
 ; return 0; }
 EOF
 ospeed = 0;
 ; return 0; }
 EOF

-if { (eval echo configure:4056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   nmh_cv_decl_ospeed_include_defines=yes
 else
   rm -rf conftest*
   nmh_cv_decl_ospeed_include_defines=yes
 else

@@ -4068,19 +4060,19 @@ echo "$ac_t""$nmh_cv_decl_ospeed_include_defines" 1>&6
  
 if test $nmh_cv_decl_ospeed_include_defines = no; then
   echo $ac_n "checking if you must define ospeed""... $ac_c" 1>&6
  
 if test $nmh_cv_decl_ospeed_include_defines = no; then
   echo $ac_n "checking if you must define ospeed""... $ac_c" 1>&6

-echo "configure:4072: checking if you must define ospeed" >&5
+echo "configure:4064: checking if you must define ospeed" >&5

 if eval "test \"`echo '$''{'nmh_cv_decl_ospeed_must_define'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'nmh_cv_decl_ospeed_must_define'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 4077 "configure"
+#line 4069 "configure"

 #include "confdefs.h"
 
 int main() {
 extern short ospeed; ospeed = 0;
 ; return 0; }
 EOF
 #include "confdefs.h"
 
 int main() {
 extern short ospeed; ospeed = 0;
 ; return 0; }
 EOF

-if { (eval echo configure:4084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   nmh_cv_decl_ospeed_must_define=yes
 else
   rm -rf conftest*
   nmh_cv_decl_ospeed_must_define=yes
 else

@@ -4115,12 +4107,12 @@ fi
 LIBS="$nmh_save_LIBS"
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
 LIBS="$nmh_save_LIBS"
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6

-echo "configure:4119: checking return type of signal handlers" >&5
+echo "configure:4111: checking return type of signal handlers" >&5

 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 4124 "configure"
+#line 4116 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>

@@ -4137,7 +4129,7 @@ int main() {
 int i;
 ; return 0; }
 EOF
 int i;
 ; return 0; }
 EOF

-if { (eval echo configure:4141: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4133: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   ac_cv_type_signal=void
 else
   rm -rf conftest*
   ac_cv_type_signal=void
 else

@@ -4156,12 +4148,12 @@ EOF
 
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
 
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6

-echo "configure:4160: checking for pid_t" >&5
+echo "configure:4152: checking for pid_t" >&5

 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 4165 "configure"
+#line 4157 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS

@@ -4189,12 +4181,12 @@ EOF
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6

-echo "configure:4193: checking for off_t" >&5
+echo "configure:4185: checking for off_t" >&5

 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 4198 "configure"
+#line 4190 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS

@@ -4222,12 +4214,12 @@ EOF
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6

-echo "configure:4226: checking for uid_t in sys/types.h" >&5
+echo "configure:4218: checking for uid_t in sys/types.h" >&5

 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 4231 "configure"
+#line 4223 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 EOF
 #include "confdefs.h"
 #include <sys/types.h>
 EOF

@@ -4256,12 +4248,12 @@ EOF
 fi
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6

-echo "configure:4260: checking for mode_t" >&5
+echo "configure:4252: checking for mode_t" >&5

 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 4265 "configure"
+#line 4257 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS

@@ -4289,12 +4281,12 @@ EOF
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6

-echo "configure:4293: checking for size_t" >&5
+echo "configure:4285: checking for size_t" >&5

 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 4298 "configure"
+#line 4290 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS

@@ -4323,12 +4315,12 @@ fi
 
 
 echo $ac_n "checking for sigset_t""... $ac_c" 1>&6
 
 
 echo $ac_n "checking for sigset_t""... $ac_c" 1>&6

-echo "configure:4327: checking for sigset_t" >&5
+echo "configure:4319: checking for sigset_t" >&5

 if eval "test \"`echo '$''{'nmh_cv_type_sigset_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'nmh_cv_type_sigset_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 4332 "configure"
+#line 4324 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>

@@ -4336,7 +4328,7 @@ int main() {
 sigset_t tempsigset;
 ; return 0; }
 EOF
 sigset_t tempsigset;
 ; return 0; }
 EOF

-if { (eval echo configure:4340: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4332: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   nmh_cv_type_sigset_t=yes
 else
   rm -rf conftest*
   nmh_cv_type_sigset_t=yes
 else

@@ -4357,12 +4349,12 @@ EOF
 fi
 
 echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6

-echo "configure:4361: checking for st_blksize in struct stat" >&5
+echo "configure:4353: checking for st_blksize in struct stat" >&5

 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 4366 "configure"
+#line 4358 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>

@@ -4370,7 +4362,7 @@ int main() {
 struct stat s; s.st_blksize;
 ; return 0; }
 EOF
 struct stat s; s.st_blksize;
 ; return 0; }
 EOF

-if { (eval echo configure:4374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4366: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   ac_cv_struct_st_blksize=yes
 else
   rm -rf conftest*
   ac_cv_struct_st_blksize=yes
 else

@@ -4392,12 +4384,12 @@ fi
 
 
 echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
 
 
 echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6

-echo "configure:4396: checking for tm_gmtoff in struct tm" >&5
+echo "configure:4388: checking for tm_gmtoff in struct tm" >&5

 if eval "test \"`echo '$''{'nmh_cv_struct_tm_gmtoff'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'nmh_cv_struct_tm_gmtoff'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 4401 "configure"
+#line 4393 "configure"

 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
 # include <sys/time.h>
 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
 # include <sys/time.h>

@@ -4413,7 +4405,7 @@ int main() {
 struct tm temptm; temptm.tm_gmtoff = 0;
 ; return 0; }
 EOF
 struct tm temptm; temptm.tm_gmtoff = 0;
 ; return 0; }
 EOF

-if { (eval echo configure:4417: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   nmh_cv_struct_tm_gmtoff=yes
 else
   rm -rf conftest*
   nmh_cv_struct_tm_gmtoff=yes
 else

@@ -4434,7 +4426,7 @@ EOF
 fi
 
 echo $ac_n "checking what style of signals to use""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking what style of signals to use""... $ac_c" 1>&6

-echo "configure:4438: checking what style of signals to use" >&5
+echo "configure:4430: checking what style of signals to use" >&5

 if test $ac_cv_func_sigaction = yes -a $ac_cv_func_sigprocmask = yes; then
   signals_style=POSIX_SIGNALS
   cat >> confdefs.h <<\EOF
 if test $ac_cv_func_sigaction = yes -a $ac_cv_func_sigprocmask = yes; then
   signals_style=POSIX_SIGNALS
   cat >> confdefs.h <<\EOF

@@ -4472,7 +4464,7 @@ fi
 echo "$ac_t""$signals_style" 1>&6
 
 echo $ac_n "checking where signal.h is located""... $ac_c" 1>&6
 echo "$ac_t""$signals_style" 1>&6
 
 echo $ac_n "checking where signal.h is located""... $ac_c" 1>&6

-echo "configure:4476: checking where signal.h is located" >&5
+echo "configure:4468: checking where signal.h is located" >&5

 if eval "test \"`echo '$''{'nmh_cv_path_signal_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'nmh_cv_path_signal_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else

@@ -4747,7 +4739,6 @@ s%@masquerade@%$masquerade%g
 s%@POPLIB@%$POPLIB%g
 s%@POPSED@%$POPSED%g
 s%@MTS@%$MTS%g
 s%@POPLIB@%$POPLIB%g
 s%@POPSED@%$POPSED%g
 s%@MTS@%$MTS%g

-s%@MTSLIB@%$MTSLIB%g

 s%@smtpservers@%$smtpservers%g
 s%@CC@%$CC%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@smtpservers@%$smtpservers%g
 s%@CC@%$CC%g
 s%@SET_MAKE@%$SET_MAKE%g

diff --git a/configure.in b/configure.in
index a60920a..a3d3386 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -121,24 +121,19 @@ fi
 dnl What method of posting should post use?
 undefine([mts])dnl
 AC_ARG_WITH(mts,
 dnl What method of posting should post use?
 undefine([mts])dnl
 AC_ARG_WITH(mts,

-[  --with-mts=MTS          specify the mail transport agent/service])
+[  --with-mts=MTS          specify the default mail transport agent/service])

 
 if test x"$with_mts" = x"smtp"; then
   MTS="smtp"
 
 if test x"$with_mts" = x"smtp"; then
   MTS="smtp"

-  MTSLIB="mts/smtp/libsmtp.a"
-  AC_DEFINE(SMTPMTS)dnl

 elif test x"$with_mts" = x"sendmail"; then
   MTS="sendmail"
 elif test x"$with_mts" = x"sendmail"; then
   MTS="sendmail"

-  MTSLIB="mts/sendmail/libsend.a"
-  AC_DEFINE(SENDMTS)dnl

 else
   MTS="smtp"
 else
   MTS="smtp"

-  MTSLIB="mts/smtp/libsmtp.a"
-  AC_DEFINE(SMTPMTS)dnl

 fi
 fi

-

 AC_SUBST(MTS)dnl
 AC_SUBST(MTS)dnl

-AC_SUBST(MTSLIB)dnl
+
+dnl Both the smtp and sendmail mail transport services use the smtp code
+AC_DEFINE(SMTPMTS)dnl

 
 dnl What should be the default pager?
 undefine([pager])dnl
 
 dnl What should be the default pager?
 undefine([pager])dnl

@@ -264,7 +259,9 @@ AC_CACHE_CHECK(whether tsort can deal with loops, nmh_cv_tsort_loop,
     nmh_cv_tsort_loop=yes
   fi])
 if test x$nmh_cv_tsort_loop = xno ; then
     nmh_cv_tsort_loop=yes
   fi])
 if test x$nmh_cv_tsort_loop = xno ; then

+  LORDER=echo

   TSORT=cat
   TSORT=cat

+  AC_SUBST(LORDER)dnl

   AC_SUBST(TSORT)dnl
 fi
 
   AC_SUBST(TSORT)dnl
 fi
 

diff --git a/docs/FAQ b/docs/FAQ
index d463f78..99f6d1f 100644 (file)
--- a/docs/FAQ
+++ b/docs/FAQ
@@ -89,9 +89,8 @@
     The default setup for nmh is to use SMTP, so nmh should work with
     most MTA's that provide a standard SMTP connection on port 25.
     Also you may configure nmh to use a sendmail interface (still
     The default setup for nmh is to use SMTP, so nmh should work with
     most MTA's that provide a standard SMTP connection on port 25.
     Also you may configure nmh to use a sendmail interface (still

-    uses SMTP) by using the configure option --with-mts=sendmail.
-    There is also an option (--enable-pop) to include client-side
-    support for POP.
+    uses SMTP) by editing the mts.conf file.  There is also a configure
+    option (--enable-pop) to include client-side support for POP.

 
 13) Why does `folder' and `flist' overlook some of my subfolders?
 
 
 13) Why does `folder' and `flist' overlook some of my subfolders?
 

diff --git a/etc/Makefile.in b/etc/Makefile.in
index ebd93d3..c2645cb 100644 (file)
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -16,6 +16,7 @@ bindir      = @bindir@
 libdir      = @libdir@
 etcdir      = @sysconfdir@
 
 libdir      = @libdir@
 etcdir      = @sysconfdir@
 

+MTS         = @MTS@

 mailspool   = @mailspool@
 masquerade  = @masquerade@
 smtpservers = @smtpservers@
 mailspool   = @mailspool@
 masquerade  = @masquerade@
 smtpservers = @smtpservers@

@@ -75,7 +76,8 @@ mhn.defaults: $(srcdir)/mhn.defaults.sh $(MHNSEARCHPROG)
 
 mts.conf: $(srcdir)/mts.conf.in Makefile
        rm -f $@
 
 mts.conf: $(srcdir)/mts.conf.in Makefile
        rm -f $@

-       $(SED) -e 's,%mailspool%,$(mailspool),' \
+       $(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 > $@
               -e 's,%etcdir%,$(etcdir),' \
               -e 's,%masquerade%,$(masquerade),' \
               -e 's,%smtpservers%,$(smtpservers),' < $(srcdir)/mts.conf.in > $@

diff --git a/etc/mts.conf.in b/etc/mts.conf.in
index 16b5bab..c3c946d 100644 (file)
--- a/etc/mts.conf.in
+++ b/etc/mts.conf.in
@@ -5,6 +5,12 @@
 # all the available options for this file.
 #
 
 # all the available options for this file.
 #
 

+# The delivery method to use.  Supported values are `smtp' and `sendmail'.
+# When `smtp', nmh will open a socket connection to the mail port on the
+# machine specified below, and speak SMTP directly.
+# When `sendmail', nmh will pipe messages directly to the sendmail program.
+mts: %mts%
+

 # The exceptions file for /etc/hosts used by
 # `post' to try to find official names.
 hostable: %etcdir%/hosts
 # The exceptions file for /etc/hosts used by
 # `post' to try to find official names.
 hostable: %etcdir%/hosts

diff --git a/h/rcvmail.h b/h/rcvmail.h
index 856409e..c3a468c 100644 (file)
--- a/h/rcvmail.h
+++ b/h/rcvmail.h
@@ -5,14 +5,14 @@
  * $Id$
  */
 
  * $Id$
  */
 

-#if defined(SENDMTS) || defined(SMTPMTS)
+#if defined(SMTPMTS)

 # include <ctype.h>
 # include <errno.h>
 # include <setjmp.h>
 # include <stdio.h>
 # include <sys/types.h>
 # include <mts/smtp/smtp.h>
 # include <ctype.h>
 # include <errno.h>
 # include <setjmp.h>
 # include <stdio.h>
 # include <sys/types.h>
 # include <mts/smtp/smtp.h>

-#endif /* SENDMTS || SMTPMTS */
+#endif /* SMTPMTS */

 
 #ifdef MMDFMTS
 # include <mts/mmdf/util.h>
 
 #ifdef MMDFMTS
 # include <mts/mmdf/util.h>

@@ -20,10 +20,10 @@
 #endif /* MMDFMTS */
 
 
 #endif /* MMDFMTS */
 
 

-#if defined(SENDMTS) || defined(SMTPMTS)
+#if defined(SMTPMTS)

 # define RCV_MOK       0
 # define RCV_MBX       1
 # define RCV_MOK       0
 # define RCV_MBX       1

-#endif /* SENDMTS || SMTPMTS */
+#endif /* SMTPMTS */

 
 #ifdef MMDFI
 # define RCV_MOK       RP_MOK
 
 #ifdef MMDFI
 # define RCV_MOK       RP_MOK

diff --git a/man/mh-tailor.man b/man/mh-tailor.man
index 990e31c..b9f2560 100644 (file)
--- a/man/mh-tailor.man
+++ b/man/mh-tailor.man
@@ -27,6 +27,21 @@ default values and a description of their meanings are listed below:
 
 .in +.5i
 .ti -.5i
 
 .in +.5i
 .ti -.5i

+mts:
+.br
+The mail transport method to use.  The two acceptable options are \fBsmtp\fP
+(which is the default), and \fBsendmail\fP.
+
+If you use \fBsmtp\fP, this will enable a direct SMTP (simple mail transport
+protocol) interface in \fInmh\fR.  When sending mail, instead of passing the
+message to the mail transport agent, \fIpost\fR will open a socket connection
+to the mail port on the machine specified in the \fIservers\fR entry.
+
+If you use \fBsendmail\fP, then \fIpost\fR will send messages by forking a
+local copy of sendmail.  Currently it will still speak SMTP with this local
+copy of sendmail.
+
+.ti -.5i

 localname:
 .br
 The hostname \fInmh\fR considers local.  It should typically be a fully
 localname:
 .br
 The hostname \fInmh\fR considers local.  It should typically be a fully

@@ -176,8 +191,7 @@ This is useful for handling admin, dummy, and guest logins.
 
 .in -.5i
 .Uh "SMTP support"
 
 .in -.5i
 .Uh "SMTP support"

-These options are only available if you compiled \fInmh\fP with the
-\*(lq/smtp\*(rq support.
+These options are only available if you set \fImts\fR to \fBsmtp\fP.

 
 .in +.5i
 .ti -.5i
 
 .in +.5i
 .ti -.5i

@@ -212,8 +226,7 @@ ignored (sorry, the interface went away under BIND).
 
 .in -.5i
 .Uh "SendMail"
 
 .in -.5i
 .Uh "SendMail"

-This option is only available if you compiled \fInmh\fP to use
-\fISendMail\fP as your delivery agent.
+This option is only available if you set \fImts\fR to \fBsendmail\fP.

 
 .in +.5i
 .ti -.5i
 
 .in +.5i
 .ti -.5i

diff --git a/mts/Makefile.in b/mts/Makefile.in
index 8627795..a8c5ee5 100644 (file)
--- a/mts/Makefile.in
+++ b/mts/Makefile.in
@@ -26,8 +26,8 @@ DIST = $(AUX)
 # subdirectories
 SUBDIRS = smtp sendmail mmdf
 
 # subdirectories
 SUBDIRS = smtp sendmail mmdf
 

-# mail transport agent we are using
-MTS = @MTS@
+# mail transport agent we are using (currently always smtp)
+MTS = smtp

 
 # ========= DEPENDENCIES FOR BUILDING AND INSTALLING ==========
 
 
 # ========= DEPENDENCIES FOR BUILDING AND INSTALLING ==========
 

diff --git a/mts/sendmail/hosts.c b/mts/sendmail/hosts.c
index 0bc7532..83727d5 100644 (file)
--- a/mts/sendmail/hosts.c
+++ b/mts/sendmail/hosts.c
@@ -57,12 +57,13 @@ OfficialName (char *name)
     }
     if (hosts.h_name || init_hs ()) {
        for (h = hosts.h_next; h; h = h->h_next)
     }
     if (hosts.h_name || init_hs ()) {
        for (h = hosts.h_next; h; h = h->h_next)

-           if (!strcasecmp (h->h_name, q))
+           if (!strcasecmp (h->h_name, q)) {

                return h->h_name;
                return h->h_name;

-           else
+           } else {

                for (r = h->h_aliases; *r; r++)
                    if (!strcasecmp (*r, q))
                        return h->h_name;
                for (r = h->h_aliases; *r; r++)
                    if (!strcasecmp (*r, q))
                        return h->h_name;

+           }

     }
 
     strncpy (buffer, site, sizeof(buffer));
     }
 
     strncpy (buffer, site, sizeof(buffer));

diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
index 025bb96..c8fb554 100644 (file)
--- a/mts/smtp/smtp.c
+++ b/mts/smtp/smtp.c
@@ -14,8 +14,6 @@
 #include <errno.h>
 #endif
 
 #include <errno.h>
 #endif
 

-
-

 /*
  * This module implements an interface to SendMail very similar
  * to the MMDF mm_(3) routines.  The sm_() routines herein talk
 /*
  * This module implements an interface to SendMail very similar
  * to the MMDF mm_(3) routines.  The sm_() routines herein talk

@@ -44,6 +42,8 @@
 #define        TRUE    1
 #define        FALSE   0
 
 #define        TRUE    1
 #define        FALSE   0
 

+#define        NBITS ((sizeof (int)) * 8)
+

 /*
  * these codes must all be different!
  */
 /*
  * these codes must all be different!
  */

@@ -60,6 +60,7 @@
 
 static int sm_addrs = 0;
 static int sm_alarmed = 0;
 
 static int sm_addrs = 0;
 static int sm_alarmed = 0;

+static int sm_child = NOTOK;

 static int sm_debug = 0;
 static int sm_nl = TRUE;
 static int sm_verbose = 0;
 static int sm_debug = 0;
 static int sm_nl = TRUE;
 static int sm_verbose = 0;

@@ -77,7 +78,6 @@ static char *sm_moreply = "; ";
 
 struct smtp sm_reply;          /* global... */
 
 
 struct smtp sm_reply;          /* global... */
 

-

 #define        MAXEHLO 20
 
 static int doingEHLO;
 #define        MAXEHLO 20
 
 static int doingEHLO;

@@ -86,6 +86,9 @@ char *EHLOkeys[MAXEHLO + 1];
 /*
  * static prototypes
  */
 /*
  * static prototypes
  */

+static int smtp_init (char *, char *, int, int, int, int, int);
+static int sendmail_init (char *, char *, int, int, int, int, int);
+

 static int rclient (char *, char *, char *);
 static int sm_ierror (char *fmt, ...);
 static int smtalk (int time, char *fmt, ...);
 static int rclient (char *, char *, char *);
 static int sm_ierror (char *fmt, ...);
 static int smtalk (int time, char *fmt, ...);

@@ -114,6 +117,18 @@ int
 sm_init (char *client, char *server, int watch, int verbose,
          int debug, int onex, int queued)
 {
 sm_init (char *client, char *server, int watch, int verbose,
          int debug, int onex, int queued)
 {

+    if (sm_mts == MTS_SMTP)
+       return smtp_init (client, server, watch, verbose,
+                         debug, onex, queued);
+    else
+       return sendmail_init (client, server, watch, verbose,
+                             debug, onex, queued);
+}
+
+static int
+smtp_init (char *client, char *server, int watch, int verbose,
+           int debug, int onex, int queued)
+{

     int result, sd1, sd2;
 
     if (watch)
     int result, sd1, sd2;
 
     if (watch)

@@ -223,6 +238,138 @@ send_options: ;
     return RP_OK;
 }
 
     return RP_OK;
 }
 

+int
+sendmail_init (char *client, char *server, int watch, int verbose,
+               int debug, int onex, int queued)
+{
+    int i, result, vecp;
+    int pdi[2], pdo[2];
+    char *vec[15];
+
+    if (watch)
+       verbose = TRUE;
+
+    sm_verbose = verbose;
+    sm_debug = debug;
+    if (sm_rfp != NULL && sm_wfp != NULL)
+       return RP_OK;
+
+    if (client == NULL || *client == '\0') {
+       if (clientname)
+           client = clientname;
+       else
+           client = LocalName();       /* no clientname -> LocalName */
+    }
+
+#ifdef ZMAILER
+    if (client == NULL || *client == '\0')
+       client = "localhost";
+#endif
+
+    if (pipe (pdi) == NOTOK)
+       return sm_ierror ("no pipes");
+    if (pipe (pdo) == NOTOK) {
+       close (pdi[0]);
+       close (pdi[1]);
+       return sm_ierror ("no pipes");
+    }
+
+    for (i = 0; (sm_child = fork ()) == NOTOK && i < 5; i++)
+       sleep (5);
+
+    switch (sm_child) {
+       case NOTOK: 
+           close (pdo[0]);
+           close (pdo[1]);
+           close (pdi[0]);
+           close (pdi[1]);
+           return sm_ierror ("unable to fork");
+
+       case OK: 
+           if (pdo[0] != fileno (stdin))
+               dup2 (pdo[0], fileno (stdin));
+           if (pdi[1] != fileno (stdout))
+               dup2 (pdi[1], fileno (stdout));
+           if (pdi[1] != fileno (stderr))
+               dup2 (pdi[1], fileno (stderr));
+           for (i = fileno (stderr) + 1; i < NBITS; i++)
+               close (i);
+
+           vecp = 0;
+           vec[vecp++] = r1bindex (sendmail, '/');
+           vec[vecp++] = "-bs";
+#ifndef ZMAILER
+           vec[vecp++] = watch ? "-odi" : queued ? "-odq" : "-odb";
+           vec[vecp++] = "-oem";
+           vec[vecp++] = "-om";
+# ifndef RAND
+           if (verbose)
+               vec[vecp++] = "-ov";
+# endif /* not RAND */
+#endif /* not ZMAILER */
+           vec[vecp++] = NULL;
+
+           setgid (getegid ());
+           setuid (geteuid ());
+           execvp (sendmail, vec);
+           fprintf (stderr, "unable to exec ");
+           perror (sendmail);
+           _exit (-1);         /* NOTREACHED */
+
+       default: 
+           SIGNAL (SIGALRM, alrmser);
+           SIGNAL (SIGPIPE, SIG_IGN);
+
+           close (pdi[1]);
+           close (pdo[0]);
+           if ((sm_rfp = fdopen (pdi[0], "r")) == NULL
+                   || (sm_wfp = fdopen (pdo[1], "w")) == NULL) {
+               close (pdi[0]);
+               close (pdo[1]);
+               sm_rfp = sm_wfp = NULL;
+               return sm_ierror ("unable to fdopen");
+           }
+           sm_alarmed = 0;
+           alarm (SM_OPEN);
+           result = smhear ();
+           alarm (0);
+           switch (result) {
+               case 220: 
+                   break;
+
+               default: 
+                   sm_end (NOTOK);
+                   return RP_RPLY;
+           }
+
+           if (client && *client) {
+               doingEHLO = 1;
+               result = smtalk (SM_HELO, "EHLO %s", client);
+               doingEHLO = 0;
+
+               if (500 <= result && result <= 599)
+                   result = smtalk (SM_HELO, "HELO %s", client);
+
+               switch (result) {
+                   case 250:
+                       break;
+
+                   default:
+                       sm_end (NOTOK);
+                       return RP_RPLY;
+               }
+           }
+
+#ifndef ZMAILER
+           if (onex)
+               smtalk (SM_HELO, "ONEX");
+#endif
+           if (watch)
+               smtalk (SM_HELO, "VERB on");
+
+           return RP_OK;
+    }
+}

 
 #ifdef MPOP
 # define MAXARGS  1000
 
 #ifdef MPOP
 # define MAXARGS  1000

@@ -435,6 +582,17 @@ sm_end (int type)
     int status;
     struct smtp sm_note;
 
     int status;
     struct smtp sm_note;
 

+    if (sm_mts == MTS_SENDMAIL) {
+       switch (sm_child) {
+           case NOTOK: 
+           case OK: 
+               return RP_OK;
+
+           default: 
+               break;
+       }
+    }
+

     if (sm_rfp == NULL && sm_wfp == NULL)
        return RP_OK;
 
     if (sm_rfp == NULL && sm_wfp == NULL)
        return RP_OK;
 

@@ -449,7 +607,13 @@ sm_end (int type)
        case DONE: 
            if (smtalk (SM_RSET, "RSET") == 250 && type == DONE)
                return RP_OK;
        case DONE: 
            if (smtalk (SM_RSET, "RSET") == 250 && type == DONE)
                return RP_OK;

-           smtalk (SM_QUIT, "QUIT");
+           if (sm_mts == MTS_SMTP)
+               smtalk (SM_QUIT, "QUIT");
+           else {
+               kill (sm_child, SIGKILL);
+               discard (sm_rfp);
+               discard (sm_wfp);
+           }

            if (type == NOTOK) {
                sm_reply.code = sm_note.code;
                strncpy (sm_reply.text, sm_note.text, sm_reply.length = sm_note.length);
            if (type == NOTOK) {
                sm_reply.code = sm_note.code;
                strncpy (sm_reply.text, sm_note.text, sm_reply.length = sm_note.length);

@@ -480,7 +644,13 @@ sm_end (int type)
        alarm (0);
     }
 
        alarm (0);
     }
 

-    status = 0;
+    if (sm_mts == MTS_SMTP)
+       status = 0;
+    else {
+       status = pidwait (sm_child, OK);
+       sm_child = NOTOK;
+    }
+

     sm_rfp = sm_wfp = NULL;
     return (status ? RP_BHST : RP_OK);
 }
     sm_rfp = sm_wfp = NULL;
     return (status ? RP_BHST : RP_OK);
 }

@@ -871,7 +1041,7 @@ smtalk (int time, char *fmt, ...)
 
 #ifdef MPOP
     if (sm_ispool) {
 
 #ifdef MPOP
     if (sm_ispool) {

-       char    file[BUFSIZ];
+       char file[BUFSIZ];

 
        if (strcmp (buffer, ".") == 0)
            time = SM_DOT;
 
        if (strcmp (buffer, ".") == 0)
            time = SM_DOT;

@@ -888,7 +1058,7 @@ smtalk (int time, char *fmt, ...)
                    char *bp;
 
                    snprintf (sm_reply.text, sizeof(sm_reply.text),
                    char *bp;
 
                    snprintf (sm_reply.text, sizeof(sm_reply.text),

-                           "error renaming %s to %s: ", sm_tmpfil, file);
+                       "error renaming %s to %s: ", sm_tmpfil, file);

                    bp = sm_reply.text;
                    len = strlen (bp);
                    bp += len;
                    bp = sm_reply.text;
                    len = strlen (bp);
                    bp += len;

@@ -1125,9 +1295,10 @@ again: ;
 
        if ((i = min (bc, rc)) > 0) {
            strncpy (rp, bp, i);
 
        if ((i = min (bc, rc)) > 0) {
            strncpy (rp, bp, i);

-           rp += i, rc -= i;
+           rp += i;
+           rc -= i;

            if (more && rc > strlen (sm_moreply) + 1) {
            if (more && rc > strlen (sm_moreply) + 1) {

-               strcpy (sm_reply.text + rc, sm_moreply);
+               strncpy (sm_reply.text + rc, sm_moreply, sizeof(sm_reply.text) - rc);

                rc += strlen (sm_moreply);
            }
        }
                rc += strlen (sm_moreply);
            }
        }

@@ -1175,11 +1346,18 @@ sm_rrecord (char *buffer, int *len)
 static int
 sm_rerror (void)
 {
 static int
 sm_rerror (void)
 {

-    sm_reply.length =
-       strlen (strcpy (sm_reply.text, sm_rfp == NULL ? "no socket opened"
-           : sm_alarmed ? "read from socket timed out"
-           : feof (sm_rfp) ? "premature end-of-file on socket"
-           : "error reading from socket"));
+    if (sm_mts == MTS_SMTP)
+       sm_reply.length =
+           strlen (strcpy (sm_reply.text, sm_rfp == NULL ? "no socket opened"
+               : sm_alarmed ? "read from socket timed out"
+               : feof (sm_rfp) ? "premature end-of-file on socket"
+               : "error reading from socket"));
+    else
+       sm_reply.length =
+           strlen (strcpy (sm_reply.text, sm_rfp == NULL ? "no pipe opened"
+               : sm_alarmed ? "read from pipe timed out"
+               : feof (sm_rfp) ? "premature end-of-file on pipe"
+               : "error reading from pipe"));

 
     return (sm_reply.code = NOTOK);
 }
 
     return (sm_reply.code = NOTOK);
 }

diff --git a/stamp-h.in b/stamp-h.in
index 1a20c5c..a26a0b8 100644 (file)
--- a/stamp-h.in
+++ b/stamp-h.in
@@ -1 +1 @@
-Wed Jun  7 18:41:39 CEST 2000
+Sat Jun 10 18:20:50 CEST 2000

diff --git a/uip/Makefile.in b/uip/Makefile.in
index b1e3950..a562ad2 100644 (file)
--- a/uip/Makefile.in
+++ b/uip/Makefile.in
@@ -24,10 +24,10 @@ INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir) $(HESIOD_INCLUDES)
 LDFLAGS  = @LDFLAGS@
 
 LIBS     = @LIBS@
 LDFLAGS  = @LDFLAGS@
 
 LIBS     = @LIBS@

-MTSLIB   = @MTSLIB@
+MTSLIB   = ../mts/smtp/libsmtp.a

 KRB4_LIBS = @KRB4_LIBS@
 HESIOD_LIBS = @HESIOD_LIBS@
 KRB4_LIBS = @KRB4_LIBS@
 HESIOD_LIBS = @HESIOD_LIBS@

-LOCALLIBS = ../config/version.o ../config/config.o ../sbr/libmh.a ../$(MTSLIB) ../zotnet/libzot.a
+LOCALLIBS = ../config/version.o ../config/config.o ../sbr/libmh.a $(MTSLIB) ../zotnet/libzot.a

 LINKLIBS = $(LOCALLIBS) $(KRB4_LIBS) $(HESIOD_LIBS) $(LIBS)
 
 LINT   = @LINT@
 LINKLIBS = $(LOCALLIBS) $(KRB4_LIBS) $(HESIOD_LIBS) $(LIBS)
 
 LINT   = @LINT@

@@ -80,7 +80,7 @@ SRCS = ali.c aliasbr.c anno.c annosbr.c ap.c burst.c comp.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 packf.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 packf.c \

-       pick.c picksbr.c popi.c popsbr.c post.c prompter.c rcvdist.c rcvpack.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 \
        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 \

diff --git a/uip/post.c b/uip/post.c
index d0d750c..a866703 100644 (file)
--- a/uip/post.c
+++ b/uip/post.c
@@ -36,15 +36,7 @@
 # include <mts/mmdf/mmdf.h>
 #endif
 
 # include <mts/mmdf/mmdf.h>
 #endif
 

-/*
- * Currently smtp and sendmail use
- * the same interface for posting.
- */

 #ifdef SMTPMTS
 #ifdef SMTPMTS

-# define SENDMTS
-#endif
-
-#ifdef SENDMTS

 # include <mts/smtp/smtp.h>
 #endif
 
 # include <mts/smtp/smtp.h>
 #endif
 

@@ -267,14 +259,14 @@ static char *submitmode = "m";            /* deliver to mailbox only    */
 static char submitopts[6] = "vl";      /* initial options for submit */
 #endif /* MMDFMTS */
 
 static char submitopts[6] = "vl";      /* initial options for submit */
 #endif /* MMDFMTS */
 

-#ifdef SENDMTS
+#ifdef SMTPMTS

 static int snoop      = 0;
 static int smtpmode   = S_MAIL;
 static char *clientsw = NULL;
 static char *serversw = NULL;
 
 extern struct smtp sm_reply;
 static int snoop      = 0;
 static int smtpmode   = S_MAIL;
 static char *clientsw = NULL;
 static char *serversw = NULL;
 
 extern struct smtp sm_reply;

-#endif /* SENDMTS */
+#endif /* SMTPMTS */

 
 static char prefix[] = "----- =_aaaaaaaaaa";
 
 
 static char prefix[] = "----- =_aaaaaaaaaa";
 

@@ -475,7 +467,7 @@ main (int argc, char **argv)
                        adios (NULL, "missing argument to %s", argp[-2]);
                    continue;
 
                        adios (NULL, "missing argument to %s", argp[-2]);
                    continue;
 

-#ifndef        SENDMTS
+#ifndef        SMTPMTS

                case CLIESW:
                case SERVSW:
                    if (!(cp = *argp++) || *cp == '-')
                case CLIESW:
                case SERVSW:
                    if (!(cp = *argp++) || *cp == '-')

@@ -484,7 +476,7 @@ main (int argc, char **argv)
 
                case SNOOPSW:
                    continue;
 
                case SNOOPSW:
                    continue;

-#else /* SENDMTS */
+#else /* SMTPMTS */

                case MAILSW:
                    smtpmode = S_MAIL;
                    continue;
                case MAILSW:
                    smtpmode = S_MAIL;
                    continue;

@@ -508,7 +500,7 @@ main (int argc, char **argv)
                case SNOOPSW:
                    snoop++;
                    continue;
                case SNOOPSW:
                    snoop++;
                    continue;

-#endif /* SENDMTS */
+#endif /* SMTPMTS */

 
                case FILLSW:
                    if (!(fill_in = *argp++) || *fill_in == '-')
 
                case FILLSW:
                    if (!(fill_in = *argp++) || *fill_in == '-')

@@ -1378,10 +1370,10 @@ do_addresses (int bccque, int talk)
        die (NULL, "problem ending addresses [%s]\n", rp_valstr (retval));
 #endif /* MMDFMTS */
 
        die (NULL, "problem ending addresses [%s]\n", rp_valstr (retval));
 #endif /* MMDFMTS */
 

-#ifdef SENDMTS
+#ifdef SMTPMTS

     if (rp_isbad (retval = sm_waend ()))
        die (NULL, "problem ending addresses; %s", rp_string (retval));
     if (rp_isbad (retval = sm_waend ()))
        die (NULL, "problem ending addresses; %s", rp_string (retval));

-#endif /* SENDMTS */
+#endif /* SMTPMTS */

 }
 
 
 }
 
 

@@ -1394,7 +1386,7 @@ do_addresses (int bccque, int talk)
  * SENDMAIL/SMTP routines
  */
 
  * SENDMAIL/SMTP routines
  */
 

-#ifdef SENDMTS
+#ifdef SMTPMTS

 
 static void
 post (char *file, int bccque, int talk)
 
 static void
 post (char *file, int bccque, int talk)

@@ -1577,7 +1569,7 @@ do_text (char *file, int fd)
     }
 }
 
     }
 }
 

-#endif /* SENDMTS */
+#endif /* SMTPMTS */

 
 /*
  * MMDF routines
 
 /*
  * MMDF routines

@@ -1870,10 +1862,10 @@ sigser (int i)
        mm_end (NOTOK);
 #endif /* MMDFMTS */
 
        mm_end (NOTOK);
 #endif /* MMDFMTS */
 

-#ifdef SENDMTS
+#ifdef SMTPMTS

     if (!whomsw || checksw)
        sm_end (NOTOK);
     if (!whomsw || checksw)
        sm_end (NOTOK);

-#endif /* SENDMTS */
+#endif /* SMTPMTS */

 
     done (1);
 }
 
     done (1);
 }

@@ -1994,10 +1986,10 @@ die (char *what, char *fmt, ...)
        mm_end (NOTOK);
 #endif /* MMDFMTS */
 
        mm_end (NOTOK);
 #endif /* MMDFMTS */
 

-#ifdef SENDMTS
+#ifdef SMTPMTS

     if (!whomsw || checksw)
        sm_end (NOTOK);
     if (!whomsw || checksw)
        sm_end (NOTOK);

-#endif /* SENDMTS */
+#endif /* SMTPMTS */

 
     va_start(ap, fmt);
     advertise (what, NULL, fmt, ap);
 
     va_start(ap, fmt);
     advertise (what, NULL, fmt, ap);

diff --git a/zotnet/mts/mts.c b/zotnet/mts/mts.c
index 3b0b180..7d9b718 100644 (file)
--- a/zotnet/mts/mts.c
+++ b/zotnet/mts/mts.c
@@ -66,11 +66,12 @@ static boolean  mmailid_masquerading = FALSE;
        boolean  username_extension_masquerading = FALSE;  /* " from addrsbr.c */
 static char*    masquerade = "";
 
        boolean  username_extension_masquerading = FALSE;  /* " from addrsbr.c */
 static char*    masquerade = "";
 

-

 /*
  * MTS specific variables
  */
 /*
  * MTS specific variables
  */

-#if defined(SENDMTS) || defined(SMTPMTS)
+#if defined(SMTPMTS)
+static char *sm_method = "smtp";
+int  sm_mts    = MTS_SMTP;

 char *hostable = nmhetcdir(/hosts);
 char *sendmail = SENDMAILPATH;
 #endif
 char *hostable = nmhetcdir(/hosts);
 char *sendmail = SENDMAILPATH;
 #endif

@@ -132,12 +133,10 @@ static struct bind binds[] = {
     { "mmdelim2", &mmdlm2 },
     { "masquerade", &masquerade },
 
     { "mmdelim2", &mmdlm2 },
     { "masquerade", &masquerade },
 

-#if defined(SENDMTS) || defined(SMTPMTS)
-    { "hostable", &hostable },
-#endif
-
-#ifdef SENDMTS
-    { "sendmail", &sendmail },
+#if defined(SMTPMTS)
+    { "mts",      &sm_method },
+    { "hostable", &hostable  },
+    { "sendmail", &sendmail  },

 #endif
 
     { "clientname",  &clientname },
 #endif
 
     { "clientname",  &clientname },

@@ -209,6 +208,17 @@ mts_init (char *name)
 
     if (strstr(masquerade, "username_extension") != NULL)
        username_extension_masquerading = TRUE;
 
     if (strstr(masquerade, "username_extension") != NULL)
        username_extension_masquerading = TRUE;

+
+#ifdef SMTPMTS
+    if (strcmp(sm_method, "smtp") == 0)
+        sm_mts = MTS_SMTP;
+    else if (strcmp(sm_method, "sendmail") == 0)
+        sm_mts = MTS_SENDMAIL;
+    else {
+        advise(NULL, "unsupported \"mts\" value in mts.conf: %s", sm_method);
+        sm_mts = MTS_SMTP;
+    }
+#endif

 }
 
 
 }
 
 

diff --git a/zotnet/mts/mts.h b/zotnet/mts/mts.h
index 66aa590..ce063d9 100644 (file)
--- a/zotnet/mts/mts.h
+++ b/zotnet/mts/mts.h
@@ -44,7 +44,13 @@ void mts_init (char *);
 /*
  * MTS specific variables
  */
 /*
  * MTS specific variables
  */

-#if defined(SENDMTS) || defined (SMTPMTS)
+#if defined (SMTPMTS)
+
+/* whether to speak SMTP to localhost:25 or to /usr/sbin/sendmail */
+#define MTS_SMTP     0
+#define MTS_SENDMAIL 1
+extern int sm_mts;
+

 extern char *hostable;
 extern char *sendmail;
 #endif
 extern char *hostable;
 extern char *sendmail;
 #endif