X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=configure.ac;h=4136044c5bdca6ee5504b10b8d5ad7f012c4179c;hp=90c82448b81a296ecb03654231ee7b789a445762;hb=9b60f3a9f3b38c085e9265e56ddb839dabe6e416;hpb=69f2f6290032e1079dfa1e83fab3559d5d2d690f diff --git a/configure.ac b/configure.ac index 90c8244..4136044 100644 --- 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]) -m4_define([libguestfs_release], [3]) +m4_define([libguestfs_release], [15]) # 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]) @@ -249,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]) @@ -292,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( @@ -411,6 +431,15 @@ PKG_CHECK_MODULES([LIBXML2], [libxml-2.0], [AC_MSG_WARN([libxml2 not found, some core features will be disabled])]) AM_CONDITIONAL([HAVE_LIBXML2],[test "x$LIBXML2_LIBS" != "x"]) +dnl libconfig (highly recommended) +PKG_CHECK_MODULES([LIBCONFIG], [libconfig], + [AC_SUBST([LIBCONFIG_CFLAGS]) + AC_SUBST([LIBCONFIG_LIBS]) + AC_DEFINE([HAVE_LIBCONFIG],[1],[libconfig found at compile time.]) + ], + [AC_MSG_WARN([libconfig not found, some features will be disabled])]) +AM_CONDITIONAL([HAVE_LIBCONFIG],[test "x$LIBCONFIG_LIBS" != "x"]) + dnl hivex library (highly recommended) dnl This used to be a part of libguestfs, but was spun off into its dnl own separate upstream project in libguestfs 1.0.85. @@ -420,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])]) +AM_CONDITIONAL([HAVE_HIVEX],[test "x$HIVEX_LIBS" != "x"]) dnl FUSE is optional to build the FUSE module. AC_ARG_ENABLE([fuse], @@ -793,7 +823,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