From 9b0ff59b56ee0ac2f4cb682f5164359d98dca78b Mon Sep 17 00:00:00 2001 From: NBonaparte Date: Mon, 25 Sep 2017 19:24:19 -0700 Subject: [PATCH] fix(build): Check for pulseaudio binary --- build.sh | 5 ----- cmake/02-opts.cmake | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build.sh b/build.sh index d65bd23f..a84530f8 100755 --- a/build.sh +++ b/build.sh @@ -53,11 +53,6 @@ function main read -r -p "$(msg "Build \"polybar-msg\" used to send ipc messages --------------------- [Y/n]: ")" -n 1 p && echo [[ "${p^^}" != "Y" ]] && build_ipc_msg="OFF" - # pulseaudio overrides alsa - if [[ "${enable_alsa}" == "ON" ]] && [[ "${enable_pulseaudio}" == "ON" ]]; then - enable_alsa="OFF" - fi - local cxx="c++" local cc="cc" diff --git a/cmake/02-opts.cmake b/cmake/02-opts.cmake index 535ff782..7ffdccbb 100644 --- a/cmake/02-opts.cmake +++ b/cmake/02-opts.cmake @@ -8,6 +8,7 @@ checklib(ENABLE_I3 "binary" i3) checklib(ENABLE_MPD "pkg-config" libmpdclient) checklib(ENABLE_NETWORK "cmake" Libiw) checklib(ENABLE_PULSEAUDIO "pkg-config" libpulse) +checklib(ENABLE_PULSEAUDIO "binary" pulseaudio) checklib(WITH_XRM "pkg-config" xcb-xrm) checklib(WITH_XRANDR_MONITORS "pkg-config" "xcb-randr>=1.12") checklib(WITH_XCURSOR "pkg-config" "xcb-cursor") @@ -30,6 +31,9 @@ option(ENABLE_MPD "Enable mpd support" ON) option(ENABLE_NETWORK "Enable network support" ON) option(ENABLE_XKEYBOARD "Enable xkeyboard support" ON) option(ENABLE_PULSEAUDIO "Enable PulseAudio support" ON) +if(ENABLE_PULSEAUDIO) + set(ENABLE_ALSA OFF) +endif() option(WITH_XRANDR "xcb-randr support" ON) option(WITH_XRANDR_MONITORS "xcb-randr monitor support" ON)