From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-15573-listarch-gdb-patches=sourceware.cygnus.com@sources.redhat.com>
Received: (qmail 30458 invoked by alias); 15 May 2002 22:18:04 -0000
Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:gdb-patches-subscribe@sources.redhat.com>
List-Archive: <http://sources.redhat.com/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sources.redhat.com>
List-Help: <mailto:gdb-patches-help@sources.redhat.com>, <http://sources.redhat.com/ml/#faqs>
Sender: gdb-patches-owner@sources.redhat.com
Received: (qmail 30450 invoked from network); 15 May 2002 22:18:02 -0000
Received: from unknown (HELO shell4.bayarea.net) (209.128.82.1)
  by sources.redhat.com with SMTP; 15 May 2002 22:18:02 -0000
Received: from modrick (209-128-79-218.BAYAREA.NET [209.128.79.218])
	by shell4.bayarea.net (8.9.3/8.9.3) with SMTP id PAA27916
	for <gdb-patches@sources.redhat.com>; Wed, 15 May 2002 15:18:01 -0700
	(envelope-from supermo@bayarea.net)
Date: Wed, 15 May 2002 15:18:00 -0000
From: Mo DeJong <supermo@bayarea.net>
To: gdb-patches@sources.redhat.com
Subject: [patch] Fix expect build under Cygwin + Tcl/Tk 8.3
Message-Id: <20020515152145.2e808669.supermo@bayarea.net>
Organization: House of Mirth
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-SW-Source: 2002-05/txt/msg00621.txt.bz2

Greetings.

The current CVS version of expect does not build correctly under Cygwin. The root of the problem is that expect is searching for a tclConfig.sh file in tcl/unix when it should be looking in tcl/win. The following patch fixes the problem by updating the m4 macros used by the expect build.

Note: This patch was extracted from a larger patch posted to the Insight list but it does not depend on the other Cygwin related changes to Tcl.

http://sources.redhat.com/ml/insight/2002-q2/msg00071.html

cheers
Mo DeJong

2002-05-15  Mo DeJong  <supermo@bayarea.net>

	* aclocal.m4 (CY_AC_PATH_TCLCONFIG, CY_AC_PATH_TKCONFIG,
	CY_AC_PATH_ITCLH): Update macros that search for tclConfig.sh
	and tkConfig.sh so that they also check the win/ subdirectory.
	Update macro that checks for itcl.h so that it looks in
	itcl/itcl/generic instead of itcl/src. These updates
	are needed to get things building correctly under Cygwin
	gcc and Tcl/Tk 8.3.
 	* configure: Regen.

Index: aclocal.m4
===================================================================
RCS file: /cvs/src/src/expect/aclocal.m4,v
retrieving revision 1.2
diff -u -r1.2 aclocal.m4
--- aclocal.m4	11 Sep 2001 19:24:02 -0000	1.2
+++ aclocal.m4	5 May 2002 02:31:20 -0000
@@ -201,6 +201,10 @@
         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
 changequote([,])
@@ -459,6 +463,10 @@
         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
 changequote([,])
@@ -533,8 +541,8 @@
 AC_MSG_CHECKING(for Itcl private headers. srcdir=${srcdir})
 if test x"${ac_cv_c_itclh}" = x ; then
   for i in ${srcdir}/../itcl ${srcdir}/../../itcl ${srcdir}/../../../itcl ; do
-    if test -f $i/src/itcl.h ; then
-      ac_cv_c_itclh=`(cd $i/src; pwd)`
+    if test -f $i/itcl/generic/itcl.h ; then
+      ac_cv_c_itclh=`(cd $i/itcl/generic; pwd)`
       break
     fi
   done