From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12412 invoked from network); 21 Nov 2007 09:50:36 -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.5 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; 21 Nov 2007 09:50:36 -0000 Received-SPF: none (ns1.primenet.com.au: domain at sunsite.dk does not designate permitted sender hosts) Received: (qmail 98251 invoked from network); 21 Nov 2007 09:50:33 -0000 Received: from sunsite.dk (130.225.247.90) by a.mx.sunsite.dk with SMTP; 21 Nov 2007 09:50:33 -0000 Received: (qmail 29328 invoked by alias); 21 Nov 2007 09:50:31 -0000 Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 24110 Received: (qmail 29316 invoked from network); 21 Nov 2007 09:50:30 -0000 Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88) by sunsite.dk with SMTP; 21 Nov 2007 09:50:30 -0000 Received: (qmail 97949 invoked from network); 21 Nov 2007 09:50:30 -0000 Received: from cluster-g.mailcontrol.com (85.115.41.190) by a.mx.sunsite.dk with SMTP; 21 Nov 2007 09:50:22 -0000 Received: from cameurexb01.EUROPE.ROOT.PRI ([62.189.241.200]) by rly13g.srv.mailcontrol.com (MailControl) with ESMTP id lAL9nb72004319 for ; Wed, 21 Nov 2007 09:50:09 GMT Received: from news01.csr.com ([10.103.143.38]) by cameurexb01.EUROPE.ROOT.PRI with Microsoft SMTPSVC(6.0.3790.1830); Wed, 21 Nov 2007 09:49:47 +0000 Received: from news01.csr.com (localhost.localdomain [127.0.0.1]) by news01.csr.com (8.14.1/8.13.4) with ESMTP id lAL9nlU0019468 for ; Wed, 21 Nov 2007 09:49:47 GMT Received: from csr.com (pws@localhost) by news01.csr.com (8.14.1/8.14.1/Submit) with ESMTP id lAL9nkch019465 for ; Wed, 21 Nov 2007 09:49:46 GMT Message-Id: <200711210949.lAL9nkch019465@news01.csr.com> X-Authentication-Warning: news01.csr.com: pws owned process doing -bs To: "Zsh Hackers' List" Sent-via: "Zsh Hackers' List" Subject: Re: zsh-4.3.4-dev-2.tar.gz In-reply-to: <20071121094036.GH1499@prunille.vinc17.org> References: <11649.1195558694@csr.com> <4742DC87.5030901@math.technion.ac.il> <20071120141442.55f7ac28@news01> <4742F733.4030908@math.technion.ac.il> <20071120154246.30388170@news01> <20071121094036.GH1499@prunille.vinc17.org> Comments: In-reply-to Vincent Lefevre message dated "Wed, 21 Nov 2007 10:40:37 +0100." Date: Wed, 21 Nov 2007 09:49:46 +0000 From: Peter Stephenson X-OriginalArrivalTime: 21 Nov 2007 09:49:47.0228 (UTC) FILETIME=[D9F579C0:01C82C23] X-Scanned-By: MailControl A-06-00-00 (www.mailcontrol.com) on 10.71.0.123 Vincent Lefevre wrote: > Shouldn't HAVE_NCURSES_NCURSES_H and HAVE_NCURSES_H be reversed, > in case both are defined? Indeed I assume that > should have the precedence over since the former is > the canonical place, isn't it? On the assumption that (i) only the original system packages are likely to put the header in /usr/include (ii) added packages will put it in some local subdirectory as ncurses/ncurses.h (iii) the added packages should take preference and some attempt with include paths and library paths has been made for this, then you're right. That's a little too complicated for me to have much faith that it's always going to work, but at least you've provided one example where it does. Index: Src/Modules/curses.c =================================================================== RCS file: /cvsroot/zsh/zsh/Src/Modules/curses.c,v retrieving revision 1.41 diff -u -r1.41 curses.c --- Src/Modules/curses.c 20 Nov 2007 15:48:51 -0000 1.41 +++ Src/Modules/curses.c 21 Nov 2007 09:45:37 -0000 @@ -49,11 +49,11 @@ # ifdef HAVE_NCURSESW_NCURSES_H # include # else -# ifdef HAVE_NCURSES_H -# include +# ifdef HAVE_NCURSES_NCURSES_H +# include # else -# ifdef HAVE_NCURSES_NCURSES_H -# include +# ifdef HAVE_NCURSES_H +# include # else # ifdef HAVE_CURSES_H # include -- Peter Stephenson Software Engineer CSR PLC, Churchill House, Cambridge Business Park, Cowley Road Cambridge, CB4 0WZ, UK Tel: +44 (0)1223 692070