summary refs log tree commit diff
diff options
context:
space:
mode:
authorBart Schaefer <barts@users.sourceforge.net>2001-05-10 07:13:41 +0000
committerBart Schaefer <barts@users.sourceforge.net>2001-05-10 07:13:41 +0000
commit16af95b1200fecb7b46940c39ca375b48c0fcdb2 (patch)
tree9ac3524013699756c48d97e23aa070d659b345b3
parent5f0cdf4899ff9de4a91b1b642a83d34d1b924f34 (diff)
downloadzsh-16af95b1200fecb7b46940c39ca375b48c0fcdb2.tar.gz
zsh-16af95b1200fecb7b46940c39ca375b48c0fcdb2.tar.xz
zsh-16af95b1200fecb7b46940c39ca375b48c0fcdb2.zip
More cleanup of 14275+14290.
-rw-r--r--ChangeLog3
-rw-r--r--configure.in10
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,