[binutils-gdb] [src/erc32] Use ncurses instead of termcap on Cygwin too

[Pedro Alves <palves at sourceware dot org>]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=c1230d1bab8e36e1aa40f3bbadcef9b5d9ddc041

commit c1230d1bab8e36e1aa40f3bbadcef9b5d9ddc041
Author: Joel Sherrill <joel@rtems.org>
Date:   Tue Oct 30 16:41:12 2018 +0000

    [src/erc32] Use ncurses instead of termcap on Cygwin too
    
    This removes a Cygwin-specific libtermcap hack that was dependent on
    the presence of one of the multiple alternative libraries.  The one it
    was hard-coded to pick isn't included with Cygwin anymore.
    
    According to Corinna, libtermcap was removed from Cygwin a long time
    ago, and libncurses is used in Cygwin for a long time too.
    
    The fix is to make Cygwin use the same autoconf code to figure out the
    correct lib as any other target.
    
    sim/erc32/Changelog:
    2018-10-30  Joel Sherrill <joel@rtems.org>
    
    	* configure.ac: Remove the Cygwin-specific libtermcap.a hack
    	and use the standard logic to determine which library to use.
    	* configure: Regenerate.

Diff:
---
 sim/erc32/ChangeLog    |  6 ++++++
 sim/erc32/configure    | 10 +++++-----
 sim/erc32/configure.ac |  9 ++++-----
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/sim/erc32/ChangeLog b/sim/erc32/ChangeLog
index e2b0232..088a2a4 100644
--- a/sim/erc32/ChangeLog
+++ b/sim/erc32/ChangeLog
@@ -1,3 +1,9 @@
+2018-10-30  Joel Sherrill <joel@rtems.org>
+
+	* configure.ac: Remove the Cygwin-specific libtermcap.a hack
+	and use the standard logic to determine which library to use.
+	* configure: Regenerate.
+
 2017-09-06  John Baldwin  <jhb@FreeBSD.org>
 
 	* 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)