projects
/
platform
/
upstream
/
gst-plugins-good.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
v4l2: display stride and width values if stride is too small
[platform/upstream/gst-plugins-good.git]
/
m4
/
gst-alsa.m4
diff --git
a/m4/gst-alsa.m4
b/m4/gst-alsa.m4
index
0ca35ef
..
4141d06
100644
(file)
--- a/
m4/gst-alsa.m4
+++ b/
m4/gst-alsa.m4
@@
-2,17
+2,17
@@
dnl Configure Paths for Alsa
dnl Some modifications by Richard Boulton <richard-alsa@tartarus.org>
dnl Christopher Lansdown <lansdoct@cs.alfred.edu>
dnl Jaroslav Kysela <perex@suse.cz>
dnl Some modifications by Richard Boulton <richard-alsa@tartarus.org>
dnl Christopher Lansdown <lansdoct@cs.alfred.edu>
dnl Jaroslav Kysela <perex@suse.cz>
-dnl Last modification:
07/01/2001
+dnl Last modification:
alsa.m4,v 1.23 2004/01/16 18:14:22 tiwai Exp
dnl AM_PATH_ALSA([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for libasound, and define ALSA_CFLAGS and ALSA_LIBS as appropriate.
dnl enables arguments --with-alsa-prefix=
dnl --with-alsa-enc-prefix=
dnl AM_PATH_ALSA([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for libasound, and define ALSA_CFLAGS and ALSA_LIBS as appropriate.
dnl enables arguments --with-alsa-prefix=
dnl --with-alsa-enc-prefix=
-dnl --disable-alsatest
(this has no effect, as yet)
+dnl --disable-alsatest
dnl
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
dnl
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
-AC_DEFUN(
AM_PATH_ALSA
,
+AC_DEFUN(
[AM_PATH_ALSA]
,
[dnl Save the original CFLAGS, LDFLAGS, and LIBS
alsa_save_CFLAGS="$CFLAGS"
alsa_save_LDFLAGS="$LDFLAGS"
[dnl Save the original CFLAGS, LDFLAGS, and LIBS
alsa_save_CFLAGS="$CFLAGS"
alsa_save_LDFLAGS="$LDFLAGS"
@@
-23,18
+23,20
@@
dnl
dnl Get the cflags and libraries for alsa
dnl
AC_ARG_WITH(alsa-prefix,
dnl Get the cflags and libraries for alsa
dnl
AC_ARG_WITH(alsa-prefix,
-[ --with-alsa-prefix=PFX Prefix where Alsa library is installed(optional)],
-[alsa_prefix="$withval"], [alsa_prefix=""])
+ AC_HELP_STRING([--with-alsa-prefix=PFX],
+ [prefix where Alsa library is installed(optional)]),
+ [alsa_prefix="$withval"], [alsa_prefix=""])
AC_ARG_WITH(alsa-inc-prefix,
AC_ARG_WITH(alsa-inc-prefix,
-[ --with-alsa-inc-prefix=PFX Prefix where include libraries are (optional)],
-[alsa_inc_prefix="$withval"], [alsa_inc_prefix=""])
+ AC_HELP_STRING([--with-alsa-inc-prefix=PFX],
+ [prefix where include libraries are (optional)]),
+ [alsa_inc_prefix="$withval"], [alsa_inc_prefix=""])
dnl FIXME: this is not yet implemented
dnl FIXME: this is not yet implemented
-AC_ARG_ENABLE(alsatest,
-
[ --disable-alsatest Do not try to compile and run a test Alsa program
],
-
[enable_alsatest=no
],
-[enable_alsatest=yes])
+
dnl
AC_ARG_ENABLE(alsatest,
+
dnl AC_HELP_STRING([--disable-alsatest
],
+
dnl [do not try to compile and run a test Alsa program
],
+
dnl [enable_alsatest=no],
[enable_alsatest=yes])
dnl Add any special include directories
AC_MSG_CHECKING(for ALSA CFLAGS)
dnl Add any special include directories
AC_MSG_CHECKING(for ALSA CFLAGS)
@@
-52,9
+54,10
@@
if test "$alsa_prefix" != "" ; then
fi
dnl add the alsa library
fi
dnl add the alsa library
-ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl"
+ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl
-lpthread
"
LIBS=`echo $LIBS | sed 's/-lm//'`
LIBS=`echo $LIBS | sed 's/-ldl//'`
LIBS=`echo $LIBS | sed 's/-lm//'`
LIBS=`echo $LIBS | sed 's/-ldl//'`
+LIBS=`echo $LIBS | sed 's/-lpthread//'`
LIBS=`echo $LIBS | sed 's/ //'`
LIBS="$ALSA_LIBS $LIBS"
AC_MSG_RESULT($ALSA_LIBS)
LIBS=`echo $LIBS | sed 's/ //'`
LIBS="$ALSA_LIBS $LIBS"
AC_MSG_RESULT($ALSA_LIBS)
@@
-73,7
+76,7
@@
no_alsa=""
AC_LANG_SAVE
AC_LANG_C
AC_TRY_COMPILE([
AC_LANG_SAVE
AC_LANG_C
AC_TRY_COMPILE([
-#include <
sys
/asoundlib.h>
+#include <
alsa
/asoundlib.h>
], [
void main(void)
{
], [
void main(void)
{
@@
-118,10
+121,12
@@
exit(0);
AC_LANG_RESTORE
dnl Now that we know that we have the right version, let's see if we have the library and not just the headers.
AC_LANG_RESTORE
dnl Now that we know that we have the right version, let's see if we have the library and not just the headers.
-AC_CHECK_LIB([asound], [snd_seq_create_event],,
+if test "x$enable_alsatest" = "xyes"; then
+AC_CHECK_LIB([asound], [snd_ctl_open],,
[ifelse([$3], , [AC_MSG_ERROR(No linkable libasound was found.)])
alsa_found=no]
)
[ifelse([$3], , [AC_MSG_ERROR(No linkable libasound was found.)])
alsa_found=no]
)
+fi
if test "x$alsa_found" = "xyes" ; then
ifelse([$2], , :, [$2])
if test "x$alsa_found" = "xyes" ; then
ifelse([$2], , :, [$2])
@@
-142,3
+147,4
@@
dnl That should be it. Now just export out symbols:
AC_SUBST(ALSA_CFLAGS)
AC_SUBST(ALSA_LIBS)
])
AC_SUBST(ALSA_CFLAGS)
AC_SUBST(ALSA_LIBS)
])
+