From 98a24fc8f99ae8160bf0e9ce3d2e57e3b231e9a5 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Thu, 3 Sep 2020 19:25:05 +0200 Subject: [PATCH] build: to verify wide curses, probe for a function that cannot be a macro This probing has been changed four times in the past: git log --grep get_wch In March 2005, commit 2161fa62 changed the probe from get_wch() to wget_wch(), reasoning that "get_wch() might be a macro instead of a function". (Four months earlier, commit 3ba9c351 changed it from addwstr() to wget_wch(), probably for the same reason.) But three months later, in commit 25799f68, the probe gets changed to get_wch() again, because "it's a more generic function"... It seems clear that the non-macro argument is the stronger one. See the NOTES section in 'man get_wch' for its possible macroness. This addresses https://savannah.gnu.org/bugs/?58997. Reported-by: Randall S. Becker --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 023175b9..e9fae4fc 100644 --- a/configure.ac +++ b/configure.ac @@ -567,9 +567,9 @@ if eval "test x$CURSES_LIB_NAME = x"; then CURSES_LIB=`$NCURSESW_CONFIG --libs` LIBS="$CURSES_LIB $LIBS" CPPFLAGS="`$NCURSESW_CONFIG --cflags` $CPPFLAGS" - AC_CHECK_LIB(ncursesw, get_wch, [CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE=yes]) + AC_CHECK_LIB(ncursesw, wget_wch, [CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE=yes]) else - AC_CHECK_LIB(ncursesw, get_wch, [CURSES_LIB="-lncursesw" CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE=yes]) + AC_CHECK_LIB(ncursesw, wget_wch, [CURSES_LIB="-lncursesw" CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE=yes]) fi LIBS="$OLDLIBS" fi @@ -583,7 +583,7 @@ if eval "test x$CURSES_LIB_NAME = x"; then AC_CHECK_HEADERS(curses.h) if test "x$enable_utf8" != xno; then - AC_CHECK_LIB(curses, get_wch, [CURSES_LIB="-lcurses" CURSES_LIB_NAME=curses CURSES_LIB_WIDE=yes]) + AC_CHECK_LIB(curses, wget_wch, [CURSES_LIB="-lcurses" CURSES_LIB_NAME=curses CURSES_LIB_WIDE=yes]) fi if eval "test x$CURSES_LIB_NAME = x"; then