nils/shairport-sync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a small conflict in mdns_avahi.c

Browse Source
This commit is contained in:
Mike Brady
2017-12-04 08:48:04 +00:00
parent 2c74e7d0bc e0ecdac91a
commit 492f365ab5
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+2
View File
@@ -279,6 +279,7 @@ AC_ARG_WITH(dbus-test-client, [ --with-dbus-test-client = compile dbus test cli
AC_MSG_RESULT(>>Including dbus test client)
HAS_DBUS_CLIENT=1
AC_DEFINE([HAVE_DBUS_CLIENT], 1, [Needed by the compiler.])
AC_DEFINE([CONFIG_DACP], 1, [Needed by the compiler.])
PKG_CHECK_MODULES([GIO_UNIX], [gio-unix-2.0 >= 2.30.0],[CFLAGS="${GIO_UNIX_CFLAGS} ${CFLAGS}" LIBS="${GIO_UNIX_LIBS} ${LIBS}"],[AC_MSG_ERROR(dbus client support requires the glib 2.0 library -- libglib2.0-dev suggested!)])
], )
AM_CONDITIONAL([USE_DBUS_CLIENT], [test "x$HAS_DBUS_CLIENT" = "x1"])
@@ -288,6 +289,7 @@ AC_ARG_WITH(mpris, [ --with-mpris = choose mpris support], [
AC_MSG_RESULT(>>Including mpris support)
HAS_MPRIS=1
AC_DEFINE([HAVE_MPRIS], 1, [Needed by the compiler.])
AC_DEFINE([CONFIG_DACP], 1, [Needed by the compiler.])
PKG_CHECK_MODULES([GIO_UNIX], [gio-unix-2.0 >= 2.30.0],[CFLAGS="${GIO_UNIX_CFLAGS} ${CFLAGS}" LIBS="${GIO_UNIX_LIBS} ${LIBS}"],[AC_MSG_ERROR(dbus messaging support for mpris requires the glib 2.0 library -- libglib2.0-dev suggested!)])
], )
AM_CONDITIONAL([USE_MPRIS], [test "x$HAS_MPRIS" = "x1"])
mdns_avahi.c
+2
View File
@@ -33,7 +33,9 @@
#include "common.h"
#include "mdns.h"
#include "rtsp.h"
#ifdef CONFIG_DACP
#include "dacp.h"
#endif
#include <string.h>
#include <avahi-client/client.h>