diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | acconfig.h | 3 | ||||
| -rw-r--r-- | configure.in | 14 |
3 files changed, 11 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog index 61f9ce6a2..f8c804eee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-05-08 Bart Schaefer <schaefer@zsh.org> + + * 14275: configure.in, acconfig.h: Fix 14270 so that it works + after config.cache has been loaded. + 2001-05-08 Peter Stephenson <pws@csr.com> * 14270: configure.in, acconfig.h: use TRY_COMPILE to check for diff --git a/acconfig.h b/acconfig.h index d05219ba7..733782f8d 100644 --- a/acconfig.h +++ b/acconfig.h @@ -318,8 +318,5 @@ /* Define if you have the terminfo strnames symbol. */ #undef HAVE_STRNAMES -/* Define if we have curses.h */ -#undef HAVE_CURSES_H - /* Define if term.h chokes without curses.h */ #undef TERM_H_NEEDS_CURSES_H diff --git a/configure.in b/configure.in index e2130d166..391d89650 100644 --- a/configure.in +++ b/configure.in @@ -562,15 +562,14 @@ esac])dnl AC_SEARCH_LIBS(tgetent, [$termcap_curses_order]) case "$LIBS" in *curses*) -AC_CACHE_CHECK(for curses.h, ac_cv_header_curses_h, +AC_CHECK_HEADERS(curses.h, [], +AC_CACHE_CHECK(for Solaris 8 curses.h mistake, ac_cv_header_curses_h, AC_TRY_COMPILE([#include <curses.h>], [], [ac_cv_header_curses_h=yes AC_DEFINE(HAVE_CURSES_H)], -ac_cv_header_curses_h=no)) -AC_CHECK_HEADERS(term.h) -if test x$ac_cv_header_term_h = xyes; then - -AC_MSG_CHECKING(if term.h needs curses.h) +ac_cv_header_curses_h=no))) +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, boolcodes_with_only_term_h=no) AC_TRY_COMPILE([#include <curses.h> @@ -620,8 +619,7 @@ AC_TRY_LINK([#include <curses.h> #include <term.h>], [char **test = strnames; printf(*test);], AC_DEFINE(HAVE_STRNAMES) strnames=yes, strnames=no) AC_MSG_RESULT($strnames) - -fi;; +]);; esac dnl Some systems (Solaris 2.x, Linux Redhat 5.x) require |