mutt: Make ncurses and ncursesw header checking the same.

[Brendan Cully]

changeset: 6833:4da647a80c55
user:      Kevin McCarthy <ke...@8t8.us>
date:      Wed Nov 02 18:27:09 2016 -0700
link:      http://dev.mutt.org/hg/mutt/rev/4da647a80c55

Make ncurses and ncursesw header checking the same.

Previously, ncurses.h wasn't searched for directly in the include
directory for ncursesw.

Also, fix a test in case $withval is empty.

Thanks to Sylvain Bertrand for the original patch.

diffs (28 lines):

diff -r b45bfce1bb0e -r 4da647a80c55 configure.ac
--- a/configure.ac      Mon Oct 31 20:30:44 2016 -0700
+++ b/configure.ac      Wed Nov 02 18:27:09 2016 -0700
@@ -273,7 +273,7 @@
 
         [mutt_cv_curses=/usr
         AC_ARG_WITH(curses, AS_HELP_STRING([--with-curses=DIR],[Where ncurses 
is installed]),
-                [if test $withval != yes; then
+                [if test x$withval != xyes; then
                         mutt_cv_curses=$withval
                 fi
                 if test x$mutt_cv_curses != x/usr; then
@@ -292,12 +292,9 @@
 
                 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
-                  
AC_CHECK_HEADERS(ncurses/ncurses.h,[cf_cv_ncurses_header="ncurses/ncurses.h"],
-                    
[AC_CHECK_HEADERS(ncurses.h,[cf_cv_ncurses_header="ncurses.h"])])
-               fi],
+                
AC_CHECK_HEADERS($cf_ncurses/ncurses.h,[cf_cv_ncurses_header="$cf_ncurses/ncurses.h"],
+                  
[AC_CHECK_HEADERS(ncurses.h,[cf_cv_ncurses_header="ncurses.h"])])
+               ],
 
                 [CF_CURSES_LIBS])
                ])