X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=configure.ac;h=8290771433aacd05ad07605b1b6eb2f46fe924b2;hp=b37d2e662f0c184ca1f70ea3b1f1df5d2141a2e8;hb=8ab8377ef64ec0e2483826388cf7d3c07ffa8ecc;hpb=8d53f8869f85b46ec3495db74565a241f33fe2cc diff --git a/configure.ac b/configure.ac index b37d2e6..8290771 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ # major/minor/release must be numbers m4_define([libguestfs_major], [1]) m4_define([libguestfs_minor], [0]) -m4_define([libguestfs_release], [59]) +m4_define([libguestfs_release], [62]) # extra can be any string m4_define([libguestfs_extra], []) @@ -83,7 +83,7 @@ AC_ARG_WITH([qemu], [], [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.]) @@ -517,9 +517,9 @@ AC_CHECK_PROG([GHC],[ghc],[ghc],[no]) 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]) @@ -529,9 +529,11 @@ for pm in Pod::Usage Getopt::Long Sys::Virt Data::Dumper XML::Writer; do 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], @@ -572,6 +574,7 @@ AC_CONFIG_FILES([Makefile ruby/Makefile ruby/Rakefile java/Makefile haskell/Makefile + cat/Makefile df/Makefile inspector/Makefile v2v/Makefile @@ -600,6 +603,8 @@ echo -n "Java bindings ....................... " 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 ...................... "