From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1879) id 362E23858D1E; Tue, 14 Feb 2023 18:32:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 362E23858D1E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1676399577; bh=w4nxv+hoj4elR5TAbfW6HepLzY1ABc1Yy7tuu/cbnnE=; h=From:To:Subject:Date:From; b=r5u+2Kmqw/2ynKHTWT8IlQfaFFZ+TF7T03WPKMrMn4kl+LwltUgoNEAtY1YpqibFQ ySd7Aibx48mfsQKxRjHRtBiQgqDpvzTkQ1mzFRuZJWjxkcVSZyxl0vuW5vaw5Yt9jA mGbwSaE1T53t2fQzaUiBgyz6iHh+w+mFNV21oa7s= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Simon Marchi To: gdb-cvs@sourceware.org Subject: [binutils-gdb] gdb: remove unnecessary tui directory check in configure X-Act-Checkin: binutils-gdb X-Git-Author: Simon Marchi X-Git-Refname: refs/heads/master X-Git-Oldrev: 81aa19c303c94f549cb9ae343cfe4b635b4e888c X-Git-Newrev: 92a2cc556c702154fcbc69f7def2a023185f25dd Message-Id: <20230214183257.362E23858D1E@sourceware.org> Date: Tue, 14 Feb 2023 18:32:57 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D92a2cc556c70= 2154fcbc69f7def2a023185f25dd commit 92a2cc556c702154fcbc69f7def2a023185f25dd Author: Simon Marchi Date: Tue Feb 14 11:37:16 2023 -0500 gdb: remove unnecessary tui directory check in configure =20 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. =20 Change-Id: Iea1412f5e5482ed003015030132ec22150c7d0b3 Approved-By: Tom Tromey Diff: --- gdb/configure | 20 +++++++++----------- gdb/configure.ac | 20 +++++++++----------- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/gdb/configure b/gdb/configure index 1114bcdc0af..cfdaf59a7b7 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" !=3D xno; then - if test -d "$srcdir/tui"; then - if test "$curses_found" !=3D no; then - CONFIG_OBS=3D"$CONFIG_OBS \$(SUBDIR_TUI_OBS)" - CONFIG_DEPS=3D"$CONFIG_DEPS \$(SUBDIR_TUI_DEPS)" - CONFIG_SRCS=3D"$CONFIG_SRCS \$(SUBDIR_TUI_SRCS)" - ENABLE_CFLAGS=3D"$ENABLE_CFLAGS \$(SUBDIR_TUI_CFLAGS)" + if test "$curses_found" !=3D no; then + CONFIG_OBS=3D"$CONFIG_OBS \$(SUBDIR_TUI_OBS)" + CONFIG_DEPS=3D"$CONFIG_DEPS \$(SUBDIR_TUI_DEPS)" + CONFIG_SRCS=3D"$CONFIG_SRCS \$(SUBDIR_TUI_SRCS)" + ENABLE_CFLAGS=3D"$ENABLE_CFLAGS \$(SUBDIR_TUI_CFLAGS)" + else + if test x"$enable_tui" =3D xyes; then + as_fn_error $? "no enhanced curses library found; disable TUI" "$LIN= ENO" 5 else - if test x"$enable_tui" =3D 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 libr= ary 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 47e35f467f8..734589856a1 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" !=3D xno; then - if test -d "$srcdir/tui"; then - if test "$curses_found" !=3D no; then - CONFIG_OBS=3D"$CONFIG_OBS \$(SUBDIR_TUI_OBS)" - CONFIG_DEPS=3D"$CONFIG_DEPS \$(SUBDIR_TUI_DEPS)" - CONFIG_SRCS=3D"$CONFIG_SRCS \$(SUBDIR_TUI_SRCS)" - ENABLE_CFLAGS=3D"$ENABLE_CFLAGS \$(SUBDIR_TUI_CFLAGS)" + if test "$curses_found" !=3D no; then + CONFIG_OBS=3D"$CONFIG_OBS \$(SUBDIR_TUI_OBS)" + CONFIG_DEPS=3D"$CONFIG_DEPS \$(SUBDIR_TUI_DEPS)" + CONFIG_SRCS=3D"$CONFIG_SRCS \$(SUBDIR_TUI_SRCS)" + ENABLE_CFLAGS=3D"$ENABLE_CFLAGS \$(SUBDIR_TUI_CFLAGS)" + else + if test x"$enable_tui" =3D xyes; then + AC_MSG_ERROR([no enhanced curses library found; disable TUI]) else - if test x"$enable_tui" =3D 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