--- src/Makefile.am.orig	Tue May 15 11:11:00 2012
+++ src/Makefile.am	Sat Apr 22 15:04:40 2017
@@ -80,7 +80,7 @@ libcanberra_la_SOURCES += \
 	cache.c cache.h
 libcanberra_la_CFLAGS += \
 	$(TDB_CLFAGS) \
-	-DCA_MACHINE_ID=\"$(localstatedir)/lib/dbus/machine-id\"
+	-DCA_MACHINE_ID=\"$(sysconfdir)/machine-id\"
 libcanberra_la_LIBADD += \
 	$(TDB_LIBS)
 
@@ -209,6 +209,36 @@ libcanberra_oss_la_CFLAGS = \
 libcanberra_oss_la_LIBADD = \
 	libcanberra.la
 libcanberra_oss_la_LDFLAGS = \
+	-avoid-version -module -export-dynamic
+endif
+endif
+
+if HAVE_SNDIO
+if BUILTIN_SNDIO
+
+libcanberra_la_SOURCES += \
+	sndio.c
+libcanberra_la_LIBADD += \
+	$(SNDIO_LIBS)
+
+else
+
+plugin_LTLIBRARIES += \
+	libcanberra-sndio.la
+
+libcanberra_sndio_la_SOURCES = \
+	sndio.c
+libcanberra_sndio_la_CFLAGS = \
+	 -Ddriver_open=sndio_driver_open \
+	 -Ddriver_destroy=sndio_driver_destroy \
+	 -Ddriver_change_device=sndio_driver_change_device \
+	 -Ddriver_change_props=sndio_driver_change_props \
+	 -Ddriver_play=sndio_driver_play \
+	 -Ddriver_cancel=sndio_driver_cancel \
+	 -Ddriver_cache=sndio_driver_cache
+libcanberra_sndio_la_LIBADD = \
+	libcanberra.la $(SNDIO_LIBS)
+libcanberra_sndio_la_LDFLAGS = \
 	-avoid-version -module -export-dynamic
 endif
 endif