X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=configure.ac;h=b00ddb4241847870ea2ff6a3c2969c1f4d202022;hp=88e66cd4f3f1c0dfa9b3a0b9d2a470fdbf24e87d;hb=9c662c7ea543ca5bc9ffae45283e92db7ba68e1f;hpb=65ad55778b8cd8e948d59fd3624966018366c45f

diff --git a/configure.ac b/configure.ac
index 88e66cd..b00ddb4 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.32])
+AC_INIT([libguestfs],[1.0.46])
 AM_INIT_AUTOMAKE
 
 AC_CONFIG_MACRO_DIR([m4])
@@ -56,6 +56,11 @@ AC_CHECK_PROG([POD2TEXT],[pod2text],[pod2text],[no])
 test "x$POD2TEXT" = "xno" &&
      AC_MSG_ERROR([pod2text must be installed])
 
+dnl Check for mksquashfs.
+AC_PATH_PROGS([MKSQUASHFS],[mksquashfs],[no],
+	[$PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin])
+test "x$MKSQUASHFS" = "xno" && AC_MSG_ERROR([mksquashfs must be installed])
+
 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-kvm qemu-system-$host_cpu qemu"
@@ -174,6 +179,33 @@ AC_ARG_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],
+	[AS_HELP_STRING([--enable-supermin],
+	  [enable supermin appliance (see README) @<:@default=no@:>@])],
+	[],
+	[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 -- "--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])
+fi
+
 dnl Readline.
 AC_ARG_WITH([readline],
     [AS_HELP_STRING([--with-readline],
@@ -196,7 +228,7 @@ AS_IF([test "x$with_readline" != xno],
 
 dnl For i18n.
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.17])
+AM_GNU_GETTEXT_VERSION([0.14])
 
 dnl Check for OCaml (optional, for OCaml bindings).
 AC_PROG_OCAML
@@ -446,7 +478,13 @@ dnl Produce output files.
 AC_CONFIG_HEADERS([config.h])
 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/guestfs-supermin-helper
 		 images/Makefile
+		 capitests/Makefile
+		 regressions/Makefile
 		 ocaml/Makefile ocaml/examples/Makefile
 		 perl/Makefile
 		 python/Makefile
@@ -454,13 +492,12 @@ AC_CONFIG_FILES([Makefile
 		 java/Makefile
 		 haskell/Makefile
 		 inspector/Makefile
-	         make-initramfs.sh update-initramfs.sh
 		 libguestfs.pc
 		 ocaml/META perl/Makefile.PL])
 AC_OUTPUT
 
 dnl WTF?
-chmod +x make-initramfs.sh update-initramfs.sh
+chmod +x appliance/*.sh appliance/guestfs-supermin-helper
 
 dnl Produce summary.
 echo
@@ -485,6 +522,7 @@ 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 "supermin appliance .................. $enable_supermin"
 echo
 echo "If any optional component is configured 'no' when you expected 'yes'"
 echo "then you should check the preceeding messages."