X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=configure.ac;h=4a57fa36a3bf17f5f77128f924d941d222cee493;hp=ec64cd3f2a3c02e42441f75da20204c5dbf56198;hb=447dae7df43e8a98da59d94f1aef9895e087aa13;hpb=0b00aa44ea85ccce17a3579d14e9d4b0f0dd9185

diff --git a/configure.ac b/configure.ac
index ec64cd3..4a57fa3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
 # 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.51])
+AC_INIT([libguestfs],[1.0.55])
 AM_INIT_AUTOMAKE
 
 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,9 @@ else
   AC_CHECK_PROG([DEBIRF],[debirf],[debirf],[no])
   test "x$DEBIRF" = "xno" &&
         AC_MSG_ERROR([debirf must be installed])
+  DIST="DEBIAN"
 fi
+AC_SUBST(DIST)
 
 
 dnl --with-repo to specify a Fedora repository.
@@ -481,7 +496,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])
@@ -497,17 +512,30 @@ fi
 AM_CONDITIONAL([HAVE_INSPECTOR],
     [test "x$PERL" != "xno" -a "x$missing_perl_modules" != "xyes"])
 
+dnl Library versioning.
+MAX_PROC_NR=`cat $srcdir/src/MAX_PROC_NR`
+AC_SUBST(MAX_PROC_NR)
+
 dnl Run in subdirs.
 AC_CONFIG_SUBDIRS([daemon])
 
 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/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
-	         appliance/make.sh appliance/update.sh
-		 appliance/supermin-split.sh appliance/supermin-make.sh
-		 appliance/libguestfs-supermin-helper
+		 appliance/debian/debirf.conf
 		 images/Makefile
 		 capitests/Makefile
 		 regressions/Makefile
@@ -522,9 +550,6 @@ AC_CONFIG_FILES([Makefile
 		 ocaml/META perl/Makefile.PL])
 AC_OUTPUT
 
-dnl WTF?
-chmod +x appliance/*.sh appliance/libguestfs-supermin-helper
-
 dnl Produce summary.
 echo
 echo