X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=configure.ac;h=8aabdf26f4faadc1f2afddf15c86de877afd3c29;hb=357d891bd6f45185cf341e6996c9e9a2a8c01ef9;hp=ea7f3ada19bed18468269b3c20e5062ad4876e4b;hpb=b5bdeec09a583c5a6e8dc1dbed1591723e5b708f;p=virt-p2v.git

diff --git a/configure.ac b/configure.ac
index ea7f3ad..8aabdf2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,48 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(virt-p2v,0.9.2)
+AC_INIT(virt-p2v,0.9.7)
+
+AC_PROG_INSTALL
+
+dnl Override CD properties.
+AC_ARG_ENABLE([cd-arch],
+	[AS_HELP_STRING([--enable-cd-arch],
+		[set CD architecture @<:@default=i386@:>@])],
+	[CD_ARCH=$enableval],
+	[CD_ARCH=i386])
+AC_ARG_ENABLE([cd-lang],
+	[AS_HELP_STRING([--enable-cd-lang],
+		[set CD language @<:@default=en_US.UTF-8@:>@])],
+	[CD_LANG=$enableval],
+	[CD_LANG=en_US.UTF-8])
+AC_ARG_ENABLE([cd-keyboard],
+	[AS_HELP_STRING([--enable-cd-keyboard],
+		[set CD keyboard @<:@default=us@:>@])],
+	[CD_KEYBOARD=$enableval],
+	[CD_KEYBOARD=us])
+AC_ARG_ENABLE([cd-timezone],
+	[AS_HELP_STRING([--enable-cd-timezone],
+		[set CD timezone @<:@default=US/Eastern@:>@])],
+	[CD_TIMEZONE=$enableval],
+	[CD_TIMEZONE=US/Eastern])
+AC_ARG_ENABLE([cd-base],
+	[AS_HELP_STRING([--enable-cd-base],
+		[set base Fedora for CD @<:@default=8@:>@])],
+	[CD_BASE=$enableval],
+	[CD_BASE=8])
+AC_ARG_ENABLE([cd-base-url],
+	[AS_HELP_STRING([--enable-cd-base-url],
+		[set download URL for packages])],
+	[CD_BASE_URL=$enableval],
+	[CD_BASE_URL=http://download.fedora.redhat.com/pub/fedora/linux/releases/$CD_BASE/Everything/$CD_ARCH/os/])
+
+AC_SUBST(CD_ARCH)
+AC_SUBST(CD_BASE)
+AC_SUBST(CD_BASE_URL)
+AC_SUBST(CD_LANG)
+AC_SUBST(CD_KEYBOARD)
+AC_SUBST(CD_TIMEZONE)
 
 dnl Check for basic OCaml script interpreter.
 AC_PROG_OCAML
@@ -40,6 +81,9 @@ fi
 dnl Check for recommended livecd-creator (for building ISOs).
 AC_CHECK_PROG(HAVE_LIVECD_CREATOR,livecd-creator,livecd-creator)
 
+dnl Check for optional livecd-iso-to-pxeboot.
+AC_CHECK_PROG(HAVE_LIVECD_ISO_TO_PXEBOOT,livecd-iso-to-pxeboot,livecd-iso-to-pxeboot)
+
 dnl Check for optional perldoc (for building manual pages).
 AC_CHECK_PROG(HAVE_PERLDOC,perldoc,perldoc)
 
@@ -47,27 +91,6 @@ dnl Check for optional qemu or qemu-kvm (for test-booting).
 AC_CHECK_PROG(HAVE_QEMU,qemu,qemu)
 AC_CHECK_PROG(HAVE_QEMU_KVM,qemu-kvm,qemu-kvm)
 
-dnl XXX Later we will change these so that the user can set them with
-dnl ./configure parameters.  This is just for testing.
-
-# i386 images also work on x86-64, so best to stick with i386.
-ARCH=i386
-
-# Base repository.
-BASE=8
-BASEURL=http://download.fedora.redhat.com/pub/fedora/linux/releases/$BASE/Everything/$ARCH/os/
-
-LANG=en_US.UTF-8
-KEYBOARD=us
-TIMEZONE=US/Eastern
-
-AC_SUBST(ARCH)
-AC_SUBST(BASE)
-AC_SUBST(BASEURL)
-AC_SUBST(LANG)
-AC_SUBST(KEYBOARD)
-AC_SUBST(TIMEZONE)
-
 dnl Summary.
 echo "------------------------------------------------------------"
 echo "Thanks for downloading" $PACKAGE_STRING