Minimal necessary futzing to make the --with{,out}-krb4 and

--with{,out}-gssapi switches to the configure script actually work.

The GSSAPI support in CVS is still busted; it makes a lot of
incorrect assumptions about the location of various GSSAPI
headers and libraries.  However, I have no interest in actually
fixing anything in CVS.

3 files changed, 2829 insertions, 1 deletions

diff --git a/devel/cvs/files/patch-sum b/devel/cvs/files/patch-sum
index c5005409172..c8d43c39eb5 100644
--- a/devel/cvs/files/patch-sum
+++ b/devel/cvs/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:33 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/08/18 21:58:57 thorpej Exp $
 
 MD5 (patch-aa) = 5849cf99985eeb67db5f9f69e69e8fd5
 MD5 (patch-ab) = 152906e7f3605dabf55aeedd9af72cce
@@ -17,3 +17,5 @@ MD5 (patch-ar) = 9aec2a8b76d7590845ee0253e2fa34d9
 MD5 (patch-as) = a1ee9d85ca2a060240d8d75f1d41f1a2
 MD5 (patch-at) = 0891e77ee194454422e366555abc157d
 MD5 (patch-au) = c29d29e86268d86449cb445a8ad909c5
+MD5 (patch-av) = aa1e487ab05bbd1731fbe130a207c262
+MD5 (patch-aw) = 416b5efeebb6064d5c85ac161452a12d
diff --git a/devel/cvs/patches/patch-av b/devel/cvs/patches/patch-av
new file mode 100644
index 00000000000..86f613e8c29
--- /dev/null
+++ b/devel/cvs/patches/patch-av
@@ -0,0 +1,82 @@
+$NetBSD: patch-av,v 1.1 1999/08/18 21:58:58 thorpej Exp $
+
+--- configure.in.orig	Tue Jun  2 10:29:56 1998
++++ configure.in	Wed Aug 18 14:14:36 1999
+@@ -168,6 +168,9 @@
+   AC_DEFINE(HAVE_CONNECT)
+ fi])
+ 
++includeopt=
++AC_SUBST(includeopt)
++
+ dnl
+ dnl set $(KRB4) from --with-krb4=value -- WITH_KRB4
+ dnl
+@@ -175,16 +178,19 @@
+ dnl libkrb in the system libraries, so --with-krb4=value needs to
+ dnl override the system -lkrb.
+ dnl
+-KRB4=/usr/kerberos
++KRB4=
+ define(WITH_KRB4,[
+ AC_ARG_WITH([krb4],
+   [  --with-krb4=value       set default \$(KRB4) from value],
+-  [KRB4=$withval],
++  [if test X"$withval" != X"no"; then KRB4=$withval; fi],
+ )dnl
+-echo "default place for krb4 is $KRB4"
++if test X"$KRB4" != X""; then
++   echo "default place for krb4 is $KRB4"
++fi
+ AC_SUBST(KRB4)])dnl
+ WITH_KRB4
+ 
++if test X"$KRB4" != X""; then
+ krb_h=
+ AC_MSG_CHECKING([for krb.h])
+ if test "$cross_compiling" != yes && test -r $KRB4/include/krb.h; then
+@@ -213,8 +219,6 @@
+ fi
+ AC_MSG_RESULT($krb_h)
+ 
+-includeopt=
+-AC_SUBST(includeopt)
+ if test -n "$krb_h"; then
+   krb_lib=
+   if test "$cross_compiling" != yes && test -r $KRB4/lib/libkrb.a; then
+@@ -246,20 +250,24 @@
+   fi
+ fi
+ AC_CHECK_FUNCS(krb_get_err_text)
++fi	# KRB4 empty
+ 
+ dnl
+ dnl Use --with-gssapi=DIR to enable GSSAPI support.
+ dnl
+-GSSAPI=/usr/cygnus/kerbnet
++GSSAPI=
+ define(WITH_GSSAPI,[
+ AC_ARG_WITH([gssapi],
+   [  --with-gssapi=value     GSSAPI directory],
+-  [GSSAPI=$withval],
++  [if test X"$withval" != X"no"; then GSSAPI=$withval; fi],
+ )dnl
+-echo "default place for GSSAPI is $GSSAPI"
++if test X"$GSSAPI" != X""; then
++   echo "default place for GSSAPI is $GSSAPI"
++fi
+ AC_SUBST(GSSAPI)])dnl
+ WITH_GSSAPI
+ 
++if test X"$GSSAPI" != X""; then
+ hold_cppflags=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS -I$GSSAPI/include "
+ AC_CHECK_HEADERS(gssapi.h gssapi/gssapi.h gssapi/gssapi_generic.h)
+@@ -286,6 +294,7 @@
+   # there, an_to_ln.o refers to things defined only in -lgen.
+   AC_CHECK_LIB(gen, compile)
+ fi
++fi	# GSSAPI empty
+ 
+ dnl
+ dnl Use --with-encryption to turn on encryption support
diff --git a/devel/cvs/patches/patch-aw b/devel/cvs/patches/patch-aw
new file mode 100644
index 00000000000..be2eb0018e0
--- /dev/null
+++ b/devel/cvs/patches/patch-aw
@@ -0,0 +1,2744 @@
+$NetBSD: patch-aw,v 1.1 1999/08/18 21:58:58 thorpej Exp $
+
+--- configure.orig	Tue Jun  2 10:29:52 1998
++++ configure	Wed Aug 18 14:18:44 1999
+@@ -1,7 +1,7 @@
+ #! /bin/sh
+ 
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated automatically using autoconf version 2.10 
++# Generated automatically using autoconf version 2.13 
+ # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+ #
+ # This configure script is free software; the Free Software Foundation
+@@ -61,6 +61,9 @@
+ # Initialize some other variables.
+ subdirs=
+ MFLAGS= MAKEFLAGS=
++SHELL=${CONFIG_SHELL-/bin/sh}
++# Maximum number of lines to put in a shell here document.
++ac_max_here_lines=12
+ 
+ ac_prev=
+ for ac_option
+@@ -342,7 +345,7 @@
+     verbose=yes ;;
+ 
+   -version | --version | --versio | --versi | --vers)
+-    echo "configure generated by autoconf version 2.10"
++    echo "configure generated by autoconf version 2.13"
+     exit 0 ;;
+ 
+   -with-* | --with-*)
+@@ -444,11 +447,14 @@
+ done
+ 
+ # NLS nuisances.
+-# Only set LANG and LC_ALL to C if already set.
+-# These must not be set unconditionally because not all systems understand
+-# e.g. LANG=C (notably SCO).
+-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
++# Only set these to C if already set.  These must not be set unconditionally
++# because not all systems understand e.g. LANG=C (notably SCO).
++# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
++# Non-C LC_CTYPE values break the ctype check.
+ if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
++if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
++if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
++if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
+ 
+ # confdefs.h avoids OS command line length limits that DEFS can exceed.
+ rm -rf conftest* confdefs.h
+@@ -509,8 +515,11 @@
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cc_cross
+ 
++ac_exeext=
++ac_objext=o
+ if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
+   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
+   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
+@@ -529,14 +538,16 @@
+ # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:542: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+-  for ac_dir in $PATH; do
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
+     test -z "$ac_dir" && ac_dir=.
+     if test -f $ac_dir/$ac_word; then
+       ac_cv_prog_CC="gcc"
+@@ -557,15 +568,17 @@
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:572: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_prog_rejected=no
+-  for ac_dir in $PATH; do
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
+     test -z "$ac_dir" && ac_dir=.
+     if test -f $ac_dir/$ac_word; then
+       if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+@@ -600,10 +613,92 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
++  if test -z "$CC"; then
++    case "`uname -s`" in
++    *win32* | *WIN32*)
++      # Extract the first word of "cl", so it can be a program name with args.
++set dummy cl; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:623: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_prog_CC="cl"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++fi
++fi
++CC="$ac_cv_prog_CC"
++if test -n "$CC"; then
++  echo "$ac_t""$CC" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++ ;;
++    esac
++  fi
+   test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+ fi
+ 
++echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
++echo "configure:655: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
++
++ac_ext=c
++# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cc_cross
++
++cat > conftest.$ac_ext << EOF
++
++#line 666 "configure"
++#include "confdefs.h"
++
++main(){return(0);}
++EOF
++if { (eval echo configure:671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  ac_cv_prog_cc_works=yes
++  # If we can't run a trivial program, we are probably using a cross compiler.
++  if (./conftest; exit) 2>/dev/null; then
++    ac_cv_prog_cc_cross=no
++  else
++    ac_cv_prog_cc_cross=yes
++  fi
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_prog_cc_works=no
++fi
++rm -fr conftest*
++ac_ext=c
++# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cc_cross
++
++echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
++if test $ac_cv_prog_cc_works = no; then
++  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
++fi
++echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
++echo "configure:697: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
++cross_compiling=$ac_cv_prog_cc_cross
++
+ echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
++echo "configure:702: checking whether we are using GNU C" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -612,7 +707,7 @@
+   yes;
+ #endif
+ EOF
+-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:616: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:711: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+   ac_cv_prog_gcc=yes
+ else
+   ac_cv_prog_gcc=no
+@@ -620,37 +715,51 @@
+ fi
+ 
+ echo "$ac_t""$ac_cv_prog_gcc" 1>&6
++
+ if test $ac_cv_prog_gcc = yes; then
+   GCC=yes
+-  if test "${CFLAGS+set}" != set; then
+-    echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+-if eval "test \"`echo '$''{'ac_cv_prog_gcc_g'+set}'`\" = set"; then
++else
++  GCC=
++fi
++
++ac_test_CFLAGS="${CFLAGS+set}"
++ac_save_CFLAGS="$CFLAGS"
++CFLAGS=
++echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
++echo "configure:730: checking whether ${CC-cc} accepts -g" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   echo 'void f(){}' > conftest.c
+ if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
+-  ac_cv_prog_gcc_g=yes
++  ac_cv_prog_cc_g=yes
+ else
+-  ac_cv_prog_gcc_g=no
++  ac_cv_prog_cc_g=no
+ fi
+ rm -f conftest*
+ 
+ fi
+ 
+-echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6
+-    if test $ac_cv_prog_gcc_g = yes; then
+-      CFLAGS="-g -O"
+-    else
+-      CFLAGS="-O"
+-    fi
++echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
++if test "$ac_test_CFLAGS" = set; then
++  CFLAGS="$ac_save_CFLAGS"
++elif test $ac_cv_prog_cc_g = yes; then
++  if test "$GCC" = yes; then
++    CFLAGS="-g -O2"
++  else
++    CFLAGS="-g"
+   fi
+ else
+-  GCC=
+-  test "${CFLAGS+set}" = set || CFLAGS="-g"
++  if test "$GCC" = yes; then
++    CFLAGS="-O2"
++  else
++    CFLAGS=
++  fi
+ fi
+ 
+ 
+ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
++echo "configure:763: checking how to run the C preprocessor" >&5
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+   CPP=
+@@ -665,39 +774,62 @@
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp.
+   cat > conftest.$ac_ext <<EOF
+-#line 669 "configure"
++#line 778 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:675: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out`
++{ (eval echo configure:784: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   :
+ else
+   echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   CPP="${CC-cc} -E -traditional-cpp"
+   cat > conftest.$ac_ext <<EOF
+-#line 684 "configure"
++#line 795 "configure"
++#include "confdefs.h"
++#include <assert.h>
++Syntax Error
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:801: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  :
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  CPP="${CC-cc} -nologo -E"
++  cat > conftest.$ac_ext <<EOF
++#line 812 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:690: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out`
++{ (eval echo configure:818: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   :
+ else
+   echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   CPP=/lib/cpp
+ fi
+ rm -f conftest*
+ fi
+ rm -f conftest*
++fi
++rm -f conftest*
+   ac_cv_prog_CPP="$CPP"
+ fi
+   CPP="$ac_cv_prog_CPP"
+@@ -707,8 +839,9 @@
+ echo "$ac_t""$CPP" 1>&6
+ 
+ echo $ac_n "checking for AIX""... $ac_c" 1>&6
++echo "configure:843: checking for AIX" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 712 "configure"
++#line 845 "configure"
+ #include "confdefs.h"
+ #ifdef _AIX
+   yes
+@@ -729,24 +862,27 @@
+ rm -f conftest*
+ 
+ 
+-ac_safe=`echo "minix/config.h" | tr './\055' '___'`
++ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6
++echo "configure:868: 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 739 "configure"
++#line 873 "configure"
+ #include "confdefs.h"
+ #include <minix/config.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:744: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out`
++{ (eval echo configure:878: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+   echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_header_$ac_safe=no"
+ fi
+@@ -776,6 +912,7 @@
+ fi
+ 
+ echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
++echo "configure:916: 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
+@@ -801,10 +938,11 @@
+ fi
+ 
+ if test "x$prefix" = xNONE; then
+-echo $ac_n "checking for prefix by ""... $ac_c" 1>&6
++echo $ac_n "checking for prefix by $ac_c" 1>&6
+ # Extract the first word of "cvs", so it can be a program name with args.
+ set dummy cvs; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:946: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_CVS'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -812,9 +950,13 @@
+   /*)
+   ac_cv_path_CVS="$CVS" # Let the user override the test with a path.
+   ;;
++  ?:/*)			 
++  ac_cv_path_CVS="$CVS" # Let the user override the test with a dos path.
++  ;;
+   *)
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+-  for ac_dir in $PATH; do
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do 
+     test -z "$ac_dir" && ac_dir=.
+     if test -f $ac_dir/$ac_word; then
+       ac_cv_path_CVS="$ac_dir/$ac_word"
+@@ -838,43 +980,18 @@
+ fi
+ 
+ 
+-# If we cannot run a trivial program, we must be cross compiling.
+-echo $ac_n "checking whether cross-compiling""... $ac_c" 1>&6
+-if eval "test \"`echo '$''{'ac_cv_c_cross'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  if test "$cross_compiling" = yes; then
+-  ac_cv_c_cross=yes
+-else
+-cat > conftest.$ac_ext <<EOF
+-#line 851 "configure"
+-#include "confdefs.h"
+-main(){return(0);}
+-EOF
+-{ (eval echo configure:855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+-if test -s conftest && (./conftest; exit) 2>/dev/null; then
+-  ac_cv_c_cross=no
+-else
+-  ac_cv_c_cross=yes
+-fi
+-fi
+-rm -fr conftest*
+-fi
+-
+-echo "$ac_t""$ac_cv_c_cross" 1>&6
+-cross_compiling=$ac_cv_c_cross
+ 
+ 
+ echo $ac_n "checking for working const""... $ac_c" 1>&6
++echo "configure:987: 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 874 "configure"
++#line 992 "configure"
+ #include "confdefs.h"
+ 
+-int main() { return 0; }
+-int t() {
++int main() {
+ 
+ /* Ultrix mips cc rejects this.  */
+ typedef int charset[2]; const charset x;
+@@ -920,15 +1037,16 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:924: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1041: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_c_const=yes
+ else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_c_const=no
+ fi
+ rm -f conftest*
+-
+ fi
+ 
+ echo "$ac_t""$ac_cv_c_const" 1>&6
+@@ -966,27 +1084,30 @@
+ # SunOS /usr/etc/install
+ # IRIX /sbin/install
+ # AIX /bin/install
++# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+ # AFS /usr/afsws/bin/install, which mishandles nonexistent args
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
++echo "configure:1093: checking for a BSD compatible install" >&5
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+-    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
++    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
+   for ac_dir in $PATH; do
+     # Account for people who put trailing slashes in PATH elements.
+     case "$ac_dir/" in
+     /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
+     *)
+       # OSF1 and SCO ODT 3.0 have their own names for install.
+-      for ac_prog in ginstall installbsd scoinst install; do
++      # Don't use installbsd from OSF since it installs stuff as root
++      # by default.
++      for ac_prog in ginstall scoinst install; do
+         if test -f $ac_dir/$ac_prog; then
+ 	  if test $ac_prog = install &&
+             grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
+ 	    # AIX install.  It has an incompatible calling convention.
+-	    # OSF/1 installbsd also uses dspmsg, but is usable.
+ 	    :
+ 	  else
+ 	    ac_cv_path_install="$ac_dir/$ac_prog -c"
+@@ -997,7 +1118,7 @@
+       ;;
+     esac
+   done
+-  IFS="$ac_save_ifs"
++  IFS="$ac_save_IFS"
+ 
+ fi
+   if test "${ac_cv_path_install+set}" = set; then
+@@ -1016,19 +1137,23 @@
+ # It thinks the first close brace ends the variable substitution.
+ test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+ 
++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
++
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+ # Extract the first word of "ranlib", so it can be a program name with args.
+ set dummy ranlib; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:1148: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$RANLIB"; then
+   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+ else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+-  for ac_dir in $PATH; do
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
+     test -z "$ac_dir" && ac_dir=.
+     if test -f $ac_dir/$ac_word; then
+       ac_cv_prog_RANLIB="ranlib"
+@@ -1051,14 +1176,16 @@
+ # 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:1180: 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
+   if test -n "$YACC"; then
+   ac_cv_prog_YACC="$YACC" # Let the user override the test.
+ else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+-  for ac_dir in $PATH; do
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
+     test -z "$ac_dir" && ac_dir=.
+     if test -f $ac_dir/$ac_word; then
+       ac_cv_prog_YACC="$ac_prog"
+@@ -1080,7 +1207,8 @@
+ test -n "$YACC" || YACC="yacc"
+ 
+ echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
+-set dummy ${MAKE-make}; ac_make=$2
++echo "configure:1211: checking whether ${MAKE-make} sets \${MAKE}" >&5
++set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1109,6 +1237,7 @@
+ # Extract the first word of "perl", so it can be a program name with args.
+ set dummy perl; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:1241: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_perl_path'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1116,9 +1245,13 @@
+   /*)
+   ac_cv_path_perl_path="$perl_path" # Let the user override the test with a path.
+   ;;
++  ?:/*)			 
++  ac_cv_path_perl_path="$perl_path" # Let the user override the test with a dos path.
++  ;;
+   *)
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+-  for ac_dir in $PATH; do
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do 
+     test -z "$ac_dir" && ac_dir=.
+     if test -f $ac_dir/$ac_word; then
+       ac_cv_path_perl_path="$ac_dir/$ac_word"
+@@ -1140,6 +1273,7 @@
+ # Extract the first word of "csh", so it can be a program name with args.
+ set dummy csh; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:1277: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_csh_path'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1147,9 +1281,13 @@
+   /*)
+   ac_cv_path_csh_path="$csh_path" # Let the user override the test with a path.
+   ;;
++  ?:/*)			 
++  ac_cv_path_csh_path="$csh_path" # Let the user override the test with a dos path.
++  ;;
+   *)
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+-  for ac_dir in $PATH; do
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do 
+     test -z "$ac_dir" && ac_dir=.
+     if test -f $ac_dir/$ac_word; then
+       ac_cv_path_csh_path="$ac_dir/$ac_word"
+@@ -1172,6 +1310,7 @@
+ # Pull the hash mark out of the macro call to avoid m4 problems.
+ ac_msg="whether #! works in shell scripts"
+ echo $ac_n "checking $ac_msg""... $ac_c" 1>&6
++echo "configure:1314: checking $ac_msg" >&5
+ if eval "test \"`echo '$''{'ac_cv_sys_interpreter'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1189,6 +1328,7 @@
+ fi
+ 
+ echo "$ac_t""$ac_cv_sys_interpreter" 1>&6
++interpval="$ac_cv_sys_interpreter"
+ 
+ if test X"$ac_cv_sys_interpreter" != X"yes" ; then
+   # silly trick to avoid problems in AC macros...
+@@ -1197,11 +1337,12 @@
+ fi
+ 
+ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
++echo "configure:1341: 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 1205 "configure"
++#line 1346 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -1209,13 +1350,15 @@
+ #include <float.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1213: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out`
++{ (eval echo configure:1354: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+   ac_cv_header_stdc=yes
+ else
+   echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_header_stdc=no
+ fi
+@@ -1224,7 +1367,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 1228 "configure"
++#line 1371 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ EOF
+@@ -1242,7 +1385,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 1246 "configure"
++#line 1389 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+@@ -1262,8 +1405,8 @@
+ if test "$cross_compiling" = yes; then
+   :
+ else
+-cat > conftest.$ac_ext <<EOF
+-#line 1267 "configure"
++  cat > conftest.$ac_ext <<EOF
++#line 1410 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+@@ -1274,15 +1417,19 @@
+ exit (0); }
+ 
+ EOF
+-{ (eval echo configure:1278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+-if test -s conftest && (./conftest; exit) 2>/dev/null; then
++if { (eval echo configure:1421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++then
+   :
+ else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -fr conftest*
+   ac_cv_header_stdc=no
+ fi
+-fi
+ rm -fr conftest*
+ fi
++
++fi
+ fi
+ 
+ echo "$ac_t""$ac_cv_header_stdc" 1>&6
+@@ -1298,24 +1445,27 @@
+                  sys/param.h sys/select.h sys/time.h sys/timeb.h \
+                  io.h direct.h sys/bsdtypes.h sys/resource.h
+ do
+-ac_safe=`echo "$ac_hdr" | tr './\055' '___'`
++ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
++echo "configure:1451: 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 1308 "configure"
++#line 1456 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1313: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out`
++{ (eval echo configure:1461: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+   echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_header_$ac_safe=no"
+ fi
+@@ -1323,7 +1473,7 @@
+ fi
+ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-    ac_tr_hdr=HAVE_`echo $ac_hdr | tr 'abcdefghijklmnopqrstuvwxyz./\055' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ___'`
++    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+   cat >> confdefs.h <<EOF
+ #define $ac_tr_hdr 1
+ EOF
+@@ -1334,11 +1484,12 @@
+ done
+ 
+ echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
++echo "configure:1488: 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 1342 "configure"
++#line 1493 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/wait.h>
+@@ -1348,22 +1499,22 @@
+ #ifndef WIFEXITED
+ #define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
+ #endif
+-int main() { return 0; }
+-int t() {
++int main() {
+ int s;
+ wait (&s);
+ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1359: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1509: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_header_sys_wait_h=yes
+ else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_header_sys_wait_h=no
+ fi
+ rm -f conftest*
+-
+ fi
+ 
+ echo "$ac_t""$ac_cv_header_sys_wait_h" 1>&6
+@@ -1375,11 +1526,12 @@
+ fi
+ 
+ echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6
++echo "configure:1530: checking whether stat file-mode macros are broken" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1383 "configure"
++#line 1535 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -1430,29 +1582,30 @@
+ fi
+ 
+ echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
++echo "configure:1586: 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 1438 "configure"
++#line 1591 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <time.h>
+-int main() { return 0; }
+-int t() {
++int main() {
+ struct tm *tp;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1448: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1600: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_header_time=yes
+ else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_header_time=no
+ fi
+ rm -f conftest*
+-
+ fi
+ 
+ echo "$ac_t""$ac_cv_header_time" 1>&6
+@@ -1466,34 +1619,35 @@
+ ac_header_dirent=no
+ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
+ do
+-ac_safe=`echo "$ac_hdr" | tr './\055' '___'`
++ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
++echo "configure:1625: 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 1476 "configure"
++#line 1630 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$ac_hdr>
+-int main() { return 0; }
+-int t() {
++int main() {
+ DIR *dirp = 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1485: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1638: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "ac_cv_header_dirent_$ac_safe=yes"
+ else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_header_dirent_$ac_safe=no"
+ fi
+ rm -f conftest*
+-
+ fi
+ if eval "test \"`echo '$ac_cv_header_dirent_'$ac_safe`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-    ac_tr_hdr=HAVE_`echo $ac_hdr | tr 'abcdedfghijklmnopqrstuvwxyz./\055' 'ABCDEDFGHIJKLMNOPQRSTUVWXYZ___'`
++    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+   cat >> confdefs.h <<EOF
+ #define $ac_tr_hdr 1
+ EOF
+@@ -1504,30 +1658,32 @@
+ done
+ # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
+ if test $ac_header_dirent = dirent.h; then
+-echo $ac_n "checking for -ldir""... $ac_c" 1>&6
+-ac_lib_var=`echo dir'_'opendir | tr './+\055' '__p_'`
++echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
++echo "configure:1663: 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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldir  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1516 "configure"
++#line 1671 "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
+     builtin and then its argument prototype would still apply.  */
+ char opendir();
+ 
+-int main() { return 0; }
+-int t() {
++int main() {
+ opendir()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++if { (eval echo configure:1682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -1543,30 +1699,32 @@
+ fi
+ 
+ else
+-echo $ac_n "checking for -lx""... $ac_c" 1>&6
+-ac_lib_var=`echo x'_'opendir | tr './+\055' '__p_'`
++echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
++echo "configure:1704: 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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lx  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1555 "configure"
++#line 1712 "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
+     builtin and then its argument prototype would still apply.  */
+ char opendir();
+ 
+-int main() { return 0; }
+-int t() {
++int main() {
+ opendir()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++if { (eval echo configure:1723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -1584,11 +1742,12 @@
+ fi
+ 
+ echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
++echo "configure:1746: 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 1592 "configure"
++#line 1751 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <signal.h>
+@@ -1601,20 +1760,20 @@
+ void (*signal ()) ();
+ #endif
+ 
+-int main() { return 0; }
+-int t() {
++int main() {
+ int i;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1610: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_type_signal=void
+ else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_type_signal=int
+ fi
+ rm -f conftest*
+-
+ fi
+ 
+ echo "$ac_t""$ac_cv_type_signal" 1>&6
+@@ -1624,11 +1783,12 @@
+ 
+ 
+ echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
++echo "configure:1787: 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 1632 "configure"
++#line 1792 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ EOF
+@@ -1657,19 +1817,21 @@
+ fi
+ 
+ echo $ac_n "checking for mode_t""... $ac_c" 1>&6
++echo "configure:1821: 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 1665 "configure"
++#line 1826 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+ #include <stdlib.h>
++#include <stddef.h>
+ #endif
+ EOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  egrep "mode_t" >/dev/null 2>&1; then
++  egrep "(^|[^a-zA-Z_0-9])mode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+   rm -rf conftest*
+   ac_cv_type_mode_t=yes
+ else
+@@ -1688,19 +1850,21 @@
+ fi
+ 
+ echo $ac_n "checking for size_t""... $ac_c" 1>&6
++echo "configure:1854: 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 1696 "configure"
++#line 1859 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+ #include <stdlib.h>
++#include <stddef.h>
+ #endif
+ EOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  egrep "size_t" >/dev/null 2>&1; then
++  egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+   rm -rf conftest*
+   ac_cv_type_size_t=yes
+ else
+@@ -1719,19 +1883,21 @@
+ fi
+ 
+ echo $ac_n "checking for pid_t""... $ac_c" 1>&6
++echo "configure:1887: checking for pid_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1727 "configure"
++#line 1892 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+ #include <stdlib.h>
++#include <stddef.h>
+ #endif
+ EOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  egrep "pid_t" >/dev/null 2>&1; then
++  egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+   rm -rf conftest*
+   ac_cv_type_pid_t=yes
+ else
+@@ -1750,28 +1916,29 @@
+ fi
+ 
+ echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
++echo "configure:1920: checking for st_blksize in struct stat" >&5
+ if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1758 "configure"
++#line 1925 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/stat.h>
+-int main() { return 0; }
+-int t() {
++int main() {
+ struct stat s; s.st_blksize;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1767: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1933: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_struct_st_blksize=yes
+ else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_struct_st_blksize=no
+ fi
+ rm -f conftest*
+-
+ fi
+ 
+ echo "$ac_t""$ac_cv_struct_st_blksize" 1>&6
+@@ -1785,11 +1952,12 @@
+ for ac_func in mkdir rename strstr dup2 strerror valloc waitpid memmove vasprintf strtoul
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
++echo "configure:1956: 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 1793 "configure"
++#line 1961 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -1799,8 +1967,7 @@
+     builtin and then its argument prototype would still apply.  */
+ char $ac_func();
+ 
+-int main() { return 0; }
+-int t() {
++int main() {
+ 
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+@@ -1813,34 +1980,41 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++if { (eval echo configure:1984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=no"
+ fi
+ rm -f conftest*
+-
+ fi
++
+ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-  :
++    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_func 1
++EOF
++ 
+ else
+   echo "$ac_t""no" 1>&6
+-LIBOBJS="$LIBOBJS ${ac_func}.o"
++LIBOBJS="$LIBOBJS ${ac_func}.${ac_objext}"
+ fi
+-
+ done
+ 
++
+ for ac_func in fchmod fsync ftime mktemp putenv vprintf ftruncate timezone getpagesize initgroups fchdir sigaction sigprocmask sigvec sigsetmask sigblock tempnam tzset readlink wait3
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
++echo "configure:2013: 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 1844 "configure"
++#line 2018 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -1850,8 +2024,7 @@
+     builtin and then its argument prototype would still apply.  */
+ char $ac_func();
+ 
+-int main() { return 0; }
+-int t() {
++int main() {
+ 
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+@@ -1864,16 +2037,18 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++if { (eval echo configure:2041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=no"
+ fi
+ rm -f conftest*
+-
+ fi
++
+ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+     ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+@@ -1896,24 +2071,27 @@
+ EOF
+ 
+ 
+-ac_safe=`echo "vfork.h" | tr './\055' '___'`
++ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
++echo "configure:2077: checking for vfork.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1906 "configure"
++#line 2082 "configure"
+ #include "confdefs.h"
+ #include <vfork.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1911: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out`
++{ (eval echo configure:2087: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+   echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_header_$ac_safe=no"
+ fi
+@@ -1930,16 +2108,18 @@
+ fi
+ 
+ echo $ac_n "checking for working vfork""... $ac_c" 1>&6
+-if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then
++echo "configure:2112: checking for working vfork" >&5
++if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test "$cross_compiling" = yes; then
+   echo $ac_n "checking for vfork""... $ac_c" 1>&6
++echo "configure:2118: checking for vfork" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1943 "configure"
++#line 2123 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char vfork(); below.  */
+@@ -1949,8 +2129,7 @@
+     builtin and then its argument prototype would still apply.  */
+ char vfork();
+ 
+-int main() { return 0; }
+-int t() {
++int main() {
+ 
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+@@ -1963,16 +2142,18 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++if { (eval echo configure:2146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_vfork=yes"
+ else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_func_vfork=no"
+ fi
+ rm -f conftest*
+-
+ fi
++
+ if eval "test \"`echo '$ac_cv_func_'vfork`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   :
+@@ -1980,9 +2161,10 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
++ac_cv_func_vfork_works=$ac_cv_func_vfork
+ else
+-cat > conftest.$ac_ext <<EOF
+-#line 1986 "configure"
++  cat > conftest.$ac_ext <<EOF
++#line 2168 "configure"
+ #include "confdefs.h"
+ /* Thanks to Paul Eggert for this test.  */
+ #include <stdio.h>
+@@ -2010,8 +2192,10 @@
+   static pid_t child;
+   if (!child) {
+     child = vfork ();
+-    if (child < 0)
++    if (child < 0) {
+       perror ("vfork");
++      _exit(2);
++    }
+     if (!child) {
+       arg = getpid();
+       write(-1, "", 0);
+@@ -2075,18 +2259,22 @@
+   }
+ }
+ EOF
+-{ (eval echo configure:2079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+-if test -s conftest && (./conftest; exit) 2>/dev/null; then
+-  ac_cv_func_vfork=yes
++if { (eval echo configure:2263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++then
++  ac_cv_func_vfork_works=yes
+ else
+-  ac_cv_func_vfork=no
+-fi
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -fr conftest*
++  ac_cv_func_vfork_works=no
+ fi
+ rm -fr conftest*
+ fi
+ 
+-echo "$ac_t""$ac_cv_func_vfork" 1>&6
+-if test $ac_cv_func_vfork = no; then
++fi
++
++echo "$ac_t""$ac_cv_func_vfork_works" 1>&6
++if test $ac_cv_func_vfork_works = no; then
+   cat >> confdefs.h <<\EOF
+ #define vfork fork
+ EOF
+@@ -2094,29 +2282,34 @@
+ fi
+ 
+ echo $ac_n "checking whether closedir returns void""... $ac_c" 1>&6
++echo "configure:2286: 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
+   if test "$cross_compiling" = yes; then
+   ac_cv_func_closedir_void=yes
+ else
+-cat > conftest.$ac_ext <<EOF
+-#line 2105 "configure"
++  cat > conftest.$ac_ext <<EOF
++#line 2294 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$ac_header_dirent>
+ int closedir(); main() { exit(closedir(opendir(".")) != 0); }
+ EOF
+-{ (eval echo configure:2111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+-if test -s conftest && (./conftest; exit) 2>/dev/null; then
++if { (eval echo configure:2300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++then
+   ac_cv_func_closedir_void=no
+ else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -fr conftest*
+   ac_cv_func_closedir_void=yes
+ fi
+-fi
+ rm -fr conftest*
+ fi
+ 
++fi
++
+ echo "$ac_t""$ac_cv_func_closedir_void" 1>&6
+ if test $ac_cv_func_closedir_void = yes; then
+   cat >> confdefs.h <<\EOF
+@@ -2126,30 +2319,32 @@
+ fi
+ 
+ 
+-echo $ac_n "checking for -lsec""... $ac_c" 1>&6
+-ac_lib_var=`echo sec'_'getspnam | tr './+\055' '__p_'`
++echo $ac_n "checking for getspnam in -lsec""... $ac_c" 1>&6
++echo "configure:2324: checking for getspnam in -lsec" >&5
++ac_lib_var=`echo sec'_'getspnam | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lsec  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2138 "configure"
++#line 2332 "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
+     builtin and then its argument prototype would still apply.  */
+ char getspnam();
+ 
+-int main() { return 0; }
+-int t() {
++int main() {
+ getspnam()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++if { (eval echo configure:2343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -2159,7 +2354,8 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-    ac_tr_lib=HAVE_LIB`echo sec | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
++    ac_tr_lib=HAVE_LIB`echo sec | sed -e 's/[^a-zA-Z0-9_]/_/g' \
++    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+   cat >> confdefs.h <<EOF
+ #define $ac_tr_lib 1
+ EOF
+@@ -2173,11 +2369,12 @@
+ for ac_func in getspnam
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
++echo "configure:2373: 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 2181 "configure"
++#line 2378 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -2187,8 +2384,7 @@
+     builtin and then its argument prototype would still apply.  */
+ char $ac_func();
+ 
+-int main() { return 0; }
+-int t() {
++int main() {
+ 
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+@@ -2201,16 +2397,18 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++if { (eval echo configure:2401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=no"
+ fi
+ rm -f conftest*
+-
+ fi
++
+ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+     ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+@@ -2225,6 +2423,7 @@
+ 
+ 
+ echo $ac_n "checking whether utime accepts a null argument""... $ac_c" 1>&6
++echo "configure:2427: 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
+@@ -2233,8 +2432,8 @@
+ if test "$cross_compiling" = yes; then
+   ac_cv_func_utime_null=no
+ else
+-cat > conftest.$ac_ext <<EOF
+-#line 2238 "configure"
++  cat > conftest.$ac_ext <<EOF
++#line 2437 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -2245,14 +2444,18 @@
+ && t.st_mtime - s.st_mtime < 120));
+ }
+ EOF
+-{ (eval echo configure:2249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+-if test -s conftest && (./conftest; exit) 2>/dev/null; then
++if { (eval echo configure:2448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++then
+   ac_cv_func_utime_null=yes
+ else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -fr conftest*
+   ac_cv_func_utime_null=no
+ fi
+-fi
+ rm -fr conftest*
++fi
++
+ rm -f core core.* *.core
+ fi
+ 
+@@ -2265,19 +2468,27 @@
+ fi
+ 
+ echo $ac_n "checking for long file names""... $ac_c" 1>&6
++echo "configure:2472: checking for long file names" >&5
+ if eval "test \"`echo '$''{'ac_cv_sys_long_file_names'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_cv_sys_long_file_names=yes
+ # Test for long file names in all the places we know might matter:
+ #      .		the current directory, where building will happen
+-#      /tmp		where it might want to write temporary files
+-#      /var/tmp		likewise
+-#      /usr/tmp		likewise
+ #      $prefix/lib	where we will be installing things
+ #      $exec_prefix/lib	likewise
+ # eval it to expand exec_prefix.
+-for ac_dir in `eval echo . /tmp /var/tmp /usr/tmp $prefix/lib $exec_prefix/lib` ; do
++#      $TMPDIR		if set, where it might want to write temporary files
++# if $TMPDIR is not set:
++#      /tmp		where it might want to write temporary files
++#      /var/tmp		likewise
++#      /usr/tmp		likewise
++if test -n "$TMPDIR" && test -d "$TMPDIR" && test -w "$TMPDIR"; then
++  ac_tmpdirs="$TMPDIR"
++else
++  ac_tmpdirs='/tmp /var/tmp /usr/tmp'
++fi
++for ac_dir in  . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do
+   test -d $ac_dir || continue
+   test -w $ac_dir || continue # It is less confusing to not echo anything here.
+   (echo 1 > $ac_dir/conftest9012345) 2>/dev/null
+@@ -2302,14 +2513,15 @@
+ 
+ 
+ echo $ac_n "checking for working fnmatch function""... $ac_c" 1>&6
++echo "configure:2517: checking for working fnmatch function" >&5
+ if eval "test \"`echo '$''{'ccvs_cv_sys_working_fnmatch'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test "$cross_compiling" = yes; then
+   ccvs_cv_sys_working_fnmatch=no
+ else
+-cat > conftest.$ac_ext <<EOF
+-#line 2313 "configure"
++  cat > conftest.$ac_ext <<EOF
++#line 2525 "configure"
+ #include "confdefs.h"
+ 
+ #include <fnmatch.h>
+@@ -2321,16 +2533,20 @@
+ 	? 0 : 1);
+ }
+ EOF
+-{ (eval echo configure:2325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+-if test -s conftest && (./conftest; exit) 2>/dev/null; then
++if { (eval echo configure:2537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++then
+   ccvs_cv_sys_working_fnmatch=yes
+ else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -fr conftest*
+   ccvs_cv_sys_working_fnmatch=no
+ fi
+-fi
+ rm -fr conftest*
+ fi
+ 
++fi
++
+ if test $ccvs_cv_sys_working_fnmatch = no; then
+   LIBOBJS="$LIBOBJS fnmatch.o"
+ fi
+@@ -2342,11 +2558,12 @@
+ # only looks in /etc/hosts), so we only look for -lsocket if we need
+ # it.
+ echo $ac_n "checking for connect""... $ac_c" 1>&6
++echo "configure:2562: 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 2350 "configure"
++#line 2567 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char connect(); below.  */
+@@ -2356,8 +2573,7 @@
+     builtin and then its argument prototype would still apply.  */
+ char connect();
+ 
+-int main() { return 0; }
+-int t() {
++int main() {
+ 
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+@@ -2370,16 +2586,18 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++if { (eval echo configure:2590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_connect=yes"
+ else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_func_connect=no"
+ fi
+ rm -f conftest*
+-
+ fi
++
+ if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   :
+@@ -2387,30 +2605,32 @@
+   echo "$ac_t""no" 1>&6
+ case "$LIBS" in
+ *-lnsl*) ;;
+-*) echo $ac_n "checking for -lnsl_s""... $ac_c" 1>&6
+-ac_lib_var=`echo nsl_s'_'printf | tr './+\055' '__p_'`
++*) echo $ac_n "checking for printf in -lnsl_s""... $ac_c" 1>&6
++echo "configure:2610: checking for printf in -lnsl_s" >&5
++ac_lib_var=`echo nsl_s'_'printf | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lnsl_s  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2399 "configure"
++#line 2618 "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
+     builtin and then its argument prototype would still apply.  */
+ char printf();
+ 
+-int main() { return 0; }
+-int t() {
++int main() {
+ printf()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++if { (eval echo configure:2629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -2420,7 +2640,8 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-    ac_tr_lib=HAVE_LIB`echo nsl_s | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
++    ac_tr_lib=HAVE_LIB`echo nsl_s | sed -e 's/[^a-zA-Z0-9_]/_/g' \
++    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+   cat >> confdefs.h <<EOF
+ #define $ac_tr_lib 1
+ EOF
+@@ -2434,30 +2655,32 @@
+ esac
+ case "$LIBS" in
+ *-lnsl*) ;;
+-*) echo $ac_n "checking for -lnsl""... $ac_c" 1>&6
+-ac_lib_var=`echo nsl'_'printf | tr './+\055' '__p_'`
++*) echo $ac_n "checking for printf in -lnsl""... $ac_c" 1>&6
++echo "configure:2660: checking for printf in -lnsl" >&5
++ac_lib_var=`echo nsl'_'printf | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lnsl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2446 "configure"
++#line 2668 "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
+     builtin and then its argument prototype would still apply.  */
+ char printf();
+ 
+-int main() { return 0; }
+-int t() {
++int main() {
+ printf()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++if { (eval echo configure:2679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -2467,7 +2690,8 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-    ac_tr_lib=HAVE_LIB`echo nsl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
++    ac_tr_lib=HAVE_LIB`echo nsl | sed -e 's/[^a-zA-Z0-9_]/_/g' \
++    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+   cat >> confdefs.h <<EOF
+ #define $ac_tr_lib 1
+ EOF
+@@ -2481,30 +2705,32 @@
+ esac
+ case "$LIBS" in
+ *-lsocket*) ;;
+-*) echo $ac_n "checking for -lsocket""... $ac_c" 1>&6
+-ac_lib_var=`echo socket'_'connect | tr './+\055' '__p_'`
++*) echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
++echo "configure:2710: 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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lsocket  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2493 "configure"
++#line 2718 "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
+     builtin and then its argument prototype would still apply.  */
+ char connect();
+ 
+-int main() { return 0; }
+-int t() {
++int main() {
+ connect()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++if { (eval echo configure:2729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -2514,7 +2740,8 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-    ac_tr_lib=HAVE_LIB`echo socket | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
++    ac_tr_lib=HAVE_LIB`echo socket | sed -e 's/[^a-zA-Z0-9_]/_/g' \
++    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+   cat >> confdefs.h <<EOF
+ #define $ac_tr_lib 1
+ EOF
+@@ -2528,30 +2755,32 @@
+ esac
+ case "$LIBS" in
+ *-linet*) ;;
+-*) echo $ac_n "checking for -linet""... $ac_c" 1>&6
+-ac_lib_var=`echo inet'_'connect | tr './+\055' '__p_'`
++*) echo $ac_n "checking for connect in -linet""... $ac_c" 1>&6
++echo "configure:2760: checking for connect in -linet" >&5
++ac_lib_var=`echo inet'_'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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-linet  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2540 "configure"
++#line 2768 "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
+     builtin and then its argument prototype would still apply.  */
+ char connect();
+ 
+-int main() { return 0; }
+-int t() {
++int main() {
+ connect()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++if { (eval echo configure:2779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -2561,7 +2790,8 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-    ac_tr_lib=HAVE_LIB`echo inet | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
++    ac_tr_lib=HAVE_LIB`echo inet | sed -e 's/[^a-zA-Z0-9_]/_/g' \
++    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+   cat >> confdefs.h <<EOF
+ #define $ac_tr_lib 1
+ EOF
+@@ -2583,144 +2813,154 @@
+ fi
+ 
+ 
+-KRB4=/usr/kerberos
++includeopt=
++
++
++KRB4=
+ 
+ # Check whether --with-krb4 or --without-krb4 was given.
+ if test "${with_krb4+set}" = set; then
+   withval="$with_krb4"
+-  KRB4=$withval
++  if test X"$withval" != X"no"; then KRB4=$withval; fi
++fi
++if test X"$KRB4" != X""; then
++   echo "default place for krb4 is $KRB4"
+ fi
+-echo "default place for krb4 is $KRB4"
+ 
+ 
++if test X"$KRB4" != X""; then
+ krb_h=
+ echo $ac_n "checking for krb.h""... $ac_c" 1>&6
++echo "configure:2835: checking for krb.h" >&5
+ if test "$cross_compiling" != yes && test -r $KRB4/include/krb.h; then
+    hold_cflags=$CFLAGS
+    CFLAGS="$CFLAGS -I$KRB4/include"
+    cat > conftest.$ac_ext <<EOF
+-#line 2603 "configure"
++#line 2840 "configure"
+ #include "confdefs.h"
+ #include <krb.h>
+-int main() { return 0; }
+-int t() {
++int main() {
+ int i;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++if { (eval echo configure:2847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   krb_h=yes krb_incdir=$KRB4/include
+ else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   CFLAGS=$hold_cflags
+            cat > conftest.$ac_ext <<EOF
+-#line 2618 "configure"
++#line 2856 "configure"
+ #include "confdefs.h"
+ #include <krb.h>
+-int main() { return 0; }
+-int t() {
++int main() {
+ int i;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++if { (eval echo configure:2863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   krb_h=yes krb_incdir=
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest*
+-
+ fi
+ rm -f conftest*
+-
+    CFLAGS=$hold_cflags
+ else
+    cat > conftest.$ac_ext <<EOF
+-#line 2638 "configure"
++#line 2876 "configure"
+ #include "confdefs.h"
+ #include <krb.h>
+-int main() { return 0; }
+-int t() {
++int main() {
+ int i;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++if { (eval echo configure:2883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   krb_h=yes krb_incdir=
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest*
+-
+ fi
+ if test -z "$krb_h"; then
+   cat > conftest.$ac_ext <<EOF
+-#line 2655 "configure"
++#line 2894 "configure"
+ #include "confdefs.h"
+ #include <krb.h>
+-int main() { return 0; }
+-int t() {
++int main() {
+ int i;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++if { (eval echo configure:2901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   krb_h=yes krb_incdir=
+ else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   if test "$cross_compiling" != yes && test -r $KRB4/include/kerberosIV/krb.h; then
+        hold_cflags=$CFLAGS
+        CFLAGS="$CFLAGS -I$KRB4/include/kerberosIV"
+        cat > conftest.$ac_ext <<EOF
+-#line 2672 "configure"
++#line 2912 "configure"
+ #include "confdefs.h"
+ #include <krb.h>
+-int main() { return 0; }
+-int t() {
++int main() {
+ int i;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++if { (eval echo configure:2919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   krb_h=yes krb_incdir=$KRB4/include/kerberosIV
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest*
+-
+        CFLAGS=$hold_cflags
+      fi
+ fi
+ rm -f conftest*
+-
+ fi
+ echo "$ac_t""$krb_h" 1>&6
+ 
+-includeopt=
+-
+ if test -n "$krb_h"; then
+   krb_lib=
+   if test "$cross_compiling" != yes && test -r $KRB4/lib/libkrb.a; then
+        hold_ldflags=$LDFLAGS
+        LDFLAGS="-L${KRB4}/lib $LDFLAGS"
+-       echo $ac_n "checking for -lkrb""... $ac_c" 1>&6
+-ac_lib_var=`echo krb'_'printf | tr './+\055' '__p_'`
++       echo $ac_n "checking for printf in -lkrb""... $ac_c" 1>&6
++echo "configure:2940: checking for printf in -lkrb" >&5
++ac_lib_var=`echo krb'_'printf | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lkrb  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2709 "configure"
++#line 2948 "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
+     builtin and then its argument prototype would still apply.  */
+ char printf();
+ 
+-int main() { return 0; }
+-int t() {
++int main() {
+ printf()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++if { (eval echo configure:2959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -2736,30 +2976,32 @@
+ LDFLAGS=$hold_ldflags
+             # Using open here instead of printf so we don't
+             # get confused by the cached value for printf from above.
+-            echo $ac_n "checking for -lkrb""... $ac_c" 1>&6
+-ac_lib_var=`echo krb'_'open | tr './+\055' '__p_'`
++            echo $ac_n "checking for open in -lkrb""... $ac_c" 1>&6
++echo "configure:2981: checking for open in -lkrb" >&5
++ac_lib_var=`echo krb'_'open | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lkrb  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2748 "configure"
++#line 2989 "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
+     builtin and then its argument prototype would still apply.  */
+ char open();
+ 
+-int main() { return 0; }
+-int t() {
++int main() {
+ open()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++if { (eval echo configure:3000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -2778,30 +3020,32 @@
+ 
+        LDFLAGS=$hold_ldflags
+   else
+-       echo $ac_n "checking for -lkrb""... $ac_c" 1>&6
+-ac_lib_var=`echo krb'_'printf | tr './+\055' '__p_'`
++       echo $ac_n "checking for printf in -lkrb""... $ac_c" 1>&6
++echo "configure:3025: checking for printf in -lkrb" >&5
++ac_lib_var=`echo krb'_'printf | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lkrb  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2790 "configure"
++#line 3033 "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
+     builtin and then its argument prototype would still apply.  */
+ char printf();
+ 
+-int main() { return 0; }
+-int t() {
++int main() {
+ printf()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++if { (eval echo configure:3044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -2829,30 +3073,32 @@
+     # the user's setting for LDFLAGS
+     hold_ldflags=$LDFLAGS
+     test -n "${krb_libdir}" && LDFLAGS="$LDFLAGS -L${krb_libdir}"
+-    echo $ac_n "checking for -ldes""... $ac_c" 1>&6
+-ac_lib_var=`echo des'_'printf | tr './+\055' '__p_'`
++    echo $ac_n "checking for printf in -ldes""... $ac_c" 1>&6
++echo "configure:3078: checking for printf in -ldes" >&5
++ac_lib_var=`echo des'_'printf | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldes  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2841 "configure"
++#line 3086 "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
+     builtin and then its argument prototype would still apply.  */
+ char printf();
+ 
+-int main() { return 0; }
+-int t() {
++int main() {
+ printf()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++if { (eval echo configure:3097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -2876,11 +3122,12 @@
+ for ac_func in krb_get_err_text
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
++echo "configure:3126: 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 2884 "configure"
++#line 3131 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -2890,8 +3137,7 @@
+     builtin and then its argument prototype would still apply.  */
+ char $ac_func();
+ 
+-int main() { return 0; }
+-int t() {
++int main() {
+ 
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+@@ -2904,16 +3150,18 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++if { (eval echo configure:3154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=no"
+ fi
+ rm -f conftest*
+-
+ fi
++
+ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+     ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+@@ -2926,39 +3174,46 @@
+ fi
+ done
+ 
++fi	# KRB4 empty
+ 
+-GSSAPI=/usr/cygnus/kerbnet
++GSSAPI=
+ 
+ # Check whether --with-gssapi or --without-gssapi was given.
+ if test "${with_gssapi+set}" = set; then
+   withval="$with_gssapi"
+-  GSSAPI=$withval
++  if test X"$withval" != X"no"; then GSSAPI=$withval; fi
++fi
++if test X"$GSSAPI" != X""; then
++   echo "default place for GSSAPI is $GSSAPI"
+ fi
+-echo "default place for GSSAPI is $GSSAPI"
+ 
+ 
++if test X"$GSSAPI" != X""; then
+ hold_cppflags=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS -I$GSSAPI/include "
+ for ac_hdr in gssapi.h gssapi/gssapi.h gssapi/gssapi_generic.h
+ do
+-ac_safe=`echo "$ac_hdr" | tr './\055' '___'`
++ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
++echo "configure:3199: 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 2951 "configure"
++#line 3204 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2956: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out`
++{ (eval echo configure:3209: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+   echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_header_$ac_safe=no"
+ fi
+@@ -2966,7 +3221,7 @@
+ fi
+ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-    ac_tr_hdr=HAVE_`echo $ac_hdr | tr 'abcdefghijklmnopqrstuvwxyz./\055' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ___'`
++    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+   cat >> confdefs.h <<EOF
+ #define $ac_tr_hdr 1
+ EOF
+@@ -2994,7 +3249,7 @@
+   CPPFLAGS="-I$GSSAPI/include $CPPFLAGS"
+   if test "$ac_cv_header_gssapi_h" = "yes"; then
+     cat > conftest.$ac_ext <<EOF
+-#line 2998 "configure"
++#line 3253 "configure"
+ #include "confdefs.h"
+ #include <gssapi.h>
+ EOF
+@@ -3010,7 +3265,7 @@
+ 
+   else
+     cat > conftest.$ac_ext <<EOF
+-#line 3014 "configure"
++#line 3269 "configure"
+ #include "confdefs.h"
+ #include <gssapi/gssapi.h>
+ EOF
+@@ -3028,30 +3283,32 @@
+   CPPFLAGS=$save_CPPFLAGS
+   # This is necessary on Irix 5.3, in order to link against libkrb5 --
+   # there, an_to_ln.o refers to things defined only in -lgen.
+-  echo $ac_n "checking for -lgen""... $ac_c" 1>&6
+-ac_lib_var=`echo gen'_'compile | tr './+\055' '__p_'`
++  echo $ac_n "checking for compile in -lgen""... $ac_c" 1>&6
++echo "configure:3288: checking for compile in -lgen" >&5
++ac_lib_var=`echo gen'_'compile | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lgen  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3040 "configure"
++#line 3296 "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
+     builtin and then its argument prototype would still apply.  */
+ char compile();
+ 
+-int main() { return 0; }
+-int t() {
++int main() {
+ compile()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++if { (eval echo configure:3307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -3061,7 +3318,8 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-    ac_tr_lib=HAVE_LIB`echo gen | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
++    ac_tr_lib=HAVE_LIB`echo gen | sed -e 's/[^a-zA-Z0-9_]/_/g' \
++    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+   cat >> confdefs.h <<EOF
+ #define $ac_tr_lib 1
+ EOF
+@@ -3073,6 +3331,7 @@
+ fi
+ 
+ fi
++fi	# GSSAPI empty
+ 
+ # Check whether --enable-encryption or --disable-encryption was given.
+ if test "${enable_encryption+set}" = set; then
+@@ -3094,11 +3353,12 @@
+ fi
+ 
+ echo $ac_n "checking for gethostname""... $ac_c" 1>&6
++echo "configure:3357: checking for gethostname" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_gethostname'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3102 "configure"
++#line 3362 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char gethostname(); below.  */
+@@ -3108,8 +3368,7 @@
+     builtin and then its argument prototype would still apply.  */
+ char gethostname();
+ 
+-int main() { return 0; }
+-int t() {
++int main() {
+ 
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+@@ -3122,16 +3381,18 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++if { (eval echo configure:3385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_gethostname=yes"
+ else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_func_gethostname=no"
+ fi
+ rm -f conftest*
+-
+ fi
++
+ if eval "test \"`echo '$ac_cv_func_'gethostname`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   :
+@@ -3191,30 +3452,32 @@
+ ### there's any harm in just testing for -lcrypt first.
+ 
+ if test "$enable_server" = yes; then
+-echo $ac_n "checking for -lcrypt""... $ac_c" 1>&6
+-ac_lib_var=`echo crypt'_'crypt | tr './+\055' '__p_'`
++echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
++echo "configure:3457: checking for crypt in -lcrypt" >&5
++ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lcrypt  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3203 "configure"
++#line 3465 "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
+     builtin and then its argument prototype would still apply.  */
+ char crypt();
+ 
+-int main() { return 0; }
+-int t() {
++int main() {
+ crypt()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++if { (eval echo configure:3476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -3224,7 +3487,8 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-    ac_tr_lib=HAVE_LIB`echo crypt | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
++    ac_tr_lib=HAVE_LIB`echo crypt | sed -e 's/[^a-zA-Z0-9_]/_/g' \
++    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+   cat >> confdefs.h <<EOF
+ #define $ac_tr_lib 1
+ EOF
+@@ -3238,11 +3502,12 @@
+ for ac_func in crypt
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
++echo "configure:3506: 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 3246 "configure"
++#line 3511 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -3252,8 +3517,7 @@
+     builtin and then its argument prototype would still apply.  */
+ char $ac_func();
+ 
+-int main() { return 0; }
+-int t() {
++int main() {
+ 
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+@@ -3266,16 +3530,18 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++if { (eval echo configure:3534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=no"
+ fi
+ rm -f conftest*
+-
+ fi
++
+ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+     ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+@@ -3303,27 +3569,28 @@
+ 
+ 
+ echo $ac_n "checking for cygwin32""... $ac_c" 1>&6
++echo "configure:3573: checking for cygwin32" >&5
+ if eval "test \"`echo '$''{'ccvs_cv_sys_cygwin32'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3311 "configure"
++#line 3578 "configure"
+ #include "confdefs.h"
+ 
+-int main() { return 0; }
+-int t() {
++int main() {
+ return __CYGWIN32__;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3585: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ccvs_cv_sys_cygwin32=yes
+ else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ccvs_cv_sys_cygwin32=no
+ fi
+ rm -f conftest*
+-
+ fi
+ 
+ echo "$ac_t""$ccvs_cv_sys_cygwin32" 1>&6
+@@ -3370,11 +3637,25 @@
+ # --recheck option to rerun configure.
+ #
+ EOF
++# The following way of writing the cache mishandles newlines in values,
++# but we know of no workaround that is simple, portable, and efficient.
++# So, don't put newlines in cache variables' values.
+ # Ultrix sh set writes to stderr and can't be redirected directly,
+ # and sets the high bit in the cache file unless we assign to the vars.
+ (set) 2>&1 |
+-  sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\${\1='\2'}/p" \
+-  >> confcache
++  case `(ac_space=' '; set | grep ac_space) 2>&1` in
++  *ac_space=\ *)
++    # `set' does not quote correctly, so add quotes (double-quote substitution
++    # turns \\\\ into \\, and sed turns \\ into \).
++    sed -n \
++      -e "s/'/'\\\\''/g" \
++      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
++    ;;
++  *)
++    # `set' quotes correctly as required by POSIX, so do not add quotes.
++    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
++    ;;
++  esac >> confcache
+ if cmp -s $cache_file confcache; then
+   :
+ else
+@@ -3429,7 +3710,7 @@
+     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
+     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
+   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
+-    echo "$CONFIG_STATUS generated by autoconf version 2.10"
++    echo "$CONFIG_STATUS generated by autoconf version 2.13"
+     exit 0 ;;
+   -help | --help | --hel | --he | --h)
+     echo "\$ac_cs_usage"; exit 0 ;;
+@@ -3454,9 +3735,11 @@
+  s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
+ $ac_vpsub
+ $extrasub
++s%@SHELL@%$SHELL%g
+ s%@CFLAGS@%$CFLAGS%g
+ s%@CPPFLAGS@%$CPPFLAGS%g
+ s%@CXXFLAGS@%$CXXFLAGS%g
++s%@FFLAGS@%$FFLAGS%g
+ s%@DEFS@%$DEFS%g
+ s%@LDFLAGS@%$LDFLAGS%g
+ s%@LIBS@%$LIBS%g
+@@ -3479,6 +3762,7 @@
+ s%@CPP@%$CPP%g
+ s%@CVS@%$CVS%g
+ s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
++s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
+ s%@INSTALL_DATA@%$INSTALL_DATA%g
+ s%@RANLIB@%$RANLIB%g
+ s%@YACC@%$YACC%g
+@@ -3486,12 +3770,48 @@
+ s%@perl_path@%$perl_path%g
+ s%@csh_path@%$csh_path%g
+ s%@LIBOBJS@%$LIBOBJS%g
+-s%@KRB4@%$KRB4%g
+ s%@includeopt@%$includeopt%g
++s%@KRB4@%$KRB4%g
+ s%@GSSAPI@%$GSSAPI%g
+ 
+ CEOF
+ EOF
++
++cat >> $CONFIG_STATUS <<\EOF
++
++# Split the substitutions into bite-sized pieces for seds with
++# small command number limits, like on Digital OSF/1 and HP-UX.
++ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
++ac_file=1 # Number of current file.
++ac_beg=1 # First line for current file.
++ac_end=$ac_max_sed_cmds # Line after last line for current file.
++ac_more_lines=:
++ac_sed_cmds=""
++while $ac_more_lines; do
++  if test $ac_beg -gt 1; then
++    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
++  else
++    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
++  fi
++  if test ! -s conftest.s$ac_file; then
++    ac_more_lines=false
++    rm -f conftest.s$ac_file
++  else
++    if test -z "$ac_sed_cmds"; then
++      ac_sed_cmds="sed -f conftest.s$ac_file"
++    else
++      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
++    fi
++    ac_file=`expr $ac_file + 1`
++    ac_beg=$ac_end
++    ac_end=`expr $ac_end + $ac_max_sed_cmds`
++  fi
++done
++if test -z "$ac_sed_cmds"; then
++  ac_sed_cmds=cat
++fi
++EOF
++
+ cat >> $CONFIG_STATUS <<EOF
+ 
+ CONFIG_FILES=\${CONFIG_FILES-"Makefile lib/Makefile src/Makefile zlib/Makefile diff/Makefile doc/Makefile \
+@@ -3503,14 +3823,14 @@
+ EOF
+ cat >> $CONFIG_STATUS <<\EOF
+ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
+-  # Support "outfile[:infile]", defaulting infile="outfile.in".
++  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+   case "$ac_file" in
+-  *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'`
++  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
+        ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+   *) ac_file_in="${ac_file}.in" ;;
+   esac
+ 
+-  # Adjust relative srcdir, etc. for subdirectories.
++  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
+ 
+   # Remove last slash and all that follows it.  Not all systems have dirname.
+   ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
+@@ -3538,6 +3858,7 @@
+   [/$]*) INSTALL="$ac_given_INSTALL" ;;
+   *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+   esac
++
+   echo creating "$ac_file"
+   rm -f "$ac_file"
+   configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
+@@ -3546,14 +3867,16 @@
+ # $configure_input" ;;
+   *) ac_comsub= ;;
+   esac
++
++  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
+   sed -e "$ac_comsub
+ s%@configure_input@%$configure_input%g
+ s%@srcdir@%$srcdir%g
+ s%@top_srcdir@%$top_srcdir%g
+ s%@INSTALL@%$INSTALL%g
+-" -f conftest.subs $ac_given_srcdir/$ac_file_in > $ac_file
++" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
+ fi; done
+-rm -f conftest.subs
++rm -f conftest.s*
+ 
+ # These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
+ # NAME is the cpp macro being defined and VALUE is the value it is being given.
+@@ -3574,11 +3897,17 @@
+ ac_eC=' '
+ ac_eD='%g'
+ 
+-CONFIG_HEADERS=${CONFIG_HEADERS-"config.h src/options.h"}
++if test "${CONFIG_HEADERS+set}" != set; then
++EOF
++cat >> $CONFIG_STATUS <<EOF
++  CONFIG_HEADERS="config.h src/options.h"
++EOF
++cat >> $CONFIG_STATUS <<\EOF
++fi
+ for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
+-  # Support "outfile[:infile]", defaulting infile="outfile.in".
++  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+   case "$ac_file" in
+-  *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'`
++  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
+        ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+   *) ac_file_in="${ac_file}.in" ;;
+   esac
+@@ -3586,7 +3915,8 @@
+   echo creating $ac_file
+ 
+   rm -f conftest.frag conftest.in conftest.out
+-  cp $ac_given_srcdir/$ac_file_in conftest.in
++  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
++  cat $ac_file_inputs > conftest.in
+ 
+ EOF
+ 
+@@ -3614,8 +3944,6 @@
+ 
+ # Break up conftest.vals because some shells have a limit on
+ # the size of here documents, and old seds have small limits too.
+-# Maximum number of lines to put in a single here document.
+-ac_max_here_lines=12
+ 
+ rm -f conftest.tail
+ while :
+@@ -3657,7 +3985,11 @@
+   fi
+ fi; done
+ 
++EOF
++cat >> $CONFIG_STATUS <<EOF
+ 
++EOF
++cat >> $CONFIG_STATUS <<\EOF
+ 
+ exit 0
+ EOF