# major/minor/release must be numbers
m4_define([libguestfs_major], [1])
m4_define([libguestfs_minor], [0])
-m4_define([libguestfs_release], [60])
+m4_define([libguestfs_release], [64])
# extra can be any string
m4_define([libguestfs_extra], [])
[],
[with_qemu="$default_qemu"])
AC_PATH_PROGS([QEMU],[$with_qemu],[no],
- [$PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin])
+ [$PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin$PATH_SEPARATOR/usr/libexec])
test "x$QEMU" = "xno" && AC_MSG_ERROR([qemu must be installed])
AC_DEFINE_UNQUOTED([QEMU],["$QEMU"],[Location of qemu binary.])
dnl Check that the chosen qemu has vmchannel support.
dnl http://lists.gnu.org/archive/html/qemu-devel/2009-02/msg01042.html
if test "x$vmchannel_test" != "xno"; then
- AC_MSG_CHECKING([for vmchannel support in $QEMU])
- vmchannelout=`$QEMU -net channel /dev/zero 2>&1 ||:`
- echo "vmchannel test command output: $vmchannelout" >&AS_MESSAGE_LOG_FD
- if ! echo $vmchannelout | grep -sq "vmchannel wrong port number" ; then
- AC_MSG_RESULT([no])
- AC_MSG_FAILURE(
+ AC_MSG_CHECKING([for "guestfwd" support in $QEMU])
+ if $QEMU --help | grep -sq guestfwd; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_CHECKING([for "-net channel" support in $QEMU])
+ vmchannelout=`$QEMU -net channel /dev/zero 2>&1 ||:`
+ echo "vmchannel test command output: $vmchannelout" >&AS_MESSAGE_LOG_FD
+ if echo $vmchannelout | grep -sq "vmchannel wrong port number" ; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ AC_MSG_FAILURE(
[I did not find vmchannel support in $QEMU.
vmchannel support is vital for libguestfs to operate. You need a version
and install it in another location, then you should configure with
the --with-qemu option.
])
+ fi
fi
- AC_MSG_RESULT([yes])
fi
dnl Set drive interface used by the guestfs_add_drive{,_ro} calls
AM_CONDITIONAL([HAVE_HASKELL],
[test "x$GHC" != "xno"])
-dnl Check for Perl modules needed by virt-df, inspector and V2V.
+dnl Check for Perl modules needed by virt-df, inspector, V2V etc.
missing_perl_modules=no
-for pm in Pod::Usage Getopt::Long Sys::Virt Data::Dumper XML::Writer; do
+for pm in Pod::Usage Getopt::Long Sys::Virt Data::Dumper XML::Writer Locale::TextDomain; do
AC_MSG_CHECKING([for $pm])
if ! perl -M$pm -e1 >/dev/null 2>&1; then
AC_MSG_RESULT([no])
fi
done
if test "x$missing_perl_modules" = "xyes"; then
- AC_MSG_WARN([some Perl modules required to compile virt-df, virt-inspector and virt-v2v are missing])
+ AC_MSG_WARN([some Perl modules required to compile virt-cat, virt-df, virt-inspector and virt-v2v are missing])
fi
+AM_CONDITIONAL([HAVE_CAT],
+ [test "x$PERL" != "xno" -a "x$missing_perl_modules" != "xyes"])
AM_CONDITIONAL([HAVE_DF],
[test "x$PERL" != "xno" -a "x$missing_perl_modules" != "xyes"])
AM_CONDITIONAL([HAVE_INSPECTOR],
images/Makefile
capitests/Makefile
regressions/Makefile
+ test-tool/Makefile
ocaml/Makefile ocaml/examples/Makefile
perl/Makefile
python/Makefile
ruby/Makefile ruby/Rakefile
java/Makefile
haskell/Makefile
+ cat/Makefile
df/Makefile
inspector/Makefile
v2v/Makefile
if test "x$HAVE_JAVA_TRUE" = "x"; then echo "yes"; else echo "no"; fi
echo -n "Haskell bindings .................... "
if test "x$HAVE_HASKELL" = "x"; then echo "yes"; else echo "no"; fi
+echo -n "virt-cat ............................ "
+if test "x$HAVE_CAT" = "x"; then echo "yes"; else echo "no"; fi
echo -n "virt-df ............................. "
if test "x$HAVE_DF" = "x"; then echo "yes"; else echo "no"; fi
echo -n "virt-inspector ...................... "