From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-14099-mason-zsh=primenet.com.au@sunsite.dk>
Received: (qmail 21104 invoked from network); 26 Apr 2001 04:29:02 -0000
Received: from sunsite.dk (130.225.51.30)
  by ns1.primenet.com.au with SMTP; 26 Apr 2001 04:29:02 -0000
Received: (qmail 4637 invoked by alias); 26 Apr 2001 04:28:54 -0000
Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm
Precedence: bulk
X-No-Archive: yes
X-Seq: 14099
Received: (qmail 4624 invoked from network); 26 Apr 2001 04:28:53 -0000
From: "Bart Schaefer" <schaefer@candle.brasslantern.com>
Message-Id: <1010426042751.ZM11961@candle.brasslantern.com>
Date: Thu, 26 Apr 2001 04:27:51 +0000
In-Reply-To: <545itjsx3ec.fsf@icd.teradyne.com>
Comments: In reply to Vin Shelton <shelton@icd.teradyne.com>
        "Re: Make Failure on SunOS-4.1" (Apr 25,  2:03pm)
References: <54566fu13tt.fsf@icd.teradyne.com> 
	<1010425041307.ZM10317@candle.brasslantern.com> 
	<545y9spyrwy.fsf@icd.teradyne.com> 
	<1010425145840.ZM11172@candle.brasslantern.com> 
	<545itjsx3ec.fsf@icd.teradyne.com>
X-Mailer: Z-Mail (5.0.0 30July97)
To: Vin Shelton <shelton@icd.teradyne.com>
Subject: Re: Make Failure on SunOS-4.1
Cc: zsh-workers@sunsite.dk
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii

On Apr 25,  2:03pm, Vin Shelton wrote:
} Subject: Re: Make Failure on SunOS-4.1
}
} OK.  I found a little time to investigate further.  This is truly
} ugly.
} 
} 'DO' conflicts with the 'DO' token from zsh.h.  I guess curses.h
} predates any kind of useful namespace standard.

Ah, distant memory begins to return ... try the following patch (against
current CVS); if this works, the only configure.in issue we need to deal
with is the question of which (if either) of tigetstr or setupterm to pass
to a call to AC_SEARCH_LIBS.


diff -u -x CVS zsh-forge/current/Src/Modules/termcap.c zsh-4.0/Src/Modules/termcap.c
--- zsh-forge/current/Src/Modules/termcap.c	Mon Apr 23 23:43:27 2001
+++ zsh-4.0/Src/Modules/termcap.c	Wed Apr 25 21:24:42 2001
@@ -27,36 +27,36 @@
  *
  */
 
-#define USES_TERMCAP_H 1
-#define USES_TERM_H 1
+#ifdef HAVE_TGETENT
+# if defined(HAVE_CURSES_H) && defined(HAVE_TERM_H)
+#  define USES_TERM_H 1
+# else
+#  ifdef HAVE_TERMCAP_H
+#   define USES_TERMCAP_H 1
+#  endif
+# endif
+
 #include "termcap.mdh"
 #include "termcap.pro"
 
 static char termcap_nam[] = "termcap";
 
-/* echotc: output a termcap */
-
 #ifdef HAVE_TGETENT
-# if defined(HAVE_CURSES_H) && defined(HAVE_TERM_H)
+# ifdef USES_TERM_H
 #  ifdef HAVE_TERMIO_H
 #   include <termio.h>
 #  endif
 #  include <curses.h>
 #  include <term.h>
 # else
-#  ifdef HAVE_TERMCAP_H
+#  ifdef USES_TERMCAP_H
 #   include <termcap.h>
-#  else
-#   ifdef HAVE_CURSES_H
-#    include <curses.h>
-#   endif
-#   ifdef HAVE_TERM_H
-#    include <term.h>
-#   endif
 #  endif
 # endif
 
 static Param termcap_pm;
+
+/* echotc: output a termcap */
 
 /**/
 static int

-- 
Bart Schaefer                                 Brass Lantern Enterprises
http://www.well.com/user/barts              http://www.brasslantern.com

Zsh: http://www.zsh.org | PHPerl Project: http://phperl.sourceforge.net