alsa.m4: another try to fix the libatopology detection

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2019-12-04 09:49:40 +01:00
parent 8e2c70add7
commit ad8527d81b

View file

@ -22,6 +22,7 @@ alsa_save_CFLAGS="$CFLAGS"
alsa_save_LDFLAGS="$LDFLAGS" alsa_save_LDFLAGS="$LDFLAGS"
alsa_save_LIBS="$LIBS" alsa_save_LIBS="$LIBS"
alsa_found=yes alsa_found=yes
alsa_topology_found=no
dnl dnl
dnl Get the cflags and libraries for alsa dnl Get the cflags and libraries for alsa
@ -158,11 +159,17 @@ AC_CHECK_LIB([asound], [snd_ctl_open],,
alsa_found=no] alsa_found=no]
) )
if test "x$enable_atopology" = "xyes"; then if test "x$enable_atopology" = "xyes"; then
alsa_topology_found=yes
AC_CHECK_LIB([atopology], [snd_tplg_new],, AC_CHECK_LIB([atopology], [snd_tplg_new],,
[ifelse([$3], , [AC_MSG_ERROR(No linkable libatopology was found.)]) [ifelse([$3], , [AC_MSG_ERROR(No linkable libatopology was found.)])
alsa_found=no] alsa_topology_found=no,
]
) )
fi fi
else
if test "x$enable_atopology" = "xyes"; then
alsa_topology_found=yes
fi
fi fi
if test "x$alsa_found" = "xyes" ; then if test "x$alsa_found" = "xyes" ; then
@ -183,7 +190,7 @@ fi
dnl add the alsa topology library; must be at the end dnl add the alsa topology library; must be at the end
AC_MSG_CHECKING(for ALSA topology LDFLAGS) AC_MSG_CHECKING(for ALSA topology LDFLAGS)
if test "x$enable_atopology" = "xyes"; then if test "x$alsa_topology_found" = "xyes"; then
ALSA_TOPOLOGY_LIBS="$ALSA_TOPOLOGY_LIBS -latopology" ALSA_TOPOLOGY_LIBS="$ALSA_TOPOLOGY_LIBS -latopology"
fi fi
AC_MSG_RESULT($ALSA_TOPOLOGY_LIBS) AC_MSG_RESULT($ALSA_TOPOLOGY_LIBS)