about summary refs log tree commit diff
path: root/Src/Modules
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2007-11-20 15:48:51 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2007-11-20 15:48:51 +0000
commitbb70fc6fe6a4162f90ed88d5f1739a7cee1f2fde (patch)
treea61954acd6905f66f08511c9c040df63acbf4529 /Src/Modules
parentc41324baa0a705a55e55a824b9e3bb9eda947e54 (diff)
downloadzsh-bb70fc6fe6a4162f90ed88d5f1739a7cee1f2fde.tar.gz
zsh-bb70fc6fe6a4162f90ed88d5f1739a7cee1f2fde.tar.xz
zsh-bb70fc6fe6a4162f90ed88d5f1739a7cee1f2fde.zip
24107: extra search for ncurses headers but dont use if library isnt ncurses
Diffstat (limited to 'Src/Modules')
-rw-r--r--Src/Modules/curses.c31
1 files changed, 23 insertions, 8 deletions
diff --git a/Src/Modules/curses.c b/Src/Modules/curses.c
index 19f58cc62..81d34ce4f 100644
--- a/Src/Modules/curses.c
+++ b/Src/Modules/curses.c
@@ -32,20 +32,35 @@
 #include "curses.mdh"
 #include "curses.pro"
 
-#ifdef HAVE_NCURSES_H
-# include <ncurses.h>
-#else
-# ifdef HAVE_CURSES_H
-#  include <curses.h>
-# endif
-#endif
-
 #ifndef MULTIBYTE_SUPPORT
 # undef HAVE_GETCCHAR
 # undef HAVE_SETCCHAR
 # undef HAVE_WADDWSTR
 # undef HAVE_WGET_WCH
 # undef HAVE_WIN_WCH
+# undef HAVE_NCURSESW_NCURSES_H
+#endif
+
+#ifdef ZSH_IGNORE_NCURSES
+# ifdef HAVE_CURSES_H
+#  include <curses.h>
+# endif
+#else
+# ifdef HAVE_NCURSESW_NCURSES_H
+#  include <ncursesw/ncurses.h>
+# else
+#  ifdef HAVE_NCURSES_H
+#   include <ncurses.h>
+#  else
+#   ifdef HAVE_NCURSES_NCURSES_H
+#    include <ncurses/ncurses.h>
+#   else
+#    ifdef HAVE_CURSES_H
+#     include <curses.h>
+#    endif
+#   endif
+#  endif
+# endif
 #endif
 
 #ifdef HAVE_SETCCHAR