diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.ac | 21 |
2 files changed, 15 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog index 775e0a3d2..43db8d7c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2007-11-20 Peter Stephenson <pws@csr.com> + * 24108 plus yet another tweak: configure.ac: the test + for whether we using ncurses as a library was both wrong + and in the wrong place. + * 24107: configure.ac, Src/Modules/curses.c: yet more library fun: search for ncurses headers in other places, don't use ncursesw/ncurses.h if no multibyte support, diff --git a/configure.ac b/configure.ac index fbbd76aca..47ffce5af 100644 --- a/configure.ac +++ b/configure.ac @@ -720,16 +720,6 @@ else AC_MSG_RESULT(no) fi -dnl If our terminal library is not ncurses, don't try including -dnl any ncurses headers. -AH_TEMPLATE([ZSH_IGNORE_NCURSES], -[Define to 1 to ignore any ncurses library headers found on the system.]) -case $LIBS in - ncurses*) ;; - *) - AC_DEFINE(ZSH_IGNORE_NCURSES) ;; -esac - AC_MSG_CHECKING(if boolcodes is available) AC_TRY_LINK([#ifdef TERM_H_NEEDS_CURSES_H #include <curses.h> @@ -768,6 +758,17 @@ AC_DEFINE(HAVE_STRNAMES) strnames=yes, strnames=no) AC_MSG_RESULT($strnames) ]) + +dnl If our terminal library is not ncurses, don't try including +dnl any ncurses headers. +AH_TEMPLATE([ZSH_IGNORE_NCURSES], +[Define to 1 to ignore any ncurses library headers found on the system.]) +case $LIBS in + *-lncurses*) ;; + *) + AC_DEFINE(ZSH_IGNORE_NCURSES) ;; +esac + dnl Some systems (Solaris 2.x, Linux Redhat 5.x) require dnl libnsl (Network Services Library) to find yp_all |