From patchwork Tue Oct 30 15:25:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Sherrill X-Patchwork-Id: 29960 Received: (qmail 37250 invoked by alias); 30 Oct 2018 15:25:51 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 123305 invoked by uid 89); 30 Oct 2018 15:25:37 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-24.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY autolearn=ham version=3.3.2 spammy=sim X-HELO: mx.coeval.ca Received: from mx.coeval.ca (HELO mx.coeval.ca) (184.75.211.21) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 30 Oct 2018 15:25:34 +0000 Received: from rtbf64c.rtems.com (gateway.oarcorp.com [67.63.146.110]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx.coeval.ca (Postfix) with ESMTPSA id 57678436065; Tue, 30 Oct 2018 15:25:14 +0000 (UTC) From: Joel Sherrill To: gdb-patches@sourceware.org Cc: Joel Sherrill Subject: [PATCH v2] configure.ac: Cygwin now has ncurses not termcap. Use standard logic. Date: Tue, 30 Oct 2018 10:25:11 -0500 Message-Id: <1540913111-14972-1-git-send-email-joel@rtems.org> sim/erc32/Changelog: 2018-10-25 Joel Sherrill * configure.ac: Cygwin has removed libtermcap.a and now has libncurses.a. Remove the Cygwin specific hack and use the standard logic to determine which library to use. * configure: Regenerate. --- sim/erc32/ChangeLog | 7 +++++++ sim/erc32/configure | 10 +++++----- sim/erc32/configure.ac | 9 ++++----- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/sim/erc32/ChangeLog b/sim/erc32/ChangeLog index e2b0232..a2c3a25 100644 --- a/sim/erc32/ChangeLog +++ b/sim/erc32/ChangeLog @@ -1,3 +1,10 @@ +2018-10-25 Joel Sherrill + + * configure.ac: Cygwin has removed libtermcap.a and now has + libncurses.a. Remove the Cygwin specific hack and use the standard + logic to determine which library to use. + * configure: Regenerate. + 2017-09-06 John Baldwin * configure: Regenerate. diff --git a/sim/erc32/configure b/sim/erc32/configure index 1f9a962..4efb9b6 100755 --- a/sim/erc32/configure +++ b/sim/erc32/configure @@ -13548,11 +13548,9 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_cv_os_cygwin" >&5 $as_echo "$sim_cv_os_cygwin" >&6; } -if test x$sim_cv_os_cygwin = xyes; then - TERMCAP='`if test -r ../../libtermcap/libtermcap.a; then echo ../../libtermcap/libtermcap.a; else echo -ltermcap; fi` -luser32' -else - # Keep in sync with gdb's configure.ac list. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tgetent" >&5 + +# Keep in sync with gdb's configure.ac list. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tgetent" >&5 $as_echo_n "checking for library containing tgetent... " >&6; } if ${ac_cv_search_tgetent+:} false; then : $as_echo_n "(cached) " >&6 @@ -13610,6 +13608,8 @@ else TERMCAP="" fi +if test x$sim_cv_os_cygwin = xyes; then + TERMCAP="${TERMCAP} -luser32" fi diff --git a/sim/erc32/configure.ac b/sim/erc32/configure.ac index 3135dc5..e4df819 100644 --- a/sim/erc32/configure.ac +++ b/sim/erc32/configure.ac @@ -26,12 +26,11 @@ AC_CACHE_CHECK([for cygwin], sim_cv_os_cygwin, lose #endif],[sim_cv_os_cygwin=yes],[sim_cv_os_cygwin=no])]) +# Keep in sync with gdb's configure.ac list. +AC_SEARCH_LIBS(tgetent, [termcap tinfo curses ncurses], + [TERMCAP=$ac_cv_search_tgetent], [TERMCAP=""]) if test x$sim_cv_os_cygwin = xyes; then - TERMCAP='`if test -r ../../libtermcap/libtermcap.a; then echo ../../libtermcap/libtermcap.a; else echo -ltermcap; fi` -luser32' -else - # Keep in sync with gdb's configure.ac list. - AC_SEARCH_LIBS(tgetent, [termcap tinfo curses ncurses], - [TERMCAP=$ac_cv_search_tgetent], [TERMCAP=""]) + TERMCAP="${TERMCAP} -luser32" fi AC_SUBST(TERMCAP)