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 <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
(cherry picked from commit 81dd4878e7a71b5acfd7a6e6f9be26cd6ab28972)

Change-Id: I139296ae267ec057fc5ee11634d19ba36c8f8d6c
Reviewed-on: http://gerrit.openafs.org/8890
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Paul Smeddle <paul.smeddle@gmail.com>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>

diff --git a/acinclude.m4 b/acinclude.m4
index b384536ccddae7daac3d296e7e5ad34534aa0c72..2238aebd36b8c4428c1075813ab242c5941c0d98 100644 (file)
--- 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 <linux/types.h>])
 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 4b3f32d3d2cc4c368fb53ce2ce1f86e364bbbfa3..8ae19acd782e148ecd1acf1863c645fbeb34d6f8 100644 (file)
--- a/src/gtx/curses_test.c
+++ b/src/gtx/curses_test.c
@@ -20,6 +20,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