From 81dd4878e7a71b5acfd7a6e6f9be26cd6ab28972 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. Change-Id: Ia174e2a3c97318d6db2a48a6098569aede93522c Reviewed-on: http://gerrit.openafs.org/8874 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- acinclude.m4 | 1 + src/gtx/curses_test.c | 2 ++ src/gtx/gtxcurseswin.h | 2 ++ 3 files changed, 5 insertions(+) diff --git a/acinclude.m4 b/acinclude.m4 index 0f1479759..694de8aa7 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1324,6 +1324,7 @@ AC_CHECK_HEADERS([ \ math.h \ mntent.h \ ncurses.h \ + ncurses/ncurses.h \ netdb.h \ netinet/in.h \ pthread_np.h \ diff --git a/src/gtx/curses_test.c b/src/gtx/curses_test.c index 808b628d0..c2710d1fb 100644 --- a/src/gtx/curses_test.c +++ b/src/gtx/curses_test.c @@ -22,6 +22,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