Skip to content

Commit 8cb78e8

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

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-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: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,18 @@ set -e -u
66

77
if [[ "$(uname -s)" == Darwin ]]; then
88
# This provides a dummy substitute to alsa.m4 on macOS
9+
# and that is a reason why "make dist" should be run on Linux, not macOS.
910
echo 'AC_DEFUN([AM_PATH_ALSA], [HAVE_ALSA=no])' > acinclude.m4
11+
else
12+
# This will make aclocal add line "m4_include([m4/alsa.m4])"
13+
# to acinclude.m4 rather than inlining the content of alsa.m4 .
14+
# As a result, package mantainers are able to run ./autogen.sh
15+
# (or autoreconf) without any ALSA development files installed.
16+
alsa_m4="$(aclocal --print-ac-dir)"/alsa.m4
17+
if [[ -f "${alsa_m4}" ]]; then
18+
mkdir -p m4/
19+
cp -v "${alsa_m4}" m4/alsa.m4
20+
fi
1021
fi
1122

1223
autoreconf --install --verbose --force || \

0 commit comments

Comments
 (0)