Skip to content

Commit 529bb19

Browse files
committed
[REVERT ME] libvisual-plugins: Resolve troublesome "--install" from ACLOCAL_AMFLAGS
.. and remake installation of file m4/alsa.m4 . This reverts commit 9b420cc.
1 parent 523a528 commit 529bb19

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

libvisual-plugins/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Process this file with automake to generate a Makefile.in
22

3-
ACLOCAL_AMFLAGS = -I m4 --install
3+
ACLOCAL_AMFLAGS = -I m4
44

55
SUBDIRS = plugins po
66

libvisual-plugins/autogen.sh

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,24 @@
44

55
set -e -u
66

7+
# For alsa.m4 (with "L" in ALSA meaning "Linux") we want three things:
8+
# - That a build on macOS is fully okay without it.
9+
# - That we ship a healthy file with "make dist" on Linux.
10+
# - That running ./autogen.sh (or autoreconf) on a host
11+
# without ALSA development files installed still succeeds.
12+
alsa_m4="$(aclocal --print-ac-dir)"/alsa.m4
13+
if [[ -f "${alsa_m4}" ]]; then
14+
mkdir -p m4/
15+
cp -v "${alsa_m4}" m4/alsa.m4
16+
fi
717
if [[ "$(uname -s)" == Darwin ]]; then
818
# This provides a dummy substitute to alsa.m4 on macOS
19+
# and that is a reason why "make dist" should be run on Linux, not macOS.
920
echo 'AC_DEFUN([AM_PATH_ALSA], [HAVE_ALSA=no])' > acinclude.m4
21+
elif [[ ! -f m4/alsa.m4 ]]; then
22+
echo "**ERROR**: Please install ALSA development files before running " >&2
23+
echo " '$0' on Linux." >&2
24+
exit 1
1025
fi
1126

1227
autoreconf --install --verbose --force || \

0 commit comments

Comments
 (0)