configure.ac: Cygwin now has ncurses not termcap. Use standard logic.
Commit Message
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(-)
Comments
WDTY by "now"?
Could you add some rationale words to the proposed commit log, please?
Thanks,
Pedro Alves
On Thu, Oct 25, 2018 at 9:34 AM Pedro Alves <palves@redhat.com> wrote:
> WDTY by "now"?
>
> I mean Cygwin used to include libtermcap and this built. I updated my
Cygwin this
week and it is no longer there. I wasn't able to figure out when it went
away. libncurses.a
is included and that's suitable.
I cc'ed Corinna. I assume she can speak to when libtermcap.a was removed.
Corring
> Could you add some rationale words to the proposed commit log, please?
>
Like what? This removes a hack that was dependent on the presence of one
of the multiple alternative libraries. And the one it was hard-coded to
pick isn't
included with Cygwin anymore.
Happy to change the text but it felt like I was removing a hack that had
outlived
its usefulness. :)
--joel
>
> Thanks,
> Pedro Alves
>
On 10/25/2018 04:01 PM, Joel Sherrill wrote:
> On Thu, Oct 25, 2018 at 9:34 AM Pedro Alves <palves@redhat.com> wrote:
>
>> WDTY by "now"?
>>
>> I mean Cygwin used to include libtermcap and this built. I updated my
> Cygwin this
> week and it is no longer there. I wasn't able to figure out when it went
> away. libncurses.a
> is included and that's suitable.
>
That's so much clearer.
> I cc'ed Corinna. I assume she can speak to when libtermcap.a was removed.
>
> Corring
>
>
>> Could you add some rationale words to the proposed commit log, please?
>>
>
> Like what? This removes a hack that was dependent on the presence of one
> of the multiple alternative libraries. And the one it was hard-coded to
> pick isn't
> included with Cygwin anymore.
That too is useful information.
>
> Happy to change the text but it felt like I was removing a hack that had
> outlived
> its usefulness. :)
And that too.
The problem is that you had no text at all beyond the ChangeLog. See:
https://sourceware.org/gdb/wiki/ContributionChecklist#Detailed_Explanation_of_the_Patch
Particularly, 3.1, first bullet.
Thanks,
Pedro Alves
On Oct 25 16:30, Pedro Alves wrote:
> On 10/25/2018 04:01 PM, Joel Sherrill wrote:
> > On Thu, Oct 25, 2018 at 9:34 AM Pedro Alves <palves@redhat.com> wrote:
> >
> >> WDTY by "now"?
> >>
> >> I mean Cygwin used to include libtermcap and this built. I updated my
> > Cygwin this
> > week and it is no longer there. I wasn't able to figure out when it went
> > away. libncurses.a
> > is included and that's suitable.
> >
>
> That's so much clearer.
>
> > I cc'ed Corinna. I assume she can speak to when libtermcap.a was removed.
I have no idea, ages ago. libncurses is used for a long time. Cygwin
should use the same autoconf code to figure out the correct lib as any
other target.
Corinna
@@ -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.
@@ -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
@@ -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)