diff mbox

configure: Detect native NetBSD curses(3)

Message ID 20170426105027.10666-1-n54@gmx.com
State New
Headers show

Commit Message

Kamil Rytarowski April 26, 2017, 10:50 a.m. UTC
NetBSD ships with traditional BSD curses with compatibility with ncurses.
qemu works nicely with the basesystem version of curses(3) from NetBSD.

The only mismatch between curses(3) and ncurses is the lack of
curses_version() in the NetBSD version. This function is used solely in
the configure script, therefore eliminate it from the curses(3) detection.

With this change applied, configure detects correctly curses frontend.

Signed-off-by: Kamil Rytarowski <n54@gmx.com>
---
 configure | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Kamil Rytarowski May 5, 2017, 11:51 a.m. UTC | #1
x1 ping

On 26.04.2017 12:50, Kamil Rytarowski wrote:
> NetBSD ships with traditional BSD curses with compatibility with ncurses.
> qemu works nicely with the basesystem version of curses(3) from NetBSD.
> 
> The only mismatch between curses(3) and ncurses is the lack of
> curses_version() in the NetBSD version. This function is used solely in
> the configure script, therefore eliminate it from the curses(3) detection.
> 
> With this change applied, configure detects correctly curses frontend.
> 
> Signed-off-by: Kamil Rytarowski <n54@gmx.com>
> ---
>  configure | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/configure b/configure
> index c35acf1192..17dc7224f7 100755
> --- a/configure
> +++ b/configure
> @@ -3034,14 +3034,13 @@ if test "$curses" != "no" ; then
>  #include <curses.h>
>  #include <wchar.h>
>  int main(void) {
> -  const char *s = curses_version();
>    wchar_t wch = L'w';
>    setlocale(LC_ALL, "");
>    resize_term(0, 0);
>    addwstr(L"wide chars\n");
>    addnwstr(&wch, 1);
>    add_wch(WACS_DEGREE);
> -  return s != 0;
> +  return 0;
>  }
>  EOF
>    IFS=:
>
Alex Bennée May 8, 2017, 11:33 a.m. UTC | #2
Kamil Rytarowski <n54@gmx.com> writes:

> NetBSD ships with traditional BSD curses with compatibility with ncurses.
> qemu works nicely with the basesystem version of curses(3) from NetBSD.
>
> The only mismatch between curses(3) and ncurses is the lack of
> curses_version() in the NetBSD version. This function is used solely in
> the configure script, therefore eliminate it from the curses(3) detection.
>
> With this change applied, configure detects correctly curses frontend.
>
> Signed-off-by: Kamil Rytarowski <n54@gmx.com>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

> ---
>  configure | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/configure b/configure
> index c35acf1192..17dc7224f7 100755
> --- a/configure
> +++ b/configure
> @@ -3034,14 +3034,13 @@ if test "$curses" != "no" ; then
>  #include <curses.h>
>  #include <wchar.h>
>  int main(void) {
> -  const char *s = curses_version();
>    wchar_t wch = L'w';
>    setlocale(LC_ALL, "");
>    resize_term(0, 0);
>    addwstr(L"wide chars\n");
>    addnwstr(&wch, 1);
>    add_wch(WACS_DEGREE);
> -  return s != 0;
> +  return 0;
>  }
>  EOF
>    IFS=:


--
Alex Bennée
Kamil Rytarowski May 20, 2017, 11:17 p.m. UTC | #3
Ping? Could someone please put it on the pull-request?

Adding qemu-trivial@.

On 08.05.2017 13:33, Alex Bennée wrote:
> 
> Kamil Rytarowski <n54@gmx.com> writes:
> 
>> NetBSD ships with traditional BSD curses with compatibility with ncurses.
>> qemu works nicely with the basesystem version of curses(3) from NetBSD.
>>
>> The only mismatch between curses(3) and ncurses is the lack of
>> curses_version() in the NetBSD version. This function is used solely in
>> the configure script, therefore eliminate it from the curses(3) detection.
>>
>> With this change applied, configure detects correctly curses frontend.
>>
>> Signed-off-by: Kamil Rytarowski <n54@gmx.com>
> 
> Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
> 
>> ---
>>  configure | 3 +--
>>  1 file changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/configure b/configure
>> index c35acf1192..17dc7224f7 100755
>> --- a/configure
>> +++ b/configure
>> @@ -3034,14 +3034,13 @@ if test "$curses" != "no" ; then
>>  #include <curses.h>
>>  #include <wchar.h>
>>  int main(void) {
>> -  const char *s = curses_version();
>>    wchar_t wch = L'w';
>>    setlocale(LC_ALL, "");
>>    resize_term(0, 0);
>>    addwstr(L"wide chars\n");
>>    addnwstr(&wch, 1);
>>    add_wch(WACS_DEGREE);
>> -  return s != 0;
>> +  return 0;
>>  }
>>  EOF
>>    IFS=:
> 
> 
> --
> Alex Bennée
>
Philippe Mathieu-Daudé May 20, 2017, 11:35 p.m. UTC | #4
Hi Kamil,

On 04/26/2017 07:50 AM, Kamil Rytarowski wrote:
> NetBSD ships with traditional BSD curses with compatibility with ncurses.
> qemu works nicely with the basesystem version of curses(3) from NetBSD.
>
> The only mismatch between curses(3) and ncurses is the lack of
> curses_version() in the NetBSD version. This function is used solely in
> the configure script, therefore eliminate it from the curses(3) detection.
>
> With this change applied, configure detects correctly curses frontend.
>
> Signed-off-by: Kamil Rytarowski <n54@gmx.com>
> ---
>  configure | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/configure b/configure
> index c35acf1192..17dc7224f7 100755
> --- a/configure
> +++ b/configure
> @@ -3034,14 +3034,13 @@ if test "$curses" != "no" ; then
>  #include <curses.h>

This checks if the <curses.h> include in present,

>  #include <wchar.h>
>  int main(void) {
> -  const char *s = curses_version();

This however checks if the library is present, trying to link it.

>    wchar_t wch = L'w';
>    setlocale(LC_ALL, "");
>    resize_term(0, 0);
>    addwstr(L"wide chars\n");
>    addnwstr(&wch, 1);
>    add_wch(WACS_DEGREE);

Those 3 functions also belong to the libcurse, so the link is still 
checked, and this patch looks good to me.

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> -  return s != 0;
> +  return 0;
>  }
>  EOF
>    IFS=:
>
Michael Tokarev May 23, 2017, 2:43 p.m. UTC | #5
26.04.2017 13:50, Kamil Rytarowski wrote:
> NetBSD ships with traditional BSD curses with compatibility with ncurses.
> qemu works nicely with the basesystem version of curses(3) from NetBSD.
> 
> The only mismatch between curses(3) and ncurses is the lack of
> curses_version() in the NetBSD version. This function is used solely in
> the configure script, therefore eliminate it from the curses(3) detection.
> 
> With this change applied, configure detects correctly curses frontend.

Applied to -trivial, thanks!

/mjt
diff mbox

Patch

diff --git a/configure b/configure
index c35acf1192..17dc7224f7 100755
--- a/configure
+++ b/configure
@@ -3034,14 +3034,13 @@  if test "$curses" != "no" ; then
 #include <curses.h>
 #include <wchar.h>
 int main(void) {
-  const char *s = curses_version();
   wchar_t wch = L'w';
   setlocale(LC_ALL, "");
   resize_term(0, 0);
   addwstr(L"wide chars\n");
   addnwstr(&wch, 1);
   add_wch(WACS_DEGREE);
-  return s != 0;
+  return 0;
 }
 EOF
   IFS=: