# major/minor/release must be numbers
m4_define([libguestfs_major], [1])
m4_define([libguestfs_minor], [11])
-m4_define([libguestfs_release], [3])
+m4_define([libguestfs_release], [20])
# extra can be any string
m4_define([libguestfs_extra], [])
dnl Check that the chosen qemu has virtio-serial support.
if test "x$vmchannel_test" != "xno"; then
+ AC_MSG_CHECKING([that $QEMU -help works])
+ if $QEMU -help > /dev/null 2>&1; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ AC_MSG_FAILURE(
+[$QEMU -help: command failed.
+
+This could be a very old version of qemu, or qemu might not be
+working.
+])
+ fi
+
+ # qemu since 0.15 requires the -machine accel=tcg option, otherwise
+ # it won't start up. QEMU DEVELOPERS, PLEASE ADD CAPABILITIES TESTING.
+ AC_MSG_CHECKING([if this qemu has the -machine accel=tcg option])
+ if $QEMU -help 2>&1 | grep -sq -- '-machine.*accel.*tcg'; then
+ qemu_machine_accel_tcg="-machine accel=tcg"
+ AC_MSG_RESULT([$qemu_machine_accel_tcg])
+ else
+ AC_MSG_RESULT([no])
+ fi
+
AC_MSG_CHECKING([for virtio-serial support in $QEMU])
- if $QEMU -nographic -device \? 2>&1 | grep -sq virtio-serial; then
+ if $QEMU $qemu_machine_accel_tcg -nographic -device \? 2>&1 | grep -sq virtio-serial; then
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
[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"])
+AM_CONDITIONAL([HAVE_OCAMLDOC],
+ [test "x$OCAMLDOC" != "xno"])
dnl Check for Perl (optional, for Perl bindings).
PERL=no
PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[[0:3]]"`
AC_MSG_RESULT([$PYTHON_VERSION])
- for d in \
- $PYTHON_PREFIX/include/python$PYTHON_VERSION \
- /usr/include/python$PYTHON_VERSION \
- /usr/local/include/python$PYTHON_VERSION
- do
- AC_MSG_CHECKING([Python.h in $d])
- if test -r "$d/Python.h"; then
- AC_MSG_RESULT([found])
- PYTHON_INCLUDEDIR=$d
- break
- fi
- AC_MSG_RESULT([not found])
- done
- if test "x$PYTHON_INCLUDEDIR" = "x"; then
- AC_MSG_WARN([Python include directory not found])
+ AC_MSG_CHECKING([for Python include path])
+ if test -z "$PYTHON_INCLUDEDIR"; then
+ python_path=`$PYTHON -c "import distutils.sysconfig; \
+ print (distutils.sysconfig.get_python_inc ());"`
+ PYTHON_INCLUDEDIR=$python_path
fi
+ AC_MSG_RESULT([$PYTHON_INCLUDEDIR])
AC_ARG_WITH([python-installdir],
[AS_HELP_STRING([--with-python-installdir],
if test "x$PYTHON_INSTALLDIR" = "xcheck"; then
PYTHON_INSTALLDIR=
- for d in \
- $PYTHON_PREFIX/lib64/python$PYTHON_VERSION/site-packages \
- $PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages \
- /usr/lib64/python$PYTHON_VERSION/site-packages \
- /usr/lib/python$PYTHON_VERSION/site-packages \
- /usr/local/lib/python$PYTHON_VERSION/site-packages
- do
- AC_MSG_CHECKING([for $d])
- if test -d "$d"; then
- AC_MSG_RESULT([found])
- PYTHON_INSTALLDIR=$d
- break
- fi
- AC_MSG_RESULT([not found])
- done
- if test "x$PYTHON_INSTALLDIR" = "x"; then
- AC_MSG_WARN([Python site-packages directory not found])
+ AC_MSG_CHECKING([for Python site-packages path])
+ if test -z "$PYTHON_INSTALLDIR"; then
+ PYTHON_INSTALLDIR=`$PYTHON -c "import distutils.sysconfig; \
+ print (distutils.sysconfig.get_python_lib(1,0));"`
fi
+ AC_MSG_RESULT([$PYTHON_INSTALLDIR])
fi
old_LIBS="$LIBS"
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
- images/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
+ edit/Makefile
+ examples/Makefile
+ fish/Makefile
+ fuse/Makefile
+ generator/Makefile
+ gnulib/lib/Makefile
+ gnulib/tests/Makefile
haskell/Makefile
+ images/Makefile
inspector/Makefile
- tools/Makefile
+ java/Makefile
+ java/examples/Makefile
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/uk/Makefile
- php/Makefile
- csharp/Makefile
- cat/Makefile
- df/Makefile
+ po/Makefile.in
+ python/Makefile
+ python/examples/Makefile
+ regressions/Makefile
rescue/Makefile
- debian/changelog
- ocaml/META perl/Makefile.PL
- resize/Makefile])
+ resize/Makefile
+ ruby/Makefile
+ ruby/Rakefile
+ ruby/examples/Makefile
+ src/Makefile
+ test-tool/Makefile
+ tools/Makefile])
AC_OUTPUT
dnl Produce summary.
git.annexia.org / libguestfs.git / blobdiff