[gtk-vnc-devel] [PATCH] Changes for latest gnulib

["Richard W.M. Jones" <rjones redhat com>]

Quite a number of misc changes required for the latest Gnulib.

Rich.

-- 
Richard Jones, Emerging Technologies, Red Hat  http://et.redhat.com/~rjones
virt-top is 'top' for virtual machines.  Tiny program with many
powerful monitoring features, net stats, disk stats, logging, etc.
http://et.redhat.com/~rjones/virt-top

diff -r 47135c91cd9c Makefile.am
--- a/Makefile.am	Thu Oct 09 11:23:09 2008 -0400
+++ b/Makefile.am	Thu Oct 30 13:59:08 2008 +0000
@@ -8,4 +8,5 @@
 pkgconfig_DATA = @PACKAGE -1 0 pc
 pkgconfigdir = $(libdir)/pkgconfig
 
-EXTRA_DIST = $(PACKAGE)-1.0.pc.in $(PACKAGE).spec.in $(PACKAGE).spec
+EXTRA_DIST = $(PACKAGE)-1.0.pc.in $(PACKAGE).spec.in $(PACKAGE).spec \
+	gnulib/m4/gnulib-cache.m4
diff -r 47135c91cd9c bootstrap
--- a/bootstrap	Thu Oct 09 11:23:09 2008 -0400
+++ b/bootstrap	Thu Oct 30 13:59:08 2008 +0000
@@ -72,6 +72,8 @@
 connect
 malloc
 vc-list-files
+close
+ioctl
 '
 
 # Tell gnulib to:
diff -r 47135c91cd9c configure.ac
--- a/configure.ac	Thu Oct 09 11:23:09 2008 -0400
+++ b/configure.ac	Thu Oct 30 13:59:08 2008 +0000
@@ -32,14 +32,14 @@
   [m4_define([m4_foreach_w],
     [m4_foreach([$1], m4_split(m4_normalize([$2]), [ ]), [$3])])])
 
+AC_PROG_CC_STDC
 gl_EARLY
-gl_INIT
-
-AC_PROG_CC_STDC
 AM_PROG_CC_C_O
 AC_LIBTOOL_WIN32_DLL
 
 AC_PROG_LIBTOOL
+
+gl_INIT
 
 AC_CHECK_HEADERS([pwd.h winsock2.h])
 
diff -r 47135c91cd9c src/gvnc.c
--- a/src/gvnc.c	Thu Oct 09 11:23:09 2008 -0400
+++ b/src/gvnc.c	Thu Oct 30 13:59:08 2008 +0000
@@ -40,8 +40,11 @@
 
 #include <gdk/gdkkeysyms.h>
 
+#include <netdb.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
+
 #include "vnc_keycodes.h"
-#include "getaddrinfo.h"
 
 /* AI_ADDRCONFIG is missing on some systems and gnulib won't provide it
    even if its emulated getaddrinfo() for us . */