This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH] configure.ac: Cygwin now has ncurses not termcap. Use standard logic.
- From: Joel Sherrill <joel at rtems dot org>
- To: gdb-patches at sourceware dot org
- Cc: Joel Sherrill <joel at rtems dot org>
- Date: Wed, 24 Oct 2018 16:07:24 -0500
- Subject: [PATCH] configure.ac: Cygwin now has ncurses not termcap. Use standard logic.
sim/erc32/Changelog:
2018-10-24 Joel Sherrill <joel@rtems.org>
* configure.ac: Cygwin now has ncurses not termcap. Use standard
logic.
* configure: Regenerate.
---
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..6a2f45d 100644
--- a/sim/erc32/ChangeLog
+++ b/sim/erc32/ChangeLog
@@ -1,3 +1,9 @@
+2018-10-24 Joel Sherrill <joel@rtems.org>
+
+ * configure.ac: Cygwin now has ncurses not termcap. Use standard
+ logic.
+ * 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)
--
1.8.3.1