MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* acinclude.m4 (CYG_AC_PATH_TCLCONFIG): Search the win/ directory,

Browse Source 
too.
        (CYG_AC_PATH_TKCONFIG): Likewise.
This commit is contained in:
Keith Seitz 2002-04-15 21:33:07 +00:00
parent 36cc83a397
commit 58fef22778
2 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/ChangeLog
View File

@ -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> 2001-10-07 Joseph S. Myers <jsm28@cam.ac.uk>
* acinclude.m4: Fix spelling error of "separate" as "seperate". * acinclude.m4: Fix spelling error of "separate" as "seperate".

28
config/acinclude.m4
View File

@ -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 dnl next check if it came with Tcl configuration file in the source tree
if test x"${ac_cv_c_tclconfig}" = x ; then if test x"${ac_cv_c_tclconfig}" = x ; then
for i in $dirlist; do 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 if test -f $srcdir/$i/unix/tclConfig.sh ; then
ac_cv_c_tclconfig=`(cd $srcdir/$i/unix; pwd)` ac_cv_c_tclconfig=`(cd $srcdir/$i/unix; pwd)`
break break
fi fi
if test -f $srcdir/$i/win/tclConfig.sh ; then
ac_cv_c_tclconfig=`(cd $srcdir/$i/win; pwd)`
break
fi
done done
fi fi
dnl check in a few other locations 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 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. 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 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 if test -f $i/unix/tclConfig.sh ; then
ac_cv_c_tclconfig=`(cd $i/unix; pwd)` ac_cv_c_tclconfig=`(cd $i/unix; pwd)`
break break
fi fi
if test -f $i/win/tclConfig.sh ; then
ac_cv_c_tclconfig=`(cd $i/win; pwd)`
break
fi
done done
fi 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 dnl next check if it came with Tk configuration file in the source tree
if test x"${ac_cv_c_tkconfig}" = x ; then if test x"${ac_cv_c_tkconfig}" = x ; then
for i in $dirlist; do 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 if test -f $srcdir/$i/unix/tkConfig.sh ; then
ac_cv_c_tkconfig=`(cd $srcdir/$i/unix; pwd)` ac_cv_c_tkconfig=`(cd $srcdir/$i/unix; pwd)`
break break
fi fi
if test -f $srcdir/$i/win/tkConfig.sh ; then
ac_cv_c_tkconfig=`(cd $srcdir/$i/unix; pwd)`
break
fi
done done
fi fi
dnl check in a few other locations 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 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. 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 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 if test -f $i/unix/tkConfig.sh ; then
ac_cv_c_tkconfig=`(cd $i/unix; pwd)` ac_cv_c_tkconfig=`(cd $i/unix; pwd)`
break break
fi fi
if test -f $i/win/tkConfig.sh ; then
ac_cv_c_tkconfig=`(cd $i/win; pwd)`
break
fi
done done
fi fi