vino r1095 - in trunk: . server server/libvncserver server/libvncserver/ifaddr

[jwendell svn gnome org]

Author: jwendell
Date: Fri Feb 13 13:19:12 2009
New Revision: 1095
URL: http://svn.gnome.org/viewvc/vino?rev=1095&view=rev

Log:
2009-02-13  Jonh Wendell  <jwendell gnome org>

	Moved ifaddrs.h and getifaddrs.c to their own directory, and only
	#include them if system ifaddrs.h is not present.



Added:
   trunk/server/libvncserver/ifaddr/   (props changed)
   trunk/server/libvncserver/ifaddr/Makefile.am
   trunk/server/libvncserver/ifaddr/getifaddrs.c   (props changed)
      - copied unchanged from r1093, /trunk/server/libvncserver/getifaddrs.c
   trunk/server/libvncserver/ifaddr/ifaddrs.h   (props changed)
      - copied unchanged from r1093, /trunk/server/libvncserver/ifaddrs.h
Removed:
   trunk/server/libvncserver/getifaddrs.c
   trunk/server/libvncserver/ifaddrs.h
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/server/libvncserver/Makefile.am
   trunk/server/libvncserver/sockets.c
   trunk/server/vino-dbus-listener.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Feb 13 13:19:12 2009
@@ -354,6 +354,7 @@
 Makefile
 server/Makefile
 server/libvncserver/Makefile
+server/libvncserver/ifaddr/Makefile
 server/libvncserver/rfb/Makefile
 server/miniupnp/Makefile
 capplet/Makefile

Modified: trunk/server/libvncserver/Makefile.am
==============================================================================
--- trunk/server/libvncserver/Makefile.am	(original)
+++ trunk/server/libvncserver/Makefile.am	Fri Feb 13 13:19:12 2009
@@ -1,6 +1,6 @@
 NULL =
 
-SUBDIRS = rfb
+SUBDIRS = ifaddr rfb
 
 noinst_LTLIBRARIES = libvncserver.la
 
@@ -38,11 +38,7 @@
 	$(NULL)
 
 if !HAVE_GETIFADDRS
-noinst_LTLIBRARIES += libifaddrs.la
-libifaddrs_la_SOURCES = 	\
-	getifaddrs.c 		\
-	ifaddrs.h
-libvncserver_la_LIBADD += ./libifaddrs.la
+libvncserver_la_LIBADD += ifaddr/libifaddrs.la
 endif
 
 EXTRA_DIST =			\

Added: trunk/server/libvncserver/ifaddr/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/server/libvncserver/ifaddr/Makefile.am	Fri Feb 13 13:19:12 2009
@@ -0,0 +1,7 @@
+if !HAVE_GETIFADDRS
+noinst_LTLIBRARIES = libifaddrs.la
+libifaddrs_la_SOURCES = 	\
+	getifaddrs.c 		\
+	ifaddrs.h
+endif
+

Modified: trunk/server/libvncserver/sockets.c
==============================================================================
--- trunk/server/libvncserver/sockets.c	(original)
+++ trunk/server/libvncserver/sockets.c	Fri Feb 13 13:19:12 2009
@@ -71,7 +71,13 @@
 #endif
 
 #include <net/if.h>  // IFF_UP
-#include <ifaddrs.h> // getifaddrs()
+
+#ifdef HAVE_IFADDRS_H
+#include <ifaddrs.h>
+#else
+#include "ifaddr/ifaddrs.h"
+#endif
+
 
 #if defined(__linux__) && defined(NEED_TIMEVAL)
 struct timeval 

Modified: trunk/server/vino-dbus-listener.c
==============================================================================
--- trunk/server/vino-dbus-listener.c	(original)
+++ trunk/server/vino-dbus-listener.c	Fri Feb 13 13:19:12 2009
@@ -36,7 +36,6 @@
 #include <unistd.h>
 #include <netdb.h>
 #include <net/if.h>
-#include <ifaddrs.h>
 #include <arpa/inet.h>
 
 #include <dbus/dbus-glib.h>
@@ -47,6 +46,12 @@
 #include "vino-http.h"
 #endif
 
+#ifdef HAVE_IFADDRS_H
+#include <ifaddrs.h>
+#else
+#include "libvncserver/ifaddr/ifaddrs.h"
+#endif
+
 #define VINO_DBUS_INTERFACE "org.gnome.VinoScreen"
 #define VINO_DBUS_BUS_NAME  "org.gnome.Vino"