Skip to content

Commit

Permalink
utils/alsa.m4: update for newer autoconf.
Browse files Browse the repository at this point in the history
fixes autoconf-2.70 warnings. should be compatible down to autoconf-2.59.

BugLink: #106
Signed-off-by: Ozkan Sezer <sezeroz@gmail.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
  • Loading branch information
sezero authored and perexg committed Apr 13, 2021
1 parent c83ddd8 commit c6e0f24
Showing 1 changed file with 9 additions and 12 deletions.
21 changes: 9 additions & 12 deletions utils/alsa.m4
Expand Up @@ -81,12 +81,11 @@ no_alsa=""
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
AC_MSG_RESULT($alsa_min_major_version.$alsa_min_minor_version.$alsa_min_micro_version)
AC_LANG_SAVE
AC_LANG_C
AC_LANG_PUSH([C])
AC_MSG_CHECKING([for libasound headers version >= $alsa_min_major_version.$alsa_min_minor_version.$alsa_min_micro_version ($min_alsa_version)])
AC_TRY_COMPILE([
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <alsa/asoundlib.h>
], [
]], [[
/* ensure backward compatibility */
#if !defined(SND_LIB_MAJOR) && defined(SOUNDLIB_VERSION_MAJOR)
#define SND_LIB_MAJOR SOUNDLIB_VERSION_MAJOR
Expand Down Expand Up @@ -118,21 +117,20 @@ AC_TRY_COMPILE([
# endif
# endif
exit(0);
],
]])],
[AC_MSG_RESULT(found.)],
[AC_MSG_RESULT(not present.)
ifelse([$3], , [AC_MSG_ERROR(Sufficiently new version of libasound not found.)])
alsa_found=no]
)
AC_LANG_RESTORE
AC_LANG_POP([C])
AC_LANG_SAVE
AC_LANG_C
AC_LANG_PUSH([C])
AC_MSG_CHECKING([for libatopology (sound headers version > 1.1.9)])
AC_TRY_COMPILE([
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <alsa/asoundlib.h>
#include <alsa/topology.h>
], [
]], [[
/* ensure backward compatibility */
#if !defined(SND_LIB_VERSION)
#define SND_LIB_VERSION 0
Expand All @@ -148,8 +146,7 @@ exit(0);
enable_atopology="yes"],
[AC_MSG_RESULT(no)]
)
AC_LANG_RESTORE
AC_LANG_POP([C])
fi
dnl Now that we know that we have the right version, let's see if we have the library and not just the headers.
Expand Down

0 comments on commit c6e0f24

Please sign in to comment.