X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=configure.ac;h=a3b7ff95ac8d576b461671910d29eda9551da49c;hb=4dfd0e1afd05220c647e8c1dfe5c8743b067daa8;hp=560d5b1178652cb89fbe7142bc325f97b464640e;hpb=67e7961ca21aa09bcb966b1d62be68a686c87d8a;p=virt-p2v.git

diff --git a/configure.ac b/configure.ac
index 560d5b1..a3b7ff9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,9 @@
 # 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.8)
+
+AC_PROG_INSTALL
 
 dnl Override CD properties.
 AC_ARG_ENABLE([cd-arch],
@@ -43,22 +45,48 @@ AC_ARG_ENABLE([cd-base],
 	[AS_HELP_STRING([--enable-cd-base],
 		[set base Fedora for CD @<:@default=8@:>@])],
 	[CD_BASE=$enableval],
-	[CD_BASE=8])
+	[CD_BASE=9])
 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_ARG_ENABLE([cd-updates-url],
+	[AS_HELP_STRING([--enable-cd-updates-url],
+		[set download URL for package updates])],
+	[CD_UPDATES_URL=$enableval],
+	[CD_UPDATES_URL=http://download.fedora.redhat.com/pub/fedora/linux/updates/$CD_BASE/$CD_ARCH/])
 
 AC_SUBST(CD_ARCH)
 AC_SUBST(CD_BASE)
 AC_SUBST(CD_BASE_URL)
+AC_SUBST(CD_UPDATES_URL)
 AC_SUBST(CD_LANG)
 AC_SUBST(CD_KEYBOARD)
 AC_SUBST(CD_TIMEZONE)
 
+dnl Allow a local repository.
+AC_ARG_ENABLE([localrepo],
+	[AS_HELP_STRING([--enable-localrepo],
+		[set path to local repository with additional packages])],
+	[LOCALREPO=$enableval],
+	[LOCALREPO=no])
+
+if test "x$LOCALREPO" != "xno"; then
+    if test -d "$LOCALREPO"; then
+        # Turn a pathname into a file URL.
+	LOCALREPO=`cd $LOCALREPO && pwd`
+	LOCALREPO=file://$LOCALREPO
+    fi
+    LOCALREPO="repo --name=local --baseurl=$LOCALREPO"
+else
+    LOCALREPO=""
+fi
+AC_SUBST(LOCALREPO)
+
 dnl Check for basic OCaml script interpreter.
 AC_PROG_OCAML
+AC_PROG_FINDLIB
 
 dnl Check for required OCaml modules.
 AC_CHECK_OCAML_MODULE(unix,pkg_unix,Unix,[.])
@@ -76,9 +104,32 @@ if test "x$pkg_xml_light" = "xno"; then
     AC_MSG_ERROR([Cannot find required OCaml package 'xml-light'])
 fi
 
+AC_CHECK_OCAML_MODULE(newt,pkg_newt,Newt,[+newt])
+if test "x$pkg_newt" = "xno"; then
+    AC_MSG_ERROR([Cannot find required OCaml package 'ocaml-newt'])
+fi
+
+AC_CHECK_OCAML_MODULE(pcre,pkg_pcre,Pcre,[+pcre])
+if test "x$pkg_pcre" = "xno"; then
+    AC_MSG_ERROR([Cannot find required OCaml package 'ocaml-pcre'])
+fi
+
+AC_CHECK_OCAML_MODULE(libvirt,pkg_libvirt,Libvirt_version,[+libvirt])
+if test "x$pkg_libvirt" = "xno"; then
+    AC_MSG_ERROR([Cannot find required OCaml package 'ocaml-libvirt'])
+fi
+
+AC_CHECK_OCAML_MODULE(gettext,pkg_gettext,Gettext,[+gettext])
+if test "x$pkg_gettext" = "xno"; then
+    AC_MSG_ERROR([Cannot find required OCaml package 'ocaml-gettext'])
+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)
 
@@ -86,11 +137,14 @@ 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 Check for recommended ocaml-gettext tool.
+AC_CHECK_PROG(OCAML_GETTEXT,ocaml-gettext,ocaml-gettext)
+
 dnl Summary.
 echo "------------------------------------------------------------"
 echo "Thanks for downloading" $PACKAGE_STRING
 echo "------------------------------------------------------------"
 
 dnl Produce output files.
-AC_CONFIG_FILES([Makefile p2v.ks])
+AC_CONFIG_FILES([Makefile po/Makefile p2v.ks virt-p2v.spec])
 AC_OUTPUT