mirror of
https://github.com/alsa-project/alsa-utils
synced 2024-12-21 15:16:31 +01:00
gitcompile: restore ACLOCAL_FLAGS ability to use
Fixes cryptic "error macro 'AM_PATH_ALSA' not found in library
configure.ac:22" when attempting a local install as described at
https://thesofproject.github.io/latest/getting_started/build-guide/build-from-scratch.html#build-alsa-lib-and-alsa-utils-from-source
Fixes giant commit f9e6010d5e
("topology: plugins - add Intel nhlt
encoder plugin") which added a second invocation of `aclocal` in 2021
but forgot the extra `$alsa_m4_flags`.
To avoid duplication, do not fix by adding the missing `$alsa_m4_flags`
to the second aclocal invocation. Instead, drop that variable and append
`-I ../alsa-lib/utils` directly to $ACLOCAL_FLAGS
Closes: https://github.com/alsa-project/alsa-utils/pull/272
Signed-off-by: Marc Herbert <marc.herbert@intel.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
parent
cbebb86a56
commit
5b511024e9
1 changed files with 2 additions and 2 deletions
|
@ -1,9 +1,9 @@
|
|||
#!/bin/bash
|
||||
|
||||
if test -d ../alsa-lib/utils && ! test -r `aclocal --print-ac-dir`/alsa.m4; then
|
||||
alsa_m4_flags="-I ../alsa-lib/utils"
|
||||
ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I ../alsa-lib/utils"
|
||||
fi
|
||||
aclocal $alsa_m4_flags $ACLOCAL_FLAGS
|
||||
aclocal $ACLOCAL_FLAGS
|
||||
# save original files to avoid stupid modifications by gettextize
|
||||
cp Makefile.am Makefile.am.ok
|
||||
cp configure.ac configure.ac.ok
|
||||
|
|
Loading…
Reference in a new issue