From 8fb2df196d5a6d3f19b90800e8d6909c577807c8 Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Wed, 2 Jul 2003 03:29:40 +0000
Subject: [PATCH] * configure.in: Fix --enable-server option.

---
 winsup/cygwin/ChangeLog    | 5 +++++
 winsup/cygwin/configure    | 6 +++---
 winsup/cygwin/configure.in | 9 +--------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index f69641db2..45b82e9be 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-01  Christopher Faylor  <cgf@redhat.com>
+
+	* configure.in: Fix --enable-server option.
+	* configure: Regenerate.
+
 2003-07-01  Christopher Faylor  <cgf@redhat.com>
 
 	* Makefile.in: Remove cygserver stuff.
diff --git a/winsup/cygwin/configure b/winsup/cygwin/configure
index 9848c905a..18476b579 100755
--- a/winsup/cygwin/configure
+++ b/winsup/cygwin/configure
@@ -1898,9 +1898,9 @@ esac
 fi
 
 
-# Check whether --enable-cygserver or --disable-cygserver was given.
-if test "${enable_cygserver+set}" = set; then
-  enableval="$enable_cygserver"
+# Check whether --enable-server or --disable-server was given.
+if test "${enable_server+set}" = set; then
+  enableval="$enable_server"
   case "${enableval}" in
 yes)	 cat >> confdefs.h <<\EOF
 #define USE_CYGSERVE 1
diff --git a/winsup/cygwin/configure.in b/winsup/cygwin/configure.in
index 9ad229c38..59810894a 100644
--- a/winsup/cygwin/configure.in
+++ b/winsup/cygwin/configure.in
@@ -84,19 +84,12 @@ AC_SUBST(all_host)
 AC_SUBST(install_host)
 
 AC_CHECK_TOOL(AR, ar, ar)
-dnl AC_SUBST(AR)
 AC_CHECK_TOOL(AS, as, as)
-dnl C_SUBST(AS)
 AC_CHECK_TOOL(RANLIB, ranlib, ranlib)
-dnl C_SUBST(RANLIB)
 AC_CHECK_TOOL(LD, ld, ld)
-dnl C_SUBST(LD)
 AC_CHECK_TOOL(NM, nm, nm)
-dnl C_SUBST(NM)
 AC_CHECK_TOOL(DLLTOOL, dlltool, dlltool)
-dnl C_SUBST(DLLTOOL)
 AC_CHECK_TOOL(WINDRES, windres, windres)
-dnl C_SUBST(WINDRES)
 
 AC_ALLOCA
 AC_PROG_MAKE_SET
@@ -140,7 +133,7 @@ no)	 ;;
 esac
 ])
 
-AC_ARG_ENABLE(cygserver,
+AC_ARG_ENABLE(server,
 [ --enable-server		Build a cygwin DLL which can communicate with cygserver],
 [case "${enableval}" in
 yes)	 AC_DEFINE(USE_CYGSERVE) ;;