X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=configure.ac;h=d0733f4facefa9a6ba045aae36a835dbbb09d5f3;hp=0d9896823f00b7cc179b96a9bdebbe6805d33805;hb=b9bd24b943f22f07b2ed5bf7edeab89bc8028f7e;hpb=f614a6dde922a9bd7351138ed6ebd524634bbd16 diff --git a/configure.ac b/configure.ac index 0d98968..d0733f4 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], [7]) -m4_define([libguestfs_release], [4]) +m4_define([libguestfs_release], [12]) # extra can be any string m4_define([libguestfs_extra], []) @@ -469,6 +469,7 @@ PKG_CHECK_MODULES([LIBXML2], [libxml-2.0], AC_DEFINE([HAVE_LIBXML2],[1],[libxml2 found at compile time.]) ], [AC_MSG_WARN([libxml2 not found, some core features will be disabled])]) +AM_CONDITIONAL([HAVE_LIBXML2],[test "x$LIBXML2_LIBS" != "x"]) dnl hivex library (highly recommended) dnl This used to be a part of libguestfs, but was spun off into its @@ -787,11 +788,11 @@ AS_IF([test "x$enable_php" != "xno"], ]) AM_CONDITIONAL([HAVE_PHP], [test "x$PHP" != "xno" && test "x$PHPIZE" != "xno"]) -dnl Check for Perl modules needed by virt-df, inspector, etc. +dnl Check for Perl modules needed by Perl virt tools (virt-df, etc.) AS_IF([test "x$PERL" != "xno"], [ missing_perl_modules=no - for pm in Pod::Usage Getopt::Long Sys::Virt Data::Dumper XML::Writer Locale::TextDomain Win::Hivex Win::Hivex::Regedit; do + for pm in Pod::Usage Getopt::Long Sys::Virt Data::Dumper Locale::TextDomain Win::Hivex Win::Hivex::Regedit; do AC_MSG_CHECKING([for $pm]) if ! $PERL -M$pm -e1 >/dev/null 2>&1; then AC_MSG_RESULT([no]) @@ -801,12 +802,10 @@ AS_IF([test "x$PERL" != "xno"], fi done if test "x$missing_perl_modules" = "xyes"; then - AC_MSG_WARN([some Perl modules required to compile virt-inspector and the other virt-* tools are missing]) + AC_MSG_WARN([some Perl modules required to compile the Perl virt-* tools are missing]) fi ]) -AM_CONDITIONAL([HAVE_INSPECTOR], - [test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes"]) AM_CONDITIONAL([HAVE_TOOLS], [test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes"]) @@ -882,8 +881,6 @@ echo -n "Haskell bindings .................... " if test "x$HAVE_HASKELL_TRUE" = "x"; then echo "yes"; else echo "no"; fi echo -n "PHP bindings ........................ " if test "x$HAVE_PHP_TRUE" = "x"; then echo "yes"; else echo "no"; fi -echo -n "virt-inspector ...................... " -if test "x$HAVE_INSPECTOR_TRUE" = "x"; then echo "yes"; else echo "no"; fi echo -n "virt-* tools ........................ " if test "x$HAVE_TOOLS_TRUE" = "x"; then echo "yes"; else echo "no"; fi echo "supermin appliance .................. $enable_supermin"