fix(build): Check for pulseaudio binary

This commit is contained in:
NBonaparte 2017-09-25 19:24:19 -07:00
parent a08c5c710a
commit 9b0ff59b56
2 changed files with 4 additions and 5 deletions

View File

@ -53,11 +53,6 @@ function main
read -r -p "$(msg "Build \"polybar-msg\" used to send ipc messages --------------------- [Y/n]: ")" -n 1 p && echo read -r -p "$(msg "Build \"polybar-msg\" used to send ipc messages --------------------- [Y/n]: ")" -n 1 p && echo
[[ "${p^^}" != "Y" ]] && build_ipc_msg="OFF" [[ "${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 cxx="c++"
local cc="cc" local cc="cc"

View File

@ -8,6 +8,7 @@ checklib(ENABLE_I3 "binary" i3)
checklib(ENABLE_MPD "pkg-config" libmpdclient) checklib(ENABLE_MPD "pkg-config" libmpdclient)
checklib(ENABLE_NETWORK "cmake" Libiw) checklib(ENABLE_NETWORK "cmake" Libiw)
checklib(ENABLE_PULSEAUDIO "pkg-config" libpulse) checklib(ENABLE_PULSEAUDIO "pkg-config" libpulse)
checklib(ENABLE_PULSEAUDIO "binary" pulseaudio)
checklib(WITH_XRM "pkg-config" xcb-xrm) checklib(WITH_XRM "pkg-config" xcb-xrm)
checklib(WITH_XRANDR_MONITORS "pkg-config" "xcb-randr>=1.12") checklib(WITH_XRANDR_MONITORS "pkg-config" "xcb-randr>=1.12")
checklib(WITH_XCURSOR "pkg-config" "xcb-cursor") 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_NETWORK "Enable network support" ON)
option(ENABLE_XKEYBOARD "Enable xkeyboard support" ON) option(ENABLE_XKEYBOARD "Enable xkeyboard support" ON)
option(ENABLE_PULSEAUDIO "Enable PulseAudio 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 "xcb-randr support" ON)
option(WITH_XRANDR_MONITORS "xcb-randr monitor support" ON) option(WITH_XRANDR_MONITORS "xcb-randr monitor support" ON)