ntsec-patch16 (and some other)

[Mumit Khan]

Corinna Vinschen <corinna@vinschen.de> writes:
> 
> The problem remains the same. As Chris mentioned, I'm building in the
> source tree. I have started a ./configure in the winsup dir. This
> configure ignores the profile directory but the Makefile.in in the
> mingw dir contains the line
> 
> 	SUBDIRS := profile
> 
> So, the mingw Makefile tries to start a make in the profile
> dir which fails. This results in exiting the complete build process.

This should fix the "Mingw profile directory" problem when building winsup 
in the source directory. However, note that there are other problems that 
may be caused by the reorg when you do build in the source directory --
the "auxiliary" paths which autoconf uses to find install-sh, config.*
may or may not be found correctly (but this is just a supposition on my
part, and it may work just fine).

To patch:
  
  $ cd winsup/mingw
  $ patch -p0 < mingw-configure.diff

And regenerate configure:
 
  $ autoconf

Regards,
Mumit

Sun Jan  9 14:45:12 2000  Mumit Khan  <khan@xraylith.wisc.edu>

	* configure.in (SUBDIRS): Set and substitute appropriately.
	* Makefile.in: Use.
	* configure: Regenerate. 

Index: configure.in
===================================================================
RCS file: /homes/khan/src/CVSROOT/cygwin-dev/winsup/mingw/configure.in,v
retrieving revision 1.1.1.1
diff -u -3 -p -r1.1.1.1 configure.in
--- configure.in	2000/01/09 19:00:17	1.1.1.1
+++ configure.in	2000/01/09 20:27:25
@@ -83,6 +83,7 @@ AC_ALLOCA
 AC_CANONICAL_SYSTEM
 
 configdirs=""
+SUBDIRS=""
 
 case "$target_os" in
 *mingw32msvc*)
@@ -92,6 +93,7 @@ case "$target_os" in
   THREAD_DLL=mingwm
   LIBM_A=libm.a
   LIBGMON_A=libgmon.a
+  SUBDIRS="profile"
   configdirs="$configdirs profile"
   ;;
 *cygwin*)
@@ -112,6 +114,7 @@ case "$target_os" in
   THREAD_DLL=mingwc
   LIBM_A=libm.a
   LIBGMON_A=libgmon.a
+  SUBDIRS="profile"
   configdirs="$configdirs profile"
   ;;
 esac
@@ -128,6 +131,8 @@ AC_SUBST(MNO_CYGWIN)
 AC_SUBST(THREAD_DLL)
 AC_SUBST(LIBM_A)
 AC_SUBST(LIBGMON_A)
+AC_SUBST(SUBDIRS)
 
 AC_PROG_INSTALL
 AC_OUTPUT(Makefile)
+
Index: Makefile.in
===================================================================
RCS file: /homes/khan/src/CVSROOT/cygwin-dev/winsup/mingw/Makefile.in,v
retrieving revision 1.1.1.1
diff -u -3 -p -r1.1.1.1 Makefile.in
--- Makefile.in	2000/01/09 19:00:17	1.1.1.1
+++ Makefile.in	2000/01/09 20:27:38
@@ -81,7 +81,7 @@ DLLWRAP = @DLLWRAP@
 DLLWRAP_FOR_TARGET = $(DLLWRAP)
 DLLWRAP_FLAGS = --dlltool $(DLLTOOL) --as $(AS) --driver-name $(CC)
 
-SUBDIRS := profile
+SUBDIRS := @SUBDIRS@
 
 FLAGS_TO_PASS:=\
 	AS="$(AS)" \