X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=configure.ac;h=689c548fa4e7c05f3d58934ac9ea0082b4bd712b;hb=843514eef9dc6d04d71e031ba9ddb16e2beb9a04;hp=297ae991b4c3e0f0fbbe606ef59dc9cbb9b1179a;hpb=863d13ea1aadddc122ad82f4dad20e73231b48f2;p=libguestfs.git

diff --git a/configure.ac b/configure.ac
index 297ae99..689c548 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,8 +15,11 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-AC_INIT([libguestfs],[0.2])
+AC_INIT([libguestfs],[0.4])
 AM_INIT_AUTOMAKE
+
+AC_CONFIG_MACRO_DIR([m4])
+
 AC_PROG_LIBTOOL
 
 dnl Check for basic C environment.
@@ -29,6 +32,9 @@ test "x$U" != "x" && AC_MSG_ERROR([Compiler not ANSI compliant])
 
 AC_PROG_CC_C_O
 
+dnl Check support for 64 bit file offsets.
+AC_SYS_LARGEFILE
+
 dnl Headers.
 AC_CHECK_HEADERS([errno.h sys/types.h sys/un.h sys/wait.h sys/socket.h])
 
@@ -39,10 +45,17 @@ AC_CHECK_LIB([portablexdr],[xdrmem_create],[],[
 	AC_SEARCH_LIBS([xdrmem_create],[rpc xdr nsl])
 	])
 
-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.
-AC_PATH_PROG([QEMU],[qemu],[no],
+dnl Check for pod2man and pod2text.
+AC_CHECK_PROG([POD2MAN],[pod2man],[pod2man],[no])
+test "x$POD2MAN" = "xno" &&
+     AC_MSG_ERROR([pod2man must be installed])
+AC_CHECK_PROG([POD2TEXT],[pod2text],[pod2text],[no])
+test "x$POD2TEXT" = "xno" &&
+     AC_MSG_ERROR([pod2text must be installed])
+
+dnl Check for QEMU for running binaries on this $host_cpu, fall
+dnl back to basic 'qemu'.
+AC_PATH_PROGS([QEMU],[qemu-system-$host_cpu qemu],[no],
 	[$PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin])
 test "x$QEMU" = "xno" && AC_MSG_ERROR([qemu must be installed])
 AC_DEFINE_UNQUOTED([QEMU],["$QEMU"],[Location of qemu binary.])
@@ -52,6 +65,10 @@ AC_CHECK_PROG([FEBOOTSTRAP],
 	[febootstrap],[febootstrap],[no])
 test "x$FEBOOTSTRAP" = "xno" && \
      AC_MSG_ERROR([febootstrap must be installed])
+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_MINIMIZE],
 	[febootstrap-minimize],[febootstrap-minimize],[no])
 test "x$FEBOOTSTRAP_MINIMIZE" = "xno" && \
@@ -69,6 +86,9 @@ AC_ARG_WITH([repo],
 	[with_repo=fedora-10])
 REPO="$with_repo"
 AC_SUBST(REPO)
+AC_DEFINE_UNQUOTED([REPO],["$REPO"],[Name of Fedora repository.])
+
+AC_DEFINE_UNQUOTED([host_cpu],["$host_cpu"],[Host architecture.])
 
 dnl --with-mirror to specify a local Fedora mirror.
 AC_ARG_WITH([mirror],
@@ -84,8 +104,10 @@ AC_CONFIG_SUBDIRS([daemon])
 
 dnl Produce output files.
 AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_FILES([Makefile src/Makefile examples/Makefile make-initramfs.sh])
+AC_CONFIG_FILES([Makefile src/Makefile fish/Makefile examples/Makefile
+	         make-initramfs.sh update-initramfs.sh
+		 libguestfs.spec])
 AC_OUTPUT
 
 dnl WTF?
-chmod +x make-initramfs.sh
\ No newline at end of file
+chmod +x make-initramfs.sh update-initramfs.sh