X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/5e29d7339f08fe3dfd91d7010326ace350414e27..0329617acee35cf4f5299e3d431fd8e0e7fb4cbe:/configure.ac

diff --git a/configure.ac b/configure.ac
index 58fcf71..03476cf 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], [~rc5])
 m4_define([gnt_version_full],
           m4_format([%d.%d.%d%s],
                     gnt_version_major, gnt_version_minor,
@@ -89,6 +89,36 @@ 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)
+
+# --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
@@ -98,29 +128,35 @@ AC_ARG_VAR(DOCBOOK2MAN, [docbook2man path])
 AC_PATH_PROG(DOCBOOK2MAN, [docbook2man], [])
 if test -z "$DOCBOOK2MAN"
 then
-  AC_MSG_ERROR([docbook2man not found])
-fi
-
-AC_ARG_VAR(DOCBOOK2PDF, [docbook2pdf path])
-AC_PATH_PROG(DOCBOOK2PDF, [docbook2pdf], [])
-if test -z "$DOCBOOK2PDF"
-then
-  AC_MSG_ERROR([docbook2pdf not found])
+  AC_MSG_WARN([docbook2man not found, man pages rebuild will not be possible])
 fi
 
 AC_ARG_VAR(DOCBOOK2HTML, [docbook2html path])
 AC_PATH_PROG(DOCBOOK2HTML, [docbook2html], [])
 if test -z "$DOCBOOK2HTML"
 then
-  AC_MSG_ERROR([docbook2html not found])
+  AC_MSG_WARN([docbook2html not found, man pages rebuild will not be possible])
+fi
+
+# Check for python-sphinx
+AC_ARG_VAR(SPHINX, [sphinx-build path])
+AC_PATH_PROG(SPHINX, [sphinx-build], [])
+if test -z "$SPHINX"
+then
+  AC_MSG_WARN([sphinx-build not found, documentation rebuild will not be possible])
+fi
+
+# Check for graphviz (dot)
+AC_ARG_VAR(DOT, [dot path])
+AC_PATH_PROG(DOT, [dot], [])
+if test -z "$DOT"
+then
+  AC_MSG_WARN([dot (from the graphviz suite) not found, documentation rebuild not possible])
 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)