Temporarily explicitely break import/export

[ganeti-local] / configure.ac

diff --git a/configure.ac b/configure.ac
index 58fcf71..582427c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -89,6 +89,16 @@ AC_ARG_WITH([file-storage-dir],
   [file_storage_dir="/srv/ganeti/file-storage"])
 AC_SUBST(FILE_STORAGE_DIR, $file_storage_dir)
 
+# --with-kvm-path=...
+AC_ARG_WITH([kvm-path],
+  [AS_HELP_STRING([--with-kvm-path=PATH],
+    [absolute path to the kvm binary]
+    [ (default is /usr/bin/kvm)]
+  )],
+  [kvm_path="$withval"],
+  [kvm_path="/usr/bin/kvm"])
+AC_SUBST(KVM_PATH, $kvm_path)
+
 # Check common programs
 AC_PROG_INSTALL
 AC_PROG_LN_S
@@ -115,12 +125,17 @@ then
   AC_MSG_ERROR([docbook2html not found])
 fi
 
+# Check for rst programs
+AC_ARG_VAR(RST2HTML, [rst2html path])
+AC_PATH_PROG(RST2HTML, [rst2html], [])
+if test -z "$RST2HTML"
+then
+  AC_MSG_ERROR([rst2html not found])
+fi
+
 # Check for Python
 AM_PATH_PYTHON(2.4)
 
-# AC_PYTHON_MODULE(twisted.internet, t)
-# AC_PYTHON_MODULE(twisted.cred, t)
-# AC_PYTHON_MODULE(twisted.spread, t)
 AC_PYTHON_MODULE(OpenSSL, t)
 AC_PYTHON_MODULE(simplejson, t)
 AC_PYTHON_MODULE(pyparsing, t)