Look for ncurses headers in more dedicated locations first (#679)

This solves a problem on FreeBSD, where the base system is shipped with
ncurses 5.9 (/usr/include/ncurses.h). When building against 3rd party
ncurses 6.0 from ports (/usr/local/include/ncurses/ncurses.h), the
configure script picks up the 5.9 headers and the 6.0 library. This
might cause problems, since 6.0 is not ABI compatible with 5.0.

diff --git a/configure.ac b/configure.ac
index fa14a474b2dfa8299f4a510e012986f69ef54ac0..4bdec80537b26a877d8c79ba05297126a4d97f79 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -356,33 +356,32 @@ else
                fi])
 
        AC_CHECK_FUNC(initscr,,[
-       cf_ncurses=""
-       for lib in ncursesw ncurses curses
-       do
-               AC_CHECK_LIB($lib, waddnwstr, [cf_ncurses="$lib"; break])
-       done
-       if test -z $cf_ncurses; then
-               AC_MSG_ERROR([Unable to find ncursesw library])
-       fi
-       AC_CHECK_LIB($cf_ncurses, initscr,
-               [LIBS="$LIBS -l$cf_ncurses"
-
-               AC_CHECK_LIB($cf_ncurses, tgetent, [:], [
-                       AC_CHECK_LIB(tinfo, tgetent, [LIBS="$LIBS -ltinfo"])
-               ])
+               cf_ncurses=""
+               for lib in ncursesw ncurses curses
+               do
+                       AC_CHECK_LIB($lib, waddnwstr, [cf_ncurses="$lib"; break])
+               done
+               if test -z $cf_ncurses; then
+                       AC_MSG_ERROR([Unable to find ncursesw library])
+               fi
+               AC_CHECK_LIB($cf_ncurses, initscr,[
+                       LIBS="$LIBS -l$cf_ncurses"
+                       AC_CHECK_LIB($cf_ncurses, tgetent, [:], [
+                               AC_CHECK_LIB(tinfo, tgetent, [LIBS="$LIBS -ltinfo"])
+                       ])
 
-               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"])]
+                               AC_CHECK_HEADERS(ncurses/ncurses.h,
+                                       [cf_cv_ncurses_header="ncurses/ncurses.h"],
+                                       AC_CHECK_HEADERS(ncurses.h,
+                                               [cf_cv_ncurses_header="ncurses.h"],
+                                               AC_MSG_ERROR(Unable to find ncurses headers)
+                                       )
+                               )
                        )
-               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_CHECK_FUNCDECLS([#include <${cf_cv_ncurses_header-curses.h}>],
                [start_color typeahead bkgdset curs_set meta use_default_colors resizeterm])