From ccc7570b8444c6de9daf80ac38665f1392676db6 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Fri, 19 Sep 2003 04:36:54 +0000
Subject: [PATCH] Get rid of relay32 directory.

---
 DEVELOPERS-HINTS       | 1 -
 configure              | 7 +------
 configure.ac           | 1 -
 tools/winapi/msvcmaker | 2 +-
 4 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/DEVELOPERS-HINTS b/DEVELOPERS-HINTS
index a6898a1fa52..b1fa494edd1 100644
--- a/DEVELOPERS-HINTS
+++ b/DEVELOPERS-HINTS
@@ -177,7 +177,6 @@ respective dlls.
 	memory/			- KERNEL memory management
 	misc/			- KERNEL shell, registry, winsock, etc.
 	msdos/			- KERNEL DOS support
-	relay32/		- KERNEL 32-bit relay code
 	scheduler/		- KERNEL process and thread management
 	win32/			- KERNEL misc Win32 functions
 
diff --git a/configure b/configure
index 0759a6209ca..54aabb9f772 100755
--- a/configure
+++ b/configure
@@ -929,7 +929,7 @@ ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
     else
       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi
-    cd $ac_popdir
+    cd "$ac_popdir"
   done
 fi
 
@@ -16688,8 +16688,6 @@ esac
 
           ac_config_commands="$ac_config_commands programs/regedit/tests"
 
-          ac_config_commands="$ac_config_commands relay32"
-
           ac_config_commands="$ac_config_commands scheduler"
 
           ac_config_commands="$ac_config_commands win32"
@@ -17462,7 +17460,6 @@ do
   "objects" ) CONFIG_COMMANDS="$CONFIG_COMMANDS objects" ;;
   "programs/regapi/tests" ) CONFIG_COMMANDS="$CONFIG_COMMANDS programs/regapi/tests" ;;
   "programs/regedit/tests" ) CONFIG_COMMANDS="$CONFIG_COMMANDS programs/regedit/tests" ;;
-  "relay32" ) CONFIG_COMMANDS="$CONFIG_COMMANDS relay32" ;;
   "scheduler" ) CONFIG_COMMANDS="$CONFIG_COMMANDS scheduler" ;;
   "win32" ) CONFIG_COMMANDS="$CONFIG_COMMANDS win32" ;;
   "windows" ) CONFIG_COMMANDS="$CONFIG_COMMANDS windows" ;;
@@ -18199,8 +18196,6 @@ echo "$as_me: creating objects" >&6;} && mkdir "objects") ;;
 echo "$as_me: creating programs/regapi/tests" >&6;} && mkdir "programs/regapi/tests") ;;
     programs/regedit/tests ) test -d "programs/regedit/tests" || ({ echo "$as_me:$LINENO: creating programs/regedit/tests" >&5
 echo "$as_me: creating programs/regedit/tests" >&6;} && mkdir "programs/regedit/tests") ;;
-    relay32 ) test -d "relay32" || ({ echo "$as_me:$LINENO: creating relay32" >&5
-echo "$as_me: creating relay32" >&6;} && mkdir "relay32") ;;
     scheduler ) test -d "scheduler" || ({ echo "$as_me:$LINENO: creating scheduler" >&5
 echo "$as_me: creating scheduler" >&6;} && mkdir "scheduler") ;;
     win32 ) test -d "win32" || ({ echo "$as_me:$LINENO: creating win32" >&5
diff --git a/configure.ac b/configure.ac
index c977a672c9a..11b597e6662 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1371,7 +1371,6 @@ WINE_CONFIG_EXTRA_DIR(msdos)
 WINE_CONFIG_EXTRA_DIR(objects)
 WINE_CONFIG_EXTRA_DIR(programs/regapi/tests)
 WINE_CONFIG_EXTRA_DIR(programs/regedit/tests)
-WINE_CONFIG_EXTRA_DIR(relay32)
 WINE_CONFIG_EXTRA_DIR(scheduler)
 WINE_CONFIG_EXTRA_DIR(win32)
 WINE_CONFIG_EXTRA_DIR(windows)
diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker
index e52374c88fa..e322a8cd6ca 100755
--- a/tools/winapi/msvcmaker
+++ b/tools/winapi/msvcmaker
@@ -88,7 +88,7 @@ sub read_spec_file {
 }
 
 my @gdi32_dirs = qw(dlls/gdi/enhmfdrv dlls/gdi/mfdrv graphics objects);
-my @ntdll_dirs = qw(files loader/ne loader memory misc msdos relay32 scheduler win32);
+my @ntdll_dirs = qw(files loader/ne loader memory misc msdos scheduler win32);
 my @user32_dirs = qw(controls dlls/user/dde windows);
 
 push @makefile_in_files, "tools/winebuild/Makefile.in";