diff options
author | Hisham Muhammad <hisham@gobolinux.org> | 2013-02-26 17:10:11 +0000 |
---|---|---|
committer | Hisham Muhammad <hisham@gobolinux.org> | 2013-02-26 17:10:11 +0000 |
commit | a0810561f3bb86910ce0f43d9d673d29c576fcbb (patch) | |
tree | 7c2d75532502dd8d448e379d25f08eda46b8bae4 | |
parent | 43a72316157e98ad48dd6fd96f1a5d8d4de2f1a6 (diff) |
Add extra checks in configure.ac for different locations of (n)curses.h
-rw-r--r-- | RichString.c | 2 | ||||
-rw-r--r-- | RichString.h | 2 | ||||
-rw-r--r-- | configure.ac | 12 |
3 files changed, 12 insertions, 4 deletions
diff --git a/RichString.c b/RichString.c index 33f5880d..5b79d8cd 100644 --- a/RichString.c +++ b/RichString.c @@ -21,6 +21,8 @@ in the source distribution for its full text. #include <ncursesw/curses.h> #elif HAVE_NCURSES_NCURSES_H #include <ncurses/ncurses.h> +#elif HAVE_NCURSES_CURSES_H +#include <ncurses/curses.h> #elif HAVE_NCURSES_H #include <ncurses.h> #elif HAVE_CURSES_H diff --git a/RichString.h b/RichString.h index f22692de..a9cb3f6e 100644 --- a/RichString.h +++ b/RichString.h @@ -19,6 +19,8 @@ in the source distribution for its full text. #include <ncursesw/curses.h> #elif HAVE_NCURSES_NCURSES_H #include <ncurses/ncurses.h> +#elif HAVE_NCURSES_CURSES_H +#include <ncurses/curses.h> #elif HAVE_NCURSES_H #include <ncurses.h> #elif HAVE_CURSES_H 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 |