[RFA] Locating Itcl and Itk depandancies.

[RFA] Locating Itcl and Itk depandancies.

[Ian Roxborough]

Hi,

this seems to be the last little bit for gdb/Insight to make
it resistant to the Tcl/Tk upgrade.  It 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 not included a diff of the regenerated configure file.
I don't seem to have the same version of autoconf (even though
the version numbers match) and my regenerated configure
seems to change about even line of the configure file...

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.

Comments, questions and autoconf tips welcome...

Thanks,
  Ian.


Index: configure.in
===================================================================
RCS file: /cvs/src/src/gdb/configure.in,v
retrieving revision 1.71
diff -U1 -r1.71 configure.in
--- configure.in	2001/08/27 22:39:55	1.71
+++ configure.in	2001/09/05 19:59:14
@@ -997,15 +997,6 @@
            if test -z "${no_itcl}"; then
-             CY_AC_LOAD_ITCLCONFIG
-	     case "${host}" in
-	     *-*-cygwin*)
-		itcldir=../itcl/itcl/win/
-		;;
-	     *)
-		itcldir=../itcl/itcl/unix/
-		;;
-	     esac
- 
+             CY_AC_LOAD_ITCLCONFIG 
 
 	     ITCLLIB="${ITCL_BUILD_LIB_SPEC}"
-	     ITCL_DEPS="${itcldir}${ITCL_LIB_FILE}"
+	     ITCL_DEPS="${ITCL_LIB_FULL_PATH}"
            fi
@@ -1018,13 +1009,4 @@
 
-	     case "${host}" in
-	       *-*-cygwin*)
-		 itkdir=../itcl/itk/win/
-		 ;;
-	       *)
-		 itkdir=../itcl/itk/unix/
-		 ;;
-	       esac 
-
 	     ITKLIB="${ITK_BUILD_LIB_SPEC}"
-	     ITK_DEPS="${itkdir}${ITK_LIB_FILE}"
+	     ITK_DEPS="${ITK_LIB_FULL_PATH}"
            fi
Index: ChangeLog
===================================================================
RCS file: /cvs/src/src/gdb/ChangeLog,v
retrieving revision 1.1587
diff -U1 -r1.1587 ChangeLog
--- ChangeLog	2001/09/05 02:54:15	1.1587
+++ ChangeLog	2001/09/05 19:59:44
@@ -1 +1,7 @@
+2001-09-05  Ian Roxborough <irox@redhat.com>
+
+	* configure.in: Use ITCL_LIB_FULL_PATH and
+	ITK_LIB_FULL_PATH to set Itcl and Itk dependancies
+	for gdb.
+
 2001-09-04  Elena Zannoni  <ezannoni@redhat.com>

Re: [RFA] Locating Itcl and Itk depandancies.

[Keith Seitz]

On Wed, 5 Sep 2001, Ian Roxborough wrote:

> this seems to be the last little bit for gdb/Insight to make
> it resistant to the Tcl/Tk upgrade.  It 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.

Has ITCL/ITK_LIB_FULL_PATH _always_ been in itcl/itkConfig.sh? Sheesh. How
did we miss _that_?? O:-)

> 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.

FWIW, I also tried this on linux and linux-cygwin, and it worked just
fine. I think this patch should go in.

You don't seem to be listed in the MAINTAINERS file, so I could commit
this for you. Andrew?

Keith

Re: [RFA] Locating Itcl and Itk depandancies.

[Ian Roxborough]

Keith Seitz wrote:
> Has ITCL/ITK_LIB_FULL_PATH _always_ been in itcl/itkConfig.sh? Sheesh. How
> did we miss _that_?? O:-)

Probably not when Insight started used Itcl. ;-)

> FWIW, I also tried this on linux and linux-cygwin, and it worked just
> fine. I think this patch should go in.
> 
> You don't seem to be listed in the MAINTAINERS file, so I could commit
> this for you. Andrew?

Thanks Keith!

 Ian.

Re: [RFA] Locating Itcl and Itk depandancies.

[Andrew Cagney]

Ian, Keith

I can't see any thing wrong with this and since keith is happy with it, 
keith can check it in :-)

don't forget to regenerate configure.

	Andrew.


> Index: ChangeLog
> ===================================================================
> RCS file: /cvs/src/src/gdb/ChangeLog,v
> retrieving revision 1.1587
> diff -U1 -r1.1587 ChangeLog
> --- ChangeLog	2001/09/05 02:54:15	1.1587
> +++ ChangeLog	2001/09/05 19:59:44
> @@ -1 +1,7 @@
> +2001-09-05  Ian Roxborough <irox@redhat.com>
> +
> +	* configure.in: Use ITCL_LIB_FULL_PATH and
> +	ITK_LIB_FULL_PATH to set Itcl and Itk dependancies
> +	for gdb.
> +
> 

Re: [RFA] Locating Itcl and Itk depandancies.

[Andrew Cagney]

> I've not included a diff of the regenerated configure file.
> I don't seem to have the same version of autoconf (even though
> the version numbers match) and my regenerated configure
> seems to change about even line of the configure file...

fyi, autoconf 2.13 is correct although people somtimes use binutils 
autoconf-000227.

	Andrew