From 9754a288e7439413ae71f1d1e89e387224494dc8 Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Fri, 4 Jan 2013 14:18:40 -0500 Subject: [PATCH] SOLARIS: Look for ncurses in ncurses/ncurses.h Solaris 11+ has ncurses.h in ncurses/ncurses.h. Look for it there. Without this, on Solaris 11.1 we will detect libncurses automatically (because it lives in /usr/lib), but not ncurses.h (since it is in ncurses/ncurses.h, not ncurses.h). So, we will fall back to curses.h, but will try to link to libncurses, which, as you might guess, fails with various undefined symbols. Reviewed-on: http://gerrit.openafs.org/8874 Tested-by: BuildBot Reviewed-by: Derrick Brashear (cherry picked from commit 81dd4878e7a71b5acfd7a6e6f9be26cd6ab28972) Change-Id: I139296ae267ec057fc5ee11634d19ba36c8f8d6c Reviewed-on: http://gerrit.openafs.org/8890 Tested-by: BuildBot Reviewed-by: Andrew Deason Reviewed-by: Paul Smeddle Reviewed-by: Stephan Wiesand --- acinclude.m4 | 2 +- src/gtx/curses_test.c | 2 ++ src/gtx/gtxcurseswin.h | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/acinclude.m4 b/acinclude.m4 index b384536cc..2238aebd3 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1297,7 +1297,7 @@ AC_CHECK_HEADERS(windows.h direct.h sys/ipc.h sys/resource.h) AC_CHECK_HEADERS(security/pam_modules.h ucontext.h regex.h sys/statvfs.h sys/statfs.h sys/bitypes.h) AC_CHECK_HEADERS(linux/errqueue.h,,,[#include ]) AC_CHECK_HEADERS(et/com_err.h) -AC_CHECK_HEADERS(ncurses.h curses.h) +AC_CHECK_HEADERS(ncurses.h ncurses/ncurses.h curses.h) AC_CHECK_HEADERS(search.h) AC_CHECK_TYPES([fsblkcnt_t],,,[ diff --git a/src/gtx/curses_test.c b/src/gtx/curses_test.c index 4b3f32d3d..8ae19acd7 100644 --- a/src/gtx/curses_test.c +++ b/src/gtx/curses_test.c @@ -20,6 +20,8 @@ #if defined(HAVE_NCURSES_H) # include +#elif defined(HAVE_NCURSES_NCURSES_H) +# include #elif defined(HAVE_CURSES_H) # include #endif diff --git a/src/gtx/gtxcurseswin.h b/src/gtx/gtxcurseswin.h index d513ea130..be88e0764 100644 --- a/src/gtx/gtxcurseswin.h +++ b/src/gtx/gtxcurseswin.h @@ -18,6 +18,8 @@ #if defined(HAVE_NCURSES_H) # include +#elif defined(HAVE_NCURSES_NCURSES_H) +# include #elif defined(HAVE_CURSES_H) # include #endif -- 2.39.5