Skip to content

Commit db7e4d4

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

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-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: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,13 @@
55
set -e -u
66

77
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
8+
# This provides a dummy substitute to alsa.m4 on macOS.. and is a reason
9+
# why "make dist" should be run on Linux rather than on macOS.
10+
echo 'AC_DEFUN([AM_PATH_ALSA], [HAVE_ALSA=no])' > m4/alsa.m4
11+
else
12+
# This will make aclocal add line "m4_include([m4/alsa.m4])"
13+
# to file acinclude.m4 rather than inlining that file's content.
14+
cp -v "$(aclocal --print-ac-dir)"/alsa.m4 m4/
1015
fi
1116

1217
autoreconf --install --verbose --force || \

0 commit comments

Comments
 (0)