X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=configure.ac;h=1aebdbbffbffdb3ab622e5767d8023e2a84a344a;hp=013a4e81a66a7034d5ae2bc780860112b580896f;hb=dc8e4b057ecd3984d7c27c8e;hpb=8e7012131cbf406a936efbbe688aec253bd742a0 diff --git a/configure.ac b/configure.ac index 013a4e8..1aebdbb 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ # libguestfs -# Copyright (C) 2009-2010 Red Hat Inc. +# Copyright (C) 2009-2011 Red Hat Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # major/minor/release must be numbers m4_define([libguestfs_major], [1]) -m4_define([libguestfs_minor], [7]) -m4_define([libguestfs_release], [20]) +m4_define([libguestfs_minor], [9]) +m4_define([libguestfs_release], [11]) # extra can be any string m4_define([libguestfs_extra], []) @@ -158,7 +158,7 @@ dnl Headers. AC_CHECK_HEADERS([errno.h sys/types.h sys/un.h sys/wait.h sys/socket.h endian.h byteswap.h]) dnl Functions. -AC_CHECK_FUNCS([posix_fallocate]) +AC_CHECK_FUNCS([futimens posix_fallocate]) dnl Build the daemon? AC_MSG_CHECKING([if we should build the daemon]) @@ -204,7 +204,8 @@ if test "x$enable_appliance" = "xyes"; then dnl dnl This used to be Very Important but is now just used to select dnl which packages to install in the appliance, since the package - dnl names vary slightly across distros. (See appliance/packagelist.in) + dnl names vary slightly across distros. (See + dnl appliance/packagelist.in and appliance/excludelist.in) AC_MSG_CHECKING([which Linux distro for package names]) DISTRO=REDHAT if test -f /etc/debian_version; then @@ -213,6 +214,9 @@ if test "x$enable_appliance" = "xyes"; then DISTRO=UBUNTU fi fi + if test -f /etc/arch-release; then + DISTRO=ARCHLINUX + fi AC_MSG_RESULT([$DISTRO]) AC_SUBST([DISTRO]) fi @@ -245,6 +249,27 @@ AC_CHECK_PROG([POD2HTML],[pod2html],[pod2html],[no]) test "x$POD2HTML" = "xno" && AC_MSG_ERROR([pod2html must be installed]) +dnl Check if pod2man, pod2text take --stderr and -u options (not in RHEL 5). +AC_MSG_CHECKING([if pod2man takes --stderr option]) +if "$POD2MAN" --stderr >/dev/null 2>&1; then + AC_MSG_RESULT([yes]) + POD2_STDERR_OPTION="--stderr" +else + AC_MSG_RESULT([no]) + POD2_STDERR_OPTION="" +fi +AC_SUBST([POD2_STDERR_OPTION]) + +AC_MSG_CHECKING([if pod2man takes -u option]) +if "$POD2MAN" -u >/dev/null 2>&1; then + AC_MSG_RESULT([yes]) + POD2_UTF8_OPTION="-u" +else + AC_MSG_RESULT([no]) + POD2_UTF8_OPTION="" +fi +AC_SUBST([POD2_UTF8_OPTION]) + dnl Check for mkisofs. AC_PATH_PROGS([MKISOFS],[mkisofs],[no], [$PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin]) @@ -288,7 +313,6 @@ if test "x$vmchannel_test" != "xno"; then AC_MSG_CHECKING([for virtio-serial support in $QEMU]) if $QEMU -nographic -device \? 2>&1 | grep -sq virtio-serial; then AC_MSG_RESULT([yes]) - vmchannel_guestfwd=guestfwd else AC_MSG_RESULT([no]) AC_MSG_FAILURE( @@ -789,7 +813,7 @@ AC_CONFIG_FILES([Makefile regressions/Makefile test-tool/Makefile ocaml/Makefile ocaml/examples/Makefile - perl/Makefile + perl/Makefile perl/examples/Makefile python/Makefile python/examples/Makefile ruby/Makefile ruby/Rakefile ruby/examples/Makefile java/Makefile