X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=configure.ac;h=4e71ddee4190b12c5c127db3f5effe3be1363252;hp=7b9db49a073fb77e4108fe602442287562fdf23c;hb=fe6820c1bbaec015a883804545362a8c9b6b4583;hpb=b6233d1fff5d9a6bbc61e7123a57bdd7d8cbc792;ds=sidebyside

diff --git a/configure.ac b/configure.ac
index 7b9db49..4e71dde 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,16 +15,12 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-AC_INIT([libguestfs],[0.1])
+AC_INIT([libguestfs],[0.2])
 AM_INIT_AUTOMAKE
-AC_PROG_LIBTOOL
 
-dnl Make sure the user has created the link to nfs-utils source.
-if ! test -e $srcdir/daemon/nfs-utils \
-    -o -f $srcdir/daemon/nfs-utils/utils/nfsd/nfsd.c; then
-  AC_MSG_ERROR([$srcdir/daemon/nfs-utils must be a symlink to the unpacked nfs-utils sources.
-See the README file for more information.])
-fi
+AC_CONFIG_MACRO_DIR([m4])
+
+AC_PROG_LIBTOOL
 
 dnl Check for basic C environment.
 AC_PROG_CC
@@ -48,21 +44,51 @@ AC_CHECK_LIB([portablexdr],[xdrmem_create],[],[
 
 dnl Check for QEMU.  We only check for the basic 'qemu' program here
 dnl (ie. the i386 full system qemu).  But at runtime we might choose
-dnl a different qemu to run, eg. qemu-system-ppc.  What we run depends
-dnl on several factors explained in the README.
+dnl a different qemu to run, eg. qemu-system-ppc.
 AC_PATH_PROG([QEMU],[qemu],[no],
 	[$PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin])
-test "x$QEMU" = "xno" && AC_MSG_ERROR([No 'qemu' program found])
+test "x$QEMU" = "xno" && AC_MSG_ERROR([qemu must be installed])
 AC_DEFINE_UNQUOTED([QEMU],["$QEMU"],[Location of qemu binary.])
 
-dnl Check for mkinitrd, cpio.
-AC_PATH_PROG([MKINITRD],[mkinitrd],[no],
-	[$PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin])
-test "x$MKINITRD" = "xno" && AC_MSG_ERROR([No 'mkinitrd' program found])
-AC_CHECK_PROG([CPIO],[cpio],[cpio],[no])
-test "x$CPIO" = "xno" && AC_MSG_ERROR([No 'cpio' program found])
+dnl Check for febootstrap etc.
+AC_CHECK_PROG([FEBOOTSTRAP],
+	[febootstrap],[febootstrap],[no])
+test "x$FEBOOTSTRAP" = "xno" && \
+     AC_MSG_ERROR([febootstrap 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 --with-repo to specify a Fedora repository.
+AC_ARG_WITH([repo],
+	[AS_HELP_STRING([--with-repo],
+	  [set name of Fedora repository @<:@default=fedora-10@:>@])],
+	[],
+	[with_repo=fedora-10])
+REPO="$with_repo"
+AC_SUBST(REPO)
+
+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 Run in subdirs.
+AC_CONFIG_SUBDIRS([daemon])
 
 dnl Produce output files.
 AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_FILES([Makefile src/Makefile examples/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile examples/Makefile make-initramfs.sh])
 AC_OUTPUT
+
+dnl WTF?
+chmod +x make-initramfs.sh
\ No newline at end of file