From 237ab58c28fc029b71ef1eb795081f7f106a4455 Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Mon, 17 Mar 2003 22:27:07 +0000
Subject: [PATCH] * configure.in: w32api directory was already optional. 
 Semi-revert 2003-02-06 change. * configure: Regenerate. * Makefile.common:
 Don't specific -nostdinc if there is no w32api directory.

---
 winsup/ChangeLog       |  8 ++++++++
 winsup/Makefile.common |  6 ++++--
 winsup/configure       | 46 ++++++++++++------------------------------
 winsup/configure.in    |  7 +++----
 4 files changed, 28 insertions(+), 39 deletions(-)

diff --git a/winsup/ChangeLog b/winsup/ChangeLog
index 3aab10c63..4f08a6e28 100644
--- a/winsup/ChangeLog
+++ b/winsup/ChangeLog
@@ -1,3 +1,11 @@
+2003-03-17  Christopher Faylor  <cgf@redhat.com>
+
+	* configure.in: w32api directory was already optional.  Semi-revert
+	2003-02-06 change.
+	* configure: Regenerate.
+	* Makefile.common: Don't specific -nostdinc if there is no w32api
+	directory.
+
 2003-03-09  Christopher Faylor  <cgf@redhat.com>
 
 	* Makefile.common: Avoid double slashes in GCC_INCLUDE.
diff --git a/winsup/Makefile.common b/winsup/Makefile.common
index c98239ffb..b0cf6dfa6 100644
--- a/winsup/Makefile.common
+++ b/winsup/Makefile.common
@@ -118,9 +118,11 @@ ifeq (,${findstring $(gcc_libdir),$(CFLAGS) $(CXXFLAGS) $(CXX) $(CC)})
 GCC_INCLUDE:=${subst //,/,-I$(gcc_libdir)/include}
 endif
 
-COMPILE_CXX=$(CXX) $c -nostdinc++ -nostdinc $(ALL_CXXFLAGS) $(GCC_INCLUDE) \
+nostdinc:=${shell [ -d "$$srcdir/w32api" ] && echo "-nostdinc -nostdinc++"]}
+
+COMPILE_CXX=$(CXX) $c $(nostdinc) $(ALL_CXXFLAGS) $(GCC_INCLUDE) \
 	     -fno-rtti -fno-exceptions
-COMPILE_CC=$(CC) $c -nostdinc $(ALL_CFLAGS) $(GCC_INCLUDE)
+COMPILE_CC=$(CC) $c $(nostdinc) $(ALL_CFLAGS) $(GCC_INCLUDE)
 
 vpath %.a	$(cygwin_build):$(w32api_lib):$(newlib_build)/libc:$(newlib_build)/libm
 
diff --git a/winsup/configure b/winsup/configure
index 4bc45723f..d24314551 100755
--- a/winsup/configure
+++ b/winsup/configure
@@ -916,14 +916,13 @@ fi
 CXXFLAGS='$(CFLAGS)'
 
 
-SUBDIRS='cygwin'
+SUBDIRS='cygwin w32api'
 test -d $srcdir/mingw && SUBDIRS="mingw $SUBDIRS"
-test -d $srcdir/w32api && SUBDIRS="w32api $SUBDIRS"
 
 case "$with_cross_host" in
   ""|*cygwin*)
-    test -d $srcdir/bz2lib && SUBDIRS="$SUBDIRS bz2lib"
-    test -d $srcdir/zlib && SUBDIRS="$SUBDIRS zlib"
+    # test -d $srcdir/bz2lib && SUBDIRS="$SUBDIRS bz2lib"
+    # test -d $srcdir/zlib && SUBDIRS="$SUBDIRS zlib"
     # test -d $srcdir/subauth && SUBDIRS="$SUBDIRS subauth"
     SUBDIRS="$SUBDIRS utils doc"
     ;;
@@ -933,7 +932,7 @@ subdirs="$SUBDIRS"
 
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:937: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:936: 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
@@ -1027,34 +1026,15 @@ trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
 # Transform confdefs.h into DEFS.
 # Protect against shell expansion while executing Makefile rules.
 # Protect against Makefile macro expansion.
-#
-# If the first sed substitution is executed (which looks for macros that
-# take arguments), then we branch to the quote section.  Otherwise,
-# look for a macro that doesn't take arguments.
-cat >confdef2opt.sed <<\_ACEOF
-t clear
-: clear
-s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	(][^ 	(]*([^)]*)\)[ 	]*\(.*\),-D\1=\2,g
-t quote
-s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	][^ 	]*\)[ 	]*\(.*\),-D\1=\2,g
-t quote
-d
-: quote
-s,[ 	`~#$^&*(){}\\|;'"<>?],\\&,g
-s,\[,\\&,g
-s,\],\\&,g
-s,\$,$$,g
-p
-_ACEOF
-# We use echo to avoid assuming a particular line-breaking character.
-# The extra dot is to prevent the shell from consuming trailing
-# line-breaks from the sub-command output.  A line-break within
-# single-quotes doesn't work because, if this script is created in a
-# platform that uses two characters for line-breaks (e.g., DOS), tr
-# would break.
-ac_LF_and_DOT=`echo; echo .`
-DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
-rm -f confdef2opt.sed
+cat > conftest.defs <<\EOF
+s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
+s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
+s%\[%\\&%g
+s%\]%\\&%g
+s%\$%$$%g
+EOF
+DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
+rm -f conftest.defs
 
 
 # Without the "./", some shells look in PATH for config.status.
diff --git a/winsup/configure.in b/winsup/configure.in
index 3e6263b43..3cf3284d3 100755
--- a/winsup/configure.in
+++ b/winsup/configure.in
@@ -66,14 +66,13 @@ AC_CANONICAL_SYSTEM
 LIB_AC_PROG_CC
 LIB_AC_PROG_CXX
 
-SUBDIRS='cygwin'
+SUBDIRS='cygwin w32api'
 test -d $srcdir/mingw && SUBDIRS="mingw $SUBDIRS"
-test -d $srcdir/w32api && SUBDIRS="w32api $SUBDIRS"
 
 case "$with_cross_host" in
   ""|*cygwin*)
-    test -d $srcdir/bz2lib && SUBDIRS="$SUBDIRS bz2lib"
-    test -d $srcdir/zlib && SUBDIRS="$SUBDIRS zlib"
+    # test -d $srcdir/bz2lib && SUBDIRS="$SUBDIRS bz2lib"
+    # test -d $srcdir/zlib && SUBDIRS="$SUBDIRS zlib"
     # test -d $srcdir/subauth && SUBDIRS="$SUBDIRS subauth"
     SUBDIRS="$SUBDIRS utils doc"
     ;;