2007-01-16 Paolo Bonzini <bonzini@gnu.org>

	* modules/javaexec-script: New, created from...
	* modules/javaexec: ... this.

2007-01-16  Yoann Vandoorselaere  <yoann.v@prelude-ids.com>

	* modules/poll (Dependencies): Add sys_select.

diff --git a/ChangeLog b/ChangeLog
index 113f9b72f33a4ba5a767c429e24ce60d32445f04..535bacd2740a5532ea41f7be9670bbf9edc3722a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-01-16  Paolo Bonzini  <bonzini@gnu.org>
+
+       * modules/javaexec-script: New, created from...
+       * modules/javaexec: ... this.
+
+2007-01-16  Yoann Vandoorselaere  <yoann.v@prelude-ids.com>
+
+       * modules/poll (Dependencies): Add sys_select.
+
 2007-01-15  Jim Meyering  <jim@meyering.net>
 
        * m4/readutmp.m4 (gl_READUTMP): Work around AIX 4.3 struct-

diff --git a/lib/socket_.h b/lib/socket_.h
index fbf04833393cb4109049ccebe857d34abf08faf5..8b28b5ed39c753dcb783c7f0cc95b93858efa1e6 100644 (file)
--- 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 2c524bc91fa40509f3614d67aebd6f1a2521ed01..aa4fc32b1dea78bdbfaf95b2a552324f6096c244 100644 (file)
--- 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 (file)
index 0000000..46492b4
--- /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 e539460a4635e24ec58175891531c84e0a9428ee..23da683aaff1580bde7d8e0e1b07b58d9e1dc06b 100644 (file)
--- 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