From 9f56feec37c00e820f868bff1b1c083fca942569 Mon Sep 17 00:00:00 2001 From: Vincent Lefevre Date: Thu, 3 Nov 2016 10:17:13 +0100 Subject: [PATCH] Fixed issue from changeset 4da647a80c55. (closes #3892) Shell variables cannot be used in the first argument of AC_CHECK_HEADERS. --- configure.ac | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 6f8ea08a0..4c12874eb 100644 --- a/configure.ac +++ b/configure.ac @@ -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]) ]) -- 2.40.0