X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=configure.ac;h=4d991b89f98f4b273ed4119980d05cedf0b959fd;hp=7c485aaa9de449d122d8dc5e8bf938269bd43fd6;hb=7682199cfca20a52664c8e52035a06345862f226;hpb=65f77271f290eca1d8b91d16fc6e123037f86229

diff --git a/configure.ac b/configure.ac
index 7c485aa..4d991b8 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.17])
+AC_INIT([libguestfs],[1.0.32])
 AM_INIT_AUTOMAKE
 
 AC_CONFIG_MACRO_DIR([m4])
@@ -58,11 +58,7 @@ test "x$POD2TEXT" = "xno" &&
 
 dnl Check for QEMU for running binaries on this $host_cpu, fall
 dnl back to basic 'qemu'.  Allow the user to override it.
-default_qemu="qemu-system-$host_cpu qemu"
-# On x86-64, try using KVM first.
-if test "x$host_cpu" = "xx86_64"; then
-    default_qemu="qemu-kvm $default_qemu"
-fi
+default_qemu="qemu-kvm qemu-system-$host_cpu qemu"
 AC_ARG_WITH([qemu],
 	[AS_HELP_STRING([--with-qemu],
 	  [set default QEMU binary @<:@default=[qemu-kvm] qemu-system-<host> qemu@:>@])],
@@ -110,6 +106,10 @@ 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" && \
@@ -144,9 +144,9 @@ fi
 dnl --with-repo to specify a Fedora repository.
 AC_ARG_WITH([repo],
 	[AS_HELP_STRING([--with-repo],
-	  [set name of Fedora repository @<:@default=fedora-10@:>@])],
+	  [set name of Fedora repository @<:@default=fedora-11@:>@])],
 	[],
-	[with_repo=fedora-10])
+	[with_repo=fedora-11])
 REPO="$with_repo"
 AC_SUBST(REPO)
 AC_DEFINE_UNQUOTED([REPO],["$REPO"],[Name of Fedora repository.])
@@ -156,9 +156,9 @@ AC_DEFINE_UNQUOTED([host_cpu],["$host_cpu"],[Host architecture.])
 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-f10@:>@])],
+	  [set name of Fedora updates repository @<:@default=updates-released-f11@:>@])],
 	[],
-	[with_updates=updates-released-f10])
+	[with_updates=updates-released-f11])
 UPDATES="$with_updates"
 AC_SUBST(UPDATES)
 AC_DEFINE_UNQUOTED([UPDATES],["$UPDATES"],[Name of Fedora updates repository.])
@@ -194,6 +194,10 @@ AS_IF([test "x$with_readline" != xno],
          fi
         ], -lncurses)])
 
+dnl For i18n.
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.17])
+
 dnl Check for OCaml (optional, for OCaml bindings).
 AC_PROG_OCAML
 AC_PROG_FINDLIB
@@ -398,6 +402,12 @@ AC_SUBST(JNI_VERSION_INFO)
 
 AM_CONDITIONAL([HAVE_JAVA],[test -n "$JAVAC"])
 
+dnl Check for Haskell (GHC).
+AC_CHECK_PROG([GHC],[ghc],[ghc],[no])
+
+AM_CONDITIONAL([HAVE_HASKELL],
+    [test "x$GHC" != "xno"])
+
 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
@@ -421,16 +431,18 @@ AC_CONFIG_SUBDIRS([daemon])
 
 dnl Produce output files.
 AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_FILES([Makefile src/Makefile fish/Makefile examples/Makefile
+AC_CONFIG_FILES([Makefile
+		 src/Makefile fish/Makefile po/Makefile.in examples/Makefile
 		 images/Makefile
 		 ocaml/Makefile ocaml/examples/Makefile
 		 perl/Makefile
 		 python/Makefile
 		 ruby/Makefile ruby/Rakefile
 		 java/Makefile
+		 haskell/Makefile
 		 inspector/Makefile
 	         make-initramfs.sh update-initramfs.sh
-		 libguestfs.spec libguestfs.pc
+		 libguestfs.pc
 		 ocaml/META perl/Makefile.PL])
 AC_OUTPUT
 
@@ -456,6 +468,8 @@ echo -n "Ruby bindings ....................... "
 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 .................... "
+if test "x$HAVE_HASKELL" = "x"; then echo "yes"; else echo "no"; fi
 echo -n "virt-inspector ...................... "
 if test "x$HAVE_INSPECTOR" = "x"; then echo "yes"; else echo "no"; fi
 echo