Mirror of the gdb-patches mailing list
 help / color / mirror / Atom feed
* [PATCH] configure.ac: Cygwin now has ncurses not termcap. Use standard logic.
@ 2018-10-24 21:07 Joel Sherrill
  2018-10-25 14:34 ` Pedro Alves
  0 siblings, 1 reply; 6+ messages in thread
From: Joel Sherrill @ 2018-10-24 21:07 UTC (permalink / raw)
  To: gdb-patches; +Cc: Joel Sherrill

	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


^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2018-10-30 20:22 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-24 21:07 [PATCH] configure.ac: Cygwin now has ncurses not termcap. Use standard logic Joel Sherrill
2018-10-25 14:34 ` Pedro Alves
2018-10-25 15:02   ` Joel Sherrill
2018-10-25 15:31     ` Pedro Alves
2018-10-25 18:50       ` Corinna Vinschen
     [not found]         ` <16e94ff1-0c06-7cca-44b1-77bf2fa59519@redhat.com>
2018-10-30 20:22           ` Corinna Vinschen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox