Skip to content

[0.4.x] libvisual-plugins: Resolve troublesome --install from ACLOCAL_AMFLAGS / Fix macOS CI (fixes #397) #398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 1, 2025
Merged

[0.4.x] libvisual-plugins: Resolve troublesome --install from ACLOCAL_AMFLAGS / Fix macOS CI (fixes #397) #398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
24c1d8f
libvisual-plugins/po: Drop three generated files
hartwork Mar 30, 2025
a071dbb
libvisual-plugins: Resolve troublesome "--install" from ACLOCAL_AMFLAGS
hartwork Mar 31, 2025
3570948
*/autogen.sh: Add note on why we are running autoreconf twice
hartwork Apr 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libvisual-plugins/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Process this file with automake to generate a Makefile.in

ACLOCAL_AMFLAGS = -I m4 --install
ACLOCAL_AMFLAGS = -I m4

SUBDIRS = plugins po

Expand Down
16 changes: 16 additions & 0 deletions libvisual-plugins/autogen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,27 @@

set -e -u

# For alsa.m4 (with "L" in ALSA meaning "Linux") we want three things:
# - That a build on macOS is fully okay without it.
# - That "make dist" results from Linux contain a healthy m4/alsa.m4 file.
# - That running ./autogen.sh (or autoreconf) on a host
# without ALSA development files installed still succeeds.
alsa_m4="$(aclocal --print-ac-dir)"/alsa.m4
if [[ -f "${alsa_m4}" ]]; then
mkdir -p m4/
cp -v "${alsa_m4}" m4/
fi
if [[ "$(uname -s)" == Darwin ]]; then
# This provides a dummy substitute to alsa.m4 on macOS
# and that is a reason why "make dist" should be run on Linux, not macOS.
echo 'AC_DEFUN([AM_PATH_ALSA], [HAVE_ALSA=no])' > acinclude.m4
elif [[ ! -f m4/alsa.m4 ]]; then
echo "ERROR: Please install ALSA development files before running" >&2
echo " '$0' on Linux." >&2
exit 1
fi

# NOTE: We're running things twice to workaround bug "too many loops" in aclocal
autoreconf --install --verbose --force || \
autoreconf --install --verbose --force

Expand Down
10 changes: 0 additions & 10 deletions libvisual-plugins/po/boldquot.sed
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions libvisual-plugins/po/quot.sed
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion libvisual-plugins/po/stamp-po
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions libvisual/autogen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

set -e -u

# NOTE: We're running things twice to workaround bug "too many loops" in aclocal
autoreconf --install --verbose --force || \
autoreconf --install --verbose --force

Expand Down
Loading