From mboxrd@z Thu Jan 1 00:00:00 1970 From: Keith Seitz To: Ian Roxborough Cc: Subject: Re: [PATCH]: Locating Itcl and Itk dependancies. Date: Thu, 06 Sep 2001 13:59:00 -0000 Message-id: References: <3B97AF9C.42A61A0@redhat.com> X-SW-Source: 2001-q3/msg00240.html On Thu, 6 Sep 2001, Ian Roxborough wrote: > (Patch reposted in proper form.) [snip] > This patch removes a couple of hard coded paths (for Itcl and Itk > library dependencies) and uses the ITCL_LIB_FULL_PATH and > ITK_LIB_FULL_PATH set in itclConfig.sh and itkConfig.sh to set the dependencies. > > I've tested this fix on Windows NT and GNU/Linux x86, > everything seems to work fine. If I can get this fix > checked in today then I maybe able to do the grand Tcl/Tk > switch over later tonight. FYI, I've committed this change. Keith > ChangeLog: > 2001-09-05 Ian Roxborough > > * configure.in: Use ITCL_LIB_FULL_PATH and > ITK_LIB_FULL_PATH to set Itcl and Itk dependancies > for gdb. > > > Index: configure.in > =================================================================== > RCS file: /cvs/src/src/gdb/configure.in,v > retrieving revision 1.71 > diff -p -r1.71 configure.in > *** configure.in 2001/08/27 22:39:55 1.71 > --- configure.in 2001/09/06 17:06:05 > *************** if test "${enable_gdbtk}" = "yes"; then > *** 995,1013 **** > > CY_AC_PATH_ITCLCONFIG > if test -z "${no_itcl}"; then > ! CY_AC_LOAD_ITCLCONFIG > ! case "${host}" in > ! *-*-cygwin*) > ! itcldir=../itcl/itcl/win/ > ! ;; > ! *) > ! itcldir=../itcl/itcl/unix/ > ! ;; > ! esac > ! > > ITCLLIB="${ITCL_BUILD_LIB_SPEC}" > ! ITCL_DEPS="${itcldir}${ITCL_LIB_FILE}" > fi > > > --- 995,1004 ---- > > CY_AC_PATH_ITCLCONFIG > if test -z "${no_itcl}"; then > ! CY_AC_LOAD_ITCLCONFIG > > ITCLLIB="${ITCL_BUILD_LIB_SPEC}" > ! ITCL_DEPS="${ITCL_LIB_FULL_PATH}" > fi > > > *************** if test "${enable_gdbtk}" = "yes"; then > *** 1016,1032 **** > if test -z "${no_itcl}"; then > CY_AC_LOAD_ITKCONFIG > > - case "${host}" in > - *-*-cygwin*) > - itkdir=../itcl/itk/win/ > - ;; > - *) > - itkdir=../itcl/itk/unix/ > - ;; > - esac > - > ITKLIB="${ITK_BUILD_LIB_SPEC}" > ! ITK_DEPS="${itkdir}${ITK_LIB_FILE}" > fi > > # now look for Tix library stuff > --- 1007,1014 ---- > if test -z "${no_itcl}"; then > CY_AC_LOAD_ITKCONFIG > > ITKLIB="${ITK_BUILD_LIB_SPEC}" > ! ITK_DEPS="${ITK_LIB_FULL_PATH}" > fi > > # now look for Tix library stuff >