From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14297 invoked by alias); 15 Apr 2002 21:06:15 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 14260 invoked from network); 15 Apr 2002 21:06:12 -0000 Received: from unknown (HELO cygnus.com) (205.180.83.203) by sources.redhat.com with SMTP; 15 Apr 2002 21:06:12 -0000 Received: from cse.cygnus.com (cse.sfbay.redhat.com [205.180.230.236]) by runyon.cygnus.com (8.8.7-cygnus/8.8.7) with ESMTP id OAA14385; Mon, 15 Apr 2002 14:06:11 -0700 (PDT) Received: from localhost (keiths@localhost) by cse.cygnus.com (8.8.8+Sun/8.6.4) with ESMTP id OAA11673; Mon, 15 Apr 2002 14:06:10 -0700 (PDT) X-Authentication-Warning: cse.cygnus.com: keiths owned process doing -bs Date: Mon, 15 Apr 2002 14:06:00 -0000 From: Keith Seitz X-X-Sender: To: , , Subject: [RFA] config/acinclude.m4 patch (CYG_AC_PATH_TCLCONFIG) Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-SW-Source: 2002-04/txt/msg00539.txt.bz2 Hello, This patch tweaks things most people won't ever notice... A recent import of tcl/tk 8.3 does things a little differently than the previous tcl/tk 8.0. The one that concerns me here is the one dealing with the location of tclConfig.sh and tkConfig.sh. tkConfig.sh is now located in tk/win/tkConfig.sh instead of tk/unix/tkConfig.sh. tclConfig.sh is still in the same place, but it is possible that it could one day also be in the win/ directory. This patch "fixes" CYG_AC_PATH_TCLCONFIG and CYG_AC_PATH_TKCONFIG so that it works on cygwin again. (It will still work fine with older versions of tcl/tk that were done for cygwin.) Ok to commit? Keith ChangeLog 2002-04-15 Keith Seitz * acinclude.m4 (CYG_AC_PATH_TCLCONFIG): Search the win/ directory, too. (CYG_AC_PATH_TKCONFIG): Likewise. Patch Index: config/acinclude.m4 =================================================================== RCS file: /cvs/src/src/config/acinclude.m4,v retrieving revision 1.3 diff -p -r1.3 acinclude.m4 *** config/acinclude.m4 12 Apr 2002 01:23:53 -0000 1.3 --- config/acinclude.m4 15 Apr 2002 20:21:39 -0000 *************** if test x"${no_tcl}" = x ; then *** 959,968 **** --- 959,975 ---- 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 *************** if test x"${no_tcl}" = x ; then *** 978,987 **** --- 985,1001 ---- 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 *************** if test x"${no_tk}" = x ; then *** 1178,1187 **** --- 1192,1208 ---- 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 *************** if test x"${no_tk}" = x ; then *** 1197,1204 **** --- 1218,1232 ---- 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