changeset: 6835:ce07aa118214
user:      Vincent Lefevre <vinc...@vinc17.net>
date:      Thu Nov 03 10:17:13 2016 +0100
link:      http://dev.mutt.org/hg/mutt/rev/ce07aa118214

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

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

diffs (20 lines):

diff -r 0e0d54b5a384 -r ce07aa118214 configure.ac
--- a/configure.ac      Wed Nov 02 18:54:06 2016 -0700
+++ b/configure.ac      Thu Nov 03 10:17:13 2016 +0100
@@ -292,9 +292,13 @@
 
                 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])
                ])

Reply via email to