X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/7e2c5b9eee64c3a5b26fad6d5e58872032044d35..0b2454b9546a78ddbe40c0dd7d7a274e2e6e2ca6:/configure.ac

diff --git a/configure.ac b/configure.ac
index a8d4499..c0bd9b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 m4_define([gnt_version_major], [2])
 m4_define([gnt_version_minor], [0])
 m4_define([gnt_version_revision], [0])
-m4_define([gnt_version_suffix], [~alpha0])
+m4_define([gnt_version_suffix], [~beta1])
 m4_define([gnt_version_full],
           m4_format([%d.%d.%d%s],
                     gnt_version_major, gnt_version_minor,
@@ -99,6 +99,26 @@ AC_ARG_WITH([kvm-path],
   [kvm_path="/usr/bin/kvm"])
 AC_SUBST(KVM_PATH, $kvm_path)
 
+# --with-kvm-migration-port=...
+AC_ARG_WITH([kvm-migration-port],
+  [AS_HELP_STRING([--with-kvm-migration-port=PORT],
+    [tcp port used for kvm instance live migration]
+    [ (default is 8102)]
+  )],
+  [kvm_migration_port="$withval"],
+  [kvm_migration_port="8102"])
+AC_SUBST(KVM_MIGRATION_PORT, $kvm_migration_port)
+
+# --with-socat-path=...
+AC_ARG_WITH([socat-path],
+  [AS_HELP_STRING([--with-socat-path=PATH],
+    [absolute path to the socat binary]
+    [ (default is /usr/bin/socat)]
+  )],
+  [socat_path="$withval"],
+  [socat_path="/usr/bin/socat"])
+AC_SUBST(SOCAT_PATH, $socat_path)
+
 # Check common programs
 AC_PROG_INSTALL
 AC_PROG_LN_S
@@ -125,12 +145,25 @@ 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 graphviz (dot)
+AC_ARG_VAR(DOT, [dot path])
+AC_PATH_PROG(DOT, [dot], [])
+if test -z "$DOT"
+then
+  AC_MSG_ERROR([dot (from the graphviz suite) 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)