diff options
author | Bart Schaefer <barts@users.sourceforge.net> | 2002-09-04 14:58:51 +0000 |
---|---|---|
committer | Bart Schaefer <barts@users.sourceforge.net> | 2002-09-04 14:58:51 +0000 |
commit | 7190ab611bc97acf1c4e75b4fc17050234ee921d (patch) | |
tree | 73b8c68c43ae3ec1b5ee864f23743b3f6dcd05e7 /zshconfig.ac | |
parent | 271732333202492d726336113a01cb3349ef26eb (diff) | |
download | zsh-7190ab611bc97acf1c4e75b4fc17050234ee921d.tar.gz zsh-7190ab611bc97acf1c4e75b4fc17050234ee921d.tar.xz zsh-7190ab611bc97acf1c4e75b4fc17050234ee921d.zip |
Merge 16613 from development version.
Diffstat (limited to 'zshconfig.ac')
-rw-r--r-- | zshconfig.ac | 41 |
1 files changed, 36 insertions, 5 deletions
diff --git a/zshconfig.ac b/zshconfig.ac index b47b21307..5db30aede 100644 --- a/zshconfig.ac +++ b/zshconfig.ac @@ -957,14 +957,16 @@ zsh_cv_func_tgetent_accepts_null, [AC_TRY_RUN([ main() { - int i = tgetent((char*)0,"vt100"); - if (i > 0) { - char tbuf[1024], *u; - u = tbuf; + char buf[4096]; + int r1 = tgetent(buf, "vt100"); + int r2 = tgetent((char*)0,"vt100"); + if (r1 >= 0 && r1 == r2) { + char tbuf[1024], *u; + u = tbuf; tgetstr("cl", &u); creat("conftest.tgetent", 0640); } - exit(!i || i == -1); + exit((r1 != r2) || r2 == -1); } ], if test -f conftest.tgetent; then @@ -977,6 +979,35 @@ main() if test $zsh_cv_func_tgetent_accepts_null = yes; then AC_DEFINE(TGETENT_ACCEPTS_NULL) fi +AC_CACHE_CHECK(if tgetent returns 0 on success, +zsh_cv_func_tgetent_zero_success, +[AC_TRY_RUN([ +main() +{ + char buf[4096]; + int r1 = tgetent(buf, "!@#$%^&*"); + int r2 = tgetent(buf, "vt100"); + if (r1 < 0 && r2 == 0) { + char tbuf[1024], *u; + u = tbuf; + tgetstr("cl", &u); + creat("conftest.tgetent0", 0640); + } + exit(r1 == r2); +} +], + if test -f conftest.tgetent0; then + zsh_cv_func_tgetent_zero_success=yes + else + zsh_cv_func_tgetent_zero_success=no + fi, + zsh_cv_func_tgetent_zero_success=no, + zsh_cv_func_tgetent_zero_success=no)]) +if test $zsh_cv_func_tgetent_zero_success = yes; then + AC_DEFINE(TGETENT_SUCCESS, 0) +else + AC_DEFINE(TGETENT_SUCCESS, 1) +fi AC_FUNC_MMAP if test x$ac_cv_func_mmap_fixed_mapped = xyes; then |