This commit was manufactured by cvs2svn to create branch 'jimb-jimb-macro-020506-branchpoint

macro-020506-branch'.

Sprout from gdb_5_2-branch 2002-03-11 00:01:12 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch 'gdb_5_2-branch'.'
Cherrypick from master 2002-05-05 18:58:17 UTC Alexandre Oliva <aoliva@redhat.com> '* configure.in (noconfigdirs): Don't disable libgcj on':
    ChangeLog
    MAINTAINERS
    Makefile.in
    config.guess
    config.sub
    config/ChangeLog
    config/acinclude.m4
    config/mh-a68bsd
    config/mh-apollo68
    config/mh-cxux
    config/mh-decstation
    config/mh-dgux
    config/mh-dgux386
    config/mh-djgpp
    config/mh-hp300
    config/mh-hpux
    config/mh-hpux8
    config/mh-interix
    config/mh-irix5
    config/mh-irix6
    config/mh-lynxrs6k
    config/mh-mingw32
    config/mh-ncr3000
    config/mh-ncrsvr43
    config/mh-necv4
    config/mh-openedition
    config/mh-riscos
    config/mh-sco
    config/mh-solaris
    config/mh-sysv
    config/mh-sysv4
    config/mh-sysv5
    config/mt-aix43
    config/mt-alphaieee
    config/mt-linux
    configure
    configure.in
    include/ChangeLog
    include/coff/ChangeLog
    include/coff/rs6k64.h
    include/dyn-string.h
    include/elf/ChangeLog
    include/elf/dwarf2.h
    include/floatformat.h
    include/opcode/ChangeLog
    include/opcode/i386.h
    include/opcode/mips.h
    include/opcode/pdp11.h
    include/xregex2.h
    ltmain.sh
Delete:
    config/mh-irix4
    config/mh-lynxos
    config/mh-sun3
    config/mh-vaxult2
    config/mt-armpic
    config/mt-elfalphapic
    config/mt-i370pic
    config/mt-ia64pic
    config/mt-m68kpic
    config/mt-papic
    config/mt-ppcpic
    config/mt-s390pic
    config/mt-sparcpic
    config/mt-x86pic

1 files changed, 29 insertions, 1 deletions

diff --git a/config/acinclude.m4 b/config/acinclude.m4
index 6187b5acd..9be62cb9a 100755
--- a/config/acinclude.m4
+++ b/config/acinclude.m4
@@ -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
     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
@@ -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 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
 
@@ -1071,7 +1085,7 @@ AC_DEFUN(CYG_AC_PATH_TKH, [
 # Note the gross little conversion here of srcdir by cd'ing to the found
 # directory. This converts the path from a relative to an absolute, so
 # recursive cache variables for the path will work right. We check all
-# the possible paths in one loop rather than many seperate loops to speed
+# the possible paths in one loop rather than many separate loops to speed
 # things up.
 # the alternative search directory is involked by --with-tkinclude
 #
@@ -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
     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
@@ -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 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
     fi