]> granicus.if.org Git - neomutt/commitdiff
Fixed issue from changeset 4da647a80c55. (closes #3892)
authorVincent Lefevre <vincent@vinc17.net>
Thu, 3 Nov 2016 09:17:13 +0000 (10:17 +0100)
committerRichard Russon <rich@flatcap.org>
Fri, 4 Nov 2016 14:57:51 +0000 (14:57 +0000)
Shell variables cannot be used in the first argument of AC_CHECK_HEADERS.

configure.ac

index 6f8ea08a027153a776bdfcb0ec3ced28ffb9d5d3..4c12874eb606608abd3cc78c5f30a9c77830e204 100644 (file)
@@ -322,9 +322,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])
                ])