X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=configure.ac;h=c70d104f86c03e3d8475dbcb4d18fdaa31e4e4fa;hp=386bec573052a224cf7d7801cb451bbdd847dcd6;hb=b5e29ac706004ad29da2e0949beda41e8e27e398;hpb=53f5ea28ffe26c112e51ebdef6d46c25919ced4f

diff --git a/configure.ac b/configure.ac
index 386bec5..c70d104 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,8 +15,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-AC_INIT([libguestfs],[1.0.52])
-AM_INIT_AUTOMAKE
+AC_INIT([libguestfs],[1.0.55])
+AM_INIT_AUTOMAKE([foreign])
 
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -102,6 +102,18 @@ the --with-qemu option.
     AC_MSG_RESULT([yes])
 fi
 
+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.
+AC_ARG_WITH([drive-if],
+	[AS_HELP_STRING([--with-drive-if],
+	  [set default driver (ide|scsi|virtio) @<:@default=ide@:>@])],
+	[],
+	[with_drive_if=ide])
+AC_DEFINE_UNQUOTED([DRIVE_IF],["$with_drive_if"],[Default drive interface.])
+
 dnl Check for febootstrap etc.
 AC_CHECK_PROG([FEBOOTSTRAP],
 	[febootstrap],[febootstrap],[no])
@@ -144,6 +156,7 @@ if test "x$FEBOOTSTRAP" != "xno"; then
         AC_MSG_ERROR([fakechroot version must be >= 2.9])
     fi
   fi
+  DIST="REDHAT"
 else
   # check for debootstrap and debirf
   AC_CHECK_PROG([DEBOOTSTRAP],
@@ -153,7 +166,21 @@ else
   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
+          ;;
+      x86_64)
+          DEBIAN_KERNEL_ARCH=amd64
+          ;;
+      *)
+         DEBIAN_KERNEL_ARCH=$host_cpu
+         ;;
+   esac
+   AC_SUBST(DEBIAN_KERNEL_ARCH)
 fi
+AC_SUBST(DIST)
 
 
 dnl --with-repo to specify a Fedora repository.
@@ -481,7 +508,7 @@ AM_CONDITIONAL([HAVE_HASKELL],
 
 dnl Check for Perl modules needed by the inspector.
 missing_perl_modules=no
-for pm in Pod::Usage Getopt::Long Sys::Virt Data::Dumper; do
+for pm in Pod::Usage Getopt::Long Sys::Virt Data::Dumper XML::Writer; do
     AC_MSG_CHECKING([for $pm])
     if ! perl -M$pm -e1 >/dev/null 2>&1; then
         AC_MSG_RESULT([no])
@@ -520,6 +547,7 @@ AC_CONFIG_FILES([appliance/libguestfs-supermin-helper],
 AC_CONFIG_FILES([Makefile
 		 src/Makefile fish/Makefile po/Makefile.in examples/Makefile
 		 appliance/Makefile
+		 appliance/debian/debirf.conf
 		 images/Makefile
 		 capitests/Makefile
 		 regressions/Makefile