[rfa/toplevel] Conditionalize GDB_TK

[rfa/toplevel] Conditionalize GDB_TK

[Andrew Cagney]

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

Hello,

The attatched only adds the tk directories to the gdb dependency list 
when the corresponding tk files are present.  That way `all-gdb' doesn't 
build tk files (except when needed).

ok?
Andrew

PS: Disclaimer, I cut/paste the configure changes.  Perhaphs someone 
able to regenerate configure should commit this?

[-- Attachment #2: diffs --]
[-- Type: text/plain, Size: 2369 bytes --]

2003-01-03  Andrew Cagney  <ac131313@redhat.com>

	* configure.in (GDB_TK): Add tcl directories conditional on
	gdb/gdbtk directory being present.
	* configure: Regenerate.
	
Index: configure
===================================================================
RCS file: /cvs/src/src/configure,v
retrieving revision 1.40
diff -u -r1.40 configure
--- configure	31 Dec 2002 18:00:11 -0000	1.40
+++ configure	3 Jan 2003 17:48:45 -0000
@@ -2334,11 +2334,23 @@
 # so we should be able to put the 'maybe's in unconditionally and
 # leave out the maybe dependencies when enable_gdbtk is false.  I'm not
 # 100% sure that that's safe though.
+
+gdb_tk="maybe-all-tcl maybe-all-tk maybe-all-itcl maybe-all-tix maybe-all-libgui"
 case "$enable_gdbtk" in
   no)
     GDB_TK="" ;;
+  yes)
+    GDB_TK="${gdb_tk}" ;;
   *)
-    GDB_TK="maybe-all-tcl maybe-all-tk maybe-all-itcl maybe-all-tix maybe-all-libgui" ;;
+    # Only add the dependency on gdbtk when GDBtk is part of the gdb
+    # distro.  Eventually someone will fix this and move Insight, nee
+    # gdbtk to a separate directory.
+    if test -d ${srcdir}/gdb/gdbtk ; then
+      GDB_TK="${gdb_tk}"
+    else
+      GDB_TK=""
+    fi
+    ;;
 esac
 
 # Create the 'maybe dependencies'.  This uses a temporary file.
Index: configure.in
===================================================================
RCS file: /cvs/src/src/configure.in,v
retrieving revision 1.137
diff -u -r1.137 configure.in
--- configure.in	31 Dec 2002 18:00:11 -0000	1.137
+++ configure.in	3 Jan 2003 17:48:45 -0000
@@ -1677,11 +1677,23 @@
 # so we should be able to put the 'maybe's in unconditionally and
 # leave out the maybe dependencies when enable_gdbtk is false.  I'm not
 # 100% sure that that's safe though.
+
+gdb_tk="maybe-all-tcl maybe-all-tk maybe-all-itcl maybe-all-tix maybe-all-libgui"
 case "$enable_gdbtk" in
   no)
     GDB_TK="" ;;
+  yes)
+    GDB_TK="${gdb_tk}" ;;
   *)
-    GDB_TK="maybe-all-tcl maybe-all-tk maybe-all-itcl maybe-all-tix maybe-all-libgui" ;;
+    # Only add the dependency on gdbtk when GDBtk is part of the gdb
+    # distro.  Eventually someone will fix this and move Insight, nee
+    # gdbtk to a separate directory.
+    if test -d ${srcdir}/gdb/gdbtk ; then
+      GDB_TK="${gdb_tk}"
+    else
+      GDB_TK=""
+    fi
+    ;;
 esac
 
 # Create the 'maybe dependencies'.  This uses a temporary file.

Re: [rfa/toplevel] Conditionalize GDB_TK

[DJ Delorie]

> The attached only adds the tk directories to the gdb dependency list
> when the corresponding tk files are present.  That way `all-gdb'
> doesn't build tk files (except when needed).
> 
> ok?

Ok.

> PS: Disclaimer, I cut/paste the configure changes.  Perhaps someone
> able to regenerate configure should commit this?

You don't have autoconf 2.13?

Re: [rfa/toplevel] Conditionalize GDB_TK

[Michael Snyder]

Andrew Cagney wrote:
> 
> Hello,
> 
> The attatched only adds the tk directories to the gdb dependency list
> when the corresponding tk files are present.  That way `all-gdb' doesn't
> build tk files (except when needed).

Thank you!

> ok?
> Andrew
> 
> PS: Disclaimer, I cut/paste the configure changes.  Perhaphs someone
> able to regenerate configure should commit this?
> 
>   -------------------------------------------------------------------------------
> 2003-01-03  Andrew Cagney  <ac131313@redhat.com>
> 
>         * configure.in (GDB_TK): Add tcl directories conditional on
>         gdb/gdbtk directory being present.
>         * configure: Regenerate.
> 
> Index: configure
> ===================================================================
> RCS file: /cvs/src/src/configure,v
> retrieving revision 1.40
> diff -u -r1.40 configure
> --- configure   31 Dec 2002 18:00:11 -0000      1.40
> +++ configure   3 Jan 2003 17:48:45 -0000
> @@ -2334,11 +2334,23 @@
>  # so we should be able to put the 'maybe's in unconditionally and
>  # leave out the maybe dependencies when enable_gdbtk is false.  I'm not
>  # 100% sure that that's safe though.
> +
> +gdb_tk="maybe-all-tcl maybe-all-tk maybe-all-itcl maybe-all-tix maybe-all-libgui"
>  case "$enable_gdbtk" in
>    no)
>      GDB_TK="" ;;
> +  yes)
> +    GDB_TK="${gdb_tk}" ;;
>    *)
> -    GDB_TK="maybe-all-tcl maybe-all-tk maybe-all-itcl maybe-all-tix maybe-all-libgui" ;;
> +    # Only add the dependency on gdbtk when GDBtk is part of the gdb
> +    # distro.  Eventually someone will fix this and move Insight, nee
> +    # gdbtk to a separate directory.
> +    if test -d ${srcdir}/gdb/gdbtk ; then
> +      GDB_TK="${gdb_tk}"
> +    else
> +      GDB_TK=""
> +    fi
> +    ;;
>  esac
> 
>  # Create the 'maybe dependencies'.  This uses a temporary file.
> Index: configure.in
> ===================================================================
> RCS file: /cvs/src/src/configure.in,v
> retrieving revision 1.137
> diff -u -r1.137 configure.in
> --- configure.in        31 Dec 2002 18:00:11 -0000      1.137
> +++ configure.in        3 Jan 2003 17:48:45 -0000
> @@ -1677,11 +1677,23 @@
>  # so we should be able to put the 'maybe's in unconditionally and
>  # leave out the maybe dependencies when enable_gdbtk is false.  I'm not
>  # 100% sure that that's safe though.
> +
> +gdb_tk="maybe-all-tcl maybe-all-tk maybe-all-itcl maybe-all-tix maybe-all-libgui"
>  case "$enable_gdbtk" in
>    no)
>      GDB_TK="" ;;
> +  yes)
> +    GDB_TK="${gdb_tk}" ;;
>    *)
> -    GDB_TK="maybe-all-tcl maybe-all-tk maybe-all-itcl maybe-all-tix maybe-all-libgui" ;;
> +    # Only add the dependency on gdbtk when GDBtk is part of the gdb
> +    # distro.  Eventually someone will fix this and move Insight, nee
> +    # gdbtk to a separate directory.
> +    if test -d ${srcdir}/gdb/gdbtk ; then
> +      GDB_TK="${gdb_tk}"
> +    else
> +      GDB_TK=""
> +    fi
> +    ;;
>  esac
> 
>  # Create the 'maybe dependencies'.  This uses a temporary file.

Re: [rfa/toplevel] Conditionalize GDB_TK

[Andrew Cagney]

>> The attached only adds the tk directories to the gdb dependency list
>> when the corresponding tk files are present.  That way `all-gdb'
>> doesn't build tk files (except when needed).
>> 
>> ok?
> 
> 
> Ok.


Thanks.

>> PS: Disclaimer, I cut/paste the configure changes.  Perhaps someone
>> able to regenerate configure should commit this?
> 
> 
> You don't have autoconf 2.13?

Which 2.13? :-)  Anyway I found the correct version, re-generated the 
file and committed (both GCC and SRC).

Andrew