|
2930
|
1 |
--- libnice-0.0.13.orig/configure.ac 2010-07-20 17:56:56.000000000 -0400
|
|
|
2 |
+++ libnice-0.0.13/configure.ac 2010-09-21 20:10:59.960332261 -0400
|
|
|
3 |
@@ -55,7 +55,9 @@
|
|
|
4 |
AC_HEADER_ASSERT
|
|
|
5 |
AC_HEADER_STDBOOL
|
|
|
6 |
AC_DEFINE([_FORTIFY_SOURCE], [2], [Define to `2' to get GNU/libc warnings.])
|
|
|
7 |
+AC_DEFINE([_XPG4_2], [ ], [Use XPG4.2 struct msghdr, but don't require C99.])
|
|
|
8 |
AC_DEFINE([NICEAPI_EXPORT], [ ], [Public library function implementation])
|
|
|
9 |
+AC_CHECK_HEADERS([sys/sockio.h])
|
|
|
10 |
AC_CHECK_HEADERS([arpa/inet.h net/in.h ifaddrs.h], \
|
|
|
11 |
[AC_DEFINE(HAVE_GETIFADDRS, [1], \
|
|
|
12 |
[Whether getifaddrs() is available on the system])])
|
|
|
13 |
@@ -71,8 +92,12 @@
|
|
|
14 |
|
|
|
15 |
# Checks for libraries.
|
|
|
16 |
AC_CHECK_LIB(rt, clock_gettime, [LIBRT="-lrt"], [LIBRT=""])
|
|
|
17 |
+AC_CHECK_LIB(socket, socket, [LIBSOCKET="-lsocket"], [LIBSOCKET=""])
|
|
|
18 |
+AC_CHECK_LIB(nsl, getaddrinfo, [LIBNSL="-lnsl"], [LIBNSL=""])
|
|
|
19 |
AC_CHECK_FUNCS([poll])
|
|
|
20 |
AC_SUBST(LIBRT)
|
|
|
21 |
+AC_SUBST(LIBSOCKET)
|
|
|
22 |
+AC_SUBST(LIBNSL)
|
|
|
23 |
|
|
|
24 |
PKG_CHECK_MODULES(GLIB, [dnl
|
|
|
25 |
glib-2.0 >= 2.10 dnl
|
|
|
26 |
--- libnice-0.0.13.orig/agent/interfaces.c 2010-07-20 17:54:40.000000000 -0400
|
|
|
27 |
+++ libnice-0.0.13/agent/interfaces.c 2010-09-21 20:09:24.623604051 -0400
|
|
|
28 |
@@ -46,6 +46,10 @@
|
|
|
29 |
#include <ifaddrs.h>
|
|
|
30 |
#endif
|
|
|
31 |
|
|
|
32 |
+#ifdef HAVE_SYS_SOCKIO_H
|
|
|
33 |
+ #include <sys/sockio.h>
|
|
|
34 |
+#endif
|
|
|
35 |
+
|
|
|
36 |
#include <net/if.h>
|
|
|
37 |
#include <net/if_arp.h>
|
|
|
38 |
#include <arpa/inet.h>
|
|
|
39 |
--- libnice-0.0.13.orig/stun/tools/Makefile.am 2009-08-14 18:46:12.000000000 -0400
|
|
|
40 |
+++ libnice-0.0.13/stun/tools/Makefile.am 2010-09-21 19:55:27.473601046 -0400
|
|
|
41 |
@@ -16,10 +16,10 @@
|
|
|
42 |
check_PROGRAMS = stund
|
|
|
43 |
|
|
|
44 |
stund_SOURCES = stund.c stund.h
|
|
|
45 |
-stund_LDADD = $(top_builddir)/stun/libstun.la
|
|
|
46 |
+stund_LDADD = $(top_builddir)/stun/libstun.la $(LIBSOCKET)
|
|
|
47 |
|
|
|
48 |
stunbdc_SOURCES = stunbdc.c
|
|
|
49 |
|
|
|
50 |
-stunbdc_LDADD = $(top_builddir)/stun/libstun.la
|
|
|
51 |
+stunbdc_LDADD = $(top_builddir)/stun/libstun.la $(LIBSOCKET) $(LIBNSL)
|
|
|
52 |
|
|
|
53 |
|
|
|
54 |
--- libnice-0.0.13.orig/stun/Makefile.am 2009-08-14 18:46:12.000000000 -0400
|
|
|
55 |
+++ libnice-0.0.13/stun/Makefile.am 2010-09-21 12:26:22.892182282 -0400
|
|
|
56 |
@@ -31,7 +31,7 @@
|
|
|
57 |
usages/turn.c usages/turn.h \
|
|
|
58 |
usages/timer.c usages/timer.h
|
|
|
59 |
|
|
|
60 |
-libstun_la_LIBADD = $(LIBRT)
|
|
|
61 |
+libstun_la_LIBADD = $(LIBRT) $(LIBSOCKET)
|
|
|
62 |
|
|
|
63 |
EXTRA_DIST = win32_common.h
|
|
|
64 |
|