"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "aclocal.m4" between
alsa-utils-1.2.1.tar.bz2 and alsa-utils-1.2.2.tar.bz2

About: ALSA (Advanced Linux Sound Architecture) - Utilities.

aclocal.m4  (alsa-utils-1.2.1.tar.bz2):aclocal.m4  (alsa-utils-1.2.2.tar.bz2)
skipping to change at line 47 skipping to change at line 47
dnl For backwards compatibility, if ACTION_IF_NOT_FOUND is not specified, dnl For backwards compatibility, if ACTION_IF_NOT_FOUND is not specified,
dnl and the alsa libraries are not found, a fatal AC_MSG_ERROR() will result. dnl and the alsa libraries are not found, a fatal AC_MSG_ERROR() will result.
dnl dnl
AC_DEFUN([AM_PATH_ALSA], AC_DEFUN([AM_PATH_ALSA],
[dnl Save the original CFLAGS, LDFLAGS, and LIBS [dnl Save the original CFLAGS, LDFLAGS, and LIBS
alsa_save_CFLAGS="$CFLAGS" 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
dnl dnl
AC_ARG_WITH(alsa-prefix, AC_ARG_WITH(alsa-prefix,
AS_HELP_STRING([--with-alsa-prefix=PFX], [Prefix where Alsa library is install ed(optional)]), AS_HELP_STRING([--with-alsa-prefix=PFX], [Prefix where Alsa library is install ed(optional)]),
[alsa_prefix="$withval"], [alsa_prefix=""]) [alsa_prefix="$withval"], [alsa_prefix=""])
AC_ARG_WITH(alsa-inc-prefix, AC_ARG_WITH(alsa-inc-prefix,
AS_HELP_STRING([--with-alsa-inc-prefix=PFX], [Prefix where include libraries a re (optional)]), AS_HELP_STRING([--with-alsa-inc-prefix=PFX], [Prefix where include libraries a re (optional)]),
skipping to change at line 155 skipping to change at line 156
ifelse([$3], , [AC_MSG_ERROR(Sufficiently new version of libasound not found. )]) ifelse([$3], , [AC_MSG_ERROR(Sufficiently new version of libasound not found. )])
alsa_found=no] alsa_found=no]
) )
AC_LANG_RESTORE AC_LANG_RESTORE
AC_LANG_SAVE AC_LANG_SAVE
AC_LANG_C AC_LANG_C
AC_MSG_CHECKING([for libatopology (sound headers version > 1.1.9)]) AC_MSG_CHECKING([for libatopology (sound headers version > 1.1.9)])
AC_TRY_COMPILE([ AC_TRY_COMPILE([
#include <alsa/asoundlib.h> #include <alsa/asoundlib.h>
#include <alsa/topology.h>
], [ ], [
/* ensure backward compatibility */ /* ensure backward compatibility */
#if !defined(SND_LIB_VERSION) #if !defined(SND_LIB_VERSION)
#define SND_LIB_VERSION 0 #define SND_LIB_VERSION 0
#endif #endif
#if SND_LIB_VERSION > 0x00010109 #if SND_LIB_VERSION > 0x00010109
exit(0); exit(0);
#else #else
# error not present # error not present
#endif #endif
skipping to change at line 182 skipping to change at line 184
fi fi
dnl Now that we know that we have the right version, let's see if we have the li brary and not just the headers. dnl Now that we know that we have the right version, let's see if we have the li brary and not just the headers.
if test "x$enable_alsatest" = "xyes"; then if test "x$enable_alsatest" = "xyes"; then
AC_CHECK_LIB([asound], [snd_ctl_open],, AC_CHECK_LIB([asound], [snd_ctl_open],,
[ifelse([$3], , [AC_MSG_ERROR(No linkable libasound was found.)]) [ifelse([$3], , [AC_MSG_ERROR(No linkable libasound was found.)])
alsa_found=no] alsa_found=no]
) )
if test "x$enable_atopology" = "xyes"; then if test "x$enable_atopology" = "xyes"; then
alsa_topology_found=yes
alsa_save_LIBS2="$LIBS"
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,
]
) )
LIBS="$alsa_save_LIBS2"
fi
else
if test "x$enable_atopology" = "xyes"; then
alsa_topology_found=yes
fi fi
fi fi
if test "x$alsa_found" = "xyes" ; then if test "x$alsa_found" = "xyes" ; then
ifelse([$2], , :, [$2]) ifelse([$2], , :, [$2])
LIBS=`echo $LIBS | sed 's/-lasound//g'` LIBS=`echo $LIBS | sed 's/-lasound//g'`
LIBS=`echo $LIBS | sed 's/ //'` LIBS=`echo $LIBS | sed 's/ //'`
LIBS="-lasound $LIBS" LIBS="-lasound $LIBS"
fi fi
if test "x$alsa_found" = "xno" ; then if test "x$alsa_found" = "xno" ; then
skipping to change at line 207 skipping to change at line 217
CFLAGS="$alsa_save_CFLAGS" CFLAGS="$alsa_save_CFLAGS"
LDFLAGS="$alsa_save_LDFLAGS" LDFLAGS="$alsa_save_LDFLAGS"
LIBS="$alsa_save_LIBS" LIBS="$alsa_save_LIBS"
ALSA_CFLAGS="" ALSA_CFLAGS=""
ALSA_LIBS="" ALSA_LIBS=""
ALSA_TOPOLOGY_LIBS="" ALSA_TOPOLOGY_LIBS=""
fi 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)
dnl That should be it. Now just export out symbols: dnl That should be it. Now just export out symbols:
AC_SUBST(ALSA_CFLAGS) AC_SUBST(ALSA_CFLAGS)
AC_SUBST(ALSA_LIBS) AC_SUBST(ALSA_LIBS)
AC_SUBST(ALSA_TOPOLOGY_LIBS) AC_SUBST(ALSA_TOPOLOGY_LIBS)
]) ])
 End of changes. 6 change blocks. 
2 lines changed or deleted 12 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)