git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add missing reference to guestfs-perl(3) to guestfs(3).
[libguestfs.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
4136044
..
544b434
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-17,8
+17,8
@@
# major/minor/release must be numbers
m4_define([libguestfs_major], [1])
# major/minor/release must be numbers
m4_define([libguestfs_major], [1])
-m4_define([libguestfs_minor], [
9
])
-m4_define([libguestfs_release], [
1
5])
+m4_define([libguestfs_minor], [
10
])
+m4_define([libguestfs_release], [5])
# 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])
@@
-476,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
@@
-815,34
+820,46
@@
dnl http://www.mail-archive.com/automake@gnu.org/msg10204.html
AC_CONFIG_FILES([podwrapper.sh],
[chmod +x podwrapper.sh])
AC_CONFIG_FILES([Makefile
AC_CONFIG_FILES([podwrapper.sh],
[chmod +x podwrapper.sh])
AC_CONFIG_FILES([Makefile
- generator/Makefile
- src/Makefile fish/Makefile po/Makefile.in examples/Makefile
appliance/Makefile
appliance/Makefile
- images/Makefile
capitests/Makefile
capitests/Makefile
- regressions/Makefile
- test-tool/Makefile
- ocaml/Makefile ocaml/examples/Makefile
- perl/Makefile perl/examples/Makefile
- python/Makefile python/examples/Makefile
- ruby/Makefile ruby/Rakefile ruby/examples/Makefile
- java/Makefile
+ cat/Makefile
+ caution/Makefile
+ csharp/Makefile
+ debian/changelog
+ df/Makefile
+ examples/Makefile
+ fish/Makefile
+ fuse/Makefile
+ generator/Makefile
+ gnulib/lib/Makefile
+ gnulib/tests/Makefile
haskell/Makefile
haskell/Makefile
+ images/Makefile
inspector/Makefile
inspector/Makefile
-
tools
/Makefile
+
java
/Makefile
libguestfs.pc
libguestfs.pc
- gnulib/lib/Makefile
- gnulib/tests/Makefile
- fuse/Makefile
+ ocaml/META
+ ocaml/Makefile
+ ocaml/examples/Makefile
+ perl/Makefile
+ perl/Makefile.PL
+ perl/examples/Makefile
+ php/Makefile
po-docs/Makefile
po-docs/ja/Makefile
po-docs/Makefile
po-docs/ja/Makefile
- php/Makefile
- csharp/Makefile
- cat/Makefile
- df/Makefile
+ po-docs/uk/Makefile
+ po/Makefile.in
+ python/Makefile
+ python/examples/Makefile
+ regressions/Makefile
rescue/Makefile
rescue/Makefile
- debian/changelog
- ocaml/META perl/Makefile.PL])
+ resize/Makefile
+ ruby/Makefile
+ ruby/Rakefile
+ ruby/examples/Makefile
+ src/Makefile
+ test-tool/Makefile
+ tools/Makefile])
AC_OUTPUT
dnl Produce summary.
AC_OUTPUT
dnl Produce summary.
@@
-870,8
+887,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'"