* [PATCH] gdb: remove unnecessary tui directory check in configure
@ 2023-02-14 16:37 Simon Marchi
2023-02-14 17:37 ` Tom Tromey
0 siblings, 1 reply; 3+ messages in thread
From: Simon Marchi @ 2023-02-14 16:37 UTC (permalink / raw)
To: gdb-patches; +Cc: Simon Marchi
I suppose this was possible in the CVS days for the tui directory to be
missing, but it's not really possible nowaday. Well, a user could
delete the directory from their source tree but... it doesn't make
sense. Remove the check for that directory in configure.
Change-Id: Iea1412f5e5482ed003015030132ec22150c7d0b3
---
gdb/configure | 20 +++++++++-----------
gdb/configure.ac | 20 +++++++++-----------
2 files changed, 18 insertions(+), 22 deletions(-)
diff --git a/gdb/configure b/gdb/configure
index 1114bcdc0af1..cfdaf59a7b74 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -20636,19 +20636,17 @@ fi
# Check whether we should enable the TUI, but only do so if we really
# can.
if test x"$enable_tui" != xno; then
- if test -d "$srcdir/tui"; then
- if test "$curses_found" != no; then
- CONFIG_OBS="$CONFIG_OBS \$(SUBDIR_TUI_OBS)"
- CONFIG_DEPS="$CONFIG_DEPS \$(SUBDIR_TUI_DEPS)"
- CONFIG_SRCS="$CONFIG_SRCS \$(SUBDIR_TUI_SRCS)"
- ENABLE_CFLAGS="$ENABLE_CFLAGS \$(SUBDIR_TUI_CFLAGS)"
+ if test "$curses_found" != no; then
+ CONFIG_OBS="$CONFIG_OBS \$(SUBDIR_TUI_OBS)"
+ CONFIG_DEPS="$CONFIG_DEPS \$(SUBDIR_TUI_DEPS)"
+ CONFIG_SRCS="$CONFIG_SRCS \$(SUBDIR_TUI_SRCS)"
+ ENABLE_CFLAGS="$ENABLE_CFLAGS \$(SUBDIR_TUI_CFLAGS)"
+ else
+ if test x"$enable_tui" = xyes; then
+ as_fn_error $? "no enhanced curses library found; disable TUI" "$LINENO" 5
else
- if test x"$enable_tui" = xyes; then
- as_fn_error $? "no enhanced curses library found; disable TUI" "$LINENO" 5
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no enhanced curses library found; disabling TUI" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no enhanced curses library found; disabling TUI" >&5
$as_echo "$as_me: WARNING: no enhanced curses library found; disabling TUI" >&2;}
- fi
fi
fi
fi
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 47e35f467f8e..734589856a16 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -574,18 +574,16 @@ fi
# Check whether we should enable the TUI, but only do so if we really
# can.
if test x"$enable_tui" != xno; then
- if test -d "$srcdir/tui"; then
- if test "$curses_found" != no; then
- CONFIG_OBS="$CONFIG_OBS \$(SUBDIR_TUI_OBS)"
- CONFIG_DEPS="$CONFIG_DEPS \$(SUBDIR_TUI_DEPS)"
- CONFIG_SRCS="$CONFIG_SRCS \$(SUBDIR_TUI_SRCS)"
- ENABLE_CFLAGS="$ENABLE_CFLAGS \$(SUBDIR_TUI_CFLAGS)"
+ if test "$curses_found" != no; then
+ CONFIG_OBS="$CONFIG_OBS \$(SUBDIR_TUI_OBS)"
+ CONFIG_DEPS="$CONFIG_DEPS \$(SUBDIR_TUI_DEPS)"
+ CONFIG_SRCS="$CONFIG_SRCS \$(SUBDIR_TUI_SRCS)"
+ ENABLE_CFLAGS="$ENABLE_CFLAGS \$(SUBDIR_TUI_CFLAGS)"
+ else
+ if test x"$enable_tui" = xyes; then
+ AC_MSG_ERROR([no enhanced curses library found; disable TUI])
else
- if test x"$enable_tui" = xyes; then
- AC_MSG_ERROR([no enhanced curses library found; disable TUI])
- else
- AC_MSG_WARN([no enhanced curses library found; disabling TUI])
- fi
+ AC_MSG_WARN([no enhanced curses library found; disabling TUI])
fi
fi
fi
--
2.39.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] gdb: remove unnecessary tui directory check in configure
2023-02-14 16:37 [PATCH] gdb: remove unnecessary tui directory check in configure Simon Marchi
@ 2023-02-14 17:37 ` Tom Tromey
2023-02-14 18:33 ` Simon Marchi
0 siblings, 1 reply; 3+ messages in thread
From: Tom Tromey @ 2023-02-14 17:37 UTC (permalink / raw)
To: Simon Marchi via Gdb-patches; +Cc: Simon Marchi
>>>>> "Simon" == Simon Marchi via Gdb-patches <gdb-patches@sourceware.org> writes:
Simon> I suppose this was possible in the CVS days for the tui directory to be
Simon> missing, but it's not really possible nowaday. Well, a user could
Simon> delete the directory from their source tree but... it doesn't make
Simon> sense. Remove the check for that directory in configure.
Thank you.
Approved-By: Tom Tromey <tom@tromey.com>
Tom
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] gdb: remove unnecessary tui directory check in configure
2023-02-14 17:37 ` Tom Tromey
@ 2023-02-14 18:33 ` Simon Marchi
0 siblings, 0 replies; 3+ messages in thread
From: Simon Marchi @ 2023-02-14 18:33 UTC (permalink / raw)
To: Tom Tromey, Simon Marchi via Gdb-patches; +Cc: Simon Marchi
On 2/14/23 12:37, Tom Tromey wrote:
>>>>>> "Simon" == Simon Marchi via Gdb-patches <gdb-patches@sourceware.org> writes:
>
> Simon> I suppose this was possible in the CVS days for the tui directory to be
> Simon> missing, but it's not really possible nowaday. Well, a user could
> Simon> delete the directory from their source tree but... it doesn't make
> Simon> sense. Remove the check for that directory in configure.
>
> Thank you.
> Approved-By: Tom Tromey <tom@tromey.com>
>
> Tom
Pushed, thanks.
Simon
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-02-14 18:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-14 16:37 [PATCH] gdb: remove unnecessary tui directory check in configure Simon Marchi
2023-02-14 17:37 ` Tom Tromey
2023-02-14 18:33 ` Simon Marchi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).