From 350c2f44b8037a70b240b87ba58b2ed0f9534c1a Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Tue, 1 Jul 2003 20:51:03 +0000
Subject: [PATCH] * configure.in: Add cygserver subdir. * Makefile.in: Ditto. *
 configure: Regenerate. * Makefile.common: Remove debugging statements.

---
 winsup/ChangeLog       | 8 ++++++++
 winsup/Makefile.common | 2 --
 winsup/Makefile.in     | 4 +++-
 winsup/configure       | 3 ++-
 winsup/configure.in    | 3 ++-
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/winsup/ChangeLog b/winsup/ChangeLog
index 9f9c5caa5..a98a2ee80 100644
--- a/winsup/ChangeLog
+++ b/winsup/ChangeLog
@@ -1,3 +1,11 @@
+2003-07-01  Christopher Faylor  <cgf@redhat.com>
+
+	* configure.in: Add cygserver subdir.
+	* Makefile.in: Ditto.
+	* configure: Regenerate.
+
+	* Makefile.common: Remove debugging statements.
+
 2003-05-12  Corinna Vinschen  <corinna@vinschen.de>
 
 	* Makefile.common: Remove newlib_sys_include and
diff --git a/winsup/Makefile.common b/winsup/Makefile.common
index 954c8477c..b028146ec 100644
--- a/winsup/Makefile.common
+++ b/winsup/Makefile.common
@@ -29,10 +29,8 @@ endif
 
 pwd:=${shell pwd}
 ifneq "${filter winsup%,${notdir $(pwd)}}" ""
-a:=${shell ${filter winsup%,${notdir $(pwd)}} >/dev/tty}
     here:=${pwd}/cygwin
 else
-a:=${shell ${filter winsup%,${notdir $(pwd)}} >/dev/tty}
     here:=${dir $(pwd)}cygwin
 endif
 bupdir:=${shell cd $(here)/..; pwd}
diff --git a/winsup/Makefile.in b/winsup/Makefile.in
index dc7d0521b..cead0750a 100644
--- a/winsup/Makefile.in
+++ b/winsup/Makefile.in
@@ -1,5 +1,5 @@
 # Makefile.in for windows stuff
-# Copyright 1995, 1996, 1997, 1998, 1999, 2000 Red Hat, Inc.
+# Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
 #
 # This file is part of Cygwin.
 #
@@ -113,3 +113,5 @@ install_utils: cygwin mingw
 install_mingw: w32api
 
 install_cygwin: w32api
+
+install_cygserver: cygwin
diff --git a/winsup/configure b/winsup/configure
index d24314551..8ed3154b6 100755
--- a/winsup/configure
+++ b/winsup/configure
@@ -924,6 +924,7 @@ case "$with_cross_host" in
     # test -d $srcdir/bz2lib && SUBDIRS="$SUBDIRS bz2lib"
     # test -d $srcdir/zlib && SUBDIRS="$SUBDIRS zlib"
     # test -d $srcdir/subauth && SUBDIRS="$SUBDIRS subauth"
+    test -d $srcdir/cygserver && SUBDIRS="$SUBDIRS cygserver"
     SUBDIRS="$SUBDIRS utils doc"
     ;;
 esac
@@ -932,7 +933,7 @@ subdirs="$SUBDIRS"
 
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:936: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:937: 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 3cf3284d3..c4bdde511 100755
--- a/winsup/configure.in
+++ b/winsup/configure.in
@@ -1,5 +1,5 @@
 dnl Autoconf configure script for Cygwin.
-dnl Copyright 1996, 1997, 1998, 1999, 2000 Red Hat, Inc.
+dnl Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
 dnl
 dnl This file is part of Cygwin.
 dnl
@@ -74,6 +74,7 @@ case "$with_cross_host" in
     # test -d $srcdir/bz2lib && SUBDIRS="$SUBDIRS bz2lib"
     # test -d $srcdir/zlib && SUBDIRS="$SUBDIRS zlib"
     # test -d $srcdir/subauth && SUBDIRS="$SUBDIRS subauth"
+    test -d $srcdir/cygserver && SUBDIRS="$SUBDIRS cygserver"
     SUBDIRS="$SUBDIRS utils doc"
     ;;
 esac