From: Jan Stary <hans@stare.cz>
To: sox-users@lists.sourceforge.net
Subject: symlinks
Date: Tue, 11 Aug 2020 16:12:09 +0200 [thread overview]
Message-ID: <20200811141209.GA9040@www.stare.cz> (raw)
I am confused by the following commit:
commit fc20c26b2500acb6690f03d610d406bffb8944a9
Author: Mans Rullgard <mans@mansr.com>
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@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/sox-users
next reply other threads:[~2020-08-11 14:12 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-11 14:12 Jan Stary [this message]
2020-08-11 14:25 ` symlinks Måns Rullgård
2020-08-11 15:30 ` symlinks Jan Stary
2020-08-11 15:44 ` symlinks Måns Rullgård
2020-08-11 17:25 ` symlinks Jan Stary
2020-08-11 17:27 ` symlinks Måns Rullgård
2020-08-12 7:08 ` symlinks Jan Stary
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://lists.sourceforge.net/lists/listinfo/sox-users
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200811141209.GA9040@www.stare.cz \
--to=sox-users@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/sox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).