Re: Bug#454414: zsh-beta: missing terminfo module

Re: Bug#454414: zsh-beta: missing terminfo module

[Clint Adams]

On Wed, Dec 05, 2007 at 08:58:56AM +0000, Stephane Chazelas wrote:
> $ zmodload zsh/terminfo
> zsh: failed to load module `zsh/terminfo': /usr/lib/zsh-beta/4.3.4-dev-3/zsh/terminfo.so: cannot open shared object file: No such file or directory
> 
> Even though it was there in previous versions and it is documented:
> $ info -f zsh-beta --index-search=terminfo
> 
> $ dpkg -L zsh-beta | grep terminfo
> $ 

termcap is still broken on systems that have ncursesw/ncurses.h but no
curses.h.  Maybe the .mdd should also care about ZSH_IGNORE_NCURSES.

Index: Src/Modules/terminfo.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Modules/terminfo.c,v
retrieving revision 1.30
diff -u -r1.30 terminfo.c
--- Src/Modules/terminfo.c	6 Jul 2007 21:52:40 -0000	1.30
+++ Src/Modules/terminfo.c	5 Dec 2007 14:48:34 -0000
@@ -49,7 +49,28 @@
 #  undef offsetof
 # endif
 
-# include <curses.h>
+#ifdef ZSH_IGNORE_NCURSES
+# ifdef HAVE_CURSES_H
+#  include <curses.h>
+# endif
+#else
+# ifdef HAVE_NCURSESW_NCURSES_H
+#  include <ncursesw/ncurses.h>
+# else
+#  ifdef HAVE_NCURSES_NCURSES_H
+#   include <ncurses/ncurses.h>
+#  else
+#   ifdef HAVE_NCURSES_H
+#    include <ncurses.h>
+#   else
+#    ifdef HAVE_CURSES_H
+#     include <curses.h>
+#    endif
+#   endif
+#  endif
+# endif
+#endif
+
 # ifdef HAVE_TERM_H
 #  include <term.h>
 # endif
Index: Src/Modules/terminfo.mdd
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Modules/terminfo.mdd,v
retrieving revision 1.12
diff -u -r1.12 terminfo.mdd
--- Src/Modules/terminfo.mdd	20 Jun 2007 20:59:18 -0000	1.12
+++ Src/Modules/terminfo.mdd	5 Dec 2007 14:48:34 -0000
@@ -1,6 +1,8 @@
 name=zsh/terminfo
 
-link='if test "x$ac_cv_func_tigetflag" = xyes -a "x$ac_cv_header_curses_h" = xyes; then
+link='if test "x$ac_cv_func_tigetflag" = xyes -a "x$ac_cv_header_curses_h" = xyes ||
+      test x$ac_cv_header_ncurses_h = xyes || test x$ac_cv_header_ncurses_ncurses_h = xyes ||
+      test x$ac_cv_header_ncursesw_ncurses_h = xyes; then
           if test "x$zsh_cv_shared_tigetstr" = xyes; then
 	      echo either
 	  else

Re: Bug#454414: zsh-beta: missing terminfo module

[Clint Adams]

On Wed, Dec 05, 2007 at 09:52:57AM -0500, Clint Adams wrote:
> +# ifdef HAVE_CURSES_H
> +#  include <curses.h>
> +# endif
> +#else
> +# ifdef HAVE_NCURSESW_NCURSES_H
> +#  include <ncursesw/ncurses.h>
> +# else
> +#  ifdef HAVE_NCURSES_NCURSES_H

Oops.

/etc/zsh-beta/zshrc:12: module `zsh/terminfo' has no such feature: `b:echoti': autoload cancelled
/etc/zsh-beta/zshrc:12: module `zsh/terminfo' has no such feature: `p:terminfo': autoload cancelled
/etc/zsh-beta/zshrc:12: unknown parameter: terminfo 

Index: Src/Modules/terminfo.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Modules/terminfo.c,v
retrieving revision 1.31
diff -u -r1.31 terminfo.c
--- Src/Modules/terminfo.c	5 Dec 2007 15:21:23 -0000	1.31
+++ Src/Modules/terminfo.c	7 Dec 2007 00:05:31 -0000
@@ -30,7 +30,7 @@
 #define USES_TERM_H 1
 #include "terminfo.mdh"
 
-#if defined(HAVE_TIGETFLAG) && defined(HAVE_CURSES_H)
+#if defined(HAVE_TIGETFLAG) && (defined(HAVE_CURSES_H) || defined(HAVE_NCURSES_H) || defined(HAVE_NCURSES_NCURSES_H) || defined(NCURSESW_NCURSES_H))
 # define USE_TERMINFO_MODULE 1
 #else
 # undef USE_TERMINFO_MODULE

Re: Bug#454414: zsh-beta: missing terminfo module

[Clint Adams]

On Thu, Dec 06, 2007 at 07:08:04PM -0500, Clint Adams wrote:
> /etc/zsh-beta/zshrc:12: module `zsh/terminfo' has no such feature: `b:echoti': autoload cancelled
> /etc/zsh-beta/zshrc:12: module `zsh/terminfo' has no such feature: `p:terminfo': autoload cancelled
> /etc/zsh-beta/zshrc:12: unknown parameter: terminfo 

That didn't seem to fix it and neither will this.

Index: configure.ac
===================================================================
RCS file: /cvsroot/zsh/zsh/configure.ac,v
retrieving revision 1.83
diff -u -r1.83 configure.ac
--- configure.ac	3 Dec 2007 22:46:10 -0000	1.83
+++ configure.ac	7 Dec 2007 02:43:29 -0000
@@ -1390,15 +1390,18 @@
 AC_CACHE_CHECK(where curses key definitions are located, zsh_cv_path_curses_keys_h,
 [dnl This is an identical trick to errno.h, except we use ncurses.h
 dnl if we can.
-if test x$ac_cv_header_ncurses_h = xyes || test x$ac_cv_header_ncurses_ncurses_h = xyes || test x$ac_cv_header_ncursesw_ncurses_h = xyes; then
+if test x$ac_cv_header_ncurses_h = xyes; then
   echo "#include <ncurses.h>" >nametmp.c
+elif test x$ac_cv_header_ncurses_ncurses_h = xyes
+  echo "#include <ncurses/ncurses.h>" >nametmp.c
+elif test x$ac_cv_header_ncursesw_ncurses_h = xyes; then
+  echo "#include <ncursesw/ncurses.h>" >nametmp.c
+elif test x$ac_cv_header_curses_h = xyes; then
+  echo "#include <curses.h>" >nametmp.c
 else
-  if test x$ac_cv_header_curses_h = xyes; then
-    echo "#include <curses.h>" >nametmp.c
-  else
-    echo >nametmp.c
-  fi
+  echo >nametmp.c
 fi
+
 curses_list="`$CPP nametmp.c |
 sed -n -e 's/^#line[ 	].*\"\(.*\)\"/\1/p' \
        -e 's/^#[ 	0-9].*\"\(.*\)\"/\1/p' |

Re: Bug#454414: zsh-beta: missing terminfo module

[Clint Adams]

On Thu, Dec 06, 2007 at 09:45:14PM -0500, Clint Adams wrote:
> That didn't seem to fix it and neither will this.

This is not my month.

Index: Src/Modules/terminfo.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Modules/terminfo.c,v
retrieving revision 1.32
diff -u -r1.32 terminfo.c
--- Src/Modules/terminfo.c	7 Dec 2007 00:11:45 -0000	1.32
+++ Src/Modules/terminfo.c	7 Dec 2007 03:03:10 -0000
@@ -30,7 +30,7 @@
 #define USES_TERM_H 1
 #include "terminfo.mdh"
 
-#if defined(HAVE_TIGETFLAG) && (defined(HAVE_CURSES_H) || defined(HAVE_NCURSES_H) || defined(HAVE_NCURSES_NCURSES_H) || defined(NCURSESW_NCURSES_H))
+#if defined(HAVE_TIGETFLAG) && (defined(HAVE_CURSES_H) || defined(HAVE_NCURSES_H) || defined(HAVE_NCURSES_NCURSES_H) || defined(HAVE_NCURSESW_NCURSES_H))
 # define USE_TERMINFO_MODULE 1
 #else
 # undef USE_TERMINFO_MODULE