Skip to content

Commit fcb1712

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 fcb1712

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
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: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,23 @@
44

55
set -e -u
66

7+
mkdir -p m4/
8+
79
if [[ "$(uname -s)" == Darwin ]]; then
8-
# This provides a dummy substitute to alsa.m4 on macOS
9-
echo 'AC_DEFUN([AM_PATH_ALSA], [HAVE_ALSA=no])' > acinclude.m4
10+
# This provides a dummy substitute to alsa.m4 on macOS.. and is a reason
11+
# why "make dist" should be run on Linux rather than on macOS.
12+
echo 'AC_DEFUN([AM_PATH_ALSA], [HAVE_ALSA=no])' > m4/alsa.m4
13+
else
14+
# This will make aclocal add line "m4_include([m4/alsa.m4])"
15+
# to file acinclude.m4 rather than inlining that file's content.
16+
# As a result, packagers are able to run ./autogen.sh (or autoreconf)
17+
# with no ALSA development files installed.
18+
alsa_m4="$(aclocal --print-ac-dir)"/alsa.m4
19+
if [[ -f "${alsa_m4}" ]]; then
20+
cp -v "${alsa_m4}" m4/alsa.m4
21+
else
22+
rm -f -v m4/alsa.m4
23+
fi
1024
fi
1125

1226
autoreconf --install --verbose --force || \

0 commit comments

Comments
 (0)