pidgin/pidgin

Check pkg-config for ncurses before manually looking for it.
release-2.x.y
2021-06-07, Gary Kramlich
0fcf52e87380
Parents 62c328d6e4b2
Children d0bc6fbd6c7f
Check pkg-config for ncurses before manually looking for it.

This patch originated from https://bugs.gentoo.org/461482 but is being applied
by Gary Kramlich

Testing Done:
Configured only, worked fine on debian unstable.

Reviewed at https://reviews.imfreedom.org/r/729/
1 files changed, 12 insertions(+), 6 deletions(-)
  • +12 -6
    configure.ac
    • --- a/configure.ac Thu Jun 03 23:19:45 2021 -0500
    +++ b/configure.ac Mon Jun 07 22:21:56 2021 -0500
    @@ -603,9 +603,11 @@
    [compile finch against the ncurses includes in DIR])],
    [ac_ncurses_includes="$withval"], [ac_ncurses_includes=""])
    if test "x$enable_consoleui" = "xyes"; then
    - AC_CHECK_LIB(ncursesw, initscr, [GNT_LIBS="-lncursesw"], [enable_consoleui=no])
    - AC_CHECK_LIB(panelw, update_panels, [GNT_LIBS="$GNT_LIBS -lpanelw"],
    - [enable_consoleui=no], [$GNT_LIBS])
    + PKG_CHECK_MODULES([GNT], [ncursesw panelw], [], [
    + AC_CHECK_LIB(ncursesw, initscr, [GNT_LIBS="-lncursesw"], [enable_consoleui=no])
    + AC_CHECK_LIB(panelw, update_panels, [GNT_LIBS="$GNT_LIBS -lpanelw"],
    + [enable_consoleui=no], [$GNT_LIBS])
    + ])
    if test "x$enable_consoleui" = "xyes"; then
    dnl # Some distros put the headers in ncursesw/, some don't
    @@ -655,9 +657,13 @@
    else
    # ncursesw was not found. Look for plain old ncurses
    enable_consoleui=yes
    - AC_CHECK_LIB(ncurses, initscr, [GNT_LIBS="-lncurses"], [enable_consoleui=no])
    - AC_CHECK_LIB(panel, update_panels, [GNT_LIBS="$GNT_LIBS -lpanel"],
    - [enable_consoleui=no], [$GNT_LIBS])
    +
    + PKG_CHECK_MODULES([GNT], [ncurses panel], [] , [
    + AC_CHECK_LIB(ncurses, initscr, [GNT_LIBS="-lncurses"], [enable_consoleui=no])
    + AC_CHECK_LIB(panel, update_panels, [GNT_LIBS="$GNT_LIBS -lpanel"],
    + [enable_consoleui=no], [$GNT_LIBS])
    + ])
    +
    AC_DEFINE(NO_WIDECHAR, 1, [Define to 1 if you don't have wide-character support.])
    if test x"$ac_ncurses_includes" != "x"; then
    GNT_CFLAGS="-I$ac_ncurses_includes"