diff -u -r zmailer-2.99.46rel/ChangeLog zmailer-2.99.46p1/ChangeLog
--- zmailer-2.99.46rel/ChangeLog        Thu Feb  6 19:39:54 1997
+++ zmailer-2.99.46p1/ChangeLog Sat Feb  8 00:38:33 1997
@@ -1,3 +1,12 @@
+Sat Feb  8 00:19:06 1997  Matti Aarnio  <[email protected]>
+
+       * compat/sendmail/sendmail.c, configure.in, lib/esyslib.c,
+         libs/Makefile.in, router/rfc822.c, smtpserver/relaytest.c,
+         smtpserver/relaytest.h, smtpserver/smtpserver.c,
+         utils/makendbm/makendbm.c, proto/scheduler.conf, ChangeLog:
+           A heap of "minor" fixes to all around to improve this
+           compilability in various systems besides my RedHat Linuxes.
+
Thu Feb  6 19:00:24 1997  Matti Aarnio  <[email protected]>

       * Makefile.in:
@@ -8,7 +17,7 @@
           To provide support for having an alias entry like this:
               "The Space Head": st-tng

-Wed Feb  5 10:02:20 1997  Caldera Desktop User  <[email protected]>
+Wed Feb  5 10:02:20 1997  Matti Aarnio  <[email protected]>

       * utils/makendbm/makendbm.c:
           Runtime option (switch)  -a  to process alias-like input
diff -u -r zmailer-2.99.46rel/compat/sendmail/sendmail.c zmailer-2.99.46p1/compat/sendmail/sendmail.c
--- zmailer-2.99.46rel/compat/sendmail/sendmail.c       Wed Feb  5 10:00:09 1997
+++ zmailer-2.99.46p1/compat/sendmail/sendmail.c        Fri Feb  7 21:50:14 1997
@@ -692,7 +692,7 @@
       char *addr, *notify;
{
       char *copy = NULL, *printme = addr, *from, *to;
-       char *s, newcp = NULL;
+       char *s, *newcp = NULL;

       if (addr == NULL) {
         fprintf(stderr, "sendmail: Argument botch: NULL address\n");
diff -u -r zmailer-2.99.46rel/configure zmailer-2.99.46p1/configure
--- zmailer-2.99.46rel/configure        Thu Feb  6 08:56:17 1997
+++ zmailer-2.99.46p1/configure Fri Feb  7 23:43:57 1997
@@ -1334,12 +1334,43 @@
else
  echo "$ac_t""no" 1>&6
fi
+# Extract the first word of "ld", so it can be a program name with args.
+set dummy ld; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1341: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$LD" in
+  /*)
+  ac_cv_path_LD="$LD" # Let the user override the test with a path.
+  ;;
+  *)
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_LD="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_LD" && ac_cv_path_LD="ld"
+  ;;
+esac
+fi
+LD="$ac_cv_path_LD"
+if test -n "$LD"; then
+  echo "$ac_t""$LD" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
for ac_prog in 'bison -y' byacc
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
-echo "configure:1343: checking for $ac_word" >&5
+echo "configure:1374: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1369,7 +1400,7 @@
test -n "$YACC" || YACC="yacc"

echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1373: checking whether ln -s works" >&5
+echo "configure:1404: checking whether ln -s works" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1390,9 +1421,9 @@
fi

echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:1394: checking for AIX" >&5
+echo "configure:1425: checking for AIX" >&5
cat > conftest.$ac_ext <<EOF
-#line 1396 "configure"
+#line 1427 "configure"
#include "confdefs.h"
#ifdef _AIX
  yes
@@ -1415,17 +1446,17 @@

ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6
-echo "configure:1419: checking for minix/config.h" >&5
+echo "configure:1450: checking for minix/config.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
-#line 1424 "configure"
+#line 1455 "configure"
#include "confdefs.h"
#include <minix/config.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1429: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1460: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
  rm -rf conftest*
@@ -1463,7 +1494,7 @@
fi

echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
-echo "configure:1467: checking for POSIXized ISC" >&5
+echo "configure:1498: checking for POSIXized ISC" >&5
if test -d /etc/conf/kconfig.d &&
  grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
then
@@ -1484,19 +1515,19 @@
fi

echo $ac_n "checking whether sys/types.h defines makedev""... $ac_c" 1>&6
-echo "configure:1488: checking whether sys/types.h defines makedev" >&5
+echo "configure:1519: checking whether sys/types.h defines makedev" >&5
if eval "test \"`echo '$''{'ac_cv_header_sys_types_h_makedev'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  cat > conftest.$ac_ext <<EOF
-#line 1493 "configure"
+#line 1524 "configure"
#include "confdefs.h"
#include <sys/types.h>
int main() {
return makedev(0, 0);
; return 0; }
EOF
-if { (eval echo configure:1500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  ac_cv_header_sys_types_h_makedev=yes
else
@@ -1514,17 +1545,17 @@
if test $ac_cv_header_sys_types_h_makedev = no; then
ac_safe=`echo "sys/mkdev.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for sys/mkdev.h""... $ac_c" 1>&6
-echo "configure:1518: checking for sys/mkdev.h" >&5
+echo "configure:1549: checking for sys/mkdev.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
-#line 1523 "configure"
+#line 1554 "configure"
#include "confdefs.h"
#include <sys/mkdev.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1528: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1559: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
  rm -rf conftest*
@@ -1552,17 +1583,17 @@
  if test $ac_cv_header_sys_mkdev_h = no; then
ac_safe=`echo "sys/sysmacros.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for sys/sysmacros.h""... $ac_c" 1>&6
-echo "configure:1556: checking for sys/sysmacros.h" >&5
+echo "configure:1587: checking for sys/sysmacros.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
-#line 1561 "configure"
+#line 1592 "configure"
#include "confdefs.h"
#include <sys/sysmacros.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1566: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1597: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
  rm -rf conftest*
@@ -1591,7 +1622,7 @@


echo $ac_n "checking size of void *""... $ac_c" 1>&6
-echo "configure:1595: checking size of void *" >&5
+echo "configure:1626: checking size of void *" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_void_p'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1599,7 +1630,7 @@
    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
  cat > conftest.$ac_ext <<EOF
-#line 1603 "configure"
+#line 1634 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -1610,7 +1641,7 @@
  exit(0);
}
EOF
-if { (eval echo configure:1614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
  ac_cv_sizeof_void_p=`cat conftestval`
else
@@ -1630,7 +1661,7 @@


echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:1634: checking size of long" >&5
+echo "configure:1665: checking size of long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1638,7 +1669,7 @@
    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
  cat > conftest.$ac_ext <<EOF
-#line 1642 "configure"
+#line 1673 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -1649,7 +1680,7 @@
  exit(0);
}
EOF
-if { (eval echo configure:1653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
  ac_cv_sizeof_long=`cat conftestval`
else
@@ -1669,7 +1700,7 @@


echo $ac_n "checking size of double""... $ac_c" 1>&6
-echo "configure:1673: checking size of double" >&5
+echo "configure:1704: checking size of double" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_double'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1677,7 +1708,7 @@
    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
  cat > conftest.$ac_ext <<EOF
-#line 1681 "configure"
+#line 1712 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -1688,7 +1719,7 @@
  exit(0);
}
EOF
-if { (eval echo configure:1692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
  ac_cv_sizeof_double=`cat conftestval`
else
@@ -1708,14 +1739,14 @@


echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:1712: checking whether byte ordering is bigendian" >&5
+echo "configure:1743: checking whether byte ordering is bigendian" >&5
if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  ac_cv_c_bigendian=unknown
# See if sys/param.h defines the BYTE_ORDER macro.
cat > conftest.$ac_ext <<EOF
-#line 1719 "configure"
+#line 1750 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
@@ -1726,11 +1757,11 @@
#endif
; return 0; }
EOF
-if { (eval echo configure:1730: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1761: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  # It does; now see whether it defined to BIG_ENDIAN or not.
cat > conftest.$ac_ext <<EOF
-#line 1734 "configure"
+#line 1765 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
@@ -1741,7 +1772,7 @@
#endif
; return 0; }
EOF
-if { (eval echo configure:1745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1776: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_c_bigendian=yes
else
@@ -1761,7 +1792,7 @@
    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
  cat > conftest.$ac_ext <<EOF
-#line 1765 "configure"
+#line 1796 "configure"
#include "confdefs.h"
main () {
  /* Are we little or big endian?  From Harbison&Steele.  */
@@ -1774,7 +1805,7 @@
  exit (u.c[sizeof (long) - 1] == 1);
}
EOF
-if { (eval echo configure:1778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
  ac_cv_c_bigendian=no
else
@@ -1798,21 +1829,21 @@
fi

echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:1802: checking for inline" >&5
+echo "configure:1833: checking for inline" >&5
if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
  cat > conftest.$ac_ext <<EOF
-#line 1809 "configure"
+#line 1840 "configure"
#include "confdefs.h"

int main() {
} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:1816: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_c_inline=$ac_kw; break
else
@@ -1981,7 +2012,7 @@
# Extract the first word of "inews", so it can be a program name with args.
set dummy inews; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1985: checking for $ac_word" >&5
+echo "configure:2016: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_INEWS'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2087,7 +2118,7 @@

if test -z "$use_rmailpath" ; then
  # Ok, no value given, make some guesses; /usr/bin ?? (last is default)
-  for RMAILDEF in /sbin/rmail usr/sbin/rmail /usr/bin/rmail /bin/rmail; do
+  for RMAILDEF in /sbin/rmail /usr/sbin/rmail /usr/bin/rmail /bin/rmail; do
    if test -x $RMAILDEF ; then
       break
    fi
@@ -2098,6 +2129,7 @@
fi
echo "$ac_t""Using ZMailer RMAILPATH: $RMAILPATH" 1>&6

+oldSELFADDRESSES="$SELFADDRESSES"

# Check whether --with-selfaddresses or --without-selfaddresses was given.
if test "${with_selfaddresses+set}" = set; then
@@ -2107,16 +2139,18 @@

if test "x$use_selfaddresses" != "x" ; then
    SELFADDRESSES="$withval"
+else
+    SELFADDRESSES="$oldSELFADDRESSES"
fi
echo "$ac_t""Using ZMailer SELFADDRESSES: $SELFADDRESSES" 1>&6

echo $ac_n "checking for res_init""... $ac_c" 1>&6
-echo "configure:2115: checking for res_init" >&5
+echo "configure:2149: checking for res_init" >&5
if eval "test \"`echo '$''{'ac_cv_func_res_init'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  cat > conftest.$ac_ext <<EOF
-#line 2120 "configure"
+#line 2154 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char res_init(); below.  */
@@ -2139,7 +2173,7 @@

; return 0; }
EOF
-if { (eval echo configure:2143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  eval "ac_cv_func_res_init=yes"
else
@@ -2245,12 +2279,12 @@
#fi

echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:2249: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:2283: 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
-#line 2254 "configure"
+#line 2288 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/wait.h>
@@ -2266,7 +2300,7 @@
s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
; return 0; }
EOF
-if { (eval echo configure:2270: \"$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_sys_wait_h=yes
else
@@ -2287,7 +2321,7 @@
fi

echo $ac_n "checking for wait3 that fills in rusage""... $ac_c" 1>&6
-echo "configure:2291: checking for wait3 that fills in rusage" >&5
+echo "configure:2325: checking for wait3 that fills in rusage" >&5
if eval "test \"`echo '$''{'ac_cv_func_wait3_rusage'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2295,7 +2329,7 @@
  ac_cv_func_wait3_rusage=no
else
  cat > conftest.$ac_ext <<EOF
-#line 2299 "configure"
+#line 2333 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@@ -2326,7 +2360,7 @@
  }
}
EOF
-if { (eval echo configure:2330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
  ac_cv_func_wait3_rusage=yes
else
@@ -2351,12 +2385,12 @@
for ac_func in waitpid wait4
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2355: checking for $ac_func" >&5
+echo "configure:2389: 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
-#line 2360 "configure"
+#line 2394 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func(); below.  */
@@ -2379,7 +2413,7 @@

; return 0; }
EOF
-if { (eval echo configure:2383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  eval "ac_cv_func_$ac_func=yes"
else
@@ -2407,12 +2441,12 @@

# things get pretty tought, if the dup2() is not available ...
echo $ac_n "checking for dup2""... $ac_c" 1>&6
-echo "configure:2411: checking for dup2" >&5
+echo "configure:2445: checking for dup2" >&5
if eval "test \"`echo '$''{'ac_cv_func_dup2'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  cat > conftest.$ac_ext <<EOF
-#line 2416 "configure"
+#line 2450 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char dup2(); below.  */
@@ -2435,7 +2469,7 @@

; return 0; }
EOF
-if { (eval echo configure:2439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  eval "ac_cv_func_dup2=yes"
else
@@ -2474,12 +2508,12 @@
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:2478: checking for $ac_hdr that defines DIR" >&5
+echo "configure:2512: 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
-#line 2483 "configure"
+#line 2517 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_hdr>
@@ -2487,7 +2521,7 @@
DIR *dirp = 0;
; return 0; }
EOF
-if { (eval echo configure:2491: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2525: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  eval "ac_cv_header_dirent_$ac_safe=yes"
else
@@ -2512,7 +2546,7 @@
# 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:2516: checking for opendir in -ldir" >&5
+echo "configure:2550: 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
@@ -2520,7 +2554,7 @@
  ac_save_LIBS="$LIBS"
LIBS="-ldir  $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2524 "configure"
+#line 2558 "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
@@ -2531,7 +2565,7 @@
opendir()
; return 0; }
EOF
-if { (eval echo configure:2535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2553,7 +2587,7 @@

else
echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:2557: checking for opendir in -lx" >&5
+echo "configure:2591: 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
@@ -2561,7 +2595,7 @@
  ac_save_LIBS="$LIBS"
LIBS="-lx  $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2565 "configure"
+#line 2599 "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
@@ -2572,7 +2606,7 @@
opendir()
; return 0; }
EOF
-if { (eval echo configure:2576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2595,7 +2629,7 @@
fi

echo $ac_n "checking whether closedir returns void""... $ac_c" 1>&6
-echo "configure:2599: checking whether closedir returns void" >&5
+echo "configure:2633: checking whether closedir returns void" >&5
if eval "test \"`echo '$''{'ac_cv_func_closedir_void'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2603,13 +2637,13 @@
  ac_cv_func_closedir_void=yes
else
  cat > conftest.$ac_ext <<EOF
-#line 2607 "configure"
+#line 2641 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_header_dirent>
int closedir(); main() { exit(closedir(opendir(".")) != 0); }
EOF
-if { (eval echo configure:2613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
  ac_cv_func_closedir_void=no
else
@@ -2633,12 +2667,12 @@


echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:2637: checking for uid_t in sys/types.h" >&5
+echo "configure:2671: 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
-#line 2642 "configure"
+#line 2676 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
@@ -2667,7 +2701,7 @@
fi

echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6
-echo "configure:2671: checking type of array argument to getgroups" >&5
+echo "configure:2705: checking type of array argument to getgroups" >&5
if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2675,7 +2709,7 @@
  ac_cv_type_getgroups=cross
else
  cat > conftest.$ac_ext <<EOF
-#line 2679 "configure"
+#line 2713 "configure"
#include "confdefs.h"

/* Thanks to Mike Rendell for this test.  */
@@ -2700,7 +2734,7 @@
}

EOF
-if { (eval echo configure:2704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
    ac_cv_type_getgroups=gid_t
else
@@ -2714,7 +2748,7 @@

if test $ac_cv_type_getgroups = cross; then
        cat > conftest.$ac_ext <<EOF
-#line 2718 "configure"
+#line 2752 "configure"
#include "confdefs.h"
#include <unistd.h>
EOF
@@ -2738,12 +2772,12 @@


echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2742: checking for ANSI C header files" >&5
+echo "configure:2776: 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
-#line 2747 "configure"
+#line 2781 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -2751,7 +2785,7 @@
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2789: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
  rm -rf conftest*
@@ -2768,7 +2802,7 @@
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 2772 "configure"
+#line 2806 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -2786,7 +2820,7 @@
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 2790 "configure"
+#line 2824 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -2807,7 +2841,7 @@
  :
else
  cat > conftest.$ac_ext <<EOF
-#line 2811 "configure"
+#line 2845 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -2818,7 +2852,7 @@
exit (0); }

EOF
-if { (eval echo configure:2822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
  :
else
@@ -2842,12 +2876,12 @@
fi

echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:2846: checking for mode_t" >&5
+echo "configure:2880: 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
-#line 2851 "configure"
+#line 2885 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -2875,12 +2909,12 @@
fi

echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:2879: checking for off_t" >&5
+echo "configure:2913: 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
-#line 2884 "configure"
+#line 2918 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -2908,12 +2942,12 @@
fi

echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:2912: checking return type of signal handlers" >&5
+echo "configure:2946: 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
-#line 2917 "configure"
+#line 2951 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
@@ -2930,7 +2964,7 @@
int i;
; return 0; }
EOF
-if { (eval echo configure:2934: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2968: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_type_signal=void
else
@@ -2949,12 +2983,12 @@


echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:2953: checking for size_t" >&5
+echo "configure:2987: 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
-#line 2958 "configure"
+#line 2992 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -2982,12 +3016,12 @@
fi

echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:2986: checking for uid_t in sys/types.h" >&5
+echo "configure:3020: 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
-#line 2991 "configure"
+#line 3025 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
@@ -3016,12 +3050,12 @@
fi

echo $ac_n "checking for ino_t""... $ac_c" 1>&6
-echo "configure:3020: checking for ino_t" >&5
+echo "configure:3054: checking for ino_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_ino_t'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  cat > conftest.$ac_ext <<EOF
-#line 3025 "configure"
+#line 3059 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -3050,12 +3084,12 @@


echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:3054: checking for working const" >&5
+echo "configure:3088: 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
-#line 3059 "configure"
+#line 3093 "configure"
#include "confdefs.h"

int main() {
@@ -3104,7 +3138,7 @@

; return 0; }
EOF
-if { (eval echo configure:3108: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_c_const=yes
else
@@ -3125,12 +3159,12 @@
fi

echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:3129: checking for ANSI C header files" >&5
+echo "configure:3163: 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
-#line 3134 "configure"
+#line 3168 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -3138,7 +3172,7 @@
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3142: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3176: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
  rm -rf conftest*
@@ -3155,7 +3189,7 @@
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 3159 "configure"
+#line 3193 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -3173,7 +3207,7 @@
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 3177 "configure"
+#line 3211 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -3194,7 +3228,7 @@
  :
else
  cat > conftest.$ac_ext <<EOF
-#line 3198 "configure"
+#line 3232 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -3205,7 +3239,7 @@
exit (0); }

EOF
-if { (eval echo configure:3209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
  :
else
@@ -3232,17 +3266,17 @@
# Timezones are always a pain in... everybody has their own ways :-(
ac_safe=`echo "sys/time.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for sys/time.h""... $ac_c" 1>&6
-echo "configure:3236: checking for sys/time.h" >&5
+echo "configure:3270: checking for sys/time.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
-#line 3241 "configure"
+#line 3275 "configure"
#include "confdefs.h"
#include <sys/time.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3246: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3280: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
  rm -rf conftest*
@@ -3264,12 +3298,12 @@
fi

echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:3268: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:3302: 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
-#line 3273 "configure"
+#line 3307 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@@ -3278,7 +3312,7 @@
struct tm *tp;
; return 0; }
EOF
-if { (eval echo configure:3282: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3316: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_header_time=yes
else
@@ -3299,12 +3333,12 @@
fi

echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:3303: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:3337: checking whether struct tm is in sys/time.h or time.h" >&5
if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  cat > conftest.$ac_ext <<EOF
-#line 3308 "configure"
+#line 3342 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <time.h>
@@ -3312,7 +3346,7 @@
struct tm *tp; tp->tm_sec;
; return 0; }
EOF
-if { (eval echo configure:3316: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3350: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_struct_tm=time.h
else
@@ -3333,12 +3367,12 @@
fi

echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
-echo "configure:3337: checking for tm_zone in struct tm" >&5
+echo "configure:3371: checking for tm_zone in struct tm" >&5
if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  cat > conftest.$ac_ext <<EOF
-#line 3342 "configure"
+#line 3376 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_cv_struct_tm>
@@ -3346,7 +3380,7 @@
struct tm tm; tm.tm_zone;
; return 0; }
EOF
-if { (eval echo configure:3350: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3384: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_struct_tm_zone=yes
else
@@ -3366,12 +3400,12 @@

else
  echo $ac_n "checking for tzname""... $ac_c" 1>&6
-echo "configure:3370: checking for tzname" >&5
+echo "configure:3404: checking for tzname" >&5
if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  cat > conftest.$ac_ext <<EOF
-#line 3375 "configure"
+#line 3409 "configure"
#include "confdefs.h"
#include <time.h>
#ifndef tzname /* For SGI.  */
@@ -3381,7 +3415,7 @@
atoi(*tzname);
; return 0; }
EOF
-if { (eval echo configure:3385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  ac_cv_var_tzname=yes
else
@@ -3407,12 +3441,12 @@


echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
-echo "configure:3411: checking for tm_gmtoff in struct tm" >&5
+echo "configure:3445: checking for tm_gmtoff in struct tm" >&5
if eval "test \"`echo '$''{'ac_cv_struct_tm_gmtoff'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  cat > conftest.$ac_ext <<EOF
-#line 3416 "configure"
+#line 3450 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_cv_struct_tm>
@@ -3420,7 +3454,7 @@
struct tm tm; tm.tm_gmtoff;
; return 0; }
EOF
-if { (eval echo configure:3424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3458: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_struct_tm_gmtoff=yes
else
@@ -3440,19 +3474,19 @@

else
  echo $ac_n "checking for altzone""... $ac_c" 1>&6
-echo "configure:3444: checking for altzone" >&5
+echo "configure:3478: checking for altzone" >&5
if eval "test \"`echo '$''{'ac_cv_var_altzone'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  cat > conftest.$ac_ext <<EOF
-#line 3449 "configure"
+#line 3483 "configure"
#include "confdefs.h"
#include <time.h>
int main() {
time_t tt = altzone;
; return 0; }
EOF
-if { (eval echo configure:3456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  ac_cv_var_altzone=yes
else
@@ -3466,19 +3500,19 @@

echo "$ac_t""$ac_cv_var_altzone" 1>&6
  echo $ac_n "checking for timezone""... $ac_c" 1>&6
-echo "configure:3470: checking for timezone" >&5
+echo "configure:3504: checking for timezone" >&5
if eval "test \"`echo '$''{'ac_cv_var_timezone'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  cat > conftest.$ac_ext <<EOF
-#line 3475 "configure"
+#line 3509 "configure"
#include "confdefs.h"
#include <time.h>
int main() {
time_t tt = timezone;
; return 0; }
EOF
-if { (eval echo configure:3482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  ac_cv_var_timezone=yes
else
@@ -3511,12 +3545,12 @@


echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6
-echo "configure:3515: checking for st_blocks in struct stat" >&5
+echo "configure:3549: checking for st_blocks in struct stat" >&5
if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  cat > conftest.$ac_ext <<EOF
-#line 3520 "configure"
+#line 3554 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/stat.h>
@@ -3524,7 +3558,7 @@
struct stat s; s.st_blocks;
; return 0; }
EOF
-if { (eval echo configure:3528: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3562: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_struct_st_blocks=yes
else
@@ -3547,13 +3581,13 @@
fi

echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
-echo "configure:3551: checking for st_blksize in struct stat" >&5
+echo "configure:3585: checking for st_blksize in struct stat" >&5
if eval "test \"`echo '$''{'ac_cv_struct_stat_st_blksize'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else

cat > conftest.$ac_ext <<EOF
-#line 3557 "configure"
+#line 3591 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/stat.h>
@@ -3561,7 +3595,7 @@
struct stat st; st.st_blksize;
; return 0; }
EOF
-if { (eval echo configure:3565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  cat >> confdefs.h <<\EOF
#define HAVE_ST_BLKSIZE 1
@@ -3584,17 +3618,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3588: checking for $ac_hdr" >&5
+echo "configure:3622: 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
-#line 3593 "configure"
+#line 3627 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3598: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3632: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
  rm -rf conftest*
@@ -3635,14 +3669,14 @@
      DBTYPE="gdbm"
    else
      cat > conftest.$ac_ext <<EOF
-#line 3639 "configure"
+#line 3673 "configure"
#include "confdefs.h"

int main() {
gdbm_open();
; return 0; }
EOF
-if { (eval echo configure:3646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  ac_cv_lib_c_gdbm_open=yes
else
@@ -3657,14 +3691,14 @@
         t_oldLibs="$LIBS"
         LIBS="$LIBS -lgdbm"
         cat > conftest.$ac_ext <<EOF
-#line 3661 "configure"
+#line 3695 "configure"
#include "confdefs.h"

int main() {
gdbm_open();
; return 0; }
EOF
-if { (eval echo configure:3668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  ac_cv_lib_gdbm_gdbm_open=yes
else
@@ -3717,14 +3751,14 @@
       fi
      else
       cat > conftest.$ac_ext <<EOF
-#line 3721 "configure"
+#line 3755 "configure"
#include "confdefs.h"

int main() {
dbm_open();
; return 0; }
EOF
-if { (eval echo configure:3728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  ac_cv_lib_c_dbm_open=yes
else
@@ -3739,14 +3773,14 @@
           t_oldLibs="$LIBS"
           LIBS="$LIBS -ldbm"
           cat > conftest.$ac_ext <<EOF
-#line 3743 "configure"
+#line 3777 "configure"
#include "confdefs.h"

int main() {
dbm_open();
; return 0; }
EOF
-if { (eval echo configure:3750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  ac_cv_lib_dbm_dbm_open=yes
else
@@ -3763,14 +3797,14 @@
           else
             LIBS="$t_oldLibs -ldb"
             cat > conftest.$ac_ext <<EOF
-#line 3767 "configure"
+#line 3801 "configure"
#include "confdefs.h"

int main() {
dbm_open();
; return 0; }
EOF
-if { (eval echo configure:3774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  ac_cv_lib_db_dbm_open=yes
else
@@ -3805,14 +3839,14 @@
    # dbm_error() function.  Check at it!
    LIBS="$LIBS $LIBNDBM"
    cat > conftest.$ac_ext <<EOF
-#line 3809 "configure"
+#line 3843 "configure"
#include "confdefs.h"
#include <ndbm.h>
int main() {
DBM *db;int i = dbm_error(db);
; return 0; }
EOF
-if { (eval echo configure:3816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  cat >> confdefs.h <<\EOF
#define HAVE_DBM_ERROR 1
@@ -3849,14 +3883,14 @@
      DBTYPE="ndbm"
    else
      cat > conftest.$ac_ext <<EOF
-#line 3853 "configure"
+#line 3887 "configure"
#include "confdefs.h"

int main() {
dbm_open();
; return 0; }
EOF
-if { (eval echo configure:3860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  ac_cv_lib_c_dbm_open=yes
else
@@ -3871,14 +3905,14 @@
         t_oldLibs="$LIBS"
         LIBS="$LIBS -lsdbm"
         cat > conftest.$ac_ext <<EOF
-#line 3875 "configure"
+#line 3909 "configure"
#include "confdefs.h"

int main() {
dbm_open();
; return 0; }
EOF
-if { (eval echo configure:3882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  ac_cv_lib_sdbm_dbm_open=yes
else
@@ -3925,14 +3959,14 @@
      DBTYPE="btree"
    else
      cat > conftest.$ac_ext <<EOF
-#line 3929 "configure"
+#line 3963 "configure"
#include "confdefs.h"

int main() {
dbopen();
; return 0; }
EOF
-if { (eval echo configure:3936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  ac_cv_lib_c_dbopen=yes
else
@@ -3947,14 +3981,14 @@
         t_oldLibs="$LIBS"
         LIBS="$LIBS -ldb"
         cat > conftest.$ac_ext <<EOF
-#line 3951 "configure"
+#line 3985 "configure"
#include "confdefs.h"

int main() {
dbopen();
; return 0; }
EOF
-if { (eval echo configure:3958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  ac_cv_lib_db_dbopen=yes
else
@@ -4030,17 +4064,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4034: checking for $ac_hdr" >&5
+echo "configure:4068: 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
-#line 4039 "configure"
+#line 4073 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4044: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4078: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
  rm -rf conftest*
@@ -4070,17 +4104,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4074: checking for $ac_hdr" >&5
+echo "configure:4108: 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
-#line 4079 "configure"
+#line 4113 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4084: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4118: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
  rm -rf conftest*
@@ -4110,17 +4144,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4114: checking for $ac_hdr" >&5
+echo "configure:4148: 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
-#line 4119 "configure"
+#line 4153 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4124: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4158: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
  rm -rf conftest*
@@ -4149,12 +4183,12 @@
for ac_func in flock lockf lstat fsync
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4153: checking for $ac_func" >&5
+echo "configure:4187: 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
-#line 4158 "configure"
+#line 4192 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func(); below.  */
@@ -4177,7 +4211,7 @@

; return 0; }
EOF
-if { (eval echo configure:4181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  eval "ac_cv_func_$ac_func=yes"
else
@@ -4207,14 +4241,14 @@
    t_oldLibs="$LIBS"
    LIBS="$LIBS -lmail"
    cat > conftest.$ac_ext <<EOF
-#line 4211 "configure"
+#line 4245 "configure"
#include "confdefs.h"
#include <maillock.h>
int main() {
mailunlock();
; return 0; }
EOF
-if { (eval echo configure:4218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*

       ac_cv_func_maillock_lmail=yes
@@ -4246,12 +4280,12 @@
               strchr strrchr setvbuf strerror strsignal setreuid
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4250: checking for $ac_func" >&5
+echo "configure:4284: 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
-#line 4255 "configure"
+#line 4289 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func(); below.  */
@@ -4274,7 +4308,7 @@

; return 0; }
EOF
-if { (eval echo configure:4278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  eval "ac_cv_func_$ac_func=yes"
else
@@ -4304,12 +4338,12 @@
                strchr strrchr setvbuf strerror strsignal
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4308: checking for $ac_func" >&5
+echo "configure:4342: 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
-#line 4313 "configure"
+#line 4347 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func(); below.  */
@@ -4332,7 +4366,7 @@

; return 0; }
EOF
-if { (eval echo configure:4336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  eval "ac_cv_func_$ac_func=yes"
else
@@ -4360,12 +4394,12 @@


echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
-echo "configure:4364: checking for sys_siglist declaration in signal.h or unistd.h" >&5
+echo "configure:4398: checking for sys_siglist declaration in signal.h or unistd.h" >&5
if eval "test \"`echo '$''{'ac_cv_decl_sys_siglist'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  cat > conftest.$ac_ext <<EOF
-#line 4369 "configure"
+#line 4403 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
@@ -4377,7 +4411,7 @@
char *msg = *(sys_siglist + 1);
; return 0; }
EOF
-if { (eval echo configure:4381: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4415: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_decl_sys_siglist=yes
else
@@ -4399,20 +4433,20 @@


echo $ac_n "checking existence of char **sys_siglist""... $ac_c" 1>&6
-echo "configure:4403: checking existence of char **sys_siglist" >&5
+echo "configure:4437: checking existence of char **sys_siglist" >&5
if eval "test \"`echo '$''{'ac_cv_arr_sys_siglist'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else

cat > conftest.$ac_ext <<EOF
-#line 4409 "configure"
+#line 4443 "configure"
#include "confdefs.h"
extern char *sys_siglist[];
int main() {
char *s = sys_siglist[2];
; return 0; }
EOF
-if { (eval echo configure:4416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  cat >> confdefs.h <<\EOF
#define HAVE_SYS_SIGLIST 1
@@ -4433,12 +4467,12 @@
for ac_func in index rindex
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4437: checking for $ac_func" >&5
+echo "configure:4471: 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
-#line 4442 "configure"
+#line 4476 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func(); below.  */
@@ -4461,7 +4495,7 @@

; return 0; }
EOF
-if { (eval echo configure:4465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  eval "ac_cv_func_$ac_func=yes"
else
@@ -4491,12 +4525,12 @@
               getpgrp setsid seteuid setuid
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4495: checking for $ac_func" >&5
+echo "configure:4529: 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
-#line 4500 "configure"
+#line 4534 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func(); below.  */
@@ -4519,7 +4553,7 @@

; return 0; }
EOF
-if { (eval echo configure:4523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  eval "ac_cv_func_$ac_func=yes"
else
@@ -4546,12 +4580,12 @@
for ac_func in setrlimit fchown utimes utime sysconf fpathconf
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4550: checking for $ac_func" >&5
+echo "configure:4584: 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
-#line 4555 "configure"
+#line 4589 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func(); below.  */
@@ -4574,7 +4608,7 @@

; return 0; }
EOF
-if { (eval echo configure:4578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  eval "ac_cv_func_$ac_func=yes"
else
@@ -4604,17 +4638,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4608: checking for $ac_hdr" >&5
+echo "configure:4642: 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
-#line 4613 "configure"
+#line 4647 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4618: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4652: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
  rm -rf conftest*
@@ -4643,12 +4677,12 @@
for ac_func in select syslog getdtablesize
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4647: checking for $ac_func" >&5
+echo "configure:4681: 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
-#line 4652 "configure"
+#line 4686 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func(); below.  */
@@ -4671,7 +4705,7 @@

; return 0; }
EOF
-if { (eval echo configure:4675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  eval "ac_cv_func_$ac_func=yes"
else
@@ -4703,12 +4737,12 @@
#
ac_cv_libsocket_both=1
echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:4707: checking for connect" >&5
+echo "configure:4741: checking for connect" >&5
if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  cat > conftest.$ac_ext <<EOF
-#line 4712 "configure"
+#line 4746 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char connect(); below.  */
@@ -4731,7 +4765,7 @@

; return 0; }
EOF
-if { (eval echo configure:4735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  eval "ac_cv_func_connect=yes"
else
@@ -4750,48 +4784,48 @@
  echo "$ac_t""no" 1>&6
fi

-echo $ac_n "checking for res_init""... $ac_c" 1>&6
-echo "configure:4755: checking for res_init" >&5
-if eval "test \"`echo '$''{'ac_cv_func_res_init'+set}'`\" = set"; then
+echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
+echo "configure:4789: 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
-#line 4760 "configure"
+#line 4794 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char res_init(); below.  */
+    which can conflict with char gethostbyname(); below.  */
#include <assert.h>
/* Override any gcc2 internal prototype to avoid an error.  */
/* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char res_init();
+char gethostbyname();

int main() {

/* The GNU C library defines this for functions which it implements
    to always fail with ENOSYS.  Some functions are actually named
    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_res_init) || defined (__stub___res_init)
+#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)
choke me
#else
-res_init();
+gethostbyname();
#endif

; return 0; }
EOF
-if { (eval echo configure:4783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
-  eval "ac_cv_func_res_init=yes"
+  eval "ac_cv_func_gethostbyname=yes"
else
  echo "configure: failed program was:" >&5
  cat conftest.$ac_ext >&5
  rm -rf conftest*
-  eval "ac_cv_func_res_init=no"
+  eval "ac_cv_func_gethostbyname=no"
fi
rm -f conftest*
fi

-if eval "test \"`echo '$ac_cv_func_'res_init`\" = yes"; then
+if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then
  echo "$ac_t""yes" 1>&6
  ac_cv_libsocket_both=0
else
@@ -4803,13 +4837,13 @@
  if test "$ac_cv_func_socket_lsocket" = yes ; then
    echo "$ac_t""need -lsocket library (cached)" 1>&6
    LIBSOCKET="-lsocket"
-    if test "$ac_cv_func_res_init_lnsl" = yes ; then
+    if test "$ac_cv_func_gethostbyname_lnsl" = yes ; then
       LIBSOCKET="-lsocket -lnsl"
    fi
  else
    # Well, will this work ?  SysVR4, but not Sun Solaris ?
    echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:4813: checking for connect in -lsocket" >&5
+echo "configure:4847: checking for connect in -lsocket" >&5
ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@@ -4817,7 +4851,7 @@
  ac_save_LIBS="$LIBS"
LIBS="-lsocket  $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4821 "configure"
+#line 4855 "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
@@ -4828,7 +4862,7 @@
connect()
; return 0; }
EOF
-if { (eval echo configure:4832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4854,14 +4888,14 @@
      t_oldLibs="$LIBS"
      LIBS="$LIBS -lsocket $LIBRESOLV"
      cat > conftest.$ac_ext <<EOF
-#line 4858 "configure"
+#line 4892 "configure"
#include "confdefs.h"

int main() {
-res_init();
+gethostbyname();
; return 0; }
EOF
-if { (eval echo configure:4865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  :
else
  echo "configure: failed program was:" >&5
@@ -4870,25 +4904,25 @@

         LIBS="$LIBS -lnsl" # Add this Solaris library..
         cat > conftest.$ac_ext <<EOF
-#line 4874 "configure"
+#line 4908 "configure"
#include "confdefs.h"

int main() {
-res_init();
+gethostbyname();
; return 0; }
EOF
-if { (eval echo configure:4881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*

                       LIBSOCKET="-lsocket -lnsl"
-                       ac_cv_func_res_init_lnsl=yes
+                       ac_cv_func_gethostbyname_lnsl=yes

else
  echo "configure: failed program was:" >&5
  cat conftest.$ac_ext >&5
  rm -rf conftest*

-                  { echo "configure: error: Weird, '$LIBS' not enough to find  res_init() ?!" 1>&2; exit 1; }
+                  { echo "configure: error: Weird, '$LIBS' not enough to find  gethostnyname() ?!" 1>&2; exit 1; }

fi
rm -f conftest*
@@ -4905,12 +4939,12 @@
for ac_func in socket socketpair
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4909: checking for $ac_func" >&5
+echo "configure:4943: 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
-#line 4914 "configure"
+#line 4948 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func(); below.  */
@@ -4933,7 +4967,7 @@

; return 0; }
EOF
-if { (eval echo configure:4937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  eval "ac_cv_func_$ac_func=yes"
else
@@ -4962,14 +4996,14 @@
if test "$ac_cv_func_socket" = no -a "$LIBSOCKET" != ""; then
  LIBS="$LIBS $LIBSOCKET"
  cat > conftest.$ac_ext <<EOF
-#line 4966 "configure"
+#line 5000 "configure"
#include "confdefs.h"

int main() {
socket();
; return 0; }
EOF
-if { (eval echo configure:4973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  ac_cv_func_socket=yes
else
@@ -4989,14 +5023,14 @@
if test "$ac_cv_func_socketpair" = no -a "$LIBSOCKET" != ""; then
  LIBS="$LIBS $LIBSOCKET"
  cat > conftest.$ac_ext <<EOF
-#line 4993 "configure"
+#line 5027 "configure"
#include "confdefs.h"

int main() {
socketpair();
; return 0; }
EOF
-if { (eval echo configure:5000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  ac_cv_func_socketpair=yes
else
@@ -5019,17 +5053,17 @@
#
ac_safe=`echo "kvm.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for kvm.h""... $ac_c" 1>&6
-echo "configure:5023: checking for kvm.h" >&5
+echo "configure:5057: checking for kvm.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
-#line 5028 "configure"
+#line 5062 "configure"
#include "confdefs.h"
#include <kvm.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5033: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5067: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
  rm -rf conftest*
@@ -5060,17 +5094,17 @@
fi
ac_safe=`echo "elf.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for elf.h""... $ac_c" 1>&6
-echo "configure:5064: checking for elf.h" >&5
+echo "configure:5098: checking for elf.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
-#line 5069 "configure"
+#line 5103 "configure"
#include "confdefs.h"
#include <elf.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5074: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5108: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
  rm -rf conftest*
@@ -5090,14 +5124,14 @@
elf_LIBS="$LIBS"
LIBS="$LIBS -lelf"
cat > conftest.$ac_ext <<EOF
-#line 5094 "configure"
+#line 5128 "configure"
#include "confdefs.h"
#include <nlist.h>
int main() {
nlist((char*)0,(char*)0);
; return 0; }
EOF
-if { (eval echo configure:5101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  cat >> confdefs.h <<\EOF
#define SVR4_elf 1
@@ -5118,7 +5152,7 @@


echo $ac_n "checking for the return type of sprintf() being char*""... $ac_c" 1>&6
-echo "configure:5122: checking for the return type of sprintf() being char*" >&5
+echo "configure:5156: checking for the return type of sprintf() being char*" >&5
if eval "test \"`echo '$''{'ac_cv_func_char_sprintf'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5126,7 +5160,7 @@
  ac_cv_func_char_sprintf=no
else
  cat > conftest.$ac_ext <<EOF
-#line 5130 "configure"
+#line 5164 "configure"
#include "confdefs.h"

    extern char *sprintf();
@@ -5137,7 +5171,7 @@
       return (ss == buf); /* returns the char pointer */
    }
EOF
-if { (eval echo configure:5141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
  ac_cv_func_char_sprintf=no
else
@@ -5160,12 +5194,12 @@
fi

echo $ac_n "checking for strftime""... $ac_c" 1>&6
-echo "configure:5164: checking for strftime" >&5
+echo "configure:5198: checking for strftime" >&5
if eval "test \"`echo '$''{'ac_cv_func_strftime'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  cat > conftest.$ac_ext <<EOF
-#line 5169 "configure"
+#line 5203 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char strftime(); below.  */
@@ -5188,7 +5222,7 @@

; return 0; }
EOF
-if { (eval echo configure:5192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  eval "ac_cv_func_strftime=yes"
else
@@ -5210,7 +5244,7 @@
  echo "$ac_t""no" 1>&6
# strftime is in -lintl on SCO UNIX.
echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6
-echo "configure:5214: checking for strftime in -lintl" >&5
+echo "configure:5248: checking for strftime in -lintl" >&5
ac_lib_var=`echo intl'_'strftime | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@@ -5218,7 +5252,7 @@
  ac_save_LIBS="$LIBS"
LIBS="-lintl  $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5222 "configure"
+#line 5256 "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
@@ -5229,7 +5263,7 @@
strftime()
; return 0; }
EOF
-if { (eval echo configure:5233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5256,12 +5290,12 @@
fi

echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:5260: checking for vprintf" >&5
+echo "configure:5294: checking for vprintf" >&5
if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  cat > conftest.$ac_ext <<EOF
-#line 5265 "configure"
+#line 5299 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char vprintf(); below.  */
@@ -5284,7 +5318,7 @@

; return 0; }
EOF
-if { (eval echo configure:5288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  eval "ac_cv_func_vprintf=yes"
else
@@ -5308,12 +5342,12 @@

if test "$ac_cv_func_vprintf" != yes; then
echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:5312: checking for _doprnt" >&5
+echo "configure:5346: checking for _doprnt" >&5
if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  cat > conftest.$ac_ext <<EOF
-#line 5317 "configure"
+#line 5351 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char _doprnt(); below.  */
@@ -5336,7 +5370,7 @@

; return 0; }
EOF
-if { (eval echo configure:5340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  eval "ac_cv_func__doprnt=yes"
else
@@ -5363,12 +5397,12 @@
for ac_func in vsprintf vsnprintf snprintf
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5367: checking for $ac_func" >&5
+echo "configure:5401: 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
-#line 5372 "configure"
+#line 5406 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func(); below.  */
@@ -5391,7 +5425,7 @@

; return 0; }
EOF
-if { (eval echo configure:5395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  eval "ac_cv_func_$ac_func=yes"
else
@@ -5418,19 +5452,19 @@
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
# for constant arguments.  Useless!
echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:5422: checking for working alloca.h" >&5
+echo "configure:5456: checking for working alloca.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  cat > conftest.$ac_ext <<EOF
-#line 5427 "configure"
+#line 5461 "configure"
#include "confdefs.h"
#include <alloca.h>
int main() {
char *p = alloca(2 * sizeof(int));
; return 0; }
EOF
-if { (eval echo configure:5434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  ac_cv_header_alloca_h=yes
else
@@ -5451,12 +5485,12 @@
fi

echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:5455: checking for alloca" >&5
+echo "configure:5489: checking for alloca" >&5
if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  cat > conftest.$ac_ext <<EOF
-#line 5460 "configure"
+#line 5494 "configure"
#include "confdefs.h"

#ifdef __GNUC__
@@ -5479,7 +5513,7 @@
char *p = (char *) alloca(1);
; return 0; }
EOF
-if { (eval echo configure:5483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  ac_cv_func_alloca_works=yes
else
@@ -5511,12 +5545,12 @@


echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:5515: checking whether alloca needs Cray hooks" >&5
+echo "configure:5549: checking whether alloca needs Cray hooks" >&5
if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  cat > conftest.$ac_ext <<EOF
-#line 5520 "configure"
+#line 5554 "configure"
#include "confdefs.h"
#if defined(CRAY) && ! defined(CRAY2)
webecray
@@ -5541,12 +5575,12 @@
if test $ac_cv_os_cray = yes; then
for ac_func in _getb67 GETB67 getb67; do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5545: checking for $ac_func" >&5
+echo "configure:5579: 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
-#line 5550 "configure"
+#line 5584 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func(); below.  */
@@ -5569,7 +5603,7 @@

; return 0; }
EOF
-if { (eval echo configure:5573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  eval "ac_cv_func_$ac_func=yes"
else
@@ -5596,7 +5630,7 @@
fi

echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:5600: checking stack direction for C alloca" >&5
+echo "configure:5634: checking stack direction for C alloca" >&5
if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5604,7 +5638,7 @@
  ac_cv_c_stack_direction=0
else
  cat > conftest.$ac_ext <<EOF
-#line 5608 "configure"
+#line 5642 "configure"
#include "confdefs.h"
find_stack_direction ()
{
@@ -5623,7 +5657,7 @@
  exit (find_stack_direction() < 0);
}
EOF
-if { (eval echo configure:5627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
  ac_cv_c_stack_direction=1
else
@@ -5645,7 +5679,7 @@
fi

echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:5649: checking whether getpgrp takes no argument" >&5
+echo "configure:5683: checking whether getpgrp takes no argument" >&5
if eval "test \"`echo '$''{'ac_cv_func_getpgrp_void'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5653,7 +5687,7 @@
  { echo "configure: error: cannot check getpgrp if cross compiling" 1>&2; exit 1; }
else
  cat > conftest.$ac_ext <<EOF
-#line 5657 "configure"
+#line 5691 "configure"
#include "confdefs.h"

/*
@@ -5708,7 +5742,7 @@
}

EOF
-if { (eval echo configure:5712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
  ac_cv_func_getpgrp_void=yes
else
@@ -5735,17 +5769,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5739: checking for $ac_hdr" >&5
+echo "configure:5773: 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
-#line 5744 "configure"
+#line 5778 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5749: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5783: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
  rm -rf conftest*
@@ -5774,12 +5808,12 @@
for ac_func in getpagesize
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5778: checking for $ac_func" >&5
+echo "configure:5812: 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
-#line 5783 "configure"
+#line 5817 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func(); below.  */
@@ -5802,7 +5836,7 @@

; return 0; }
EOF
-if { (eval echo configure:5806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  eval "ac_cv_func_$ac_func=yes"
else
@@ -5827,7 +5861,7 @@
done

echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:5831: checking for working mmap" >&5
+echo "configure:5865: checking for working mmap" >&5
if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5835,7 +5869,7 @@
  ac_cv_func_mmap_fixed_mapped=no
else
  cat > conftest.$ac_ext <<EOF
-#line 5839 "configure"
+#line 5873 "configure"
#include "confdefs.h"

/* Thanks to Mike Haertel and Jim Avera for this test.
@@ -5975,7 +6009,7 @@
}

EOF
-if { (eval echo configure:5979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
  ac_cv_func_mmap_fixed_mapped=yes
else
@@ -5998,7 +6032,7 @@
fi

echo $ac_n "checking whether utime accepts a null argument""... $ac_c" 1>&6
-echo "configure:6002: checking whether utime accepts a null argument" >&5
+echo "configure:6036: checking whether utime accepts a null argument" >&5
if eval "test \"`echo '$''{'ac_cv_func_utime_null'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6008,7 +6042,7 @@
  ac_cv_func_utime_null=no
else
  cat > conftest.$ac_ext <<EOF
-#line 6012 "configure"
+#line 6046 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/stat.h>
@@ -6019,7 +6053,7 @@
&& t.st_mtime - s.st_mtime < 120));
}
EOF
-if { (eval echo configure:6023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
  ac_cv_func_utime_null=yes
else
@@ -6044,12 +6078,12 @@


echo $ac_n "checking for d_ino member in directory struct""... $ac_c" 1>&6
-echo "configure:6048: checking for d_ino member in directory struct" >&5
+echo "configure:6082: checking for d_ino member in directory struct" >&5
if eval "test \"`echo '$''{'fu_cv_sys_d_ino_in_dirent'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  cat > conftest.$ac_ext <<EOF
-#line 6053 "configure"
+#line 6087 "configure"
#include "confdefs.h"

#include <sys/types.h>
@@ -6072,7 +6106,7 @@
struct dirent dp; dp.d_ino = 0;
; return 0; }
EOF
-if { (eval echo configure:6076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  fu_cv_sys_d_ino_in_dirent=yes
else
@@ -6099,7 +6133,7 @@
# make sure LIBS contains -lsun (on Irix4) or -lseq (on PTX).
# getmntent is in -lsun on Irix 4, -lseq on Dynix/PTX, -lgen on Unixware.
echo $ac_n "checking for getmntent in -lsun""... $ac_c" 1>&6
-echo "configure:6103: checking for getmntent in -lsun" >&5
+echo "configure:6137: checking for getmntent in -lsun" >&5
ac_lib_var=`echo sun'_'getmntent | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@@ -6107,7 +6141,7 @@
  ac_save_LIBS="$LIBS"
LIBS="-lsun  $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6111 "configure"
+#line 6145 "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
@@ -6118,7 +6152,7 @@
getmntent()
; return 0; }
EOF
-if { (eval echo configure:6122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6137,7 +6171,7 @@
else
  echo "$ac_t""no" 1>&6
echo $ac_n "checking for getmntent in -lseq""... $ac_c" 1>&6
-echo "configure:6141: checking for getmntent in -lseq" >&5
+echo "configure:6175: checking for getmntent in -lseq" >&5
ac_lib_var=`echo seq'_'getmntent | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@@ -6145,7 +6179,7 @@
  ac_save_LIBS="$LIBS"
LIBS="-lseq  $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6149 "configure"
+#line 6183 "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
@@ -6156,7 +6190,7 @@
getmntent()
; return 0; }
EOF
-if { (eval echo configure:6160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6175,7 +6209,7 @@
else
  echo "$ac_t""no" 1>&6
echo $ac_n "checking for getmntent in -lgen""... $ac_c" 1>&6
-echo "configure:6179: checking for getmntent in -lgen" >&5
+echo "configure:6213: checking for getmntent in -lgen" >&5
ac_lib_var=`echo gen'_'getmntent | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@@ -6183,7 +6217,7 @@
  ac_save_LIBS="$LIBS"
LIBS="-lgen  $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6187 "configure"
+#line 6221 "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
@@ -6194,7 +6228,7 @@
getmntent()
; return 0; }
EOF
-if { (eval echo configure:6198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6219,12 +6253,12 @@
fi

echo $ac_n "checking for getmntent""... $ac_c" 1>&6
-echo "configure:6223: checking for getmntent" >&5
+echo "configure:6257: checking for getmntent" >&5
if eval "test \"`echo '$''{'ac_cv_func_getmntent'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  cat > conftest.$ac_ext <<EOF
-#line 6228 "configure"
+#line 6262 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char getmntent(); below.  */
@@ -6247,7 +6281,7 @@

; return 0; }
EOF
-if { (eval echo configure:6251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  eval "ac_cv_func_getmntent=yes"
else
@@ -6278,7 +6312,7 @@
  if test -z "$list_mounted_fs"; then
    # 4.3BSD, SunOS, HP-UX, Dynix, Irix
    echo $ac_n "checking for one-argument getmntent function""... $ac_c" 1>&6
-echo "configure:6282: checking for one-argument getmntent function" >&5
+echo "configure:6316: checking for one-argument getmntent function" >&5
    if eval "test \"`echo '$''{'fu_cv_sys_mounted_getmntent1'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6300,12 +6334,12 @@
  if test -z "$list_mounted_fs"; then
    # SVR4
    echo $ac_n "checking for two-argument getmntent function""... $ac_c" 1>&6
-echo "configure:6304: checking for two-argument getmntent function" >&5
+echo "configure:6338: checking for two-argument getmntent function" >&5
    if eval "test \"`echo '$''{'fu_cv_sys_mounted_getmntent2'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  cat > conftest.$ac_ext <<EOF
-#line 6309 "configure"
+#line 6343 "configure"
#include "confdefs.h"
#include <sys/mnttab.h>
EOF
@@ -6340,12 +6374,12 @@
if test -z "$list_mounted_fs"; then
  # DEC Alpha running OSF/1.
  echo $ac_n "checking for getfsstat function""... $ac_c" 1>&6
-echo "configure:6344: checking for getfsstat function" >&5
+echo "configure:6378: checking for getfsstat function" >&5
  if eval "test \"`echo '$''{'fu_cv_sys_mounted_getsstat'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  cat > conftest.$ac_ext <<EOF
-#line 6349 "configure"
+#line 6383 "configure"
#include "confdefs.h"

#include <sys/types.h>
@@ -6356,7 +6390,7 @@
  numsys = getfsstat ((struct statfs *)0, 0L, MNT_WAIT);
; return 0; }
EOF
-if { (eval echo configure:6360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  fu_cv_sys_mounted_getsstat=yes
else
@@ -6381,17 +6415,17 @@
if test -z "$list_mounted_fs"; then
  # AIX.
  echo $ac_n "checking for mntctl function and struct vmount""... $ac_c" 1>&6
-echo "configure:6385: checking for mntctl function and struct vmount" >&5
+echo "configure:6419: checking for mntctl function and struct vmount" >&5
  if eval "test \"`echo '$''{'fu_cv_sys_mounted_vmount'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  cat > conftest.$ac_ext <<EOF
-#line 6390 "configure"
+#line 6424 "configure"
#include "confdefs.h"
#include <fshelp.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6395: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6429: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
  rm -rf conftest*
@@ -6419,12 +6453,12 @@
if test -z "$list_mounted_fs"; then
  # SVR3
  echo $ac_n "checking for FIXME existence of three headers""... $ac_c" 1>&6
-echo "configure:6423: checking for FIXME existence of three headers" >&5
+echo "configure:6457: checking for FIXME existence of three headers" >&5
  if eval "test \"`echo '$''{'fu_cv_sys_mounted_fread_fstyp'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  cat > conftest.$ac_ext <<EOF
-#line 6428 "configure"
+#line 6462 "configure"
#include "confdefs.h"

#include <sys/statfs.h>
@@ -6432,7 +6466,7 @@
#include <mnttab.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6436: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6470: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
  rm -rf conftest*
@@ -6460,7 +6494,7 @@
if test -z "$list_mounted_fs"; then
  # 4.4BSD and DEC OSF/1.
  echo $ac_n "checking for getmntinfo function""... $ac_c" 1>&6
-echo "configure:6464: checking for getmntinfo function" >&5
+echo "configure:6498: checking for getmntinfo function" >&5
  if eval "test \"`echo '$''{'fu_cv_sys_mounted_getmntinfo'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6468,7 +6502,7 @@
      ok=
      if test $ac_cv_func_getmntinfo = yes; then
       cat > conftest.$ac_ext <<EOF
-#line 6472 "configure"
+#line 6506 "configure"
#include "confdefs.h"
#include <sys/mount.h>
EOF
@@ -6501,19 +6535,19 @@
if test -z "$list_mounted_fs"; then
  # Ultrix
  echo $ac_n "checking for getmnt function""... $ac_c" 1>&6
-echo "configure:6505: checking for getmnt function" >&5
+echo "configure:6539: checking for getmnt function" >&5
  if eval "test \"`echo '$''{'fu_cv_sys_mounted_getmnt'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  cat > conftest.$ac_ext <<EOF
-#line 6510 "configure"
+#line 6544 "configure"
#include "confdefs.h"

#include <sys/fs_types.h>
#include <sys/mount.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6517: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6551: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
  rm -rf conftest*
@@ -6541,17 +6575,17 @@
if test -z "$list_mounted_fs"; then
  # SVR2
  echo $ac_n "checking whether it is possible to resort to fread on /etc/mnttab""... $ac_c" 1>&6
-echo "configure:6545: checking whether it is possible to resort to fread on /etc/mnttab" >&5
+echo "configure:6579: checking whether it is possible to resort to fread on /etc/mnttab" >&5
  if eval "test \"`echo '$''{'fu_cv_sys_mounted_fread'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  cat > conftest.$ac_ext <<EOF
-#line 6550 "configure"
+#line 6584 "configure"
#include "confdefs.h"
#include <mnttab.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6555: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6589: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
  rm -rf conftest*
@@ -6583,7 +6617,7 @@
fi

echo "checking how to get filesystem space usage:" 1>&6
-echo "configure:6587: checking how to get filesystem space usage:" >&5
+echo "configure:6621: checking how to get filesystem space usage:" >&5
space=no

# Here we'll compromise a little (and perform only the link test)
@@ -6593,12 +6627,12 @@
  for ac_func in statvfs
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6597: checking for $ac_func" >&5
+echo "configure:6631: 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
-#line 6602 "configure"
+#line 6636 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func(); below.  */
@@ -6621,7 +6655,7 @@

; return 0; }
EOF
-if { (eval echo configure:6625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  eval "ac_cv_func_$ac_func=yes"
else
@@ -6657,7 +6691,7 @@
if test $space = no; then
  # DEC Alpha running OSF/1
  echo $ac_n "checking for 3-argument statfs function (DEC OSF/1)""... $ac_c" 1>&6
-echo "configure:6661: checking for 3-argument statfs function (DEC OSF/1)" >&5
+echo "configure:6695: checking for 3-argument statfs function (DEC OSF/1)" >&5
  if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs3_osf1'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6665,7 +6699,7 @@
  fu_cv_sys_stat_statfs3_osf1=no
else
  cat > conftest.$ac_ext <<EOF
-#line 6669 "configure"
+#line 6703 "configure"
#include "confdefs.h"

#include <sys/param.h>
@@ -6678,7 +6712,7 @@
    exit (statfs (".", &fsd, sizeof (struct statfs)));
  }
EOF
-if { (eval echo configure:6682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
  fu_cv_sys_stat_statfs3_osf1=yes
else
@@ -6705,7 +6739,7 @@
if test $space = no; then
# AIX
  echo $ac_n "checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)""... $ac_c" 1>&6
-echo "configure:6709: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5
+echo "configure:6743: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5
  if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs2_bsize'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6713,7 +6747,7 @@
  fu_cv_sys_stat_statfs2_bsize=no
else
  cat > conftest.$ac_ext <<EOF
-#line 6717 "configure"
+#line 6751 "configure"
#include "confdefs.h"

#ifdef HAVE_SYS_PARAM_H
@@ -6732,7 +6766,7 @@
  exit (statfs (".", &fsd));
  }
EOF
-if { (eval echo configure:6736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
  fu_cv_sys_stat_statfs2_bsize=yes
else
@@ -6759,7 +6793,7 @@
if test $space = no; then
# SVR3
  echo $ac_n "checking for four-argument statfs (AIX-3.2.5, SVR3)""... $ac_c" 1>&6
-echo "configure:6763: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5
+echo "configure:6797: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5
  if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs4'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6767,7 +6801,7 @@
  fu_cv_sys_stat_statfs4=no
else
  cat > conftest.$ac_ext <<EOF
-#line 6771 "configure"
+#line 6805 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/statfs.h>
@@ -6777,7 +6811,7 @@
  exit (statfs (".", &fsd, sizeof fsd, 0));
  }
EOF
-if { (eval echo configure:6781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
  fu_cv_sys_stat_statfs4=yes
else
@@ -6804,7 +6838,7 @@
if test $space = no; then
# 4.4BSD and NetBSD
  echo $ac_n "checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)""... $ac_c" 1>&6
-echo "configure:6808: checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)" >&5
+echo "configure:6842: checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)" >&5
  if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs2_fsize'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6812,7 +6846,7 @@
  fu_cv_sys_stat_statfs2_fsize=no
else
  cat > conftest.$ac_ext <<EOF
-#line 6816 "configure"
+#line 6850 "configure"
#include "confdefs.h"
#include <sys/types.h>
#ifdef HAVE_SYS_PARAM_H
@@ -6828,7 +6862,7 @@
  exit (statfs (".", &fsd));
  }
EOF
-if { (eval echo configure:6832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
  fu_cv_sys_stat_statfs2_fsize=yes
else
@@ -6855,7 +6889,7 @@
if test $space = no; then
  # Ultrix
  echo $ac_n "checking for two-argument statfs with struct fs_data (Ultrix)""... $ac_c" 1>&6
-echo "configure:6859: checking for two-argument statfs with struct fs_data (Ultrix)" >&5
+echo "configure:6893: checking for two-argument statfs with struct fs_data (Ultrix)" >&5
  if eval "test \"`echo '$''{'fu_cv_sys_stat_fs_data'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6863,7 +6897,7 @@
  fu_cv_sys_stat_fs_data=no
else
  cat > conftest.$ac_ext <<EOF
-#line 6867 "configure"
+#line 6901 "configure"
#include "confdefs.h"
#include <sys/types.h>
#ifdef HAVE_SYS_PARAM_H
@@ -6883,7 +6917,7 @@
  exit (statfs (".", &fsd) != 1);
  }
EOF
-if { (eval echo configure:6887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
  fu_cv_sys_stat_fs_data=yes
else
@@ -6910,12 +6944,12 @@
if test $space = no; then
# SVR2
cat > conftest.$ac_ext <<EOF
-#line 6914 "configure"
+#line 6948 "configure"
#include "confdefs.h"
#include <sys/filsys.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6919: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6953: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
  rm -rf conftest*
@@ -6938,12 +6972,12 @@
for ac_func in ftruncate
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6942: checking for $ac_func" >&5
+echo "configure:6976: 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
-#line 6947 "configure"
+#line 6981 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func(); below.  */
@@ -6966,7 +7000,7 @@

; return 0; }
EOF
-if { (eval echo configure:6970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  eval "ac_cv_func_$ac_func=yes"
else
@@ -6994,12 +7028,12 @@

if test "$ftruncate_missing" = yes; then
  echo $ac_n "checking fcntl emulation of ftruncate""... $ac_c" 1>&6
-echo "configure:6998: checking fcntl emulation of ftruncate" >&5
+echo "configure:7032: checking fcntl emulation of ftruncate" >&5
  if eval "test \"`echo '$''{'fu_cv_sys_ftruncate_emulation'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  cat > conftest.$ac_ext <<EOF
-#line 7003 "configure"
+#line 7037 "configure"
#include "confdefs.h"

#include <sys/types.h>
@@ -7012,7 +7046,7 @@

; return 0; }
EOF
-if { (eval echo configure:7016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  fu_cv_sys_ftruncate_emulation=yes
else
@@ -7033,12 +7067,12 @@
# If we don't yet have getgroups, see if it's in -lbsd.
# This is reported to be necessary on an ITOS 3000WS running SEIUX 3.1.
echo $ac_n "checking for getgroups""... $ac_c" 1>&6
-echo "configure:7037: checking for getgroups" >&5
+echo "configure:7071: checking for getgroups" >&5
if eval "test \"`echo '$''{'ac_cv_func_getgroups'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
else
  cat > conftest.$ac_ext <<EOF
-#line 7042 "configure"
+#line 7076 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char getgroups(); below.  */
@@ -7061,7 +7095,7 @@

; return 0; }
EOF
-if { (eval echo configure:7065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  eval "ac_cv_func_getgroups=yes"
else
@@ -7079,7 +7113,7 @@
else
  echo "$ac_t""no" 1>&6
echo $ac_n "checking for getgroups in -lbsd""... $ac_c" 1>&6
-echo "configure:7083: checking for getgroups in -lbsd" >&5
+echo "configure:7117: checking for getgroups in -lbsd" >&5
ac_lib_var=`echo bsd'_'getgroups | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@@ -7087,7 +7121,7 @@
  ac_save_LIBS="$LIBS"
LIBS="-lbsd  $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7091 "configure"
+#line 7125 "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
@@ -7098,7 +7132,7 @@
getgroups()
; return 0; }
EOF
-if { (eval echo configure:7102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7130,7 +7164,7 @@

# Check for libypsec.a on Dolphin M88K machines.
echo $ac_n "checking for main in -lypsec""... $ac_c" 1>&6
-echo "configure:7134: checking for main in -lypsec" >&5
+echo "configure:7168: checking for main in -lypsec" >&5
ac_lib_var=`echo ypsec'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@@ -7138,14 +7172,14 @@
  ac_save_LIBS="$LIBS"
LIBS="-lypsec  $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7142 "configure"
+#line 7176 "configure"
#include "confdefs.h"

int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:7149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7175,7 +7209,7 @@

# m88k running dgux 5.4 needs this
echo $ac_n "checking for main in -lldgc""... $ac_c" 1>&6
-echo "configure:7179: checking for main in -lldgc" >&5
+echo "configure:7213: checking for main in -lldgc" >&5
ac_lib_var=`echo ldgc'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@@ -7183,14 +7217,14 @@
  ac_save_LIBS="$LIBS"
LIBS="-lldgc  $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7187 "configure"
+#line 7221 "configure"
#include "confdefs.h"

int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:7194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7219,7 +7253,7 @@


echo "checking for AFS" 1>&6
-echo "configure:7223: checking for AFS" >&5
+echo "configure:7257: checking for AFS" >&5
test -d /afs && cat >> confdefs.h <<\EOF
#define AFS 1
EOF
@@ -7392,6 +7426,7 @@
s%@INSTALL_DATA@%$INSTALL_DATA%g
s%@RANLIB@%$RANLIB%g
s%@AR@%$AR%g
+s%@LD@%$LD%g
s%@YACC@%$YACC%g
s%@LN_S@%$LN_S%g
s%@ZMAILERCFGFILE@%$ZMAILERCFGFILE%g
diff -u -r zmailer-2.99.46rel/configure.in zmailer-2.99.46p1/configure.in
--- zmailer-2.99.46rel/configure.in     Thu Feb  6 03:37:09 1997
+++ zmailer-2.99.46p1/configure.in      Fri Feb  7 23:17:17 1997
@@ -87,6 +87,7 @@
AC_PROG_INSTALL
AC_PROG_RANLIB
AC_PATH_PROG(AR, ar, ar)dnl
+AC_PATH_PROG(LD, ld, ld)dnl
AC_PROG_YACC
AC_PROG_LN_S
AC_AIX
@@ -276,7 +277,7 @@
       use_rmailpath=1)
if test -z "$use_rmailpath" ; then
  # Ok, no value given, make some guesses; /usr/bin ?? (last is default)
-  for RMAILDEF in /sbin/rmail usr/sbin/rmail /usr/bin/rmail /bin/rmail; do
+  for RMAILDEF in /sbin/rmail /usr/sbin/rmail /usr/bin/rmail /bin/rmail; do
    if test -x $RMAILDEF ; then
       break
    fi
@@ -287,11 +288,14 @@
fi
AC_MSG_RESULT([Using ZMailer RMAILPATH: $RMAILPATH])

+oldSELFADDRESSES="$SELFADDRESSES"
AC_SUBST(SELFADDRESSES)
AC_ARG_WITH(selfaddresses,   [  --with-selfaddresses=NAME,NAME  Comma separated list of names],
       use_selfaddresses=1)
if test "x$use_selfaddresses" != "x" ; then
    SELFADDRESSES="$withval"
+else
+    SELFADDRESSES="$oldSELFADDRESSES"
fi
AC_MSG_RESULT([Using ZMailer SELFADDRESSES: $SELFADDRESSES])

@@ -735,13 +739,13 @@
AC_SUBST(LIBSOCKET)dnl
ac_cv_libsocket_both=1
AC_CHECK_FUNC(connect, ac_cv_libsocket_both=0)
-AC_CHECK_FUNC(res_init, ac_cv_libsocket_both=0)
+AC_CHECK_FUNC(gethostbyname, ac_cv_libsocket_both=0)
if test "$ac_cv_libsocket_both" = 1 ; then
  # Check cache
  if test "$ac_cv_func_socket_lsocket" = yes ; then
    AC_MSG_RESULT([need -lsocket library (cached)])
    LIBSOCKET="-lsocket"
-    if test "$ac_cv_func_res_init_lnsl" = yes ; then
+    if test "$ac_cv_func_gethostbyname_lnsl" = yes ; then
       LIBSOCKET="-lsocket -lnsl"
    fi
  else
@@ -752,13 +756,13 @@
    if test "$ac_cv_func_socket_lsocket" = yes ; then
      t_oldLibs="$LIBS"
      LIBS="$LIBS -lsocket $LIBRESOLV"
-      AC_TRY_LINK([],[res_init();], ,[
+      AC_TRY_LINK([],[gethostbyname();], ,[
         LIBS="$LIBS -lnsl" # Add this Solaris library..
-         AC_TRY_LINK([],[res_init();],[
+         AC_TRY_LINK([],[gethostbyname();],[
                       LIBSOCKET="-lsocket -lnsl"
-                       ac_cv_func_res_init_lnsl=yes
+                       ac_cv_func_gethostbyname_lnsl=yes
               ], [
-                  AC_MSG_ERROR([Weird, '$LIBS' not enough to find  res_init() ?!])
+                  AC_MSG_ERROR([Weird, '$LIBS' not enough to find  gethostnyname() ?!])
               ])
       ])
      LIBS="$t_oldLibs"
diff -u -r zmailer-2.99.46rel/lib/esyslib.c zmailer-2.99.46p1/lib/esyslib.c
--- zmailer-2.99.46rel/lib/esyslib.c    Thu Dec 12 18:35:35 1996
+++ zmailer-2.99.46p1/lib/esyslib.c     Fri Feb  7 22:35:25 1997
@@ -233,7 +233,7 @@
{
       int     r;

-#ifdef HAVE_RENAME
+#ifdef HAVE_RENAME_we_use_link_unlink_only_to_avoid_races_in_routers

       if ((r = rename(from, to)) < 0) {
#else  /* !HAVE_RENAME */
@@ -241,8 +241,9 @@
       if (((r = unlink(to)) < 0 && errno != ENOENT)
           || (r = link(from, to)) < 0) {
#endif /* HAVE_RENAME */
+         /* All ok, be happy! */
       }
-#ifndef        HAVE_RENAME
+#ifndef        HAVE_RENAME_we_use_link_unlink_only_to_avoid_races_in_routers
       else
               unlink(from);
#endif /* !HAVE_RENAME */
diff -u -r zmailer-2.99.46rel/libs/Makefile.in zmailer-2.99.46p1/libs/Makefile.in
--- zmailer-2.99.46rel/libs/Makefile.in Mon Dec 30 21:54:24 1996
+++ zmailer-2.99.46p1/libs/Makefile.in  Fri Feb  7 23:42:16 1997
@@ -44,7 +44,7 @@
       fi

libsystem.a:
-       # Dummy...
+       : # Dummy...

#
#  Usage of this resolver depends on if the configurer
diff -u -r zmailer-2.99.46rel/proto/db/fqdnaliases zmailer-2.99.46p1/proto/db/fqdnaliases
--- zmailer-2.99.46rel/proto/db/fqdnaliases     Wed Feb  5 09:44:37 1997
+++ zmailer-2.99.46p1/proto/db/fqdnaliases      Sat Feb  8 01:03:00 1997
@@ -3,10 +3,8 @@
#
# Left side: FQDN-form of some address, Right side: rewritten form
#
-# Use of this map needs router system specification of:
-#      protocols='fqdnalias routes ...'
-# The order IS important!   This mapping applies only to the recipient
-# addresses, not to the sender addresses.
+# This map tried BEFORE the address is fed even to tests wether or not
+# the address is local or not!
#
# Refreshing this mapping is done with program  MAILBIN/newfqdnaliases
# (no way to call it via some non-MAILBIN program..)
@@ -14,3 +12,4 @@

#[email protected]: [email protected]

+sample@sample-domain: postmaster
diff -u -r zmailer-2.99.46rel/proto/scheduler.conf zmailer-2.99.46p1/proto/scheduler.conf
--- zmailer-2.99.46rel/proto/scheduler.conf     Tue Nov 26 14:57:45 1996
+++ zmailer-2.99.46p1/proto/scheduler.conf      Sat Feb  8 00:40:51 1997
@@ -13,7 +13,9 @@

# Boilerplate default parameters
*/*    interval=1m
-       idlemax=2m
+       idlemax=4m # Max idle for SMTP connections is 5 minutes, don't exceed that!
+       #          # (Unless smtp channel becomes a bit smarter on handling it..)
+       #
       # expire messages after 3 days without full delivery
       expiry=2d
       # when the scheduler gets to the end of the retry sequence,
@@ -74,7 +76,10 @@
local/*
       interval=60s
       idlemax=90s
-       expiry=3h
+       # Originally we had 3 hour expiry, but if your local system goes to
+       # a fizz (freezes, that is), your local mail may start to bounce
+       # before anybody notices anything...
+       expiry=3d
       # want 20 channel slots, but only one HOST
       maxchannel=10
       maxring=5
diff -u -r zmailer-2.99.46rel/router/rfc822.c zmailer-2.99.46p1/router/rfc822.c
--- zmailer-2.99.46rel/router/rfc822.c  Thu Feb  6 00:28:53 1997
+++ zmailer-2.99.46p1/router/rfc822.c   Fri Feb  7 22:00:23 1997
@@ -944,7 +944,7 @@

       th = (struct header *)tmalloc(sizeof (struct header));
       th->h_pname = "Received";
-       th->h_descriptor = &traceDesc;
+       th->h_descriptor = (struct headerinfo *)&traceDesc;
       th->h_stamp = newHeader;
       th->h_next = 0;
       th->h_contents.r = (struct received *)tmalloc(sizeof (struct received));
diff -u -r zmailer-2.99.46rel/smtpserver/relaytest.c zmailer-2.99.46p1/smtpserver/relaytest.c
--- zmailer-2.99.46rel/smtpserver/relaytest.c   Sat Jan 25 17:48:56 1997
+++ zmailer-2.99.46p1/smtpserver/relaytest.c    Fri Feb  7 22:29:32 1997
@@ -8,6 +8,9 @@
#include <ctype.h>
#include <sys/types.h>
#include <fcntl.h>
+#ifdef HAVE_DB_H
+#include <db.h>
+#endif
#ifdef HAVE_NDBM_H
#define datum Ndatum
#include <ndbm.h>
@@ -18,9 +21,6 @@
#include <gdbm.h>
#undef datum
#endif
-#ifdef HAVE_DB_H
-#include <db.h>
-#endif

#define _RELAYTEST_INTERNAL_
#include "relaytest.h"
@@ -34,18 +34,20 @@
  rel->dbtype = strdup(dbtype);
  rel->dbpath = strdup(dbpath);
  rel->dbt = _dbt_none;
-  rel->btree = NULL; /* It is union, NULL the pointer now */
#ifdef HAVE_NDBM_H
  if (cistrcmp(dbtype,"ndbm")==0)
    rel->dbt = _dbt_ndbm;
+  rel->ndbm = NULL; /* Initialize it in case we are the only variant */
#endif
#ifdef HAVE_GDBM_H
  if (cistrcmp(dbtype,"gdbm")==0)
    rel->dbt = _dbt_ndbm;
+  rel->gdbm = NULL; /* Initialize it in case we are the only variant */
#endif
#ifdef HAVE_DB_H
  if (cistrcmp(dbtype,"btree")==0)
    rel->dbt = _dbt_btree;
+  rel->btree = NULL; /* Initialize it in case we are the only variant */
#endif
  if (rel->dbt == _dbt_none) {
    /* XX: ERROR! Unknown/unsupported dbtype! */
diff -u -r zmailer-2.99.46rel/smtpserver/relaytest.h zmailer-2.99.46p1/smtpserver/relaytest.h
--- zmailer-2.99.46rel/smtpserver/relaytest.h   Sun Feb  2 23:02:08 1997
+++ zmailer-2.99.46p1/smtpserver/relaytest.h    Fri Feb  7 22:26:46 1997
@@ -30,10 +30,12 @@
#define ndbm  db_._ndbm
};

-#else
+#else  /* This is the external interface -- doesn't tell a thing ;-) */
+
struct relaytest {
  void *dummy;
};
+
#endif


diff -u -r zmailer-2.99.46rel/smtpserver/smtpserver.c zmailer-2.99.46p1/smtpserver/smtpserver.c
--- zmailer-2.99.46rel/smtpserver/smtpserver.c  Mon Feb  3 00:46:10 1997
+++ zmailer-2.99.46p1/smtpserver/smtpserver.c   Fri Feb  7 16:32:20 1997
@@ -1287,7 +1287,7 @@
       s = rfc821_path(cp,STYLE(cfinfo, 'R'));
       if (s == cp) {
         /* Failure.. */
-         type821err(501,m552,buf,"Path data: %.200s",rfc821_error);
+         type821err(SS,501,m552,buf,"Path data: %.200s",rfc821_error);
         return;
       }
       if (*s == '>') {
@@ -1378,7 +1378,7 @@
           drpt_envid = s+6;
           s = xtext_string(s+6);
           if (s == NULL) {
-             type821err(-501,m554,buf,"Invalid ENVID value '%.200s'", drpt_envid);
+             type821err(SS,-501,m554,buf,"Invalid ENVID value '%.200s'", drpt_envid);
             type(SS,501,m554,"ENVID data contains illegal characters!");
             rc = 1;
             break;
@@ -1548,7 +1548,7 @@
       s = rfc821_path(cp,STYLE(cfinfo, 'R'));
       if (s == cp) {
         /* Failure.. */
-         type821err(501,m552,buf,"Path data: %s",rfc821_error);
+         type821err(SS,501,m552,buf,"Path data: %s",rfc821_error);
         return;
       }
       if (*s == '>') {
@@ -1606,7 +1606,7 @@
           drpt_orcpt = s;
           s = orcpt_string(s+6);
           if (s == NULL) {
-             type821err(-501,m454,buf,"Invalid ORCPT value '%s'", drpt_orcpt);
+             type821err(SS,-501,m454,buf,"Invalid ORCPT value '%s'", drpt_orcpt);
             type(SS,501,m454,"ORCPT-param data error!");
             return;
           }
@@ -1985,7 +1985,7 @@
       else
         s = rfc821_path2(cp,cfi); /* Without < > */
       if (s == cp) {
-         type821err(501,m552, buf,"Path data: %s",rfc821_error);
+         type821err(SS,501,m552, buf,"Path data: %s",rfc821_error);
         return;
       }
       while (*s == ' ' || *s == '\t') ++s;
@@ -2206,7 +2206,7 @@

         if (rc >= 0) {
           rfc821_error_ptr = buf + rc;
-           type821err(500, m552, buf,
+           type821err(SS,500, m552, buf,
                      "Illegal input characters: %s",
                      ((buf[rc]=='\0') ? "NUL on SMTP input" :
                       ((buf[rc]&0x80) ? "8-bit char on SMTP input":
diff -u -r zmailer-2.99.46rel/transports/mailbox/mailbox.c zmailer-2.99.46p1/transports/mailbox/mailbox.c
--- zmailer-2.99.46rel/transports/mailbox/mailbox.c     Wed Feb  5 02:24:24 1997
+++ zmailer-2.99.46p1/transports/mailbox/mailbox.c      Sat Feb  8 00:54:25 1997
@@ -890,7 +890,7 @@
           }
           return;
         }
-         if (!setupuidgid(rp, uid, -1)) {
+         if (!setupuidgid(rp, uid, 1)) {
           setrootuid(rp);
           return;
         }
@@ -1883,10 +1883,11 @@
       int gid;
{
       setrootuid(rp);
-       if (setgid(gid) < 0) {
-         DIAGNOSTIC(rp, EX_OSERR, "can't setgid to %d", (int)gid);
-         return 0;
-       }
+       if (gid >= 0)
+         if (setgid(gid) < 0) {
+           DIAGNOSTIC(rp, EX_OSERR, "can't setgid to %d", (int)gid);
+           return 0;
+         }
       if (*(rp->addr->user) == TO_FILE || *(rp->addr->user) == TO_PIPE)
         uid = atol(rp->addr->misc);
       if (setreuid(-1, uid) < 0) {
diff -u -r zmailer-2.99.46rel/utils/makendbm/makendbm.c zmailer-2.99.46p1/utils/makendbm/makendbm.c
--- zmailer-2.99.46rel/utils/makendbm/makendbm.c        Thu Feb  6 02:15:47 1997
+++ zmailer-2.99.46p1/utils/makendbm/makendbm.c Fri Feb  7 23:14:24 1997
@@ -75,7 +75,7 @@
}


-char linebuf[64*1024]; /* 64 kB for SINGLE line is rather much :-) */
+char inputline[64*1024]; /* 64 kB for SINGLE line is rather much :-) */

void
create_dbase(infile,dbf,typ)
@@ -97,15 +97,15 @@


       while (!feof(infile) && !ferror(infile)) {
-         *linebuf = 0;
-         fgets(linebuf,sizeof(linebuf)-1,infile);
-         if (*linebuf == 0) break; /* Last! */
-         s = (char *)strchr(linebuf,'\n');
+         *inputline = 0;
+         fgets(inputline,sizeof(inputline)-1,infile);
+         if (*inputline == 0) break; /* Last! */
+         s = (char *)strchr(inputline,'\n');
         if (s) *s = 0; /* Zap \n from the end -- if it exists.. */
-         if (*linebuf == '#') continue; /* Comment! */
+         if (*inputline == '#') continue; /* Comment! */

         /* Scan first white-space separated token, point its start with t! */
-         t = linebuf;
+         t = inputline;
         while (*t == '\t' || *t == ' ') ++t;

         if (*t == 0) continue; /* Blank line! */