From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19182 invoked from network); 5 Dec 2007 14:53:17 -0000 X-Spam-Checker-Version: SpamAssassin 3.2.3 (2007-08-08) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=AWL,BAYES_00 autolearn=ham version=3.2.3 Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88) by ns1.primenet.com.au with SMTP; 5 Dec 2007 14:53:17 -0000 Received-SPF: none (ns1.primenet.com.au: domain at sunsite.dk does not designate permitted sender hosts) Received: (qmail 54827 invoked from network); 5 Dec 2007 14:53:11 -0000 Received: from sunsite.dk (130.225.247.90) by a.mx.sunsite.dk with SMTP; 5 Dec 2007 14:53:11 -0000 Received: (qmail 22620 invoked by alias); 5 Dec 2007 14:53:07 -0000 Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 24160 Received: (qmail 22606 invoked from network); 5 Dec 2007 14:53:06 -0000 Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88) by sunsite.dk with SMTP; 5 Dec 2007 14:53:06 -0000 Received: (qmail 54441 invoked from network); 5 Dec 2007 14:53:06 -0000 Received: from acolyte.scowler.net (216.254.112.45) by a.mx.sunsite.dk with SMTP; 5 Dec 2007 14:52:59 -0000 Received: by acolyte.scowler.net (Postfix, from userid 1000) id 658245CDC7; Wed, 5 Dec 2007 09:52:56 -0500 (EST) Date: Wed, 5 Dec 2007 09:52:57 -0500 From: Clint Adams To: zsh-workers@sunsite.dk Cc: Stephane Chazelas , 454414@bugs.debian.org Subject: Re: Bug#454414: zsh-beta: missing terminfo module Message-ID: <20071205145257.GA22893@scowler.net> Mail-Followup-To: zsh-workers@sunsite.dk, Stephane Chazelas , 454414@bugs.debian.org References: <20071205085856.7844.56170.reportbug@localhost> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20071205085856.7844.56170.reportbug@localhost> User-Agent: Mutt/1.5.17 (2007-11-01) 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 +#ifdef ZSH_IGNORE_NCURSES +# ifdef HAVE_CURSES_H +# include +# endif +#else +# ifdef HAVE_NCURSESW_NCURSES_H +# include +# else +# ifdef HAVE_NCURSES_NCURSES_H +# include +# else +# ifdef HAVE_NCURSES_H +# include +# else +# ifdef HAVE_CURSES_H +# include +# endif +# endif +# endif +# endif +#endif + # ifdef HAVE_TERM_H # include # 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