On Tue, Jul 23, 2013 at 05:37:54PM +0530, Kaleb KEITHLEY wrote:
> On 07/23/2013 05:32 PM, Anand Avati wrote:
> >On 7/23/13 4:57 AM, Daniel P. Berrange wrote:
> >>On Fri, Jul 12, 2013 at 12:28:54PM +0530, Bharata B Rao wrote:
> >>>gluster: Use pkg-config to configure GlusterFS block driver
> >>>
> >>>Use pkg-config to determine the version and library dependency
> >>>for GlusterFS block driver.
> >>>
> >>>Signed-off-by: Bharata B Rao <bhar...@linux.vnet.ibm.com>
> >>>---
> >>> configure | 20 +++++++-------------
> >>> 1 file changed, 7 insertions(+), 13 deletions(-)
> >>>
> >>>diff --git a/configure b/configure
> >>>index cb0f870..76adcb1 100755
> >>>--- a/configure
> >>>+++ b/configure
> >>>@@ -2566,23 +2566,17 @@ 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
> >>>- libs_tools="$glusterfs_libs $libs_tools"
> >>>- libs_softmmu="$glusterfs_libs $libs_softmmu"
> >>>+ 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="$LIBS $glusterfs_libs"
> >>
> >>The glusterfs v 3.4 RPMs in Fedora do not include any pkg-config files.
> >>So with this change now in GIT, QEMU no longer detects support for
> >>glusterfs even though it is present.
> >>
> >>Has the min required glusterfs been increased to a new 3.5 version
> >>which does include pkg-config support ? If not, then I think this
> >>patch needs to be reverted, so that it does a non-pkg-config based
> >>check for glusterfs.
> >>
> >>Regards,
> >>Daniel
> >>
> >
> >Copying Kaleb.
> >
> >We should just include the pkg-config file in the Fedora RPM for
> >glusterfs if it already isn't.
>
> It's in the glusterfs-api-devel rpm:
>
> % rpm -ql glusterfs-api-devel
> /usr/include/glusterfs/api/glfs.h
> /usr/lib64/libgfapi.so
> /usr/lib64/pkgconfig/glusterfs-api.pc
Oooh, not the main glusterfs-devel RPM. Ok, ignore my earlier message
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 :|
