Skip to content

Commit 5b51102

Browse files
marc-hbperexg
authored andcommitted
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 f9e6010 ("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: #272 Signed-off-by: Marc Herbert <[email protected]> Signed-off-by: Jaroslav Kysela <[email protected]>
1 parent cbebb86 commit 5b51102

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

gitcompile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/bin/bash
22

33
if test -d ../alsa-lib/utils && ! test -r `aclocal --print-ac-dir`/alsa.m4; then
4-
alsa_m4_flags="-I ../alsa-lib/utils"
4+
ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I ../alsa-lib/utils"
55
fi
6-
aclocal $alsa_m4_flags $ACLOCAL_FLAGS
6+
aclocal $ACLOCAL_FLAGS
77
# save original files to avoid stupid modifications by gettextize
88
cp Makefile.am Makefile.am.ok
99
cp configure.ac configure.ac.ok

0 commit comments

Comments
 (0)