Fix mixed pvm/hvm clusters and instance listing

[ganeti-local] / configure.ac

diff --git a/configure.ac b/configure.ac
index 1a0f90c..960d60d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 # Configure script for Ganeti
-m4_define([gnt_version_major], [1])
-m4_define([gnt_version_minor], [3])
+m4_define([gnt_version_major], [2])
+m4_define([gnt_version_minor], [0])
 m4_define([gnt_version_revision], [0])
-m4_define([gnt_version_suffix], [~alpha1])
+m4_define([gnt_version_suffix], [~beta2])
 m4_define([gnt_version_full],
           m4_format([%d.%d.%d%s],
                     gnt_version_major, gnt_version_minor,
@@ -12,7 +12,7 @@ AC_PREREQ(2.59)
 AC_INIT(ganeti, gnt_version_full, ganeti@googlegroups.com)
 AC_CONFIG_AUX_DIR(autotools)
 AC_CONFIG_SRCDIR(configure)
-AM_INIT_AUTOMAKE([foreign tar-ustar])
+AM_INIT_AUTOMAKE([1.9 foreign tar-ustar -Wall -Wno-portability])
 
 AC_SUBST([VERSION_MAJOR], gnt_version_major)
 AC_SUBST([VERSION_MINOR], gnt_version_minor)
@@ -89,40 +89,85 @@ 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
 
+# Check for docbook programs
+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])
+fi
+
+AC_ARG_VAR(DOCBOOK2HTML, [docbook2html path])
+AC_PATH_PROG(DOCBOOK2HTML, [docbook2html], [])
+if test -z "$DOCBOOK2HTML"
+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)
 
-# Check for docbook2man
-found_docbook2man=
-AC_CHECK_PROG(found_docbook2man, [docbook2man], [yes])
-if test "$found_docbook2man" != "yes"
-then
-  AC_MSG_WARN([docbook2man not found.])
-fi
-
-AC_CONFIG_FILES([
-  Makefile
-  daemons/Makefile
-  doc/Makefile
-  doc/examples/Makefile
-  lib/Makefile
-  man/Makefile
-  qa/Makefile
-  qa/hooks/Makefile
-  scripts/Makefile
-  test/Makefile
-  tools/Makefile
-])
+AC_CONFIG_FILES([ Makefile ])
 
 AC_OUTPUT