From: Vincent Lefevre <vincent@vinc17.net>
Date: Thu, 3 Nov 2016 09:17:13 +0000 (+0100)
Subject: Fixed issue from changeset 4da647a80c55. (closes #3892)
X-Git-Tag: mutt-1-8-rel~107
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f32997aecb807e04fcdcbceb87436353d857b623;p=mutt

Fixed issue from changeset 4da647a80c55. (closes #3892)

Shell variables cannot be used in the first argument of AC_CHECK_HEADERS.
---

diff --git a/configure.ac b/configure.ac
index f679ac4b..6d1c418a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -292,9 +292,13 @@ main ()
 
                 AC_CHECK_LIB(tinfo, tgetent, [MUTTLIBS="$MUTTLIBS -ltinfo"])
 
-                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"])])
-		],
+                if test "$cf_ncurses" = ncursesw; then
+                  AC_CHECK_HEADERS(ncursesw/ncurses.h,[cf_cv_ncurses_header="ncursesw/ncurses.h"],
+                    [AC_CHECK_HEADERS(ncurses.h,[cf_cv_ncurses_header="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],
 
                 [CF_CURSES_LIBS])
 		])