diff --git a/winsup/ChangeLog b/winsup/ChangeLog
index 184bf27d1..f607cc421 100644
--- a/winsup/ChangeLog
+++ b/winsup/ChangeLog
@@ -1,3 +1,8 @@
+Fri May  4 11:24:53 2001  Christopher Faylor <cgf@cygnus.com>
+
+	* configure.in: Make subauth configuration optional.
+	* configure: Regenerate.
+
 Fri May  4 15:06:00  Corinna Vinschen <corinna@vinschen.de>
 
 	* subauth: New subdirectory.
diff --git a/winsup/configure b/winsup/configure
index 7427ef06a..3545ae03a 100755
--- a/winsup/configure
+++ b/winsup/configure
@@ -921,7 +921,8 @@ case "$with_cross_host" in
   ""|*cygwin*)
     test -d $srcdir/bz2lib && SUBDIRS="$SUBDIRS bz2lib"
     test -d $srcdir/cinstall && SUBDIRS="$SUBDIRS cinstall"
-    SUBDIRS="$SUBDIRS utils doc testsuite subauth"
+    test -d $srcdir/cinstall && SUBDIRS="$SUBDIRS subauth"
+    SUBDIRS="$SUBDIRS utils doc testsuite"
     ;;
 esac
 
@@ -929,7 +930,7 @@ subdirs="$SUBDIRS"
 
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:933: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:934: 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
diff --git a/winsup/configure.in b/winsup/configure.in
index 79f03808a..254256898 100755
--- a/winsup/configure.in
+++ b/winsup/configure.in
@@ -71,7 +71,8 @@ case "$with_cross_host" in
   ""|*cygwin*)
     test -d $srcdir/bz2lib && SUBDIRS="$SUBDIRS bz2lib"
     test -d $srcdir/cinstall && SUBDIRS="$SUBDIRS cinstall"
-    SUBDIRS="$SUBDIRS utils doc testsuite subauth"
+    test -d $srcdir/cinstall && SUBDIRS="$SUBDIRS subauth"
+    SUBDIRS="$SUBDIRS utils doc testsuite"
     ;;
 esac