diff options
| author | Keith Seitz <keiths@redhat.com> | 2008-08-02 22:56:04 +0000 |
|---|---|---|
| committer | Keith Seitz <kseitz@gcc.gnu.org> | 2008-08-02 22:56:04 +0000 |
| commit | e5b1b03f56ef63f2d46bd66f865510c57a0f2de8 (patch) | |
| tree | 7ed821f2ef9c489e21ce168007958e2ca5124ded /config | |
| parent | ba63dfb91874f08aa311b014c6c40b5007837d94 (diff) | |
| download | gcc-e5b1b03f56ef63f2d46bd66f865510c57a0f2de8.zip gcc-e5b1b03f56ef63f2d46bd66f865510c57a0f2de8.tar.gz gcc-e5b1b03f56ef63f2d46bd66f865510c57a0f2de8.tar.bz2 | |
tcl.m4 (SC_PATH_TCLCONFIG): Add some simple logic to deal with cygwin.
* tcl.m4 (SC_PATH_TCLCONFIG): Add some simple logic to deal
with cygwin.
(SC_PATH_TKCONFIG): Likewise.
From-SVN: r138555
Diffstat (limited to 'config')
| -rw-r--r-- | config/ChangeLog | 6 | ||||
| -rw-r--r-- | config/tcl.m4 | 24 |
2 files changed, 22 insertions, 8 deletions
diff --git a/config/ChangeLog b/config/ChangeLog index a35fe14..75bee5d 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -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> * mh-pa: New, from gcc/config/pa/x-ada. diff --git a/config/tcl.m4 b/config/tcl.m4 index 51809fd..be0129b 100644 --- a/config/tcl.m4 +++ b/config/tcl.m4 @@ -32,6 +32,10 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [ AC_CACHE_VAL(ac_cv_c_tclconfig,[ # 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 -f "${with_tclconfig}/tclConfig.sh" ; then 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]] 2>/dev/null` \ `ls -dr ../../../tcl[[8-9]].[[0-9]]* 2>/dev/null` ; do - if test -f "$i/unix/tclConfig.sh" ; then - ac_cv_c_tclconfig=`(cd $i/unix; pwd)` + if test -f "$i/$platDir/tclConfig.sh" ; then + ac_cv_c_tclconfig=`(cd $i/$platDir; pwd)` break fi 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]] 2>/dev/null` \ `ls -dr ${srcdir}/../tcl[[8-9]].[[0-9]]* 2>/dev/null` ; do - if test -f "$i/unix/tclConfig.sh" ; then - ac_cv_c_tclconfig=`(cd $i/unix; pwd)` + if test -f "$i/$platDir/tclConfig.sh" ; then + ac_cv_c_tclconfig=`(cd $i/$platDir; pwd)` break fi done @@ -161,6 +165,10 @@ AC_DEFUN([SC_PATH_TKCONFIG], [ fi # 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 for i in \ ../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]] 2>/dev/null` \ `ls -dr ../../../tk[[8-9]].[[0-9]]* 2>/dev/null` ; do - if test -f "$i/unix/tkConfig.sh" ; then - ac_cv_c_tkconfig=`(cd $i/unix; pwd)` + if test -f "$i/$platDir/tkConfig.sh" ; then + ac_cv_c_tkconfig=`(cd $i/$platDir; pwd)` break fi 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]] 2>/dev/null` \ `ls -dr ${srcdir}/../tk[[8-9]].[[0-9]]* 2>/dev/null` ; do - if test -f "$i/unix/tkConfig.sh" ; then - ac_cv_c_tkconfig=`(cd $i/unix; pwd)` + if test -f "$i/$platDir/tkConfig.sh" ; then + ac_cv_c_tkconfig=`(cd $i/$platDir; pwd)` break fi done |