[vlc-devel] commit: fix automagic alsa dependency (Daniel Mierswa )
git version control
git at videolan.org
Sun Sep 14 04:20:24 CEST 2008
vlc | branch: 0.9-bugfix | Daniel Mierswa <impulze at impulze.org> | Sun Sep 14 00:11:29 2008 +0200| [9c0f9757a1f5fe30ee360a12e5ca74d327e334fd] | committer: Jean-Baptiste Kempf
fix automagic alsa dependency
when --enable-v4l2 was passed to configure, alsa was searched and linked
against if found (only do that when alsa wasn't disabled)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit 4c50e9eed9c725a9cc57c4ea96e730ba720433a7)
backported to help packagers.
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9c0f9757a1f5fe30ee360a12e5ca74d327e334fd
---
configure.ac | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/configure.ac b/configure.ac
index 2e0601d..ba5bf96 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2389,7 +2389,11 @@ then
VLC_ADD_CPPFLAGS([v4l2],[-I${with_v4l2}/include])
fi
- AC_CHECK_HEADER(alsa/asoundlib.h, AC_CHECK_LIB(asound, main, have_v4l2_alsa="true", have_v4l2_alsa="false"),have_v4l2_alsa="false")
+ if test "${enable_alsa}" != "no"
+ then
+ AC_CHECK_HEADER(alsa/asoundlib.h, AC_CHECK_LIB(asound, main, have_v4l2_alsa="true", have_v4l2_alsa="false"),have_v4l2_alsa="false")
+ fi
+
if test "${have_v4l2_alsa}" = "true"
then
CFLAGS="${CFLAGS_save}"
More information about the vlc-devel
mailing list