New APIs: set-network and get-network to enable network support.

[libguestfs.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c88d51b..62998ba 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # libguestfs
 # libguestfs

-# Copyright (C) 2009 Red Hat Inc.
+# Copyright (C) 2009-2010 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
 #
 # 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])
 
 # major/minor/release must be numbers
 m4_define([libguestfs_major],   [1])

-m4_define([libguestfs_minor],   [0])
-m4_define([libguestfs_release], [72])
+m4_define([libguestfs_minor],   [5])
+m4_define([libguestfs_release], [3])

 # extra can be any string
 m4_define([libguestfs_extra],   [])
 
 # extra can be any string
 m4_define([libguestfs_extra],   [])
 


@@ -37,6 +37,33 @@ AC_DEFINE([PACKAGE_VERSION_MINOR],[libguestfs_minor],[Minor version number])
 AC_DEFINE([PACKAGE_VERSION_RELEASE],[libguestfs_release],[Release number])
 AC_DEFINE([PACKAGE_VERSION_EXTRA],["libguestfs_extra"],[Extra version string])
 
 AC_DEFINE([PACKAGE_VERSION_RELEASE],[libguestfs_release],[Release number])
 AC_DEFINE([PACKAGE_VERSION_EXTRA],["libguestfs_extra"],[Extra version string])
 

+dnl Stable or unstable version?
+AC_MSG_CHECKING([if this is a stable or unstable branch of libguestfs])
+AS_IF([test "$((libguestfs_minor % 2))" -eq 0 ],[
+            AC_MSG_RESULT([stable])
+       ],[
+            AC_MSG_RESULT([unstable])
+            AC_MSG_NOTICE([
+***
+This is a development version of libguestfs. Some APIs may be unstable
+until they appear in a stable release of libguestfs (at which point
+the C API and ABI is guaranteed to remain stable forever).  For
+more information about stable and development branches of libguestfs
+please see the section "LIBGUESTFS VERSION NUMBERS" in guestfs(3).
+***])
+       ])
+
+dnl Die if the user tries to configure as root, see:
+dnl https://www.redhat.com/archives/libguestfs/2010-April/msg00098.html
+AC_MSG_CHECKING([if you are trying to configure as root])
+AS_IF([test "`id -u`" = 0 ],[
+            AC_MSG_RESULT([yes])
+            AC_MSG_FAILURE([Don't run './configure' or 'make' as root.])
+      ],[
+            AC_MSG_RESULT([no])
+      ])
+
+dnl Early gnulib initialization.

 gl_EARLY
 gl_INIT
 
 gl_EARLY
 gl_INIT
 


@@ -83,9 +110,11 @@ if test "$gl_gcc_warnings" = yes; then
   nw="$nw -Wmissing-format-attribute" # daemon.h's asprintf_nowarn
   nw="$nw -Winline"                 # daemon.h's asprintf_nowarn
   nw="$nw -Wshadow"                 # numerous, plus we're not unanimous
   nw="$nw -Wmissing-format-attribute" # daemon.h's asprintf_nowarn
   nw="$nw -Winline"                 # daemon.h's asprintf_nowarn
   nw="$nw -Wshadow"                 # numerous, plus we're not unanimous

-  # ?? -Wstrict-overflow

   nw="$nw -Wunsafe-loop-optimizations" # just a warning that an optimization
                                     # was not possible, safe to ignore
   nw="$nw -Wunsafe-loop-optimizations" # just a warning that an optimization
                                     # was not possible, safe to ignore

+  nw="$nw -Wpacked"                 # Allow attribute((packed)) on structs
+  nw="$nw -Wlong-long"              # Allow long long since it's required
+                                    # by Python, Ruby and xstrtoll.

 
   gl_MANYWARN_ALL_GCC([ws])
   gl_MANYWARN_COMPLEMENT([ws], [$ws], [$nw])
 
   gl_MANYWARN_ALL_GCC([ws])
   gl_MANYWARN_COMPLEMENT([ws], [$ws], [$nw])


@@ -115,14 +144,55 @@ test "x$U" != "x" && AC_MSG_ERROR([Compiler not ANSI compliant])
 
 AM_PROG_CC_C_O
 
 
 AM_PROG_CC_C_O
 

+dnl Work out how to specify the linker script to the linker.
+VERSION_SCRIPT_FLAGS=-Wl,--version-script=
+`/usr/bin/ld --help 2>&1 | grep -- --version-script >/dev/null` || \
+    VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,"
+AC_SUBST(VERSION_SCRIPT_FLAGS)
+

 dnl Check support for 64 bit file offsets.
 AC_SYS_LARGEFILE
 
 dnl Check sizeof long.
 AC_CHECK_SIZEOF([long])
 
 dnl Check support for 64 bit file offsets.
 AC_SYS_LARGEFILE
 
 dnl Check sizeof long.
 AC_CHECK_SIZEOF([long])
 

+dnl Define a C symbol for the host CPU architecture.
+AC_DEFINE_UNQUOTED([host_cpu],["$host_cpu"],[Host architecture.])
+

 dnl Headers.
 dnl Headers.

-AC_CHECK_HEADERS([errno.h sys/types.h sys/un.h sys/wait.h sys/socket.h])
+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])
+
+dnl Build the daemon?
+AC_MSG_CHECKING([if we should build the daemon])
+AC_ARG_ENABLE([daemon],
+        [AS_HELP_STRING([--enable-daemon],
+          [enable building the daemon @<:@default=yes@:>@])],
+        [],
+        [enable_daemon=yes])
+AM_CONDITIONAL([ENABLE_DAEMON],[test "x$enable_daemon" = "xyes"])
+AC_MSG_RESULT([$enable_daemon])
+
+dnl Build the appliance?
+AC_MSG_CHECKING([if we should build the appliance])
+AC_ARG_ENABLE([appliance],
+        [AS_HELP_STRING([--enable-appliance],
+          [enable building the appliance @<:@default=yes@:>@])],
+        [],
+        [enable_appliance=yes])
+AM_CONDITIONAL([ENABLE_APPLIANCE],[test "x$enable_appliance" = "xyes"])
+AC_MSG_RESULT([$enable_appliance])
+
+dnl Check for PCRE.
+AC_CHECK_LIB([pcre],[pcre_compile],
+        [AC_SUBST([LIBPCRE], ["-lpcre"])],
+        [AC_MSG_FAILURE(
+             [Perl Compatible Regular Expressions library (PCRE) is required])])
+AC_CHECK_HEADER([pcre.h],[],
+        [AC_MSG_FAILURE(
+             [Perl Compatible Regular Expressions library (PCRE) header file pcre.h is required])])

 
 dnl Check for rpcgen and XDR library.  rpcgen is optional.
 AC_CHECK_PROG([RPCGEN],[rpcgen],[rpcgen],[no])
 
 dnl Check for rpcgen and XDR library.  rpcgen is optional.
 AC_CHECK_PROG([RPCGEN],[rpcgen],[rpcgen],[no])


@@ -166,7 +236,7 @@ dnl fallback to null vmchannel (still using SLIRP).  See the
 dnl discussion in the README file.
 if test "x$vmchannel_test" != "xno"; then
     AC_MSG_CHECKING([for guestfwd support in $QEMU])
 dnl discussion in the README file.
 if test "x$vmchannel_test" != "xno"; then
     AC_MSG_CHECKING([for guestfwd support in $QEMU])

-    if $QEMU --help | grep -sq guestfwd; then
+    if $QEMU -nographic --help | grep -sq guestfwd; then

         AC_MSG_RESULT([yes])
         vmchannel_guestfwd=guestfwd
     else
         AC_MSG_RESULT([yes])
         vmchannel_guestfwd=guestfwd
     else


@@ -175,7 +245,7 @@ if test "x$vmchannel_test" != "xno"; then
         # test failing.  This is because recent qemu will throw
         # up an SDL window and hang if we try to run this test.
         AC_MSG_CHECKING([for "-net channel" (old guestfwd) support in $QEMU])
         # test failing.  This is because recent qemu will throw
         # up an SDL window and hang if we try to run this test.
         AC_MSG_CHECKING([for "-net channel" (old guestfwd) support in $QEMU])

-        vmchannelout=`$QEMU -net channel /dev/zero 2>&1 ||:`
+        vmchannelout=`$QEMU -nographic -net channel /dev/zero 2>&1 ||:`

         echo "vmchannel test command output: $vmchannelout" >&AS_MESSAGE_LOG_FD
         if echo "$vmchannelout" | grep -sq "vmchannel wrong port number" ; then
             AC_MSG_RESULT([yes])
         echo "vmchannel test command output: $vmchannelout" >&AS_MESSAGE_LOG_FD
         if echo "$vmchannelout" | grep -sq "vmchannel wrong port number" ; then
             AC_MSG_RESULT([yes])


@@ -187,7 +257,7 @@ if test "x$vmchannel_test" != "xno"; then
     fi
 
     AC_MSG_CHECKING([for "-net user" (user mode network) support in $QEMU])
     fi
 
     AC_MSG_CHECKING([for "-net user" (user mode network) support in $QEMU])

-    if $QEMU --help | grep -sq -- "-net user"; then
+    if $QEMU -nographic --help | grep -sq -- "-net user"; then

         AC_MSG_RESULT([yes])
         vmchannel_net_user=yes
     else
         AC_MSG_RESULT([yes])
         vmchannel_net_user=yes
     else


@@ -220,80 +290,85 @@ fi
 dnl Set drive interface used by the guestfs_add_drive{,_ro} calls
 dnl ('-drive ...,if=...' option to qemu).
 dnl
 dnl Set drive interface used by the guestfs_add_drive{,_ro} calls
 dnl ('-drive ...,if=...' option to qemu).
 dnl

-dnl NB. We will change the default in future to virtio, but at the
-dnl moment this causes a performance problem, RHBZ#509383.
+dnl If you encounter performance problems with virtio (RHBZ#509383)
+dnl then try '--with-drive-if=ide'.

 AC_ARG_WITH([drive-if],
         [AS_HELP_STRING([--with-drive-if],
 AC_ARG_WITH([drive-if],
         [AS_HELP_STRING([--with-drive-if],

-          [set default driver (ide|scsi|virtio) @<:@default=ide@:>@])],
+          [set default driver (ide|scsi|virtio) @<:@default=virtio@:>@])],

         [],
         [],

-        [with_drive_if=ide])
+        [with_drive_if=virtio])

 AC_DEFINE_UNQUOTED([DRIVE_IF],["$with_drive_if"],[Default drive interface.])
 
 dnl Set interface used by the network.  Normally you should
 AC_DEFINE_UNQUOTED([DRIVE_IF],["$with_drive_if"],[Default drive interface.])
 
 dnl Set interface used by the network.  Normally you should

-dnl leave this at the default (virtio) but you can use the
+dnl leave this at the default (virtio-net-pci) but you can use the

 dnl alternative (ne2k_pci) because of bugs in virtio networking
 dnl eg. https://bugzilla.redhat.com/show_bug.cgi?id=516022
 AC_ARG_WITH([net-if],
         [AS_HELP_STRING([--with-net-if],
 dnl alternative (ne2k_pci) because of bugs in virtio networking
 dnl eg. https://bugzilla.redhat.com/show_bug.cgi?id=516022
 AC_ARG_WITH([net-if],
         [AS_HELP_STRING([--with-net-if],

-          [set default net driver (virtio|ne2k_pci) @<:@default=virtio@:>@])],
+          [set default net driver (virtio-net-pci|ne2k_pci) @<:@default=virtio-net-pci@:>@])],

         [],
         [],

-        [with_net_if=virtio])
+        [with_net_if=virtio-net-pci])

 AC_DEFINE_UNQUOTED([NET_IF],["$with_net_if"],[Default network interface.])
 
 dnl Check for febootstrap etc.
 AC_DEFINE_UNQUOTED([NET_IF],["$with_net_if"],[Default network interface.])
 
 dnl Check for febootstrap etc.

-AC_CHECK_PROG([FEBOOTSTRAP],
-        [febootstrap],[febootstrap],[no])
-if test "x$FEBOOTSTRAP" != "xno"; then
-  AC_CHECK_PROG([FEBOOTSTRAP_RUN],
-        [febootstrap-run],[febootstrap-run],[no])
-  test "x$FEBOOTSTRAP_RUN" = "xno" && \
-     AC_MSG_ERROR([febootstrap-run must be installed])
-  AC_CHECK_PROG([FEBOOTSTRAP_INSTALL],
-        [febootstrap-install],[febootstrap-install],[no])
-  test "x$FEBOOTSTRAP_INSTALL" = "xno" && \
-     AC_MSG_ERROR([febootstrap-install must be installed])
-  AC_CHECK_PROG([FEBOOTSTRAP_MINIMIZE],
-        [febootstrap-minimize],[febootstrap-minimize],[no])
-  test "x$FEBOOTSTRAP_MINIMIZE" = "xno" && \
-     AC_MSG_ERROR([febootstrap-minimize must be installed])
-  AC_CHECK_PROG([FEBOOTSTRAP_TO_INITRAMFS],
-        [febootstrap-to-initramfs],[febootstrap-to-initramfs],[no])
-  test "x$FEBOOTSTRAP_TO_INITRAMFS" = "xno" && \
-     AC_MSG_ERROR([febootstrap-to-initramfs must be installed])
-
-  dnl Check we have fakechroot >= 2.9 (it's an indirect requirement
-  dnl of febootstrap, but old versions will fail with yum).
-  AC_CHECK_PROG([FAKECHROOT],
-        [fakechroot],[fakechroot],[no])
-  test "x$FAKECHROOT" = "xno" && \
-    AC_MSG_ERROR([fakechroot must be installed])
-
-  AC_MSG_CHECKING([fakechroot version])
-  fakechroot_version=`$FAKECHROOT --version | awk '{print $3}'`
-  if test -z "$fakechroot_version"; then
-    AC_MSG_RESULT([failed])
-    AC_MSG_WARN([fakechroot --version command failed, proceeding anyway])
-  else
-    AC_MSG_RESULT([$fakechroot_version])
-    fakechroot_major=`echo "$fakechroot_version" | awk -F. '{print $1}'`
-    fakechroot_minor=`echo "$fakechroot_version" | awk -F. '{print $2}'`
-    if test "$fakechroot_major" -lt 2 -o \
+if test "x$enable_appliance" = "xyes"; then
+    AC_CHECK_PROG([FEBOOTSTRAP],
+                  [febootstrap],[febootstrap],[no])
+    if test "x$FEBOOTSTRAP" != "xno"; then
+      AC_CHECK_PROG([FEBOOTSTRAP_RUN],
+                    [febootstrap-run],[febootstrap-run],[no])
+      test "x$FEBOOTSTRAP_RUN" = "xno" && \
+          AC_MSG_ERROR([febootstrap-run must be installed])
+      AC_CHECK_PROG([FEBOOTSTRAP_INSTALL],
+                    [febootstrap-install],[febootstrap-install],[no])
+      test "x$FEBOOTSTRAP_INSTALL" = "xno" && \
+          AC_MSG_ERROR([febootstrap-install must be installed])
+      AC_CHECK_PROG([FEBOOTSTRAP_MINIMIZE],
+                    [febootstrap-minimize],[febootstrap-minimize],[no])
+      test "x$FEBOOTSTRAP_MINIMIZE" = "xno" && \
+          AC_MSG_ERROR([febootstrap-minimize must be installed])
+      AC_CHECK_PROG([FEBOOTSTRAP_TO_INITRAMFS],
+                    [febootstrap-to-initramfs],[febootstrap-to-initramfs],[no])
+      test "x$FEBOOTSTRAP_TO_INITRAMFS" = "xno" && \
+          AC_MSG_ERROR([febootstrap-to-initramfs must be installed])
+      AC_CHECK_PROG([FEBOOTSTRAP_TO_SUPERMIN],
+                    [febootstrap-to-supermin],[febootstrap-to-supermin],[no])
+      test "x$FEBOOTSTRAP_TO_SUPERMIN" = "xno" && \
+          AC_MSG_ERROR([febootstrap-to-supermin must be installed])
+
+      dnl Check we have fakechroot >= 2.9 (it's an indirect requirement
+      dnl of febootstrap, but old versions will fail with yum).
+      AC_CHECK_PROG([FAKECHROOT],
+                    [fakechroot],[fakechroot],[no])
+      test "x$FAKECHROOT" = "xno" && \
+         AC_MSG_ERROR([fakechroot must be installed])
+
+      AC_MSG_CHECKING([fakechroot version])
+      fakechroot_version=`$FAKECHROOT --version | awk '{print $3}'`
+      if test -z "$fakechroot_version"; then
+        AC_MSG_RESULT([failed])
+        AC_MSG_WARN([fakechroot --version command failed, proceeding anyway])
+      else
+        AC_MSG_RESULT([$fakechroot_version])
+        fakechroot_major=`echo "$fakechroot_version" | awk -F. '{print $1}'`
+        fakechroot_minor=`echo "$fakechroot_version" | awk -F. '{print $2}'`
+        if test "$fakechroot_major" -lt 2 -o \

             \( "$fakechroot_major" -eq 2 -a "$fakechroot_minor" -lt 9 \); then
             \( "$fakechroot_major" -eq 2 -a "$fakechroot_minor" -lt 9 \); then

-        AC_MSG_ERROR([fakechroot version must be >= 2.9])
-    fi
-  fi
-  DIST="REDHAT"
-else
-  # check for debootstrap and debirf
-  AC_CHECK_PROG([DEBOOTSTRAP],
-        [debootstrap],[debootstrap],[no])
-  test "x$DEBOOTSTRAP" = "xno" && \
-        AC_MSG_ERROR([Either febootstrap or debootstrap must be installed])
-  AC_CHECK_PROG([DEBIRF],[debirf],[debirf],[no])
-  test "x$DEBIRF" = "xno" &&
-        AC_MSG_ERROR([debirf must be installed])
-  DIST="DEBIAN"
-  case "$host_cpu" in
+          AC_MSG_ERROR([fakechroot version must be >= 2.9])
+        fi
+      fi
+      DIST="REDHAT"
+    else
+      # check for debootstrap and debirf
+      AC_CHECK_PROG([DEBOOTSTRAP],
+                    [debootstrap],[debootstrap],[no])
+      test "x$DEBOOTSTRAP" = "xno" && \
+          AC_MSG_ERROR([Either febootstrap or debootstrap must be installed])
+      AC_CHECK_PROG([DEBIRF],[debirf],[debirf],[no])
+      test "x$DEBIRF" = "xno" &&
+          AC_MSG_ERROR([debirf must be installed])
+      DIST="DEBIAN"
+      case "$host_cpu" in

       *86)
           DEBIAN_KERNEL_ARCH=486
           ;;
       *86)
           DEBIAN_KERNEL_ARCH=486
           ;;


@@ -303,43 +378,40 @@ else
       *)
          DEBIAN_KERNEL_ARCH=$host_cpu
          ;;
       *)
          DEBIAN_KERNEL_ARCH=$host_cpu
          ;;

-   esac
-   AC_SUBST(DEBIAN_KERNEL_ARCH)
-fi
-AC_SUBST(DIST)
+      esac
+      AC_SUBST(DEBIAN_KERNEL_ARCH)
+    fi
+    AC_SUBST(DIST)

 
 

+    dnl --with-updates to specify a Fedora updates repository.
+    AC_ARG_WITH([updates],
+        [AS_HELP_STRING([--with-updates],
+          [set name of Fedora updates repository @<:@default=updates-released-f12@:>@])],
+        [],
+        [with_updates=updates-released-f12])
+    UPDATES="$with_updates"
+    AC_SUBST(UPDATES)
+
+    dnl --with-mirror to specify a local Fedora mirror.
+    AC_ARG_WITH([mirror],
+        [AS_HELP_STRING([--with-mirror],
+          [set URI of a local Fedora mirror])],
+        [],
+        [with_mirror=])
+    MIRROR="$with_mirror"
+    AC_SUBST(MIRROR)
+fi

 
 dnl --with-repo to specify a Fedora repository.
 AC_ARG_WITH([repo],
         [AS_HELP_STRING([--with-repo],
 
 dnl --with-repo to specify a Fedora repository.
 AC_ARG_WITH([repo],
         [AS_HELP_STRING([--with-repo],

-          [set name of Fedora repository @<:@default=fedora-11@:>@])],
+          [set name of Fedora repository @<:@default=fedora-12@:>@])],

         [],
         [],

-        [with_repo=fedora-11])
+        [with_repo=fedora-12])

 REPO="$with_repo"
 AC_SUBST(REPO)
 AC_DEFINE_UNQUOTED([REPO],["$REPO"],[Name of Fedora repository.])
 
 REPO="$with_repo"
 AC_SUBST(REPO)
 AC_DEFINE_UNQUOTED([REPO],["$REPO"],[Name of Fedora repository.])
 

-dnl --with-updates to specify a Fedora updates repository.
-AC_ARG_WITH([updates],
-        [AS_HELP_STRING([--with-updates],
-          [set name of Fedora updates repository @<:@default=updates-released-f11@:>@])],
-        [],
-        [with_updates=updates-released-f11])
-UPDATES="$with_updates"
-AC_SUBST(UPDATES)
-
-dnl Define a symbol for the host CPU architecture.
-AC_DEFINE_UNQUOTED([host_cpu],["$host_cpu"],[Host architecture.])
-
-dnl --with-mirror to specify a local Fedora mirror.
-AC_ARG_WITH([mirror],
-        [AS_HELP_STRING([--with-mirror],
-          [set URI of a local Fedora mirror])],
-        [],
-        [with_mirror=])
-MIRROR="$with_mirror"
-AC_SUBST(MIRROR)
-

 dnl Build the supermin appliance?  Please see README file before
 dnl enabling this option.
 AC_ARG_ENABLE([supermin],
 dnl Build the supermin appliance?  Please see README file before
 dnl enabling this option.
 AC_ARG_ENABLE([supermin],


@@ -349,40 +421,6 @@ AC_ARG_ENABLE([supermin],
         [enable_supermin=no])
 AM_CONDITIONAL([SUPERMIN],[test "x$enable_supermin" = "xyes"])
 
         [enable_supermin=no])
 AM_CONDITIONAL([SUPERMIN],[test "x$enable_supermin" = "xyes"])
 

-if test "x$enable_supermin" = "xyes"; then
-    dnl Check febootstrap-to-initramfs accepts the --files option
-    dnl (febootstrap >= 2.2).
-    AC_MSG_CHECKING([for --files support in $FEBOOTSTRAP_TO_INITRAMFS])
-    out=`$FEBOOTSTRAP_TO_INITRAMFS 2>&1 ||:`
-    echo "febootstrap_to_initramfs test command output: $out" >&AS_MESSAGE_LOG_FD
-    if ! echo "$out" | grep -sq -e --files ; then
-        AC_MSG_RESULT([no])
-        AC_MSG_FAILURE(
-[febootstrap-to-initramfs does not support the --files option.
-
-To build the supermin appliance, you need to upgrade to the latest
-version of febootstrap.
-])
-    fi
-    AC_MSG_RESULT([yes])
-
-    dnl Check febootstrap-to-initramfs accepts the --nocompress option
-    dnl (febootstrap >= 2.3).
-    AC_MSG_CHECKING([for --nocompress support in $FEBOOTSTRAP_TO_INITRAMFS])
-    out=`$FEBOOTSTRAP_TO_INITRAMFS 2>&1 ||:`
-    echo "febootstrap_to_initramfs test command output: $out" >&AS_MESSAGE_LOG_FD
-    if ! echo "$out" | grep -sq -e --nocompress ; then
-        AC_MSG_RESULT([no])
-        AC_MSG_FAILURE(
-[febootstrap-to-initramfs does not support the --nocompress option.
-
-To build the supermin appliance, you need to upgrade to the latest
-version of febootstrap.
-])
-    fi
-    AC_MSG_RESULT([yes])
-fi
-

 dnl Enable packet dumps when in verbose mode.  This generates lots
 dnl of debug info, only useful for people debugging the RPC mechanism.
 AC_ARG_ENABLE([packet-dump],
 dnl Enable packet dumps when in verbose mode.  This generates lots
 dnl of debug info, only useful for people debugging the RPC mechanism.
 AC_ARG_ENABLE([packet-dump],


@@ -409,19 +447,61 @@ AS_IF([test "x$with_readline" != xno],
          AC_MSG_FAILURE(
              [--with-readline was given, but test for readline failed])
          fi
          AC_MSG_FAILURE(
              [--with-readline was given, but test for readline failed])
          fi

-        ], -lncurses)])
+        ], -lncurses)
+     old_LIBS="$LIBS"
+     LIBS="$LIBS $LIBREADLINE"
+     AC_CHECK_FUNCS([append_history completion_matches rl_completion_matches])
+     LIBS="$old_LIBS"
+    ])

 
 dnl For i18n.
 AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION([0.17])
 
 
 dnl For i18n.
 AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION([0.17])
 

+dnl libmagic (required)
+AC_CHECK_LIB([magic],[magic_file],[
+        AC_SUBST([LIBMAGIC], ["-lmagic"])
+    ],[
+        AC_MSG_FAILURE([libmagic is required])
+    ])
+AC_CHECK_HEADER([magic.h],[],[
+        AC_MSG_FAILURE([magic.h header file is required])
+    ])
+
+dnl libvirt (required)
+PKG_CHECK_MODULES([LIBVIRT], [libvirt])
+AC_SUBST([LIBVIRT_CFLAGS])
+AC_SUBST([LIBVIRT_LIBS])
+
+dnl libxml2 (required)
+PKG_CHECK_MODULES([LIBXML2], [libxml-2.0])
+AC_SUBST([LIBXML2_CFLAGS])
+AC_SUBST([LIBXML2_LIBS])
+
+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.
+HAVE_HIVEX=yes
+PKG_CHECK_MODULES([HIVEX], [hivex],,[
+        HAVE_HIVEX=no
+        AC_MSG_WARN([Hivex library and headers are missing, so optional Windows Registry tools won't be built])])
+AM_CONDITIONAL([HAVE_HIVEX],[test "x$HAVE_HIVEX" = "xyes"])
+AC_SUBST([HIVEX_CFLAGS])
+AC_SUBST([HIVEX_LIBS])
+
+dnl FUSE is optional to build the FUSE module.
+HAVE_FUSE=yes
+PKG_CHECK_MODULES([FUSE],[fuse],,[
+        HAVE_FUSE=no
+        AC_MSG_WARN([FUSE library and headers are missing, so optional FUSE module won't be built])])
+AM_CONDITIONAL([HAVE_FUSE],[test "x$HAVE_FUSE" = "xyes"])
+

 dnl Check for OCaml (optional, for OCaml bindings).
 AC_PROG_OCAML
 AC_PROG_FINDLIB
 AM_CONDITIONAL([HAVE_OCAML],[test "x$OCAMLC" != "xno" -a "x$OCAMLFIND" != "xno"])
 
 dnl Check for OCaml (optional, for OCaml bindings).
 AC_PROG_OCAML
 AC_PROG_FINDLIB
 AM_CONDITIONAL([HAVE_OCAML],[test "x$OCAMLC" != "xno" -a "x$OCAMLFIND" != "xno"])
 

-dnl Optional xml-light for building virt-inspector language bindings
-dnl from the virt-inspector.rng file.
+dnl Optional xml-light for running the generator.

 OCAML_PKG_xml_light=no
 if test "x$OCAMLC" != "xno" -a "x$OCAMLFIND" != "xno"; then
     AC_CHECK_OCAML_PKG([xml-light])
 OCAML_PKG_xml_light=no
 if test "x$OCAMLC" != "xno" -a "x$OCAMLFIND" != "xno"; then
     AC_CHECK_OCAML_PKG([xml-light])


@@ -445,7 +525,7 @@ AC_CHECK_PROG([PERL],[perl],[perl],[no])
 dnl Check for Perl modules that must be present to compile and
 dnl test the Perl bindings.
 missing_perl_modules=no
 dnl Check for Perl modules that must be present to compile and
 dnl test the Perl bindings.
 missing_perl_modules=no

-for pm in Test::More Test::Pod Test::Pod::Coverage ExtUtils::MakeMaker; do
+for pm in Test::More ExtUtils::MakeMaker; do

     AC_MSG_CHECKING([for $pm])
     if ! perl -M$pm -e1 >/dev/null 2>&1; then
         AC_MSG_RESULT([no])
     AC_MSG_CHECKING([for $pm])
     if ! perl -M$pm -e1 >/dev/null 2>&1; then
         AC_MSG_RESULT([no])


@@ -500,6 +580,11 @@ if test "x$PYTHON" != "xno"; then
         fi
         AC_MSG_RESULT([not found])
     done
         fi
         AC_MSG_RESULT([not found])
     done

+
+    old_LIBS="$LIBS"
+    LIBS="$LIBS -lpython$PYTHON_VERSION"
+    AC_CHECK_FUNCS([PyCapsule_New])
+    LIBS="$old_LIBS"

 fi
 
 AC_SUBST(PYTHON_PREFIX)
 fi
 
 AC_SUBST(PYTHON_PREFIX)


@@ -665,7 +750,7 @@ AM_CONDITIONAL([HAVE_HASKELL],
 
 dnl Check for Perl modules needed by virt-df, inspector, etc.
 missing_perl_modules=no
 
 dnl Check for Perl modules needed by virt-df, inspector, etc.
 missing_perl_modules=no

-for pm in Pod::Usage Getopt::Long Sys::Virt Data::Dumper XML::Writer Locale::TextDomain; do
+for pm in Pod::Usage Getopt::Long Sys::Virt Data::Dumper XML::Writer Locale::TextDomain Win::Hivex Win::Hivex::Regedit; do

     AC_MSG_CHECKING([for $pm])
     if ! perl -M$pm -e1 >/dev/null 2>&1; then
         AC_MSG_RESULT([no])
     AC_MSG_CHECKING([for $pm])
     if ! perl -M$pm -e1 >/dev/null 2>&1; then
         AC_MSG_RESULT([no])


@@ -675,18 +760,12 @@ for pm in Pod::Usage Getopt::Long Sys::Virt Data::Dumper XML::Writer Locale::Tex
     fi
 done
 if test "x$missing_perl_modules" = "xyes"; then
     fi
 done
 if test "x$missing_perl_modules" = "xyes"; then

-    AC_MSG_WARN([some Perl modules required to compile virt-cat, virt-df, virt-edit, virt-inspector and virt-rescue are missing])
+    AC_MSG_WARN([some Perl modules required to compile virt-inspector and the other virt-* tools are missing])

 fi
 
 fi
 

-AM_CONDITIONAL([HAVE_CAT],
-    [test "x$PERL" != "xno" -a "x$missing_perl_modules" != "xyes"])
-AM_CONDITIONAL([HAVE_DF],
-    [test "x$PERL" != "xno" -a "x$missing_perl_modules" != "xyes"])
-AM_CONDITIONAL([HAVE_EDIT],
-    [test "x$PERL" != "xno" -a "x$missing_perl_modules" != "xyes"])

 AM_CONDITIONAL([HAVE_INSPECTOR],
     [test "x$PERL" != "xno" -a "x$missing_perl_modules" != "xyes"])
 AM_CONDITIONAL([HAVE_INSPECTOR],
     [test "x$PERL" != "xno" -a "x$missing_perl_modules" != "xyes"])

-AM_CONDITIONAL([HAVE_RESCUE],
+AM_CONDITIONAL([HAVE_TOOLS],

     [test "x$PERL" != "xno" -a "x$missing_perl_modules" != "xyes"])
 
 dnl Library versioning.
     [test "x$PERL" != "xno" -a "x$missing_perl_modules" != "xyes"])
 
 dnl Library versioning.


@@ -694,21 +773,15 @@ MAX_PROC_NR=`cat $srcdir/src/MAX_PROC_NR`
 AC_SUBST(MAX_PROC_NR)
 
 dnl Run in subdirs.
 AC_SUBST(MAX_PROC_NR)
 
 dnl Run in subdirs.

-AC_CONFIG_SUBDIRS([daemon])
+if test "x$enable_daemon" = "xyes"; then
+    AC_CONFIG_SUBDIRS([daemon])
+fi

 
 dnl Produce output files.
 AC_CONFIG_HEADERS([config.h])
 dnl http://www.mail-archive.com/automake@gnu.org/msg10204.html
 
 dnl Produce output files.
 AC_CONFIG_HEADERS([config.h])
 dnl http://www.mail-archive.com/automake@gnu.org/msg10204.html

-AC_CONFIG_FILES([appliance/make.sh],
-                [chmod +x appliance/make.sh])

 AC_CONFIG_FILES([appliance/update.sh],
                 [chmod +x appliance/update.sh])
 AC_CONFIG_FILES([appliance/update.sh],
                 [chmod +x appliance/update.sh])

-AC_CONFIG_FILES([appliance/supermin-split.sh],
-                [chmod +x appliance/supermin-split.sh])
-AC_CONFIG_FILES([appliance/supermin-make.sh],
-                [chmod +x appliance/supermin-make.sh])
-AC_CONFIG_FILES([appliance/libguestfs-supermin-helper],
-                [chmod +x appliance/libguestfs-supermin-helper])

 AC_CONFIG_FILES([Makefile
                  src/Makefile fish/Makefile po/Makefile.in examples/Makefile
                  appliance/Makefile
 AC_CONFIG_FILES([Makefile
                  src/Makefile fish/Makefile po/Makefile.in examples/Makefile
                  appliance/Makefile


@@ -723,14 +796,12 @@ AC_CONFIG_FILES([Makefile
                  ruby/Makefile ruby/Rakefile
                  java/Makefile
                  haskell/Makefile
                  ruby/Makefile ruby/Rakefile
                  java/Makefile
                  haskell/Makefile

-                 cat/Makefile
-                 df/Makefile
-                 edit/Makefile

                  inspector/Makefile
                  inspector/Makefile

-                 rescue/Makefile
+                 tools/Makefile

                  libguestfs.pc
                  gnulib/lib/Makefile
                  gnulib/tests/Makefile
                  libguestfs.pc
                  gnulib/lib/Makefile
                  gnulib/tests/Makefile

+                 fuse/Makefile

                  ocaml/META perl/Makefile.PL])
 AC_OUTPUT
 
                  ocaml/META perl/Makefile.PL])
 AC_OUTPUT
 


@@ -742,6 +813,8 @@ echo "Thank you for downloading $PACKAGE_STRING"
 echo
 echo "This is how we have configured the optional components for you today:"
 echo
 echo
 echo "This is how we have configured the optional components for you today:"
 echo

+echo    "Daemon .............................. $enable_daemon"
+echo    "Appliance ........................... $enable_appliance"

 echo    "QEMU ................................ $QEMU"
 echo -n "OCaml bindings ...................... "
 if test "x$HAVE_OCAML_TRUE" = "x"; then echo "yes"; else echo "no"; fi
 echo    "QEMU ................................ $QEMU"
 echo -n "OCaml bindings ...................... "
 if test "x$HAVE_OCAML_TRUE" = "x"; then echo "yes"; else echo "no"; fi


@@ -754,18 +827,13 @@ if test "x$HAVE_RUBY_TRUE" = "x"; then echo "yes"; else echo "no"; fi
 echo -n "Java bindings ....................... "
 if test "x$HAVE_JAVA_TRUE" = "x"; then echo "yes"; else echo "no"; fi
 echo -n "Haskell bindings .................... "
 echo -n "Java bindings ....................... "
 if test "x$HAVE_JAVA_TRUE" = "x"; then echo "yes"; else echo "no"; fi
 echo -n "Haskell bindings .................... "

-if test "x$HAVE_HASKELL" = "x"; then echo "yes"; else echo "no"; fi
-echo -n "virt-cat ............................ "
-if test "x$HAVE_CAT" = "x"; then echo "yes"; else echo "no"; fi
-echo -n "virt-df ............................. "
-if test "x$HAVE_DF" = "x"; then echo "yes"; else echo "no"; fi
-echo -n "virt-edit ........................... "
-if test "x$HAVE_EDIT" = "x"; then echo "yes"; else echo "no"; fi
+if test "x$HAVE_HASKELL_TRUE" = "x"; then echo "yes"; else echo "no"; fi

 echo -n "virt-inspector ...................... "
 echo -n "virt-inspector ...................... "

-if test "x$HAVE_INSPECTOR" = "x"; then echo "yes"; else echo "no"; fi
-echo -n "virt-rescue ......................... "
-if test "x$HAVE_RESCUE" = "x"; then echo "yes"; else echo "no"; fi
+if test "x$HAVE_INSPECTOR_TRUE" = "x"; then echo "yes"; else echo "no"; fi
+echo -n "virt-* tools ........................ "
+if test "x$HAVE_TOOLS_TRUE" = "x"; then echo "yes"; else echo "no"; fi

 echo "supermin appliance .................. $enable_supermin"
 echo "supermin appliance .................. $enable_supermin"

+echo "FUSE filesystem ..................... $HAVE_FUSE"

 echo
 echo "If any optional component is configured 'no' when you expected 'yes'"
 echo "then you should check the preceeding messages."
 echo
 echo "If any optional component is configured 'no' when you expected 'yes'"
 echo "then you should check the preceeding messages."