* tcl.m4 (SC_PATH_TCLCONFIG): Add some simple logic to deal
with cygwin. (SC_PATH_TKCONFIG): Likewise.
This commit is contained in:
parent
4b64c41f5e
commit
8fe634981f
2 changed files with 22 additions and 8 deletions
|
@ -1,3 +1,9 @@
|
||||||
|
2008-08-02 Keith Seitz <keiths@redhat.com>
|
||||||
|
|
||||||
|
* tcl.m4 (SC_PATH_TCLCONFIG): Add some simple logic to deal
|
||||||
|
with cygwin.
|
||||||
|
(SC_PATH_TKCONFIG): Likewise.
|
||||||
|
|
||||||
2008-07-30 Paolo Bonzini <bonzini@gnu.org>
|
2008-07-30 Paolo Bonzini <bonzini@gnu.org>
|
||||||
|
|
||||||
* mh-pa: New, from gcc/config/pa/x-ada.
|
* mh-pa: New, from gcc/config/pa/x-ada.
|
||||||
|
|
|
@ -32,6 +32,10 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [
|
||||||
AC_CACHE_VAL(ac_cv_c_tclconfig,[
|
AC_CACHE_VAL(ac_cv_c_tclconfig,[
|
||||||
|
|
||||||
# First check to see if --with-tcl was specified.
|
# First check to see if --with-tcl was specified.
|
||||||
|
case "${host}" in
|
||||||
|
*-*-cygwin*) platDir="win" ;;
|
||||||
|
*) platDir="unix" ;;
|
||||||
|
esac
|
||||||
if test x"${with_tclconfig}" != x ; then
|
if test x"${with_tclconfig}" != x ; then
|
||||||
if test -f "${with_tclconfig}/tclConfig.sh" ; then
|
if test -f "${with_tclconfig}/tclConfig.sh" ; then
|
||||||
ac_cv_c_tclconfig=`(cd ${with_tclconfig}; pwd)`
|
ac_cv_c_tclconfig=`(cd ${with_tclconfig}; pwd)`
|
||||||
|
@ -55,8 +59,8 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [
|
||||||
`ls -dr ../../../tcl[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \
|
`ls -dr ../../../tcl[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \
|
||||||
`ls -dr ../../../tcl[[8-9]].[[0-9]] 2>/dev/null` \
|
`ls -dr ../../../tcl[[8-9]].[[0-9]] 2>/dev/null` \
|
||||||
`ls -dr ../../../tcl[[8-9]].[[0-9]]* 2>/dev/null` ; do
|
`ls -dr ../../../tcl[[8-9]].[[0-9]]* 2>/dev/null` ; do
|
||||||
if test -f "$i/unix/tclConfig.sh" ; then
|
if test -f "$i/$platDir/tclConfig.sh" ; then
|
||||||
ac_cv_c_tclconfig=`(cd $i/unix; pwd)`
|
ac_cv_c_tclconfig=`(cd $i/$platDir; pwd)`
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
@ -99,8 +103,8 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [
|
||||||
`ls -dr ${srcdir}/../tcl[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \
|
`ls -dr ${srcdir}/../tcl[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \
|
||||||
`ls -dr ${srcdir}/../tcl[[8-9]].[[0-9]] 2>/dev/null` \
|
`ls -dr ${srcdir}/../tcl[[8-9]].[[0-9]] 2>/dev/null` \
|
||||||
`ls -dr ${srcdir}/../tcl[[8-9]].[[0-9]]* 2>/dev/null` ; do
|
`ls -dr ${srcdir}/../tcl[[8-9]].[[0-9]]* 2>/dev/null` ; do
|
||||||
if test -f "$i/unix/tclConfig.sh" ; then
|
if test -f "$i/$platDir/tclConfig.sh" ; then
|
||||||
ac_cv_c_tclconfig=`(cd $i/unix; pwd)`
|
ac_cv_c_tclconfig=`(cd $i/$platDir; pwd)`
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
@ -161,6 +165,10 @@ AC_DEFUN([SC_PATH_TKCONFIG], [
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# then check for a private Tk library
|
# then check for a private Tk library
|
||||||
|
case "${host}" in
|
||||||
|
*-*-cygwin*) platDir="win" ;;
|
||||||
|
*) platDir="unix" ;;
|
||||||
|
esac
|
||||||
if test x"${ac_cv_c_tkconfig}" = x ; then
|
if test x"${ac_cv_c_tkconfig}" = x ; then
|
||||||
for i in \
|
for i in \
|
||||||
../tk \
|
../tk \
|
||||||
|
@ -175,8 +183,8 @@ AC_DEFUN([SC_PATH_TKCONFIG], [
|
||||||
`ls -dr ../../../tk[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \
|
`ls -dr ../../../tk[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \
|
||||||
`ls -dr ../../../tk[[8-9]].[[0-9]] 2>/dev/null` \
|
`ls -dr ../../../tk[[8-9]].[[0-9]] 2>/dev/null` \
|
||||||
`ls -dr ../../../tk[[8-9]].[[0-9]]* 2>/dev/null` ; do
|
`ls -dr ../../../tk[[8-9]].[[0-9]]* 2>/dev/null` ; do
|
||||||
if test -f "$i/unix/tkConfig.sh" ; then
|
if test -f "$i/$platDir/tkConfig.sh" ; then
|
||||||
ac_cv_c_tkconfig=`(cd $i/unix; pwd)`
|
ac_cv_c_tkconfig=`(cd $i/$platDir; pwd)`
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
@ -218,8 +226,8 @@ AC_DEFUN([SC_PATH_TKCONFIG], [
|
||||||
`ls -dr ${srcdir}/../tk[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \
|
`ls -dr ${srcdir}/../tk[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \
|
||||||
`ls -dr ${srcdir}/../tk[[8-9]].[[0-9]] 2>/dev/null` \
|
`ls -dr ${srcdir}/../tk[[8-9]].[[0-9]] 2>/dev/null` \
|
||||||
`ls -dr ${srcdir}/../tk[[8-9]].[[0-9]]* 2>/dev/null` ; do
|
`ls -dr ${srcdir}/../tk[[8-9]].[[0-9]]* 2>/dev/null` ; do
|
||||||
if test -f "$i/unix/tkConfig.sh" ; then
|
if test -f "$i/$platDir/tkConfig.sh" ; then
|
||||||
ac_cv_c_tkconfig=`(cd $i/unix; pwd)`
|
ac_cv_c_tkconfig=`(cd $i/$platDir; pwd)`
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
Loading…
Reference in a new issue