From 45b314b1ade5a71ec784d5ba5b3c041ccebd478f Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Fri, 7 Feb 2003 03:45:15 +0000
Subject: [PATCH] * configure.in: Make w32api directory optional. * configure:
 Regenerate.

---
 winsup/ChangeLog    |  5 +++++
 winsup/configure    | 46 +++++++++++++++++++++++++++++----------------
 winsup/configure.in |  7 +------
 3 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/winsup/ChangeLog b/winsup/ChangeLog
index d141297d4..4e542900a 100644
--- a/winsup/ChangeLog
+++ b/winsup/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-06  Christopher Faylor  <cgf@redhat.com>
+
+	* configure.in: Make w32api directory optional.
+	* configure: Regenerate.
+
 2003-01-22  Corinna Vinschen  <corinna@vinschen.de>
 
 	* Makefile.common (MINGW_LDFLAGS): Add mingw/mingwex builddir.
diff --git a/winsup/configure b/winsup/configure
index cae532bfd..4bc45723f 100755
--- a/winsup/configure
+++ b/winsup/configure
@@ -918,12 +918,7 @@ CXXFLAGS='$(CFLAGS)'
 
 SUBDIRS='cygwin'
 test -d $srcdir/mingw && SUBDIRS="mingw $SUBDIRS"
-if test -d $srcdir/w32api; then
-    SUBDIRS="w32api $SUBDIRS"
-else
-    echo "*** missing w32api directory" 1>&2
-    exit 1
-fi
+test -d $srcdir/w32api && SUBDIRS="w32api $SUBDIRS"
 
 case "$with_cross_host" in
   ""|*cygwin*)
@@ -938,7 +933,7 @@ subdirs="$SUBDIRS"
 
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:942: 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
@@ -1032,15 +1027,34 @@ 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.
-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
+#
+# 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
 
 
 # Without the "./", some shells look in PATH for config.status.
diff --git a/winsup/configure.in b/winsup/configure.in
index 2f29da8bd..3e6263b43 100755
--- a/winsup/configure.in
+++ b/winsup/configure.in
@@ -68,12 +68,7 @@ LIB_AC_PROG_CXX
 
 SUBDIRS='cygwin'
 test -d $srcdir/mingw && SUBDIRS="mingw $SUBDIRS"
-if test -d $srcdir/w32api; then
-    SUBDIRS="w32api $SUBDIRS"
-else
-    echo "*** missing w32api directory" 1>&2
-    exit 1
-fi
+test -d $srcdir/w32api && SUBDIRS="w32api $SUBDIRS"
 
 case "$with_cross_host" in
   ""|*cygwin*)