From 63a25752c23822dcabe487042ce38964316a8937 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 16 Jan 2007 12:43:13 +0000 Subject: [PATCH] 2007-01-16 Paolo Bonzini * modules/javaexec-script: New, created from... * modules/javaexec: ... this. 2007-01-16 Yoann Vandoorselaere * modules/poll (Dependencies): Add sys_select. --- ChangeLog | 9 +++++++++ lib/socket_.h | 10 ++++++++++ modules/javaexec | 5 +---- modules/javaexec-script | 23 +++++++++++++++++++++++ modules/poll | 1 + 5 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 modules/javaexec-script diff --git a/ChangeLog b/ChangeLog index 113f9b72f3..535bacd274 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2007-01-16 Paolo Bonzini + + * modules/javaexec-script: New, created from... + * modules/javaexec: ... this. + +2007-01-16 Yoann Vandoorselaere + + * modules/poll (Dependencies): Add sys_select. + 2007-01-15 Jim Meyering * m4/readutmp.m4 (gl_READUTMP): Work around AIX 4.3 struct- diff --git a/lib/socket_.h b/lib/socket_.h index fbf0483339..8b28b5ed39 100644 --- a/lib/socket_.h +++ b/lib/socket_.h @@ -57,4 +57,14 @@ # define SHUT_RDWR SD_BOTH #endif +#if defined _WIN32 || defined __WIN32__ +# define ENOTSOCK WSAENOTSOCK +# define EADDRINUSE WSAEADDRINUSE +# define ENETRESET WSAENETRESET +# define ECONNABORTED WSAECONNABORTED +# define ECONNRESET WSAECONNRESET +# define ENOTCONN WSAENOTCONN +# define ESHUTDOWN WSAESHUTDOWN +#endif + #endif /* _SYS_SOCKET_H */ diff --git a/modules/javaexec b/modules/javaexec index 2c524bc91f..aa4fc32b1d 100644 --- a/modules/javaexec +++ b/modules/javaexec @@ -2,10 +2,8 @@ Description: Execute a Java program. Files: -build-aux/javaexec.sh.in lib/javaexec.h lib/javaexec.c -m4/javaexec.m4 Depends-on: stdbool @@ -18,10 +16,9 @@ xalloc xallocsa error gettext-h +javaexec-script configure.ac: -# You need to invoke gt_JAVAEXEC yourself, possibly with arguments. -AC_CONFIG_FILES([javaexec.sh:build-aux/javaexec.sh.in]) Makefile.am: DEFS += -DEXEEXT=\"$(EXEEXT)\" diff --git a/modules/javaexec-script b/modules/javaexec-script new file mode 100644 index 0000000000..46492b4960 --- /dev/null +++ b/modules/javaexec-script @@ -0,0 +1,23 @@ +Description: +Execute a Java program. + +Files: +build-aux/javaexec.sh.in +m4/javaexec.m4 + +Depends-on: + +configure.ac: +# You need to invoke gt_JAVAEXEC yourself, possibly with arguments. +AC_CONFIG_FILES([javaexec.sh:build-aux/javaexec.sh.in]) + +Makefile.am: + +Include: + +License: +GPLed build tool + +Maintainer: +Bruno Haible + diff --git a/modules/poll b/modules/poll index e539460a46..23da683aaf 100644 --- a/modules/poll +++ b/modules/poll @@ -7,6 +7,7 @@ lib/poll_.h m4/poll.m4 Depends-on: +sys_select configure.ac: gl_FUNC_POLL -- 2.30.2