X-Spam-Check-By: sourceware.org
Message-ID: <451DAA6C.5090105@debian.org>
Date: Fri, 29 Sep 2006 16:21:16 -0700
From: Rafael Kitover <caelum AT debian DOT org>
User-Agent: Thunderbird 1.4 (Windows/20050908)
MIME-Version: 1.0
To: list AT epicsol DOT org
CC: cygwin AT cygwin DOT com
Subject: [PATCH] building epic4 (CVS version 1.39) in Cygwin
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Mailing-List: contact cygwin-help AT cygwin DOT com; run by ezmlm
List-Subscribe: <mailto:cygwin-subscribe AT cygwin DOT com>
List-Archive: <http://sourceware.org/ml/cygwin/>
List-Post: <mailto:cygwin AT cygwin DOT com>
List-Help: <mailto:cygwin-help AT cygwin DOT com>, <http://sourceware.org/ml/#faqs>
Sender: cygwin-owner AT cygwin DOT com
Mail-Followup-To: cygwin AT cygwin DOT com
Delivered-To: mailing list cygwin AT cygwin DOT com

This is a minor fix for building epic4 from CVS on Cygwin cleanly.

Please CC: me on responses, if possible. Thank you!

Index: configure
===================================================================
RCS file: /home/cvs/repository/epic4/configure,v
retrieving revision 1.39
diff -u -3 -p -r1.39 configure
--- configure	31 Jan 2004 16:52:06 -0000	1.39
+++ configure	29 Sep 2006 18:14:33 -0000
@@ -1723,7 +1723,7 @@ fi



-for ac_hdr in fcntl.h netdb.h regex.h sys/fcntl.h sys/file.h 
sys/select.h sys/syslimits.h sys/un.h sys/time.h termcap.h sys/filio.h 
sys/sysctl.h inttypes.h stdint.h
+for ac_hdr in fcntl.h netdb.h regex.h sys/fcntl.h sys/file.h 
sys/select.h sys/syslimits.h sys/un.h sys/time.h ncurses/termcap.h 
termcap.h sys/filio.h sys/sysctl.h inttypes.h stdint.h
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
Index: configure.in
===================================================================
RCS file: /home/cvs/repository/epic4/configure.in,v
retrieving revision 1.39
diff -u -3 -p -r1.39 configure.in
--- configure.in	31 Jan 2004 16:28:32 -0000	1.39
+++ configure.in	29 Sep 2006 18:14:34 -0000
@@ -180,7 +180,7 @@ dnl
  dnl Checking for headers, functions, and a type declarations
  dnl

-AC_CHECK_HEADERS(fcntl.h netdb.h regex.h sys/fcntl.h sys/file.h 
sys/select.h sys/syslimits.h sys/un.h sys/time.h termcap.h sys/filio.h 
sys/sysctl.h inttypes.h stdint.h)
+AC_CHECK_HEADERS(fcntl.h netdb.h regex.h sys/fcntl.h sys/file.h 
sys/select.h sys/syslimits.h sys/un.h sys/time.h ncurses/termcap.h 
termcap.h sys/filio.h sys/sysctl.h inttypes.h stdint.h)

  if test $termcap -eq 0 ; then
  	AC_CHECK_FUNC(setupterm, AC_DEFINE(HAVE_TERMINFO),)
Index: include/defs.h.in
===================================================================
RCS file: /home/cvs/repository/epic4/include/defs.h.in,v
retrieving revision 1.29
diff -u -3 -p -r1.29 defs.h.in
--- include/defs.h.in	22 Nov 2003 23:33:01 -0000	1.29
+++ include/defs.h.in	29 Sep 2006 18:14:34 -0000
@@ -333,5 +333,8 @@
  /* Define if you have the <sys/un.h> header file.  */
  #undef HAVE_SYS_UN_H

+/* Define if you have the <ncurses/termcap.h> header file.  */
+#undef HAVE_NCURSES_TERMCAP_H
+
  /* Define if you have the <termcap.h> header file.  */
  #undef HAVE_TERMCAP_H
Index: include/irc_std.h
===================================================================
RCS file: /home/cvs/repository/epic4/include/irc_std.h,v
retrieving revision 1.18
diff -u -3 -p -r1.18 irc_std.h
--- include/irc_std.h	6 Oct 2004 00:22:05 -0000	1.18
+++ include/irc_std.h	29 Sep 2006 18:14:34 -0000
@@ -63,8 +63,12 @@
  /*
   * Some systems define tputs, etc in this header
   */
-#ifdef HAVE_TERMCAP_H
-#include <termcap.h>
+#ifdef HAVE_NCURSES_TERMCAP_H
+# include <ncurses/termcap.h>
+#else
+# ifdef HAVE_TERMCAP_H
+#  include <termcap.h>
+# endif
  #endif


--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Problem reports:       http://cygwin.com/problems.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/