From 23da59920c4c911ee08498eb283b69bdef80fd65 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Mon, 29 Jul 2019 20:57:48 +0200 Subject: make pulseaudio an optional dependency, follow best practices MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For my thoughts about optional dependencies, see https://michael.stapelberg.ch/posts/2019-05-23-optional-dependencies/ This commit follows the best practices outlined in that article: 1. The travis config was modified to verify both code paths build and link/don’t link against pulseaudio. 2. If pulseaudio is missing, the build fails until packagers explicitly pass a --disable flag. In practice, I think the only situation when this flag should be set is in source-based linux distributions where users can express package-level compilation preferences (e.g. Gentoo USE flags). 3. The --version output now reflects the status of the optional dependency. fixes #359 --- src/print_volume.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/print_volume.c') diff --git a/src/print_volume.c b/src/print_volume.c index 91e8ce2..7364d47 100644 --- a/src/print_volume.c +++ b/src/print_volume.c @@ -86,7 +86,7 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char * free(instance); } -#if !defined(__DragonFly__) && !defined(__OpenBSD__) +#if HAS_PULSEAUDIO /* Try PulseAudio first */ /* If the device name has the format "pulse[:N]" where N is the -- cgit v1.2.3