From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 3865 invoked by alias); 15 Jul 2002 22:00:54 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 3848 invoked from network); 15 Jul 2002 22:00:51 -0000 Received: from unknown (HELO mta6.snfc21.pbi.net) (206.13.28.240) by sources.redhat.com with SMTP; 15 Jul 2002 22:00:51 -0000 Received: from modrick ([66.120.11.181]) by mta6.snfc21.pbi.net (iPlanet Messaging Server 5.1 (built May 7 2001)) with SMTP id <0GZB00DEF95EQJ@mta6.snfc21.pbi.net> for gdb-patches@sources.redhat.com; Mon, 15 Jul 2002 15:00:51 -0700 (PDT) Date: Mon, 15 Jul 2002 16:34:00 -0000 From: Mo DeJong Subject: Re: [patch] Fix expect build under cygwin + Tcl/Tk 8.3 To: gdb-patches@sources.redhat.com Message-id: <20020715150015.747082dd.supermo@bayarea.net> Organization: House of Mirth MIME-version: 1.0 Content-type: text/plain; charset=US-ASCII Content-transfer-encoding: 7bit X-SW-Source: 2002-07/txt/msg00343.txt.bz2 > What would have helped would have been if it actually failed for me. > I can build expect with no problem. Expect currently builds, it is Itcl that does not build: http://sources.redhat.com/ml/insight/2002-q2/msg00073.html > Again, expect is not supposed to be using the windows version of > anything. It is supposed to be using the cygwin/unix version. > > cgf Ok, you win. Here is a patch to fixup the tcl/cygwin and tcl/win configures along with expect. It will also fix the Itcl build. 2002-07-15 Mo DeJong * cygwin/configure: Regen. * cygwin/configure.in: Emit a tclConfig.sh file so that expect can load it at configure time. * win/configure: Regen. * win/configure.in: Don't emit a ../unix/tclConfig.sh file, this was a hack to get expect to build and it breaks the Itcl build. Index: cygwin/configure.in =================================================================== RCS file: /cvs/src/src/tcl/cygwin/configure.in,v retrieving revision 1.5 diff -u -r1.5 configure.in --- cygwin/configure.in 28 Oct 2001 23:31:03 -0000 1.5 +++ cygwin/configure.in 15 Jul 2002 21:37:11 -0000 @@ -88,4 +88,19 @@ AC_SUBST(TCL_PACKAGE_PATH) AC_SUBST(TCL_LIBRARY) -AC_OUTPUT([Makefile]) +# These variables are needed to get expect working with +# the tclConfig.sh script in the cygwin directory. +LD_FLAGS="" +AC_SUBST(LD_FLAGS) +TCL_LD_SEARCH_FLAGS="" +AC_SUBST(TCL_LD_SEARCH_FLAGS) +DL_LIBS="" +AC_SUBST(DL_LIBS) +MATH_LIBS="" +AC_SUBST(MATH_LIBS) +SHLIB_LD='${CC} -shared ${CFLAGS}' +AC_SUBST(SHLIB_LD) + + +AC_OUTPUT([Makefile tclConfig.sh]) + Index: win/configure.in =================================================================== RCS file: /cvs/src/src/tcl/win/configure.in,v retrieving revision 1.7 diff -u -r1.7 configure.in --- win/configure.in 28 Oct 2001 16:26:29 -0000 1.7 +++ win/configure.in 15 Jul 2002 21:37:11 -0000 @@ -247,5 +247,5 @@ AC_SUBST(MAKE_DLL) AC_SUBST(MAKE_EXE) -AC_OUTPUT(Makefile tclConfig.sh tcl.hpj ../unix/tclConfig.sh) +AC_OUTPUT(Makefile tclConfig.sh tcl.hpj) 2002-07-15 Mo DeJong * aclocal.m4 (CY_AC_PATH_TCLCONFIG): Check for a tclConfig.sh file in tcl/cygwin if one can't be found in tcl/unix. Update Itcl header check. * configure: Regen. Index: aclocal.m4 =================================================================== RCS file: /cvs/src/src/expect/aclocal.m4,v retrieving revision 1.2 diff -u -r1.2 aclocal.m4 --- aclocal.m4 11 Sep 2001 19:24:02 -0000 1.2 +++ aclocal.m4 15 Jul 2002 21:38:21 -0000 @@ -201,6 +201,10 @@ 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)` + break + fi done fi changequote([,]) @@ -533,8 +537,8 @@ 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)` + if test -f $i/itcl/generic/itcl.h ; then + ac_cv_c_itclh=`(cd $i/itcl/generic; pwd)` break fi done