Patchwork configure: Fix spice probe

login
register
mail settings
Submitter Jiri Denemark
Date Jan. 24, 2011, 12:20 p.m.
Message ID <f3d1a48bca6e78c782bd9d127e61e8d3b24b374a.1295871629.git.jdenemar@redhat.com>
Download mbox | patch
Permalink /patch/80153/
State New
Headers show

Comments

Jiri Denemark - Jan. 24, 2011, 12:20 p.m.
From: Jiri Denemark <Jiri.Denemark@gmail.com>

Non-existent $pkgconfig instead of $pkg_config was used when configure
probes for spice availability.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
 configure |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
Gerd Hoffmann - Jan. 24, 2011, 2:01 p.m.
On 01/24/11 13:20, Jiri Denemark wrote:
> From: Jiri Denemark<Jiri.Denemark@gmail.com>
>
> Non-existent $pkgconfig instead of $pkg_config was used when configure
> probes for spice availability.

What tree you are looking at?  It _is_ $pkgconfig in mine ...

cheers,
   Gerd
Jiri Denemark - Jan. 24, 2011, 2:17 p.m.
On Mon, Jan 24, 2011 at 15:01:27 +0100, Gerd Hoffmann wrote:
> On 01/24/11 13:20, Jiri Denemark wrote:
> > From: Jiri Denemark<Jiri.Denemark@gmail.com>
> >
> > Non-existent $pkgconfig instead of $pkg_config was used when configure
> > probes for spice availability.
> 
> What tree you are looking at?  It _is_ $pkgconfig in mine ...

Yes, it is. And that's the problem, since $pkgconfig is not ever set inside
configure script. However, $pkg_config is set and used all over the script so
this patch makes spice probe use correct $pkg_config.

Jirka
Jiri Denemark - Jan. 24, 2011, 2:20 p.m.
On Mon, Jan 24, 2011 at 15:17:17 +0100, Jiri Denemark wrote:
> On Mon, Jan 24, 2011 at 15:01:27 +0100, Gerd Hoffmann wrote:
> > On 01/24/11 13:20, Jiri Denemark wrote:
> > > From: Jiri Denemark<Jiri.Denemark@gmail.com>
> > >
> > > Non-existent $pkgconfig instead of $pkg_config was used when configure
> > > probes for spice availability.
> > 
> > What tree you are looking at?  It _is_ $pkgconfig in mine ...
> 
> Yes, it is. And that's the problem, since $pkgconfig is not ever set inside
> configure script. However, $pkg_config is set and used all over the script so
> this patch makes spice probe use correct $pkg_config.

Looking at git://git.qemu.org/qemu.git tree.

Jirka
Alon Levy - Jan. 24, 2011, 2:20 p.m.
On Mon, Jan 24, 2011 at 03:01:27PM +0100, Gerd Hoffmann wrote:
> On 01/24/11 13:20, Jiri Denemark wrote:
> >From: Jiri Denemark<Jiri.Denemark@gmail.com>
> >
> >Non-existent $pkgconfig instead of $pkg_config was used when configure
> >probes for spice availability.
> 
> What tree you are looking at?  It _is_ $pkgconfig in mine ...

And it needs to be $pkg_config - someone did a cleanup and decided to
rename $pkgconfig->$pkg_config recently.

> 
> cheers,
>   Gerd
> 
>
Gerd Hoffmann - Jan. 24, 2011, 2:38 p.m.
On 01/24/11 15:20, Alon Levy wrote:
> On Mon, Jan 24, 2011 at 03:01:27PM +0100, Gerd Hoffmann wrote:
>> On 01/24/11 13:20, Jiri Denemark wrote:
>>> From: Jiri Denemark<Jiri.Denemark@gmail.com>
>>>
>>> Non-existent $pkgconfig instead of $pkg_config was used when configure
>>> probes for spice availability.
>>
>> What tree you are looking at?  It _is_ $pkgconfig in mine ...
>
> And it needs to be $pkg_config - someone did a cleanup and decided to
> rename $pkgconfig->$pkg_config recently.

Ah, now after rebasing to latest master I see it too.

/me goes pick the patch into the spice queue.

thanks,
   Gerd

Patch

diff --git a/configure b/configure
index 210670c..dc469b2 100755
--- a/configure
+++ b/configure
@@ -2207,9 +2207,9 @@  if test "$spice" != "no" ; then
 #include <spice.h>
 int main(void) { spice_server_new(); return 0; }
 EOF
-  spice_cflags=$($pkgconfig --cflags spice-protocol spice-server 2>/dev/null)
-  spice_libs=$($pkgconfig --libs spice-protocol spice-server 2>/dev/null)
-  if $pkgconfig --atleast-version=0.5.3 spice-server >/dev/null 2>&1 && \
+  spice_cflags=$($pkg_config --cflags spice-protocol spice-server 2>/dev/null)
+  spice_libs=$($pkg_config --libs spice-protocol spice-server 2>/dev/null)
+  if $pkg_config --atleast-version=0.5.3 spice-server >/dev/null 2>&1 && \
      compile_prog "$spice_cflags" "$spice_libs" ; then
     spice="yes"
     libs_softmmu="$libs_softmmu $spice_libs"