changeset: 6702:c84aa0d62ce3 user: Kevin McCarthy <ke...@8t8.us> date: Wed Jun 29 18:58:48 2016 -0700 link: http://dev.mutt.org/hg/mutt/rev/c84aa0d62ce3
Include ncurses tinfo library if found. Thanks to Fabian Groffen for reporting this issue and providing a couple possible patches. From Fabian's report: For some time now, ncurses can be built in a mode where the low level terminfo functionality lives in a separate lib called libtinfo. Because some people do, this means Mutt needs to include this library in that case to avoid linking errors [...] changeset: 6703:4b6829229176 user: Kevin McCarthy <ke...@8t8.us> date: Wed Jun 29 18:58:53 2016 -0700 link: http://dev.mutt.org/hg/mutt/rev/4b6829229176 Fix cppflags and muttlibs duplication with --with-gss. When krb5-config was found, MUTT_AM_PATH_GSSAPI included CFLAGS in GSSAPI_CFLAGS and MUTTLIBS in GSSAPI_LIBS. However, configure.ac afterwards sets: CPPFLAGS="$CPPFLAGS $GSSAPI_CFLAGS" MUTTLIBS="$MUTTLIBS $GSSAPI_LIBS" This caused the flags and libs to be duplicated. diffs (28 lines): diff -r b62483975c94 -r 4b6829229176 configure.ac --- a/configure.ac Wed Jun 29 12:25:34 2016 -0700 +++ b/configure.ac Wed Jun 29 18:58:53 2016 -0700 @@ -289,7 +289,9 @@ done AC_CHECK_LIB($cf_ncurses, initscr, [MUTTLIBS="$MUTTLIBS -l$cf_ncurses" - + + AC_CHECK_LIB(tinfo, tgetent, [MUTTLIBS="$MUTTLIBS -ltinfo"]) + if test "$cf_ncurses" = ncursesw; then AC_CHECK_HEADERS(ncursesw/ncurses.h,[cf_cv_ncurses_header="ncursesw/ncurses.h"]) else diff -r b62483975c94 -r 4b6829229176 m4/gssapi.m4 --- a/m4/gssapi.m4 Wed Jun 29 12:25:34 2016 -0700 +++ b/m4/gssapi.m4 Wed Jun 29 18:58:53 2016 -0700 @@ -23,8 +23,8 @@ AC_PATH_PROG(KRB5CFGPATH, krb5-config, none, $krb5_path) if test "$KRB5CFGPATH" != "none" then - GSSAPI_CFLAGS="$CPPFLAGS `$KRB5CFGPATH --cflags gssapi`" - GSSAPI_LIBS="$MUTTLIBS `$KRB5CFGPATH --libs gssapi`" + GSSAPI_CFLAGS="`$KRB5CFGPATH --cflags gssapi`" + GSSAPI_LIBS="`$KRB5CFGPATH --libs gssapi`" case "`$KRB5CFGPATH --version`" in "Kerberos 5 "*) GSSAPI_IMPL="MIT";; ?eimdal*) GSSAPI_IMPL="Heimdal";;
