Mercurial > mplayer.hg

changeset 27256:d2f920cb9847

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ALSA stupidly tries to define struct timeval and struct timespec, which may cause compilation errors. Check for this and disable ALSA.
author reimar
date Tue, 15 Jul 2008 16:39:26 +0000
parents aff85d51de87
children 58d731fe531c
files configure
diffstat 1 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Tue Jul 15 09:21:53 2008 +0000
+++ b/configure	Tue Jul 15 16:39:26 2008 +0000
@@ -5197,6 +5197,7 @@
 if test "$_alsa" != no ; then
   _alsa=no
   cat > $TMPC << EOF
+#include <sys/time.h>
 #include <sys/asoundlib.h>
 #if !((SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 5))
 #error "alsa version != 0.5.x"
@@ -5206,6 +5207,7 @@
   cc_check -lasound $_ld_dl $_ld_pthread && _alsaver='0.5.x'
 
   cat > $TMPC << EOF
+#include <sys/time.h>
 #include <sys/asoundlib.h>
 #if !((SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 9))
 #error "alsa version != 0.9.x"
@@ -5214,6 +5216,7 @@
 EOF
   cc_check -lasound $_ld_dl $_ld_pthread && _alsaver='0.9.x-sys'
   cat > $TMPC << EOF
+#include <sys/time.h>
 #include <alsa/asoundlib.h>
 #if !((SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 9))
 #error "alsa version != 0.9.x"
@@ -5223,6 +5226,7 @@
   cc_check -lasound $_ld_dl $_ld_pthread && _alsaver='0.9.x-alsa'
 
   cat > $TMPC << EOF
+#include <sys/time.h>
 #include <sys/asoundlib.h>
 #if !((SND_LIB_MAJOR == 1) && (SND_LIB_MINOR == 0))
 #error "alsa version != 1.0.x"
@@ -5231,6 +5235,7 @@
 EOF
   cc_check -lasound $_ld_dl $_ld_pthread && _alsaver='1.0.x-sys'
   cat > $TMPC << EOF
+#include <sys/time.h>
 #include <alsa/asoundlib.h>
 #if !((SND_LIB_MAJOR == 1) && (SND_LIB_MINOR == 0))
 #error "alsa version != 1.0.x"