$(KRB4) -> \$KRB4 so our /bin/sh won't spit out an error message while

configuring.

2 files changed, 225 insertions, 307 deletions

diff --git a/gnu/usr.bin/cvs/configure b/gnu/usr.bin/cvs/configure
index 4cf2521b515..fdaa36c7a4e 100644
--- a/gnu/usr.bin/cvs/configure
+++ b/gnu/usr.bin/cvs/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.3 
+# Generated automatically using autoconf version 2.4 
 # Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
@@ -12,7 +12,7 @@ ac_help=
 ac_default_prefix=/usr/local
 # Any additions from configure.in:
 ac_help="$ac_help
-  --with-krb4"
+  --with-krb4=value       set default \$KRB4 from value"
 
 # Initialize some variables set by options.
 # The variables have the same names as the options, with
@@ -218,7 +218,7 @@ EOF
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.3"
+    echo "configure generated by autoconf version 2.4"
     exit 0 ;;
 
   -with-* | --with-*)
@@ -402,11 +402,6 @@ fi
 
 
 
-cat >> confdefs.h <<\EOF
-#define CVS_SUPPORT 1
-EOF
-
-
 # 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
@@ -480,6 +475,7 @@ else
   test "${CFLAGS+set}" = set || CFLAGS="-g"
 fi
 
+
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
@@ -495,7 +491,7 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 499 "configure"
+#line 495 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
@@ -509,7 +505,7 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 513 "configure"
+#line 509 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
@@ -528,13 +524,15 @@ fi
 rm -f conftest*
   ac_cv_prog_CPP="$CPP"
 fi
+  CPP="$ac_cv_prog_CPP"
+else
+  ac_cv_prog_CPP="$CPP"
 fi
-CPP="$ac_cv_prog_CPP"
 echo "$ac_t""$CPP" 1>&6
 
 echo $ac_n "checking for AIX""... $ac_c" 1>&6
 cat > conftest.$ac_ext <<EOF
-#line 538 "configure"
+#line 536 "configure"
 #include "confdefs.h"
 #ifdef _AIX
   yes
@@ -561,7 +559,7 @@ 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 565 "configure"
+#line 563 "configure"
 #include "confdefs.h"
 #include <minix/config.h>
 EOF
@@ -624,12 +622,76 @@ if test "$ISC" = yes; then
 CFLAGS="$CFLAGS -D_SYSV3"
 fi
 
+if test "x$prefix" = xNONE; then
+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
+if eval "test \"`echo '$''{'ac_cv_path_CVS'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$CVS" in
+  /*)
+  ac_cv_path_CVS="$CVS" # Let the user override the test with a path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_CVS="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  ;;
+esac
+fi
+CVS="$ac_cv_path_CVS"
+if test -n "$CVS"; then
+  echo "$ac_t""$CVS" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+  if test -n "$ac_cv_path_CVS"; then
+    prefix=`echo $ac_cv_path_CVS|sed 's%/[^/][^/]*//*[^/][^/]*$%%'`
+  fi
+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 673 "configure"
+#include "confdefs.h"
+main(){return(0);}
+EOF
+eval $ac_link
+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
+cross_compiling=$ac_cv_c_cross
+echo "$ac_t""$ac_cv_c_cross" 1>&6
+
+
 echo $ac_n "checking for working const""... $ac_c" 1>&6
 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 633 "configure"
+#line 695 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -697,31 +759,6 @@ EOF
 
 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 710 "configure"
-#include "confdefs.h"
-main(){return(0);}
-EOF
-eval $ac_link
-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
-cross_compiling=$ac_cv_c_cross
-echo "$ac_t""$ac_cv_c_cross" 1>&6
-
 echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6
 if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -729,7 +766,7 @@ else
   if test "$GCC" = yes; then
   # GCC predefines this symbol on systems where it applies.
 cat > conftest.$ac_ext <<EOF
-#line 733 "configure"
+#line 770 "configure"
 #include "confdefs.h"
 #ifdef __CHAR_UNSIGNED__
   yes
@@ -751,7 +788,7 @@ if test "$cross_compiling" = yes; then
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
 cat > conftest.$ac_ext <<EOF
-#line 755 "configure"
+#line 792 "configure"
 #include "confdefs.h"
 /* volatile prevents gcc2 from optimizing the test away on sparcs.  */
 #if !defined(__STDC__) || __STDC__ != 1
@@ -786,7 +823,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 790 "configure"
+#line 827 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1065,123 +1102,12 @@ if test X"$ac_cv_sys_interpreter" != X"yes" ; then
   echo "configure: warning: $ac_msg" 1>&2
 fi
 
-for ac_prog in gnudiff diff
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_path_gdiff_path'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$gdiff_path" in
-  /*)
-  ac_cv_path_gdiff_path="$gdiff_path" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_gdiff_path="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-gdiff_path="$ac_cv_path_gdiff_path"
-if test -n "$gdiff_path"; then
-  echo "$ac_t""$gdiff_path" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$gdiff_path" && break
-done
-test -n "$gdiff_path" || gdiff_path="diff"
-
-echo $ac_n "checking to see if $gdiff_path supports -a""... $ac_c" 1>&6
-if $gdiff_path -a /dev/null /dev/null > /dev/null 2>&1 ; then
-  echo "$ac_t""yes; appending -a to $gdiff_path" 1>&6
-  gdiff_path="$gdiff_path -a"
-fi
-cat >> confdefs.h <<EOF
-#define DIFF "$gdiff_path"
-EOF
-
-
-for ac_prog in ggrep gnugrep grep
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_path_ggrep_path'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$ggrep_path" in
-  /*)
-  ac_cv_path_ggrep_path="$ggrep_path" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_ggrep_path="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-ggrep_path="$ac_cv_path_ggrep_path"
-if test -n "$ggrep_path"; then
-  echo "$ac_t""$ggrep_path" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$ggrep_path" && break
-done
-test -n "$ggrep_path" || ggrep_path="grep"
-
-echo $ac_n "checking to see if $ggrep_path supports -s""... $ac_c" 1>&6
-echo foostring | $ggrep_path -s foostring > conftest.out 2>/dev/null
-if test $? -ne 0 ; then
-  echo "configure: warning: $ggrep_path does not support -s" 1>&2
-else
-  echo "$ac_t""yes" 1>&6
-  echo $ac_n "checking to see if $ggrep_path -s means to work silently""... $ac_c" 1>&6
-  if test -s conftest.out ; then
-    echo "$ac_t""no" 1>&6
-    if test "$ggrep_path" != /usr/bin/grep ; then
-      echo $ac_n "checking to see if /usr/bin/grep has the right -s""... $ac_c" 1>&6
-      echo foostring | /usr/bin/grep -s foostring > conftest.out 2>/dev/null
-      if test $? -eq 0 -a ! -s foostring ; then
-	echo "$ac_t""yes; using /usr/bin/grep" 1>&6
-	ggrep_path=/usr/bin/grep
-      else
-	echo "$ac_t""no" 1>&6
-      fi
-    fi
-  else
-    echo "$ac_t""yes" 1>&6
-  fi
-fi
-cat >> confdefs.h <<EOF
-#define GREP "$ggrep_path"
-EOF
-
-rm -f conftest*
-
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
 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 1185 "configure"
+#line 1111 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1203,7 +1129,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1207 "configure"
+#line 1133 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -1221,7 +1147,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1225 "configure"
+#line 1151 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -1242,7 +1168,7 @@ if test "$cross_compiling" = yes; then
   ac_cv_header_stdc=no
 else
 cat > conftest.$ac_ext <<EOF
-#line 1246 "configure"
+#line 1172 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1273,7 +1199,7 @@ fi
 
 for ac_hdr in errno.h unistd.h string.h memory.h utime.h fcntl.h ndbm.h \
                  sys/param.h sys/select.h sys/time.h sys/timeb.h \
-                 io.h direct.h sys/bsdtypes.h
+                 io.h direct.h sys/bsdtypes.h sys/resource.h
 do
 ac_safe=`echo "$ac_hdr" | tr './\055' '___'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -1281,7 +1207,7 @@ 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 1285 "configure"
+#line 1211 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
@@ -1314,7 +1240,7 @@ 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 1318 "configure"
+#line 1244 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -1354,7 +1280,7 @@ 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 1358 "configure"
+#line 1284 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -1408,7 +1334,7 @@ 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 1412 "configure"
+#line 1338 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -1445,7 +1371,7 @@ 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 1449 "configure"
+#line 1375 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -1484,7 +1410,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1488 "configure"
+#line 1414 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1518,7 +1444,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1522 "configure"
+#line 1448 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1551,7 +1477,7 @@ 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 1555 "configure"
+#line 1481 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -1588,7 +1514,7 @@ 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 1592 "configure"
+#line 1518 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -1620,7 +1546,7 @@ 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 1624 "configure"
+#line 1550 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -1651,7 +1577,7 @@ 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 1655 "configure"
+#line 1581 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -1682,7 +1608,7 @@ 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 1686 "configure"
+#line 1612 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -1715,7 +1641,7 @@ 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 1719 "configure"
+#line 1645 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1757,14 +1683,14 @@ fi
 
 done
 
-for ac_func in fchmod fsync ftime mkfifo putenv setvbuf vfork vprintf ftruncate timezone getpagesize fchdir
+for ac_func in fchmod fsync ftime mkfifo putenv setvbuf vfork vprintf ftruncate timezone getpagesize fchdir sigaction sigprocmask sigvec sigsetmask sigblock
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 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 1768 "configure"
+#line 1694 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1813,7 +1739,7 @@ if eval "test \"`echo '$''{'ac_cv_func_re_exec'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1817 "configure"
+#line 1743 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char re_exec(); below.  */
@@ -1863,7 +1789,7 @@ if test "$cross_compiling" = yes; then
   ac_cv_func_utime_null=no
 else
 cat > conftest.$ac_ext <<EOF
-#line 1867 "configure"
+#line 1793 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -1899,7 +1825,7 @@ if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1903 "configure"
+#line 1829 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() { return 0; }
@@ -1930,7 +1856,7 @@ if eval "test \"`echo '$''{'ac_cv_func_alloca'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1934 "configure"
+#line 1860 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -1988,7 +1914,7 @@ if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1992 "configure"
+#line 1918 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -2016,7 +1942,7 @@ 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 2020 "configure"
+#line 1946 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2070,7 +1996,7 @@ else
   ac_cv_c_stack_direction=0
 else
 cat > conftest.$ac_ext <<EOF
-#line 2074 "configure"
+#line 2000 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -2149,7 +2075,7 @@ else
   ccvs_cv_sys_working_fnmatch=no
 else
 cat > conftest.$ac_ext <<EOF
-#line 2153 "configure"
+#line 2079 "configure"
 #include "confdefs.h"
 
 #include <fnmatch.h>
@@ -2176,14 +2102,12 @@ if test $ccvs_cv_sys_working_fnmatch = no; then
 fi
 echo "$ac_t""$ccvs_cv_sys_working_fnmatch" 1>&6
 
+KRB4=/usr/kerberos
 
 # Check whether --with-krb4 or --without-krb4 was given.
 withval="$with_krb4"
 if test -n "$withval"; then
   KRB4=$withval
-else
-  KRB4=/usr/kerberos
-
 fi
 echo "default place for krb4 is $KRB4"
 
@@ -2196,7 +2120,7 @@ else
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
 cat > conftest.$ac_ext <<EOF
-#line 2200 "configure"
+#line 2124 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -2230,7 +2154,7 @@ else
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
 cat > conftest.$ac_ext <<EOF
-#line 2234 "configure"
+#line 2158 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -2257,36 +2181,10 @@ EOF
 
 
 
-
 krb_h=
-# 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
+echo $ac_n "checking for krb.h""... $ac_c" 1>&6
 cat > conftest.$ac_ext <<EOF
-#line 2272 "configure"
-#include "confdefs.h"
-main(){return(0);}
-EOF
-eval $ac_link
-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
-cross_compiling=$ac_cv_c_cross
-echo "$ac_t""$ac_cv_c_cross" 1>&6
-
-echo "checking for krb.h" 1>&6
-cat > conftest.$ac_ext <<EOF
-#line 2290 "configure"
+#line 2188 "configure"
 #include "confdefs.h"
 #include <krb.h>
 int main() { return 0; }
@@ -2302,9 +2200,8 @@ else
   if test "$cross_compiling" != yes && test -r $KRB4/include/krb.h; then
      hold_cflags=$CFLAGS
      CFLAGS="$CFLAGS -I$KRB4/include"
-     echo "checking for krb.h in $KRB4/include" 1>&6
-cat > conftest.$ac_ext <<EOF
-#line 2308 "configure"
+     cat > conftest.$ac_ext <<EOF
+#line 2205 "configure"
 #include "confdefs.h"
 #include <krb.h>
 int main() { return 0; }
@@ -2323,6 +2220,47 @@ rm -f conftest*
 fi
 rm -f conftest*
 
+if test -z "$krb_h"; then
+  cat > conftest.$ac_ext <<EOF
+#line 2226 "configure"
+#include "confdefs.h"
+#include <krb.h>
+int main() { return 0; }
+int t() {
+int i;
+; return 0; }
+EOF
+if eval $ac_link; then
+  rm -rf conftest*
+  krb_h=yes krb_incdir=
+else
+  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 2243 "configure"
+#include "confdefs.h"
+#include <krb.h>
+int main() { return 0; }
+int t() {
+int i;
+; return 0; }
+EOF
+if eval $ac_link; then
+  rm -rf conftest*
+  krb_h=yes krb_incdir=$KRB4/include/kerberosIV
+fi
+rm -f conftest*
+
+       CFLAGS=$hold_cflags
+     fi
+fi
+rm -f conftest*
+
+fi
+echo "$ac_t""$krb_h" 1>&6
+
 if test -n "$krb_h"; then
   krb_lib=
   echo $ac_n "checking for -lkrb""... $ac_c" 1>&6
@@ -2332,7 +2270,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lkrb  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2336 "configure"
+#line 2274 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -2342,20 +2280,21 @@ main()
 EOF
 if eval $ac_link; then
   rm -rf conftest*
-  ac_cv_lib_krb=yes
+  eval "ac_cv_lib_krb=yes"
 else
   rm -rf conftest*
-  ac_cv_lib_krb=no
+  eval "ac_cv_lib_krb=no"
 fi
 rm -f conftest*
 LIBS="$ac_save_LIBS"
 
 fi
-echo "$ac_t""$ac_cv_lib_krb" 1>&6
-if test "$ac_cv_lib_krb" = yes; then
+if eval "test \"`echo '$ac_cv_lib_'krb`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
   krb_lib=yes krb_libdir=
 else
-  if test "$cross_compiling" != yes && test -r $KRB4/lib/libkrb.a; then
+  echo "$ac_t""no" 1>&6
+if test "$cross_compiling" != yes && test -r $KRB4/lib/libkrb.a; then
        krb_lib=yes krb_libdir=$KRB4/lib
      fi
 fi
@@ -2374,7 +2313,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldes  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2378 "configure"
+#line 2317 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -2384,18 +2323,20 @@ main()
 EOF
 if eval $ac_link; then
   rm -rf conftest*
-  ac_cv_lib_des=yes
+  eval "ac_cv_lib_des=yes"
 else
   rm -rf conftest*
-  ac_cv_lib_des=no
+  eval "ac_cv_lib_des=no"
 fi
 rm -f conftest*
 LIBS="$ac_save_LIBS"
 
 fi
-echo "$ac_t""$ac_cv_lib_des" 1>&6
-if test "$ac_cv_lib_des" = yes; then
+if eval "test \"`echo '$ac_cv_lib_'des`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
   LIBS="${LIBS} -ldes"
+else
+  echo "$ac_t""no" 1>&6
 fi
 
     if test -n "$krb_incdir"; then
@@ -2411,7 +2352,7 @@ 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 2415 "configure"
+#line 2356 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2466,7 +2407,7 @@ 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 2470 "configure"
+#line 2411 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -2503,7 +2444,7 @@ if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then
   :
 else
   echo "$ac_t""no" 1>&6
-case $LIBS in
+case "$LIBS" in
 *-lnsl*) ;;
 *) echo $ac_n "checking for -lnsl_s""... $ac_c" 1>&6
 if eval "test \"`echo '$''{'ac_cv_lib_nsl_s'+set}'`\" = set"; then
@@ -2512,7 +2453,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl_s  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2516 "configure"
+#line 2457 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -2545,7 +2486,7 @@ else
 fi
  ;;
 esac
-case $LIBS in
+case "$LIBS" in
 *-lnsl*) ;;
 *) echo $ac_n "checking for -lnsl""... $ac_c" 1>&6
 if eval "test \"`echo '$''{'ac_cv_lib_nsl'+set}'`\" = set"; then
@@ -2554,7 +2495,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2558 "configure"
+#line 2499 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -2587,7 +2528,7 @@ else
 fi
  ;;
 esac
-case $LIBS in
+case "$LIBS" in
 *-lsocket*) ;;
 *) echo $ac_n "checking for -lsocket""... $ac_c" 1>&6
 if eval "test \"`echo '$''{'ac_cv_lib_socket'+set}'`\" = set"; then
@@ -2596,7 +2537,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2600 "configure"
+#line 2541 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -2629,7 +2570,7 @@ else
 fi
  ;;
 esac
-case $LIBS in
+case "$LIBS" in
 *-linet*) ;;
 *) echo $ac_n "checking for -linet""... $ac_c" 1>&6
 if eval "test \"`echo '$''{'ac_cv_lib_inet'+set}'`\" = set"; then
@@ -2638,7 +2579,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-linet  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2642 "configure"
+#line 2583 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -2679,7 +2620,7 @@ 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 2683 "configure"
+#line 2624 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2731,7 +2672,7 @@ 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 2735 "configure"
+#line 2676 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostname(); below.  */
@@ -2867,7 +2808,7 @@ do
     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.3"
+    echo "$CONFIG_STATUS generated by autoconf version 2.4"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;
@@ -2880,7 +2821,8 @@ ac_given_INSTALL="$INSTALL"
 
 trap 'rm -fr `echo "Makefile lib/Makefile src/Makefile doc/Makefile \
 	  man/Makefile contrib/Makefile contrib/pcl-cvs/Makefile \
-	  examples/Makefile windows-NT/Makefile stamp-h config.h src/options.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+	  examples/Makefile windows-NT/Makefile os2/Makefile \
+	  macintosh/Makefile stamp-h config.h src/options.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 
 # Protect against being on the right side of a sed subst in config.status. 
 sed 's/%@/@@/; s/@%/@@/; s/%g$/@g/; /@g$/s/[\\\\&%]/\\\\&/g; 
@@ -2898,6 +2840,7 @@ s%@prefix@%$prefix%g
 s%@program_transform_name@%$program_transform_name%g
 s%@CC@%$CC%g
 s%@CPP@%$CPP%g
+s%@CVS@%$CVS%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
 s%@RANLIB@%$RANLIB%g
@@ -2905,8 +2848,6 @@ s%@YACC@%$YACC%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@perl_path@%$perl_path%g
 s%@csh_path@%$csh_path%g
-s%@gdiff_path@%$gdiff_path%g
-s%@ggrep_path@%$ggrep_path%g
 s%@LIBOBJS@%$LIBOBJS%g
 s%@ALLOCA@%$ALLOCA%g
 s%@KRB4@%$KRB4%g
@@ -2918,7 +2859,8 @@ cat >> $CONFIG_STATUS <<EOF
 
 CONFIG_FILES=\${CONFIG_FILES-"Makefile lib/Makefile src/Makefile doc/Makefile \
 	  man/Makefile contrib/Makefile contrib/pcl-cvs/Makefile \
-	  examples/Makefile windows-NT/Makefile stamp-h"}
+	  examples/Makefile windows-NT/Makefile os2/Makefile \
+	  macintosh/Makefile stamp-h"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
diff --git a/gnu/usr.bin/cvs/configure.in b/gnu/usr.bin/cvs/configure.in
index 5c43c46bfd0..32eb799273a 100644
--- a/gnu/usr.bin/cvs/configure.in
+++ b/gnu/usr.bin/cvs/configure.in
@@ -1,11 +1,11 @@
 dnl configure.in for cvs
+dnl "$CVSid$"
 AC_INIT(src/cvs.h)
-AC_PREREQ(2.1)dnl Required Autoconf version.
+AC_PREREQ(2.4)dnl Required Autoconf version.
 AC_CONFIG_HEADER(config.h src/options.h)
 
-AC_DEFINE(CVS_SUPPORT)
-
 AC_PROG_CC
+
 AC_AIX
 AC_MINIX
 AC_ISC_POSIX
@@ -13,6 +13,10 @@ if test "$ISC" = yes; then
 CFLAGS="$CFLAGS -D_SYSV3"
 fi
 
+AC_PREFIX_PROGRAM(cvs)
+
+AC_C_CROSS
+
 AC_C_CONST
 AC_C_CHAR_UNSIGNED
 AC_C_INLINE
@@ -32,52 +36,10 @@ if test X"$ac_cv_sys_interpreter" != X"yes" ; then
   AC_MSG_WARN($ac_msg)
 fi
 
-AC_PATH_PROGS(gdiff_path, gnudiff diff, diff)
-AC_MSG_CHECKING(to see if $gdiff_path supports -a)
-if $gdiff_path -a /dev/null /dev/null > /dev/null 2>&1 ; then
-  AC_MSG_RESULT(yes; appending -a to $gdiff_path)
-  gdiff_path="$gdiff_path -a"
-fi
-AC_DEFINE_UNQUOTED(DIFF, "$gdiff_path")
-
-AC_PATH_PROGS(ggrep_path, ggrep gnugrep grep, grep)
-AC_MSG_CHECKING(to see if $ggrep_path supports -s)
-[echo foostring | $ggrep_path -s foostring > conftest.out 2>/dev/null]
-dnl
-dnl FIXME: We use a work-around for SunOS users with /usr/5bin first in their
-dnl FIXME: path but we should really iterate through all the possible grep's
-dnl FIXME: for one that works the way we want it to.
-dnl FIXME: On the other hand, we should handle the failure to find a "working"
-dnl FIXME: -s option by doing the old fashioned ">/dev/null".....
-dnl
-if test $? -ne 0 ; then
-  AC_MSG_WARN($ggrep_path does not support -s, used when checking for merge conflicts)
-else
-  AC_MSG_RESULT(yes)
-  AC_MSG_CHECKING(to see if $ggrep_path -s means to work silently)
-  if test -s conftest.out ; then
-    AC_MSG_RESULT(no)
-    if test "$ggrep_path" != /usr/bin/grep ; then
-      AC_MSG_CHECKING(to see if /usr/bin/grep has the right -s)
-      [echo foostring | /usr/bin/grep -s foostring > conftest.out 2>/dev/null]
-      if test $? -eq 0 -a ! -s foostring ; then
-	AC_MSG_RESULT(yes; using /usr/bin/grep)
-	ggrep_path=/usr/bin/grep
-      else
-	AC_MSG_RESULT(no)
-      fi
-    fi
-  else
-    AC_MSG_RESULT(yes)
-  fi
-fi
-AC_DEFINE_UNQUOTED(GREP, "$ggrep_path")
-rm -f conftest*
-
 AC_HEADER_STDC
 AC_CHECK_HEADERS(errno.h unistd.h string.h memory.h utime.h fcntl.h ndbm.h \
                  sys/param.h sys/select.h sys/time.h sys/timeb.h \
-                 io.h direct.h sys/bsdtypes.h)
+                 io.h direct.h sys/bsdtypes.h sys/resource.h)
 AC_HEADER_SYS_WAIT
 AC_HEADER_STAT
 AC_HEADER_TIME
@@ -88,7 +50,7 @@ AC_TYPE_MODE_T
 AC_TYPE_SIZE_T
 AC_TYPE_PID_T
 AC_REPLACE_FUNCS(getwd mkdir rename strdup strstr dup2 strerror valloc waitpid memmove)
-AC_CHECK_FUNCS(fchmod fsync ftime mkfifo putenv setvbuf vfork vprintf ftruncate timezone getpagesize fchdir)
+AC_CHECK_FUNCS(fchmod fsync ftime mkfifo putenv setvbuf vfork vprintf ftruncate timezone getpagesize fchdir sigaction sigprocmask sigvec sigsetmask sigblock)
 AC_CHECK_FUNC(re_exec, :, LIBOBJS="$LIBOBJS regex.o")
 AC_FUNC_UTIME_NULL
 AC_FUNC_ALLOCA
@@ -114,12 +76,13 @@ fi
 AC_MSG_RESULT($ccvs_cv_sys_working_fnmatch)
 
 dnl
-dnl set $(KRB4) from --with-krb4=value -- WITH_KRB4
+dnl set $KRB4 from --with-krb4=value -- WITH_KRB4
 dnl
-define(WITH_KRB4,[
-AC_WITH([krb4],
-KRB4=$withval,
 KRB4=/usr/kerberos
+define(WITH_KRB4,[
+AC_ARG_WITH([krb4],
+  [  --with-krb4=value       set default \$KRB4 from value],
+  [KRB4=$withval],
 )dnl
 echo "default place for krb4 is $KRB4"
 AC_SUBST(KRB4)])dnl
@@ -128,21 +91,33 @@ WITH_KRB4
 AC_CHECK_SIZEOF(long)
 AC_CHECK_SIZEOF(int)
 
-AC_REQUIRE([AC_CROSS_CHECK])
 krb_h=
-AC_COMPILE_CHECK(krb.h,[#include <krb.h>],[int i;],
+AC_MSG_CHECKING([for krb.h])
+AC_TRY_LINK([#include <krb.h>],[int i;],
   [krb_h=yes krb_incdir=],
   [if test "$cross_compiling" != yes && test -r $KRB4/include/krb.h; then
      hold_cflags=$CFLAGS
      CFLAGS="$CFLAGS -I$KRB4/include"
-     AC_COMPILE_CHECK(krb.h in $KRB4/include,
-       [#include <krb.h>],[int i;],
+     AC_TRY_LINK([#include <krb.h>],[int i;],
        [krb_h=yes krb_incdir=$KRB4/include])
      CFLAGS=$hold_cflags
    fi])
+if test -z "$krb_h"; then
+  AC_TRY_LINK([#include <krb.h>],[int i;],
+    [krb_h=yes krb_incdir=],
+    [if test "$cross_compiling" != yes && test -r $KRB4/include/kerberosIV/krb.h; then
+       hold_cflags=$CFLAGS
+       CFLAGS="$CFLAGS -I$KRB4/include/kerberosIV"
+       AC_TRY_LINK([#include <krb.h>],[int i;],
+	 [krb_h=yes krb_incdir=$KRB4/include/kerberosIV])
+       CFLAGS=$hold_cflags
+     fi])
+fi
+AC_MSG_RESULT($krb_h)
+
 if test -n "$krb_h"; then
   krb_lib=
-  AC_HAVE_LIBRARY(-lkrb,[krb_lib=yes krb_libdir=],
+  AC_CHECK_LIB(krb,main,[krb_lib=yes krb_libdir=],
     [if test "$cross_compiling" != yes && test -r $KRB4/lib/libkrb.a; then
        krb_lib=yes krb_libdir=$KRB4/lib
      fi])
@@ -150,7 +125,7 @@ if test -n "$krb_h"; then
     AC_DEFINE(HAVE_KERBEROS)
     test -n "${krb_libdir}" && LIBS="${LIBS} -L${krb_libdir}"
     LIBS="${LIBS} -lkrb"
-    AC_HAVE_LIBRARY(-ldes,[LIBS="${LIBS} -ldes"])
+    AC_CHECK_LIB(des,main,[LIBS="${LIBS} -ldes"])
     if test -n "$krb_incdir"; then
       includeopt="${includeopt} -I$krb_incdir"
       AC_SUBST(includeopt)
@@ -165,19 +140,19 @@ AC_CHECK_FUNCS(krb_get_err_text)
 # it.
 unset ac_cv_func_connect
 AC_CHECK_FUNC(connect, :, 
-[case $LIBS in
+[case "$LIBS" in
 *-lnsl*) ;;
 *) AC_CHECK_LIB(nsl_s, main) ;;
 esac
-case $LIBS in
+case "$LIBS" in
 *-lnsl*) ;;
 *) AC_CHECK_LIB(nsl, main) ;;
 esac
-case $LIBS in
+case "$LIBS" in
 *-lsocket*) ;;
 *) AC_CHECK_LIB(socket, connect) ;;
 esac
-case $LIBS in
+case "$LIBS" in
 *-linet*) ;;
 *) AC_CHECK_LIB(inet, connect) ;;
 esac
@@ -201,4 +176,5 @@ test -f src/options.h && (
 
 AC_OUTPUT(Makefile lib/Makefile src/Makefile doc/Makefile \
 	  man/Makefile contrib/Makefile contrib/pcl-cvs/Makefile \
-	  examples/Makefile windows-NT/Makefile stamp-h)
+	  examples/Makefile windows-NT/Makefile os2/Makefile \
+	  macintosh/Makefile stamp-h)