patch for expect to build on Cygwin

patch for expect to build on Cygwin

[Alexandre Oliva]

[-- Attachment #1: Type: text/plain, Size: 757 bytes --]

I'm not sure this is the best place to post patches for expect, but we
seem to have other s.r.c-local changes similar to this, and I
understand we have expect only because it's used by dejagnu, and
dejagnu is regarded as part of gdb in s.r.c, so I'm only posting it
here.  The problem was that, on Cygwin, expect/configure couldn't find
the tk config file in the build tree because it wouldn't search tk/win
and tk/unix didn't exist, and expect/Dbgconfigure wouldn't even find
tcl/unix in the build tree, since it hadn't been updated after the
patch that added that code to aclocal.m4.  (Ab)using my powers of
configury maintainer (in the top level), I'm going ahead and checking
this in.  Please let me know in case I shouldn't do things like this
again.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: expect-cygwin.patch --]
[-- Type: text/x-patch, Size: 746 bytes --]

Index: expect/ChangeLog
from  Alexandre Oliva  <aoliva@redhat.com>

	* aclocal.m4 (CY_AC_PATH_TKCONFIG): Look for it in .../tk/win.
	* configure: Rebuilt.
	* Dbgconfigure: Rebuilt to pick up 2002-07-30's change.

Index: expect/aclocal.m4
===================================================================
RCS file: /cvs/src/src/expect/aclocal.m4,v
retrieving revision 1.3
diff -u -p -r1.3 aclocal.m4
--- expect/aclocal.m4 30 Jul 2002 20:24:22 -0000 1.3
+++ expect/aclocal.m4 14 Jul 2003 19:07:21 -0000
@@ -463,6 +463,10 @@ changequote(,)
         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
 changequote([,])

[-- Attachment #3: Type: text/plain, Size: 289 bytes --]


-- 
Alexandre Oliva   Enjoy Guarana', see http://www.ic.unicamp.br/~oliva/
Red Hat GCC Developer                 aoliva@{redhat.com, gcc.gnu.org}
CS PhD student at IC-Unicamp        oliva@{lsd.ic.unicamp.br, gnu.org}
Free Software Evangelist                Professional serial bug killer

Re: patch for expect to build on cygwin

[Christopher Faylor]

On Mon, Jul 14, 2003 at 04:15:56PM -0300, Alexandre Oliva wrote:
>I'm not sure this is the best place to post patches for expect, but we
>seem to have other s.r.c-local changes similar to this, and I
>understand we have expect only because it's used by dejagnu, and
>dejagnu is regarded as part of gdb in s.r.c, so I'm only posting it
>here.  The problem was that, on Cygwin, expect/configure couldn't find
>the tk config file in the build tree because it wouldn't search tk/win

Why is expect looking for tk at all?

cgf

Re: patch for expect to build on cygwin

[Alexandre Oliva]

On Jul 14, 2003, Christopher Faylor <cgf@redhat.com> wrote:

> On Mon, Jul 14, 2003 at 04:15:56PM -0300, Alexandre Oliva wrote:

>> The problem was that, on Cygwin, expect/configure couldn't find the
>> tk config file in the build tree because it wouldn't search tk/win

> Why is expect looking for tk at all?

Don't, erhm, expect me to know the answer :-)

-- 
Alexandre Oliva   Enjoy Guarana', see http://www.ic.unicamp.br/~oliva/
Red Hat GCC Developer                 aoliva@{redhat.com, gcc.gnu.org}
CS PhD student at IC-Unicamp        oliva@{lsd.ic.unicamp.br, gnu.org}
Free Software Evangelist                Professional serial bug killer

Re: patch for expect to build on Cygwin

[Alexandre Oliva]

[-- Attachment #1: Type: text/plain, Size: 907 bytes --]

On Jul 14, 2003, Alexandre Oliva <aoliva@redhat.com> wrote:

> The problem was that, on Cygwin, expect/configure couldn't find
> the tk config file in the build tree

It would also find the wrong tcl config file: tcl/cygwin/tclConfig.sh
is full of variables that aren't substituted properly, and itcl/tcl.m4
indicates we should be using tcl/win/tclConfig.sh instead, so I'm
changing expect to that effect.  In fact, if you're unlucky to have
expect configured before itcl, it would pollute config.cache to the
point that itcl wouldn't build.

What I don't understand is why itcl has outdated code in its
aclocal.m4.  That code is not used, it is tcl.m4 that is used in
iwidgets.

Anyway, I'm going ahead and checking this in as well, which should get
s.r.c gdb/insight/etc back to a buildable state on Cygwin regardless
of the order in which expect and itcl are configured (or if
config.cache is disabled)


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: expect-cygwin-tcl.patch --]
[-- Type: text/x-patch, Size: 804 bytes --]

Index: expect/ChangeLog
from  Alexandre Oliva  <aoliva@redhat.com>

	* aclocal.m4 (CY_AC_PATH_TCLCONFIG): Use .../tcl/win, not cygwin.
	* configure, Dbgconfigure, testsuite/configure: Rebuilt.

Index: expect/aclocal.m4
===================================================================
RCS file: /cvs/src/src/expect/aclocal.m4,v
retrieving revision 1.4
diff -u -p -r1.4 aclocal.m4
--- expect/aclocal.m4 14 Jul 2003 19:16:43 -0000 1.4
+++ expect/aclocal.m4 15 Jul 2003 18:36:58 -0000
@@ -201,8 +201,8 @@ changequote(,)
         ac_cv_c_tclconfig=`(cd $i/unix; pwd)`
 	break
       fi
-      if test -f "$i/cygwin/tclConfig.sh" ; then
-        ac_cv_c_tclconfig=`(cd $i/cygwin; pwd)`
+      if test -f "$i/win/tclConfig.sh" ; then
+        ac_cv_c_tclconfig=`(cd $i/win; pwd)`
 	break
       fi
     done

[-- Attachment #3: Type: text/plain, Size: 289 bytes --]


-- 
Alexandre Oliva   Enjoy Guarana', see http://www.ic.unicamp.br/~oliva/
Red Hat GCC Developer                 aoliva@{redhat.com, gcc.gnu.org}
CS PhD student at IC-Unicamp        oliva@{lsd.ic.unicamp.br, gnu.org}
Free Software Evangelist                Professional serial bug killer