[sheepdog] compile with libvirt 1.2.5

[Vasiliy Tolstov]

Not tested, but i thinks that's enough:

--- a/configure.ac  2014-06-11 12:51:22.852000000 +0400
+++ b/configure.ac  2014-06-11 12:52:21.452000000 +0400
@@ -1925,14 +1925,14 @@

 if test "$with_storage_sheepdog" = "yes" ||
    test "$with_storage_sheepdog" = "check"; then
-  AC_PATH_PROG([COLLIE], [collie], [], [$PATH:/sbin:/usr/sbin])
+  AC_PATH_PROG([DOG], [dog], [], [$PATH:/sbin:/usr/sbin])

   if test "$with_storage_sheepdog" = "yes"; then
-    if test -z "$COLLIE"; then
-      AC_MSG_ERROR([We need collie for Sheepdog storage driver])
+    if test -z "$DOG"; then
+      AC_MSG_ERROR([We need dog for Sheepdog storage driver])
     fi
   else
-    if test -z "$COLLIE"; then
+    if test -z "$DOG"; then
       with_storage_sheepdog=no
     fi

@@ -1944,7 +1944,7 @@
   if test "$with_storage_sheepdog" = "yes"; then
     AC_DEFINE_UNQUOTED([WITH_STORAGE_SHEEPDOG], 1,
       [whether Sheepdog backend for storage driver is enabled])
-    AC_DEFINE_UNQUOTED([COLLIE],["$COLLIE"],[Location of collie program])
+    AC_DEFINE_UNQUOTED([DOG],["$DOG"],[Location of dog program])
   fi
 fi
 AM_CONDITIONAL([WITH_STORAGE_SHEEPDOG],

2014-06-11 12:48 GMT+04:00 Vasiliy Tolstov <v.tolstov at selfip.ru>:
> 2014-06-11 6:49 GMT+04:00 Hitoshi Mitake <mitake.hitoshi at gmail.com>:
>> Thanks for your report, can I see error messages?
>>
>> Thanks,
>> Hitoshi
>
>
> checking for collie... no
> configure: error: We need collie for Sheepdog storage driver
> As i see error in configure.ac:
> if test "$with_storage_sheepdog" = "yes" ||
>    test "$with_storage_sheepdog" = "check"; then
>   AC_PATH_PROG([COLLIE], [collie], [], [$PATH:/sbin:/usr/sbin])
>
>   if test "$with_storage_sheepdog" = "yes"; then
>     if test -z "$COLLIE"; then
>       AC_MSG_ERROR([We need collie for Sheepdog storage driver])
>     fi
>   else
>     if test -z "$COLLIE"; then
>       with_storage_sheepdog=no
>     fi
>
>     if test "$with_storage_sheepdog" = "check"; then
>       with_storage_sheepdog=yes
>     fi
>   fi
>
>   if test "$with_storage_sheepdog" = "yes"; then
>     AC_DEFINE_UNQUOTED([WITH_STORAGE_SHEEPDOG], 1,
>       [whether Sheepdog backend for storage driver is enabled])
>     AC_DEFINE_UNQUOTED([COLLIE],["$COLLIE"],[Location of collie program])
>   fi
> fi
>
> COLLIE needs to be replaced to DOG
>
> --
> Vasiliy Tolstov,
> e-mail: v.tolstov at selfip.ru
> jabber: vase at selfip.ru



-- 
Vasiliy Tolstov,
e-mail: v.tolstov at selfip.ru
jabber: vase at selfip.ru