Fix build errors.

* proxy/Makefile.am (libvirt_proxy_LDADD): Add ../gnulib/lib/libgnu.la.
* gnulib/lib/arpa_inet.in.h: Add new file from gnulib.

diff --git a/ChangeLog b/ChangeLog
index 401a72499bfdbccfab0c80d18a5b1f6c808fb1e9..2f01eb989bf5fd29ad2c43b2cd1d2d5228a9a7d2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 Tue Apr 29 21:43:28 CEST 2008 Jim Meyering <meyering@redhat.com>
 
+       Fix build errors.
+       * proxy/Makefile.am (libvirt_proxy_LDADD): Add ../gnulib/lib/libgnu.la.
+       * gnulib/lib/arpa_inet.in.h: Add new file from gnulib.
+
        update from gnulib
        * gnulib/lib/inet_ntop.h: Remove file.
        * gnulib/m4/onceonly_2_57.m4: Remove file.

diff --git a/gnulib/lib/.cvsignore b/gnulib/lib/.cvsignore
index 315947a2e8f1e9b59ad6d801ba096e987ee8a8db..2849ca97d0212fc31b009aefe282269b51205e02 100644 (file)
--- a/gnulib/lib/.cvsignore
+++ b/gnulib/lib/.cvsignore
@@ -11,6 +11,7 @@ netinet_in.h
 poll.h
 stdbool.h
 stdint.h
+stdio-impl.h
 stdio.h
 stdlib.h
 string.h

diff --git a/gnulib/lib/arpa_inet.in.h b/gnulib/lib/arpa_inet.in.h
new file mode 100644 (file)
index 0000000..6d62825
--- /dev/null
+++ b/gnulib/lib/arpa_inet.in.h
@@ -0,0 +1,76 @@
+/* A GNU-like <arpa/inet.h>.
+
+   Copyright (C) 2005-2006, 2008 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _GL_ARPA_INET_H
+
+/* Gnulib's sys/socket.h is responsible for pulling in winsock2.h etc
+   under MinGW. */
+#include <sys/socket.h>
+
+#if @HAVE_ARPA_INET_H@
+
+/* The include_next requires a split double-inclusion guard.  */
+# @INCLUDE_NEXT@ @NEXT_ARPA_INET_H@
+
+#endif
+
+#ifndef _GL_ARPA_INET_H
+#define _GL_ARPA_INET_H
+
+#if @GNULIB_INET_NTOP@
+# if !@HAVE_DECL_INET_NTOP@
+/* Converts an internet address from internal format to a printable,
+   presentable format.
+   AF is an internet address family, such as AF_INET or AF_INET6.
+   SRC points to a 'struct in_addr' (for AF_INET) or 'struct in6_addr'
+   (for AF_INET6).
+   DST points to a buffer having room for CNT bytes.
+   The printable representation of the address (in numeric form, not
+   surrounded by [...], no reverse DNS is done) is placed in DST, and
+   DST is returned.  If an error occurs, the return value is NULL and
+   errno is set.  If CNT bytes are not sufficient to hold the result,
+   the return value is NULL and errno is set to ENOSPC.  A good value
+   for CNT is 46.
+
+   For more details, see the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/inet_ntop.html>.  */
+extern const char *inet_ntop (int af, const void *restrict src,
+                             char *restrict dst, socklen_t cnt);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef inet_ntop
+# define inet_ntop(af,src,dst,cnt) \
+    (GL_LINK_WARNING ("inet_ntop is unportable - " \
+                      "use gnulib module inet_ntop for portability"), \
+     inet_ntop (af, src, dst, cnt))
+#endif
+
+#if @GNULIB_INET_PTON@
+# if !@HAVE_DECL_INET_PTON@
+extern int inet_pton (int af, const char *restrict src, void *restrict dst);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef inet_pton
+# define inet_pton(af,src,dst) \
+  (GL_LINK_WARNING ("inet_pton is unportable - " \
+                   "use gnulib module inet_pton for portability"), \
+   inet_pton (af, src, dst))
+#endif
+
+#endif /* _GL_ARPA_INET_H */
+#endif /* _GL_ARPA_INET_H */

diff --git a/gnulib/tests/.cvsignore b/gnulib/tests/.cvsignore
index 68d25626948cb592dbcdc620809b112a2cac5ef0..9bea902e32c82036e428f989acccfd21cd6b68c8 100644 (file)
--- a/gnulib/tests/.cvsignore
+++ b/gnulib/tests/.cvsignore
@@ -24,3 +24,4 @@ test-unistd
 test-vasnprintf
 test-vasprintf
 test-wchar
+test-EOVERFLOW.c

diff --git a/proxy/Makefile.am b/proxy/Makefile.am
index 2fe77c8209eae2b5cead95d46783b254ae49c95c..348be3499d0d550111fbb2bb4c0a48fcc5855d16 100644 (file)
--- a/proxy/Makefile.am
+++ b/proxy/Makefile.am
@@ -19,7 +19,7 @@ libvirt_proxy_SOURCES = libvirt_proxy.c @top_srcdir@/src/xend_internal.c \
            @top_srcdir@/src/uuid.c
 libvirt_proxy_LDFLAGS = $(WARN_CFLAGS)
 libvirt_proxy_DEPENDENCIES =
-libvirt_proxy_LDADD =
+libvirt_proxy_LDADD = ../gnulib/lib/libgnu.la
 
 install-exec-hook:
        chmod u+s $(DESTDIR)$(libexecdir)/libvirt_proxy