daemon.GenericMain: Don't use list of multithreaded daemons

[ganeti-local] / configure.ac

diff --git a/configure.ac b/configure.ac
index 955b860..97de447 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_minor], [1])
 m4_define([gnt_version_revision], [0])
-m4_define([gnt_version_suffix], [~rc3])
+m4_define([gnt_version_suffix], [~rc1])
 m4_define([gnt_version_full],
           m4_format([%d.%d.%d%s],
                     gnt_version_major, gnt_version_minor,
@@ -61,6 +61,15 @@ AC_ARG_WITH([iallocator-search-path],
   [iallocator_search_path="'$libdir/$PACKAGE_NAME/iallocators'"])
 AC_SUBST(IALLOCATOR_SEARCH_PATH, $iallocator_search_path)
 
+# --with-xen-bootloader=...
+AC_ARG_WITH([xen-bootloader],
+  [AS_HELP_STRING([--with-xen-bootloader=PATH],
+    [bootloader for Xen hypervisor (default is empty)]
+  )],
+  [xen_bootloader="$withval"],
+  [xen_bootloader=])
+AC_SUBST(XEN_BOOTLOADER, $xen_bootloader)
+
 # --with-xen-kernel=...
 AC_ARG_WITH([xen-kernel],
   [AS_HELP_STRING([--with-xen-kernel=PATH],
@@ -99,25 +108,15 @@ 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)]
+# ---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)]
   )],
-  [socat_path="$withval"],
-  [socat_path="/usr/bin/socat"])
-AC_SUBST(SOCAT_PATH, $socat_path)
+  [lvm_stripecount="$withval"],
+  [lvm_stripecount="1"])
+AC_SUBST(LVM_STRIPECOUNT, $lvm_stripecount)
 
 # Check common programs
 AC_PROG_INSTALL
@@ -138,12 +137,12 @@ then
   AC_MSG_WARN([docbook2html not found, man pages rebuild will not be possible])
 fi
 
-# Check for rst programs
-AC_ARG_VAR(RST2HTML, [rst2html path])
-AC_PATH_PROG(RST2HTML, [rst2html], [])
-if test -z "$RST2HTML"
+# 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([rst2html not found, documentation rebuild will not be possible])
+  AC_MSG_WARN([sphinx-build not found, documentation rebuild will not be possible])
 fi
 
 # Check for graphviz (dot)
@@ -154,12 +153,44 @@ then
   AC_MSG_WARN([dot (from the graphviz suite) not found, documentation rebuild not possible])
 fi
 
+# Check for socat
+AC_ARG_VAR(SOCAT, [socat path])
+AC_PATH_PROG(SOCAT, [socat], [])
+if test -z "$SOCAT"
+then
+  AC_MSG_ERROR([socat not found])
+fi
+
+SOCAT_USE_ESCAPE=
+AC_ARG_ENABLE([socat-escape],
+  [AS_HELP_STRING([--enable-socat-escape],
+    [use escape functionality available in socat >= 1.7 (default: detect
+     automatically)])],
+  [[if test "$enableval" = yes; then
+      SOCAT_USE_ESCAPE=True
+    else
+      SOCAT_USE_ESCAPE=False
+    fi
+  ]])
+
+if test -z "$SOCAT_USE_ESCAPE"
+then
+  if $SOCAT -hh | grep -w -q escape; then
+    SOCAT_USE_ESCAPE=True
+  else
+    SOCAT_USE_ESCAPE=False
+  fi
+fi
+
+AC_SUBST(SOCAT_USE_ESCAPE)
+
 # Check for Python
 AM_PATH_PYTHON(2.4)
 
 AC_PYTHON_MODULE(OpenSSL, t)
 AC_PYTHON_MODULE(simplejson, t)
 AC_PYTHON_MODULE(pyparsing, t)
+AC_PYTHON_MODULE(pyinotify, t)
 
 AC_CONFIG_FILES([ Makefile ])