git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build: Move po4a detection up near other program detection.
[libguestfs.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
30a3310
..
8389390
100644
(file)
--- 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])
# major/minor/release must be numbers
m4_define([libguestfs_major], [1])
m4_define([libguestfs_minor], [7])
-m4_define([libguestfs_release], [
8
])
+m4_define([libguestfs_release], [
12
])
# extra can be any string
m4_define([libguestfs_extra], [])
# extra can be any string
m4_define([libguestfs_extra], [])
@@
-222,6
+222,10
@@
dnl Check for optional xmllint.
AC_CHECK_PROG([XMLLINT],[xmllint],[xmllint],[no])
AM_CONDITIONAL([HAVE_XMLLINT],[test "x$XMLLINT" != "xno"])
AC_CHECK_PROG([XMLLINT],[xmllint],[xmllint],[no])
AM_CONDITIONAL([HAVE_XMLLINT],[test "x$XMLLINT" != "xno"])
+dnl po4a for translating man pages and POD files (optional).
+AC_CHECK_PROG([PO4A],[po4a],[po4a],[no])
+AM_CONDITIONAL([HAVE_PO4A], [test "x$PO4A" != "xno"])
+
dnl Check for QEMU for running binaries on this $host_cpu, fall
dnl back to basic 'qemu'. Allow the user to override it.
default_qemu="qemu-kvm kvm qemu-system-$host_cpu qemu"
dnl Check for QEMU for running binaries on this $host_cpu, fall
dnl back to basic 'qemu'. Allow the user to override it.
default_qemu="qemu-kvm kvm qemu-system-$host_cpu qemu"
@@
-469,6
+473,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])])
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
dnl hivex library (highly recommended)
dnl This used to be a part of libguestfs, but was spun off into its
@@
-787,11
+792,11
@@
AS_IF([test "x$enable_php" != "xno"],
])
AM_CONDITIONAL([HAVE_PHP], [test "x$PHP" != "xno" && test "x$PHPIZE" != "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
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])
AC_MSG_CHECKING([for $pm])
if ! $PERL -M$pm -e1 >/dev/null 2>&1; then
AC_MSG_RESULT([no])
@@
-801,19
+806,13
@@
AS_IF([test "x$PERL" != "xno"],
fi
done
if test "x$missing_perl_modules" = "xyes"; then
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
])
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"])
AM_CONDITIONAL([HAVE_TOOLS],
[test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes"])
-dnl po4a for translating man pages and POD files (optional).
-AC_CHECK_PROG([PO4A],[po4a],[po4a],[no])
-AM_CONDITIONAL([HAVE_PO4A], [test "x$PO4A" != "xno"])
-
dnl Library versioning.
MAX_PROC_NR=`cat $srcdir/src/MAX_PROC_NR`
AC_SUBST(MAX_PROC_NR)
dnl Library versioning.
MAX_PROC_NR=`cat $srcdir/src/MAX_PROC_NR`
AC_SUBST(MAX_PROC_NR)
@@
-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
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"
echo -n "virt-* tools ........................ "
if test "x$HAVE_TOOLS_TRUE" = "x"; then echo "yes"; else echo "no"; fi
echo "supermin appliance .................. $enable_supermin"