I am confused by the following commit:
commit fc20c26b2500acb6690f03d610d406bffb8944a9
Author: Mans Rullgard <mans@xxxxxxxxx>
Date: Mon Aug 10 21:38:11 2020 +0100
build: fix symlink selection
The configure test whether to enable the play/rec links is broken,
and the makefile uses the same condition for both play/rec and soxi.
Fix both problems.
diff --git a/configure.ac b/configure.ac
index 9f55b5f8..12af65b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -647,13 +647,13 @@ AC_MSG_RESULT($enable_symlinks)
enable_playrec_symlinks=no
if test "$enable_symlinks" = "yes"; then
SYMLINKS=yes
- if test false \
- -o "$enable_alsa" = yes \
- -o "$enable_ao" = yes \
- -o "$enable_coreaudio" = yes \
- -o "$enable_oss" = yes \
- -o "$enable_pulseaudio" = yes \
- -o "$enable_sndio" = yes \
+ if test "" \
+ -o "$using_alsa" = yes \
+ -o "$using_ao" = yes \
+ -o "$using_coreaudio" = yes \
+ -o "$using_oss" = yes \
+ -o "$using_pulseaudio" = yes \
+ -o "$using_sndio" = yes \
; then
PLAYRECLINKS=yes
enable_playrec_symlinks=yes
How is using alsa/oss/sndio/whatever
related to creating symlinks (or not)?
Why do we have both SYMLINKS and PLAYRECLINKS?
Why is this different for play/rec vs soxi (also below)?
Naively, I would assume we want to create symlinks
for each of play, rec, soxi, or none of them.
Jan
diff --git a/src/Makefile.am b/src/Makefile.am
index 1c5000df..25198232 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -145,11 +145,16 @@ EXTRA_DIST = monkey.wav optional-fmts.am \
all: sox$(EXEEXT) play$(EXEEXT) rec$(EXEEXT) soxi$(EXEEXT) sox_sample_test$(EXEEXT) example0$(EXEEXT) example1$(EXEEXT) example2$(EXEEXT) example3$(EXEEXT) example4$(EXEEXT) example5$(EXEEXT) example6$(EXEEXT)
-play$(EXEEXT) rec$(EXEEXT) soxi$(EXEEXT): sox$(EXEEXT)
+play$(EXEEXT) rec$(EXEEXT): sox$(EXEEXT)
if test "$(PLAYRECLINKS)" = "yes"; then \
test -f sox$(EXEEXT) && ( $(RM) $@ && $(LN_S) sox$(EXEEXT) $@ ) || $(LN_S) sox $@; \
fi
+soxi$(EXEEXT): sox$(EXEEXT)
+ if test "$(SYMLINKS)" = "yes"; then \
+ test -f sox$(EXEEXT) && ( $(RM) $@ && $(LN_S) sox$(EXEEXT) $@ ) || $(LN_S) sox $@; \
+ fi
+
install-exec-hook:
if test "$(PLAYRECLINKS)" = "yes"; then \
cd $(DESTDIR)$(bindir); $(RM) play$(EXEEXT) rec$(EXEEXT); $(LN_S) sox$(EXEEXT) play$(EXEEXT); $(LN_S) sox$(EXEEXT) rec$(EXEEXT); \
_______________________________________________
Sox-users mailing list
Sox-users@xxxxxxxxxxxxxxxxxxxxx
https://lists.sourceforge.net/lists/listinfo/sox-users
