From d76d08a1bdbc36d159fa32673c2427976e4abaf7 Mon Sep 17 00:00:00 2001
From: Keith Seitz <keiths@redhat.com>
Date: Mon, 15 Apr 2002 21:33:07 +0000
Subject: [PATCH]         * acinclude.m4 (CYG_AC_PATH_TCLCONFIG): Search the
 win/ directory,         too.         (CYG_AC_PATH_TKCONFIG): Likewise.

---
 config/ChangeLog    |  6 ++++++
 config/acinclude.m4 | 28 ++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/config/ChangeLog b/config/ChangeLog
index 17a98eba9..6e51fa2c4 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,9 @@
+2002-04-15  Keith Seitz  <keiths@redhat.com>
+
+	* acinclude.m4 (CYG_AC_PATH_TCLCONFIG): Search the win/ directory,
+	too.
+	(CYG_AC_PATH_TKCONFIG): Likewise.
+
 2001-10-07  Joseph S. Myers  <jsm28@cam.ac.uk>
 
 	* acinclude.m4: Fix spelling error of "separate" as "seperate".
diff --git a/config/acinclude.m4 b/config/acinclude.m4
index 6669ac2c0..9be62cb9a 100755
--- a/config/acinclude.m4
+++ b/config/acinclude.m4
@@ -959,10 +959,17 @@ if test x"${no_tcl}" = x ; then
     dnl next check if it came with Tcl configuration file in the source tree
     if test x"${ac_cv_c_tclconfig}" = x ; then
         for i in $dirlist; do
+            dnl need to test both unix and win directories, since 
+            dnl cygwin's tkConfig.sh could be in either directory depending
+            dnl on the cygwin port of tcl.
             if test -f $srcdir/$i/unix/tclConfig.sh ; then
                 ac_cv_c_tclconfig=`(cd $srcdir/$i/unix; pwd)`
 	        break
             fi
+            if test -f $srcdir/$i/win/tclConfig.sh ; then
+                ac_cv_c_tclconfig=`(cd $srcdir/$i/win; pwd)`
+	        break
+            fi
         done
     fi
     dnl check in a few other locations
@@ -978,10 +985,17 @@ if test x"${no_tcl}" = x ; then
         dnl find the exact Tcl dir. We do it this way, cause there
         dnl might be multiple version of Tcl, and we want the most recent one.
         for i in `ls -dr $tclconfpath/tcl* 2>/dev/null ` ; do
+            dnl need to test both unix and win directories, since 
+            dnl cygwin's tclConfig.sh could be in either directory depending
+            dnl on the cygwin port of tcl.
             if test -f $i/unix/tclConfig.sh ; then
                 ac_cv_c_tclconfig=`(cd $i/unix; pwd)`
                 break
             fi
+            if test -f $i/win/tclConfig.sh ; then
+                ac_cv_c_tclconfig=`(cd $i/win; pwd)`
+                break
+            fi
         done
     fi
 
@@ -1178,10 +1192,17 @@ if test x"${no_tk}" = x ; then
     dnl next check if it came with Tk configuration file in the source tree
     if test x"${ac_cv_c_tkconfig}" = x ; then
         for i in $dirlist; do
+            dnl need to test both unix and win directories, since 
+            dnl cygwin's tkConfig.sh could be in either directory depending
+            dnl on the cygwin port of tk.
             if test -f $srcdir/$i/unix/tkConfig.sh ; then
                 ac_cv_c_tkconfig=`(cd $srcdir/$i/unix; pwd)`
 	        break
             fi
+            if test -f $srcdir/$i/win/tkConfig.sh ; then
+                ac_cv_c_tkconfig=`(cd $srcdir/$i/unix; pwd)`
+	        break
+            fi
         done
     fi
     dnl check in a few other locations
@@ -1197,10 +1218,17 @@ if test x"${no_tk}" = x ; then
         dnl find the exact Tk dir. We do it this way, cause there
         dnl might be multiple version of Tk, and we want the most recent one.
         for i in `ls -dr $tkconfpath/tk* 2>/dev/null ` ; do
+            dnl need to test both unix and win directories, since 
+            dnl cygwin's tkConfig.sh could be in either directory depending
+            dnl on the cygwin port of tk.
             if test -f $i/unix/tkConfig.sh ; then
                 ac_cv_c_tkconfig=`(cd $i/unix; pwd)`
                 break
             fi
+            if test -f $i/win/tkConfig.sh ; then
+                ac_cv_c_tkconfig=`(cd $i/win; pwd)`
+                break
+            fi
         done
     fi