git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 1.7.5.
[libguestfs.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
67b1309
..
1fe0445
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], [
3
])
+m4_define([libguestfs_release], [
5
])
# extra can be any string
m4_define([libguestfs_extra], [])
# extra can be any string
m4_define([libguestfs_extra], [])
@@
-460,6
+460,7
@@
PKG_CHECK_MODULES([LIBVIRT], [libvirt],
AC_DEFINE([HAVE_LIBVIRT],[1],[libvirt found at compile time.])
],
[AC_MSG_WARN([libvirt not found, some core features will be disabled])])
AC_DEFINE([HAVE_LIBVIRT],[1],[libvirt found at compile time.])
],
[AC_MSG_WARN([libvirt not found, some core features will be disabled])])
+AM_CONDITIONAL([HAVE_LIBVIRT],[test "x$LIBVIRT_LIBS" != "x"])
dnl libxml2 (highly recommended)
PKG_CHECK_MODULES([LIBXML2], [libxml-2.0],
dnl libxml2 (highly recommended)
PKG_CHECK_MODULES([LIBXML2], [libxml-2.0],
@@
-493,7
+494,6
@@
AM_CONDITIONAL([HAVE_FUSE],[test "x$enable_fuse" != "xno"])
dnl Check for OCaml (optional, for OCaml bindings).
OCAMLC=no
OCAMLFIND=no
dnl Check for OCaml (optional, for OCaml bindings).
OCAMLC=no
OCAMLFIND=no
-OCAML_PKG_xml_light=no
AC_ARG_ENABLE([ocaml],
AS_HELP_STRING([--disable-ocaml], [Disable OCaml language bindings]),
[],
AC_ARG_ENABLE([ocaml],
AS_HELP_STRING([--disable-ocaml], [Disable OCaml language bindings]),
[],
@@
-505,14
+505,9
@@
AS_IF([test "x$enable_ocaml" != "xno"],
OCAMLFIND=
AC_PROG_OCAML
AC_PROG_FINDLIB
OCAMLFIND=
AC_PROG_OCAML
AC_PROG_FINDLIB
-
- dnl Optional xml-light for running the generator.
- if test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"; then
- AC_CHECK_OCAML_PKG([xml-light])
- fi])
+ ])
AM_CONDITIONAL([HAVE_OCAML],
[test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"])
AM_CONDITIONAL([HAVE_OCAML],
[test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"])
-AM_CONDITIONAL([HAVE_XML_LIGHT],[test "x$OCAML_PKG_xml_light" != "xno"])
dnl Check for Perl (optional, for Perl bindings).
PERL=no
dnl Check for Perl (optional, for Perl bindings).
PERL=no
@@
-858,6
+853,7
@@
AC_CONFIG_FILES([Makefile
po-docs/ja/Makefile
php/Makefile
csharp/Makefile
po-docs/ja/Makefile
php/Makefile
csharp/Makefile
+ cat/Makefile
ocaml/META perl/Makefile.PL])
AC_OUTPUT
ocaml/META perl/Makefile.PL])
AC_OUTPUT