Attachment #199029 for bug #270859

Lines 350-357 Link Here

(-)bluez-4.46~orig/acinclude.m4 (-2 / +4 lines)
350	AC_SUBST([GDBUS_CFLAGS], ['-I$(top_srcdir)/gdbus'])	350	AC_SUBST([GDBUS_CFLAGS], ['-I$(top_srcdir)/gdbus'])
351	AC_SUBST([GDBUS_LIBS], ['$(top_builddir)/gdbus/libgdbus.la'])	351	AC_SUBST([GDBUS_LIBS], ['$(top_builddir)/gdbus/libgdbus.la'])
352		352
353	AC_SUBST([SBC_CFLAGS], ['-I$(top_srcdir)/sbc'])	353	if (test "${alsa_enable}" = "yes" \|\| test "${gstreamer_enable}" = "yes"); then
354	AC_SUBST([SBC_LIBS], ['$(top_builddir)/sbc/libsbc.la'])	354	AC_SUBST([SBC_CFLAGS], ['-I$(top_srcdir)/sbc'])
		355	AC_SUBST([SBC_LIBS], ['$(top_builddir)/sbc/libsbc.la'])
		356	fi
355		357
356	AM_CONDITIONAL(SNDFILE, test "${sndfile_enable}" = "yes" && test "${sndfile_found}" = "yes")	358	AM_CONDITIONAL(SNDFILE, test "${sndfile_enable}" = "yes" && test "${sndfile_found}" = "yes")
357	AM_CONDITIONAL(NETLINK, test "${netlink_enable}" = "yes" && test "${netlink_found}" = "yes")	359	AM_CONDITIONAL(NETLINK, test "${netlink_enable}" = "yes" && test "${netlink_found}" = "yes")

Lines 67-76 Link Here

(-)bluez-4.46~orig/audio/Makefile.am (+6 lines)
67		67
68	libipc_la_SOURCES = ipc.h ipc.c	68	libipc_la_SOURCES = ipc.h ipc.c
69		69
		70	if AUDIOPLUGIN
		71	if SBC
		72
70	noinst_PROGRAMS = ipctest	73	noinst_PROGRAMS = ipctest
71		74
72	ipctest_LDADD= libipc.la @SBC_LIBS@ @GLIB_LIBS@	75	ipctest_LDADD= libipc.la @SBC_LIBS@ @GLIB_LIBS@
73		76
		77	endif
		78	endif
		79
74	AM_CFLAGS = -fvisibility=hidden -fno-strict-aliasing @SBC_CFLAGS@ \	80	AM_CFLAGS = -fvisibility=hidden -fno-strict-aliasing @SBC_CFLAGS@ \
75	@BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@	81	@BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@
76		82

Return to bug 270859