Skip to content

Commit f6d617e

Browse files
committed
Fix
1 parent fb41def commit f6d617e

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

Makefile

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,19 +59,12 @@ ifneq ($(UNAME_S),$(filter $(UNAME_S),Linux Darwin))
5959
ENABLE_VIRTIOSND := 0
6060
endif
6161

62-
ENABLE_PULSEAUDIO ?= 1
6362
ifeq ($(UNAME_S),Linux)
6463
# Check ALSA installation
6564
ifeq (0, $(call check-alsa))
6665
$(warning No libasound installed. Check libasound in advance.)
6766
ENABLE_VIRTIOSND := 0
6867
endif
69-
70-
# Check PulseAudio installation
71-
ifeq (0, $(call check-pa))
72-
$(warning No PulseAudio installed.)
73-
ENABLE_PULSEAUDIO := 0
74-
endif
7568
endif
7669
ifeq ($(UNAME_S),Darwin)
7770
ifeq (0, $(call check-ca))
@@ -88,7 +81,8 @@ ifeq ($(call has, VIRTIOSND), 1)
8881

8982
ifeq ($(UNAME_S),Linux)
9083
LDFLAGS += -lasound -lrt
91-
ifeq (1, $(ENABLE_PULSEAUDIO))
84+
# Check PulseAudio installation
85+
ifeq (1, $(call check-pa))
9286
LDFLAGS += -lpulse
9387
endif
9488
endif

mk/check-libs.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ endef
4242
# Check PulseAudio installation
4343
define check-pa
4444
$(shell $(call create-pa-prog) | $(CC) -x c -lpulse -o /dev/null > /dev/null 2> /dev/null -
45-
&& echo $$?)
45+
&& echo 0 || echo 1)
4646
endef
4747

4848
# Check CoreAudio installation

0 commit comments

Comments
 (0)