Ethers hook, compatibility with old lockfile

[ganeti-local] / configure.ac

diff --git a/configure.ac b/configure.ac
index 38fae84..6d3b906 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 # Configure script for Ganeti
 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_revision], [3])
+m4_define([gnt_version_suffix], [])
 m4_define([gnt_version_full],
           m4_format([%d.%d.%d%s],
                     gnt_version_major, gnt_version_minor,
@@ -99,6 +99,36 @@ 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)
+
+# ---with-lvm-stripecount=...
+AC_ARG_WITH([lvm-stripecount],
+  [AS_HELP_STRING([--with-lvm-stripecount=NUM],
+    [the number of stripes to use for LVM volumes]
+    [ (default is 1)]
+  )],
+  [lvm_stripecount="$withval"],
+  [lvm_stripecount="1"])
+AC_SUBST(LVM_STRIPECOUNT, $lvm_stripecount)
+
 # Check common programs
 AC_PROG_INSTALL
 AC_PROG_LN_S
@@ -108,21 +138,14 @@ 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 rst programs
@@ -130,15 +153,20 @@ AC_ARG_VAR(RST2HTML, [rst2html path])
 AC_PATH_PROG(RST2HTML, [rst2html], [])
 if test -z "$RST2HTML"
 then
-  AC_MSG_ERROR([rst2html not found])
+  AC_MSG_WARN([rst2html 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)