From a0810561f3bb86910ce0f43d9d673d29c576fcbb Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Tue, 26 Feb 2013 17:10:11 +0000 Subject: Add extra checks in configure.ac for different locations of (n)curses.h --- configure.ac | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index ff6901b1..668a0953 100644 --- a/configure.ac +++ b/configure.ac @@ -27,7 +27,7 @@ AC_CHECK_LIB([m], [ceil], [], [missing_libraries="$missing_libraries libm"]) # Checks for header files. AC_HEADER_DIRENT AC_HEADER_STDC -AC_CHECK_HEADERS([stdlib.h string.h strings.h sys/param.h sys/time.h unistd.h curses.h],[:],[ +AC_CHECK_HEADERS([stdlib.h string.h strings.h sys/param.h sys/time.h unistd.h],[:],[ missing_headers="$missing_headers $ac_header" ]) AC_CHECK_HEADERS([execinfo.h],[:],[:]) @@ -94,11 +94,15 @@ if test "x$enable_unicode" = xyes; then AC_MSG_ERROR([You may want to use --disable-unicode or install libncursesw.]) ]) AC_CHECK_HEADERS([ncursesw/curses.h],[:], - [AC_CHECK_HEADERS([ncurses/ncurses.h],[:], - [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])]) + [AC_CHECK_HEADERS([ncurses/ncurses.h],[:], + [AC_CHECK_HEADERS([ncurses/curses.h],[:], + [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])]) else AC_CHECK_LIB([ncurses], [refresh], [], [missing_libraries="$missing_libraries libncurses"]) - AC_CHECK_HEADERS([curses.h],[:],[missing_headers="$missing_headers $ac_header"]) + AC_CHECK_HEADERS([curses.h],[:], + [AC_CHECK_HEADERS([ncurses/curses.h],[:], + [AC_CHECK_HEADERS([ncurses/ncurses.h],[:], + [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])]) fi if test ! -z "$missing_libraries"; then -- cgit v1.2.3