diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | configure.in | 10 |
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index ab1d5dab7..e63adee0b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2001-05-09 Bart Schaefer <schaefer@zsh.org> + * unposted: configure.in: Clean up 14275+14290 a bit at Andrej's + urging so as not to violate quite so many autoconf usage rules. + * 14290: configure.in: Use a different cache variable for the Solaris-curses.h-mistake-fix from 14275. diff --git a/configure.in b/configure.in index 9c90b9128..6ae0522f8 100644 --- a/configure.in +++ b/configure.in @@ -563,11 +563,15 @@ AC_SEARCH_LIBS(tgetent, [$termcap_curses_order]) case "$LIBS" in *curses*) AC_CHECK_HEADERS(curses.h, [], -AC_CACHE_CHECK(for Solaris 8 curses.h mistake, ac_cv_solaris_curses_h, +[AC_CACHE_CHECK(for Solaris 8 curses.h mistake, ac_cv_header_curses_solaris, AC_TRY_COMPILE([#include <curses.h>], [], [ac_cv_header_curses_h=yes -AC_DEFINE(HAVE_CURSES_H)], -ac_cv_header_curses_h=no))) +ac_cv_header_curses_solaris=yes], +ac_cv_header_curses_h=no +ac_cv_header_curses_solaris=no)) +if test x$ac_cv_header_curses_solaris = xyes; then +AC_DEFINE(HAVE_CURSES_H) +fi]) AC_CHECK_HEADERS(term.h, [AC_MSG_CHECKING(if term.h needs curses.h) AC_TRY_COMPILE([#include <term.h>], [char **test = boolcodes;], boolcodes_with_only_term_h=yes, |