From: "Daniel P. Berrange" <berrange@redhat.com>
To: Gerd Hoffmann <kraxel@redhat.com>
Cc: qemu-devel@nongnu.org, Anthony Liguori <aliguori@amazon.com>,
Richard Henderson <rth@twiddle.net>
Subject: Re: [Qemu-devel] [PATCH] gtk: cleanup backend dependencies
Date: Mon, 2 Jun 2014 12:13:53 +0100 [thread overview]
Message-ID: <20140602111353.GE28039@redhat.com> (raw)
In-Reply-To: <20140602111044.GD28039@redhat.com>
On Mon, Jun 02, 2014 at 12:10:44PM +0100, Daniel P. Berrange wrote:
> On Mon, Jun 02, 2014 at 12:58:33PM +0200, Gerd Hoffmann wrote:
> > diff --git a/configure b/configure
> > index 0e516f9..b02f822 100755
> > --- a/configure
> > +++ b/configure
> > @@ -1986,6 +1986,8 @@ fi
> >
> > if test "$gtk" != "no"; then
> > gtkpackage="gtk+-$gtkabi"
> > + gtkx11package="gtk+-x11-$gtkabi"
> > + gtkwin32package="gtk+-win32-$gtkabi"
> > if test "$gtkabi" = "3.0" ; then
> > gtkversion="3.0.0"
> > else
> > @@ -1996,6 +1998,13 @@ if test "$gtk" != "no"; then
> > gtk_libs=`$pkg_config --libs $gtkpackage`
> > libs_softmmu="$gtk_libs $libs_softmmu"
> > gtk="yes"
> > + if $pkg_config --exists "$gtkx11package >= $gtkversion"; then
> > + gtkx11="yes"
> > + gtk_libs="$gtk_libs -lX11"
> > + fi
> > + if $pkg_config --exists "$gtkwin32package >= $gtkversion"; then
> > + gtkwin32="yes"
> > + fi
> > elif test "$gtk" = "yes"; then
> > feature_not_found "gtk" "Install gtk2 or gtk3 devel"
> > else
> > @@ -4459,6 +4468,12 @@ if test "$gtk" = "yes" ; then
> > echo "CONFIG_GTKABI=$gtkabi" >> $config_host_mak
> > echo "GTK_CFLAGS=$gtk_cflags" >> $config_host_mak
> > fi
> > +if test "$gtkx11" = "yes" ; then
> > + echo "CONFIG_GTK_X11=y" >> $config_host_mak
> > +fi
> > +if test "$gtkwin32" = "yes" ; then
> > + echo "CONFIG_GTK_WIN32=y" >> $config_host_mak
> > +fi
> > if test "$vte" = "yes" ; then
> > echo "CONFIG_VTE=y" >> $config_host_mak
> > echo "VTE_CFLAGS=$vte_cflags" >> $config_host_mak
>
> None of this configure time detection is needed, as GTK already
> defines macros in its header which let you check this eg you can
> just do
Correction - the setting of CONFIG_GTK_* stuff is not needed,
the addition of '-lX11' is still needed.
Regards,
Daniel
--
|: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org -o- http://virt-manager.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
next prev parent reply other threads:[~2014-06-02 11:14 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-02 10:58 [Qemu-devel] [PATCH] gtk: cleanup backend dependencies Gerd Hoffmann
2014-06-02 11:10 ` Daniel P. Berrange
2014-06-02 11:13 ` Daniel P. Berrange [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-06-02 11:50 Gerd Hoffmann
2014-06-02 11:54 ` Daniel P. Berrange
2014-06-02 18:13 ` Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140602111353.GE28039@redhat.com \
--to=berrange@redhat.com \
--cc=aliguori@amazon.com \
--cc=kraxel@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).