qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: Anthony Liguori <aliguori@us.ibm.com>,
	Stefan Hajnoczi <stefanha@redhat.com>,
	Bharata B Rao <bharata@linux.vnet.ibm.com>
Subject: [Qemu-devel] [PATCH 01/11] gluster: Use pkg-config to configure GlusterFS block driver
Date: Fri, 19 Jul 2013 16:38:42 +0800	[thread overview]
Message-ID: <1374223132-29107-2-git-send-email-stefanha@redhat.com> (raw)
In-Reply-To: <1374223132-29107-1-git-send-email-stefanha@redhat.com>

From: Bharata B Rao <bharata@linux.vnet.ibm.com>

Use pkg-config to determine the version and library dependency
for GlusterFS block driver.

Signed-off-by: Bharata B Rao <bharata@linux.vnet.ibm.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 configure | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/configure b/configure
index 9e1cd19..cf13493 100755
--- a/configure
+++ b/configure
@@ -2570,23 +2570,18 @@ fi
 ##########################################
 # glusterfs probe
 if test "$glusterfs" != "no" ; then
-  cat > $TMPC <<EOF
-#include <glusterfs/api/glfs.h>
-int main(void) {
-    (void) glfs_new("volume");
-    return 0;
-}
-EOF
-  glusterfs_libs="-lgfapi -lgfrpc -lgfxdr"
-  if compile_prog "" "$glusterfs_libs" ; then
-    glusterfs=yes
+  if $pkg_config --atleast-version=3 glusterfs-api >/dev/null 2>&1; then
+    glusterfs="yes"
+    glusterfs_cflags=`$pkg_config --cflags glusterfs-api 2>/dev/null`
+    glusterfs_libs=`$pkg_config --libs glusterfs-api 2>/dev/null`
+    CFLAGS="$CFLAGS $glusterfs_cflags"
     libs_tools="$glusterfs_libs $libs_tools"
     libs_softmmu="$glusterfs_libs $libs_softmmu"
   else
     if test "$glusterfs" = "yes" ; then
       feature_not_found "GlusterFS backend support"
     fi
-    glusterfs=no
+    glusterfs="no"
   fi
 fi
 
-- 
1.8.1.4

  reply	other threads:[~2013-07-19  8:39 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-19  8:38 [Qemu-devel] [PULL for-1.6 00/11] Block patches Stefan Hajnoczi
2013-07-19  8:38 ` Stefan Hajnoczi [this message]
2013-07-19  8:38 ` [Qemu-devel] [PATCH 02/11] gluster: Add discard support for GlusterFS block driver Stefan Hajnoczi
2013-07-19  8:38 ` [Qemu-devel] [PATCH 03/11] dataplane: sync virtio.c and vring.c virtqueue state Stefan Hajnoczi
2013-07-19  8:38 ` [Qemu-devel] [PATCH 04/11] QEMUBH: make AioContext's bh re-entrant Stefan Hajnoczi
2013-07-19  8:38 ` [Qemu-devel] [PATCH 05/11] block: fix vvfat error path for enable_write_target Stefan Hajnoczi
2013-07-19  8:38 ` [Qemu-devel] [PATCH 06/11] block: add bdrv_write_zeroes() Stefan Hajnoczi
2013-07-19  8:38 ` [Qemu-devel] [PATCH 07/11] block/raw: add bdrv_co_write_zeroes Stefan Hajnoczi
2013-07-19  8:38 ` [Qemu-devel] [PATCH 08/11] block-migration: efficiently encode zero blocks Stefan Hajnoczi
2013-07-19  8:38 ` [Qemu-devel] [PATCH 09/11] cpus: Let vm_stop[_force_state]() always flush block devices Stefan Hajnoczi
2013-07-19  8:38 ` [Qemu-devel] [PATCH 10/11] block: fix bdrv_read_unthrottled() Stefan Hajnoczi
2013-07-19  8:38 ` [Qemu-devel] [PATCH 11/11] block/raw: add .bdrv_get_info Stefan Hajnoczi

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=1374223132-29107-2-git-send-email-stefanha@redhat.com \
    --to=stefanha@redhat.com \
    --cc=aliguori@us.ibm.com \
    --cc=bharata@linux.vnet.ibm.com \
    --cc=qemu-devel@nongnu.org \
    /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).