Index: Makefile.in =================================================================== RCS file: /usr/cvsroot/asterisk/editline/Makefile.in,v retrieving revision 1.4 diff -u -r1.4 Makefile.in --- Makefile.in 14 Dec 2004 23:36:30 -0000 1.4 +++ Makefile.in 4 Jul 2005 03:58:40 -0000 @@ -3,6 +3,13 @@ # OSTYPE=$(shell uname -s) +cygx="$(shell uname -s | sed -e c\cygwin | tr [:upper:] [:lower:])" +define cyg_subst_sys + if [ $(cygx) = "cygwin" ]; then \ + cat $@ | sed -e s/"sys\.h"/"config.h"/g > $@.copy; \ + mv --force $@.copy $@; \ + fi +endef SHELL = /bin/sh @@ -184,7 +191,7 @@ $(RANLIB) $@ $(LIB_S) : $(BGCSRCS:.c=.o_s) $(CCSRCS:.c=.o_s) - $(CC) $(S_LDFLAGS) -o $@ $(BGCSRCS:.c=.o_s) $(CCSRCS:.c=.o_s) + $(CC) $(S_LDFLAGS) -o $@ $(BGCSRCS:.c=.o_s) $(CCSRCS:.c=.o_s) $(LIBS) $(TEST) : $(TCSRCS:.c=.o) $(LIB_A) $(CC) -o $@ $(TCSRCS:.c=.o) $(LIB_A) $(LIBS) @@ -203,12 +210,14 @@ fcns.c : $(AGHDRS) fcns.h $(SHELL) makelist -fc $(AGHDRS) > $@ + $(cyg_subst_sys) help.h : $(ACSRCS) $(SHELL) makelist -bh $(ACSRCS) > $@ help.c : $(ACSRCS) help.h $(SHELL) makelist -bc $(ACSRCS) > $@ + $(cyg_subst_sys) editline.c : $(ACSRCS) $(BCSRCS) $(AGCSRCS) $(SHELL) makelist -e $(ACSRCS) $(BCSRCS) $(AGCSRCS) > $@ Index: config.h.in =================================================================== RCS file: /usr/cvsroot/asterisk/editline/config.h.in,v retrieving revision 1.1 diff -u -r1.1 config.h.in --- config.h.in 27 Nov 2002 05:04:06 -0000 1.1 +++ config.h.in 4 Jul 2005 03:58:40 -0000 @@ -1,4 +1,5 @@ #undef SUNOS +#undef CYGWIN #undef HAVE_SYS_CDEFS_H #undef HAVE_TERMCAP_H @@ -15,3 +16,6 @@ #undef HAVE_STRUNVIS #include "sys.h" +#ifdef CYGWIN +# include "cygdef.h" +#endif Index: configure =================================================================== RCS file: /usr/cvsroot/asterisk/editline/configure,v retrieving revision 1.2 diff -u -r1.2 configure --- configure 27 Apr 2003 18:13:11 -0000 1.2 +++ configure 4 Jul 2005 03:58:42 -0000 @@ -894,7 +894,26 @@ *-*-freebsd*) ABI="elf" ;; - *-*-linux*) + *-*-linux* | *cygwin*) + cyg="$(echo ${host} | sed -e c\cygwin)" + if [ ${cyg} = cygwin ]; then \ + echo "cygwin detected"; \ + S_CFLAGS=""; \ + echo "/* cygdef.h. Generated automatically by configure. */ +#ifndef _CYGDEF_H_ +#define _CYGDEF_H_ 1 +#include +#define __linux__ 1 + + +typedef void (*sig_t)(int); + + +#endif /* _CYGDEF_H_ */" > cygdef.h; \ + echo " + #define CYGWIN 1 +" > confdefs.h; \ + fi ABI="elf" ;; *-*-netbsd*) Index: configure.in =================================================================== RCS file: /usr/cvsroot/asterisk/editline/configure.in,v retrieving revision 1.2 diff -u -r1.2 configure.in --- configure.in 27 Apr 2003 18:13:11 -0000 1.2 +++ configure.in 4 Jul 2005 03:58:42 -0000 @@ -31,7 +31,26 @@ *-*-freebsd*) ABI="elf" ;; - *-*-linux*) + *-*-linux* | *cygwin*) + cyg="$(echo ${host} | sed -e c\cygwin)" + if [ ${cyg} = cygwin ]; then \ + echo "cygwin detected"; \ + S_CFLAGS=""; \ + echo "/* cygdef.h. Generated automatically by configure. */ +#ifndef _CYGDEF_H_ +#define _CYGDEF_H_ 1 +#include +#define __linux__ 1 + + +typedef void (*sig_t)(int); + + +#endif /* _CYGDEF_H_ */" > cygdef.h; \ + echo " + #define CYGWIN 1 +" > confdefs.h; \ + fi ABI="elf" ;; *-*-netbsd*)