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

configure.ac

index f679ac4b4f90f079a728681388f2645bfe00a821..6d1c418a3a386e857c01a13e46fd5450c99a2d98 100644 (file)
@@ -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])
                ])