diff --git a/libvisual-plugins/Makefile.am b/libvisual-plugins/Makefile.am index 73a568e3..eeab59fb 100644 --- a/libvisual-plugins/Makefile.am +++ b/libvisual-plugins/Makefile.am @@ -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 diff --git a/libvisual-plugins/autogen.sh b/libvisual-plugins/autogen.sh index a1764362..3e5fcbdf 100755 --- a/libvisual-plugins/autogen.sh +++ b/libvisual-plugins/autogen.sh @@ -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 diff --git a/libvisual-plugins/po/boldquot.sed b/libvisual-plugins/po/boldquot.sed deleted file mode 100644 index 4b937aa5..00000000 --- a/libvisual-plugins/po/boldquot.sed +++ /dev/null @@ -1,10 +0,0 @@ -s/"\([^"]*\)"/“\1”/g -s/`\([^`']*\)'/‘\1’/g -s/ '\([^`']*\)' / ‘\1’ /g -s/ '\([^`']*\)'$/ ‘\1’/g -s/^'\([^`']*\)' /‘\1’ /g -s/“”/""/g -s/“/“/g -s/”/”/g -s/‘/‘/g -s/’/’/g diff --git a/libvisual-plugins/po/quot.sed b/libvisual-plugins/po/quot.sed deleted file mode 100644 index 0122c463..00000000 --- a/libvisual-plugins/po/quot.sed +++ /dev/null @@ -1,6 +0,0 @@ -s/"\([^"]*\)"/“\1”/g -s/`\([^`']*\)'/‘\1’/g -s/ '\([^`']*\)' / ‘\1’ /g -s/ '\([^`']*\)'$/ ‘\1’/g -s/^'\([^`']*\)' /‘\1’ /g -s/“”/""/g diff --git a/libvisual-plugins/po/stamp-po b/libvisual-plugins/po/stamp-po deleted file mode 100644 index 9788f702..00000000 --- a/libvisual-plugins/po/stamp-po +++ /dev/null @@ -1 +0,0 @@ -timestamp diff --git a/libvisual/autogen.sh b/libvisual/autogen.sh index a547c666..347e2e9c 100755 --- a/libvisual/autogen.sh +++ b/libvisual/autogen.sh @@ -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