git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Include po/Makefile.in.in in git, to avoid needing to rerun gettextize.
[libguestfs.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
7736bd7
..
05db6e0
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], [9])
# major/minor/release must be numbers
m4_define([libguestfs_major], [1])
m4_define([libguestfs_minor], [9])
-m4_define([libguestfs_release], [1
4
])
+m4_define([libguestfs_release], [1
7
])
# extra can be any string
m4_define([libguestfs_extra], [])
# extra can be any string
m4_define([libguestfs_extra], [])
@@
-270,10
+270,10
@@
else
fi
AC_SUBST([POD2_UTF8_OPTION])
fi
AC_SUBST([POD2_UTF8_OPTION])
-dnl Check for
mkisofs
.
-AC_PATH_PROGS([
MKISOFS],[mkisofs
],[no],
+dnl Check for
genisoimage
.
+AC_PATH_PROGS([
GENISOIMAGE],[genisoimage
],[no],
[$PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin])
[$PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin])
-test "x$
MKISOFS" = "xno" && AC_MSG_ERROR([mkisofs
must be installed])
+test "x$
GENISOIMAGE" = "xno" && AC_MSG_ERROR([genisoimage
must be installed])
dnl Check for optional xmllint.
AC_CHECK_PROG([XMLLINT],[xmllint],[xmllint],[no])
dnl Check for optional xmllint.
AC_CHECK_PROG([XMLLINT],[xmllint],[xmllint],[no])
@@
-449,6
+449,7
@@
PKG_CHECK_MODULES([HIVEX], [hivex],
AC_DEFINE([HAVE_HIVEX],[1],[hivex library found at compile time.])
],
[AC_MSG_WARN([hivex not found, some core features will be disabled])])
AC_DEFINE([HAVE_HIVEX],[1],[hivex library found at compile time.])
],
[AC_MSG_WARN([hivex not found, some core features will be disabled])])
+AM_CONDITIONAL([HAVE_HIVEX],[test "x$HIVEX_LIBS" != "x"])
dnl FUSE is optional to build the FUSE module.
AC_ARG_ENABLE([fuse],
dnl FUSE is optional to build the FUSE module.
AC_ARG_ENABLE([fuse],
@@
-475,9
+476,14
@@
AS_IF([test "x$enable_ocaml" != "xno"],
OCAMLFIND=
AC_PROG_OCAML
AC_PROG_FINDLIB
OCAMLFIND=
AC_PROG_OCAML
AC_PROG_FINDLIB
+
+ AS_IF([test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"],
+ [AC_CHECK_OCAML_PKG([pcre])])
])
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_OCAML_PCRE],
+ [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno" && test "x$OCAML_PKG_pcre" != "xno"])
dnl Check for Perl (optional, for Perl bindings).
PERL=no
dnl Check for Perl (optional, for Perl bindings).
PERL=no
@@
-835,13
+841,15
@@
AC_CONFIG_FILES([Makefile
fuse/Makefile
po-docs/Makefile
po-docs/ja/Makefile
fuse/Makefile
po-docs/Makefile
po-docs/ja/Makefile
+ po-docs/uk/Makefile
php/Makefile
csharp/Makefile
cat/Makefile
df/Makefile
rescue/Makefile
debian/changelog
php/Makefile
csharp/Makefile
cat/Makefile
df/Makefile
rescue/Makefile
debian/changelog
- ocaml/META perl/Makefile.PL])
+ ocaml/META perl/Makefile.PL
+ resize/Makefile])
AC_OUTPUT
dnl Produce summary.
AC_OUTPUT
dnl Produce summary.
@@
-869,8
+877,11
@@
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-* tools ........................ "
+echo "guestfish and C virt tools .......... yes"
+echo -n "Perl virt tools ..................... "
if test "x$HAVE_TOOLS_TRUE" = "x"; then echo "yes"; else echo "no"; fi
if test "x$HAVE_TOOLS_TRUE" = "x"; then echo "yes"; else echo "no"; fi
+echo -n "virt-resize ......................... "
+if test "x$HAVE_OCAML" = "x" && test "x$HAVE_OCAML_PCRE" = "x"; then echo "yes"; else echo "no"; fi
echo "FUSE filesystem ..................... $enable_fuse"
echo
echo "If any optional component is configured 'no' when you expected 'yes'"
echo "FUSE filesystem ..................... $enable_fuse"
echo
echo "If any optional component is configured 'no' when you expected 'yes'"