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 <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>

diff --git a/acinclude.m4 b/acinclude.m4
index 0f1479759a41f0753efe0a1ba336ef5f07be4f49..694de8aa772f012ecc2666f9f06915976cd64882 100644 (file)
--- 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 808b628d01f260bb674fa4b766acde1c5ee83c7f..c2710d1fbfb856b6dc3bd6656e924a6d1ace6d98 100644 (file)
--- a/src/gtx/curses_test.c
+++ b/src/gtx/curses_test.c
@@ -22,6 +22,8 @@
 
 #if defined(HAVE_NCURSES_H)
 # include <ncurses.h>
+#elif defined(HAVE_NCURSES_NCURSES_H)
+# include <ncurses/ncurses.h>
 #elif defined(HAVE_CURSES_H)
 # include <curses.h>
 #endif

diff --git a/src/gtx/gtxcurseswin.h b/src/gtx/gtxcurseswin.h
index d513ea130abd87e76495d10dc533d6457b36aac9..be88e0764e647e975048a417c27ab60fccefeb6f 100644 (file)
--- a/src/gtx/gtxcurseswin.h
+++ b/src/gtx/gtxcurseswin.h
@@ -18,6 +18,8 @@
 
 #if defined(HAVE_NCURSES_H)
 # include <ncurses.h>
+#elif defined(HAVE_NCURSES_NCURSES_H)
+# include <ncurses/ncurses.h>
 #elif defined(HAVE_CURSES_H)
 # include <curses.h>
 #endif