Message ID | 1312823054-28331-2-git-send-email-aneesh.kumar@linux.vnet.ibm.com |
---|---|
State | New |
Headers | show |
On Tue, Aug 9, 2011 at 01:03, Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> wrote: > From: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> > > Commit 1fc7bd4a86a2bfeafcec29445871eb97469a2699 removed the gthread and > gio dependency since qemu-ga did not require it. Coroutines require > gthread, so add it back in. > > Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> > --- > configure | 18 ++++++++---------- > 1 files changed, 8 insertions(+), 10 deletions(-) > > diff --git a/configure b/configure > index 0c67a4a..a6687f7 100755 > --- a/configure > +++ b/configure > @@ -1844,16 +1844,14 @@ fi > > ########################################## > # glib support probe > -if test "$guest_agent" != "no" ; then Why did you remove this line? > - if $pkg_config --modversion glib-2.0 > /dev/null 2>&1 ; then > - glib_cflags=`$pkg_config --cflags glib-2.0 2>/dev/null` > - glib_libs=`$pkg_config --libs glib-2.0 2>/dev/null` > - libs_softmmu="$glib_libs $libs_softmmu" > - libs_tools="$glib_libs $libs_tools" > - else > - echo "glib-2.0 required to compile QEMU" > - exit 1 > - fi > +if $pkg_config --modversion gthread-2.0 > /dev/null 2>&1 ; then > + glib_cflags=`$pkg_config --cflags gthread-2.0 2>/dev/null` > + glib_libs=`$pkg_config --libs gthread-2.0 2>/dev/null` > + libs_softmmu="$glib_libs $libs_softmmu" > + libs_tools="$glib_libs $libs_tools" > +else > + echo "glib-2.0 required to compile QEMU" > + exit 1 > fi > > ########################################## > -- > 1.7.4.1 > > >
diff --git a/configure b/configure index 0c67a4a..a6687f7 100755 --- a/configure +++ b/configure @@ -1844,16 +1844,14 @@ fi ########################################## # glib support probe -if test "$guest_agent" != "no" ; then - if $pkg_config --modversion glib-2.0 > /dev/null 2>&1 ; then - glib_cflags=`$pkg_config --cflags glib-2.0 2>/dev/null` - glib_libs=`$pkg_config --libs glib-2.0 2>/dev/null` - libs_softmmu="$glib_libs $libs_softmmu" - libs_tools="$glib_libs $libs_tools" - else - echo "glib-2.0 required to compile QEMU" - exit 1 - fi +if $pkg_config --modversion gthread-2.0 > /dev/null 2>&1 ; then + glib_cflags=`$pkg_config --cflags gthread-2.0 2>/dev/null` + glib_libs=`$pkg_config --libs gthread-2.0 2>/dev/null` + libs_softmmu="$glib_libs $libs_softmmu" + libs_tools="$glib_libs $libs_tools" +else + echo "glib-2.0 required to compile QEMU" + exit 1 fi ##########################################