From: Jean Guyader <jean.guyader@eu.citrix.com>
Date: Tue, 24 Nov 2009 14:42:49 +0000 (+0000)
Subject: alsa-config: rebase on the top of the new ioemu-compil
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=12ed951bb278cf6c115344012c8fd1ec515f37ab;p=xenclient%2Fioemu-pq.git

alsa-config: rebase on the top of the new ioemu-compil
---

diff --git a/master/alsa-config b/master/alsa-config
index 3b351ff..5c75d58 100644
--- a/master/alsa-config
+++ b/master/alsa-config
@@ -12,10 +12,10 @@ index 5b1f4d7..75a748c 100644
 +
  #endif /*XEN_CONFIG_HOST_H*/
 diff --git a/xen-hooks.mak b/xen-hooks.mak
-index eb321c8..871f8ce 100644
+index 7c22471..c21df83 100644
 --- a/xen-hooks.mak
 +++ b/xen-hooks.mak
-@@ -51,6 +51,7 @@ CONFIG_SDL=
+@@ -43,6 +43,7 @@ CONFIG_SDL=
  CONFIG_AUDIO=
  OBJS += xenfbfront.o
  else
@@ -24,15 +24,15 @@ index eb321c8..871f8ce 100644
  LIBS += -L$(XEN_ROOT)/tools/blktap/lib -lblktap
  OBJS += xen_blktap.o
 diff --git a/xen-setup b/xen-setup
-index f74a09e..454301a 100755
+index 5ea1727..4f6edac 100755
 --- a/xen-setup
 +++ b/xen-setup
 @@ -9,7 +9,7 @@ rm -f config-host.mak
  
  if test -f config-host.h; then mv config-host.h config-host.h~; fi
  
--./configure --disable-gfx-check --disable-curses --disable-slirp --disable-vnc-tls --disable-sdl --disable-aio "$@" --prefix=/usr --cc=${CC}
-+./configure --disable-gfx-check --disable-curses --disable-slirp --disable-vnc-tls --disable-sdl --disable-aio "$@" --prefix=/usr --cc=${CC} --audio-drv-list=alsa 
+-./configure --disable-gfx-check --disable-curses --disable-slirp --disable-vnc-tls --disable-sdl --disable-aio "$@" --prefix=/usr --cc=gcc
++./configure --disable-gfx-check --disable-curses --disable-slirp --disable-vnc-tls --disable-sdl --disable-aio "$@" --prefix=/usr --cc=gcc --audio-drv-list=alsa
  
  target=i386-dm