Index: expect/aclocal.m4
===================================================================
RCS file: /cvs/src/src/expect/aclocal.m4,v
retrieving revision 1.1.1.1
diff -u -3 -p -b -r1.1.1.1 aclocal.m4
--- aclocal.m4	1999/11/09 01:28:42	1.1.1.1
+++ aclocal.m4	2001/06/02 17:53:57
@@ -532,9 +532,9 @@ dnl    AC_SUBST(TK_EXEC_PREFIX)
 AC_DEFUN(CY_AC_PATH_ITCLH, [
 AC_MSG_CHECKING(for Itcl private headers. srcdir=${srcdir})
 if test x"${ac_cv_c_itclh}" = x ; then
-  for i in ${srcdir}/../itcl ${srcdir}/../../itcl ${srcdir}/../../../itcl ; do
-    if test -f $i/src/itcl.h ; then
-      ac_cv_c_itclh=`(cd $i/src; pwd)`
+  for i in ${srcdir}/../itcl ${srcdir}/../../itcl ${srcdir}/../../../itcl ${srcdir}/../itcl/itcl; do
+    if test -f $i/generic/itcl.h ; then
+      ac_cv_c_itclh=`(cd $i/generic; pwd)`
       break
     fi
   done
Index: expect/configure
===================================================================
RCS file: /cvs/src/src/expect/configure,v
retrieving revision 1.3
diff -u -3 -p -b -r1.3 configure
--- configure	2001/05/12 04:09:04	1.3
+++ configure	2001/06/02 17:54:00
@@ -2166,9 +2166,9 @@ fi
 echo $ac_n "checking for Itcl private headers. srcdir=${srcdir}""... $ac_c" 1>&6
 echo "configure:2168: checking for Itcl private headers. srcdir=${srcdir}" >&5
 if test x"${ac_cv_c_itclh}" = x ; then
-  for i in ${srcdir}/../itcl ${srcdir}/../../itcl ${srcdir}/../../../itcl ; do
-    if test -f $i/src/itcl.h ; then
-      ac_cv_c_itclh=`(cd $i/src; pwd)`
+  for i in ${srcdir}/../itcl ${srcdir}/../../itcl ${srcdir}/../../../itcl ${srcdir}/../itcl/itcl; do
+    if test -f $i/generic/itcl.h ; then
+      ac_cv_c_itclh=`(cd $i/generic; pwd)`
       break
     fi
   done