Rename OpRemoveNode and LURemoveNode

[ganeti-local] / configure.ac

diff --git a/configure.ac b/configure.ac
index 0df9f2b..04034d4 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], [2])
-m4_define([gnt_version_revision], [1])
-m4_define([gnt_version_suffix], [])
+m4_define([gnt_version_minor], [4])
+m4_define([gnt_version_revision], [0])
+m4_define([gnt_version_suffix], [~beta1])
 m4_define([gnt_version_full],
           m4_format([%d.%d.%d%s],
                     gnt_version_major, gnt_version_minor,
@@ -141,9 +141,9 @@ AC_ARG_WITH([user-prefix],
     [prefix for daemon users]
     [ (default is to run all daemons as root)]
   )],
-  [user_masterd="root";
+  [user_masterd="${withval}masterd";
    user_rapi="${withval}rapi";
-   user_confd="root";
+   user_confd="${withval}confd";
    user_noded="root"],
   [user_masterd="root";
    user_rapi="root";
@@ -160,10 +160,10 @@ AC_ARG_WITH([group-prefix],
     [prefix for daemon POSIX groups]
     [ (default is to run all daemons under group root)]
   )],
-  [group_rapi="root";
-   group_admin="root";
-   group_confd="root";
-   group_masterd="root";
+  [group_rapi="${withval}rapi";
+   group_admin="${withval}admin";
+   group_confd="${withval}confd";
+   group_masterd="${withval}masterd";
    group_daemons="${withval}daemons";],
   [group_rapi="root";
    group_admin="root";
@@ -223,23 +223,25 @@ then
 fi
 AC_SUBST(SYSLOG_USAGE, $SYSLOG)
 
+# --with-disk-separator=...
+AC_ARG_WITH([disk-separator],
+  [AS_HELP_STRING([--with-disk-separator=STRING],
+    [Disk index separator, useful if the default of ':' is handled specially by the hypervisor]
+  )],
+  [disk_separator="$withval"],
+  [disk_separator=":"])
+AC_SUBST(DISK_SEPARATOR, $disk_separator)
+
 # 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_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"
+# Check for pandoc
+AC_ARG_VAR(PANDOC, [pandoc path])
+AC_PATH_PROG(PANDOC, [pandoc], [])
+if test -z "$PANDOC"
 then
-  AC_MSG_WARN([docbook2html not found, man pages rebuild will not be possible])
+  AC_MSG_WARN([pandoc not found, man pages rebuild will not be possible])
 fi
 
 # Check for python-sphinx
@@ -297,6 +299,29 @@ fi
 
 AC_SUBST(SOCAT_USE_ESCAPE)
 
+SOCAT_USE_COMPRESS=
+AC_ARG_ENABLE([socat-compress],
+  [AS_HELP_STRING([--enable-socat-compress],
+    [use OpenSSL compression option available in patched socat builds
+     (see INSTALL for details; default: detect automatically)])],
+  [[if test "$enableval" = yes; then
+      SOCAT_USE_COMPRESS=True
+    else
+      SOCAT_USE_COMPRESS=False
+    fi
+  ]])
+
+if test -z "$SOCAT_USE_COMPRESS"
+then
+  if $SOCAT -hhh | grep -w -q openssl-compress; then
+    SOCAT_USE_COMPRESS=True
+  else
+    SOCAT_USE_COMPRESS=False
+  fi
+fi
+
+AC_SUBST(SOCAT_USE_COMPRESS)
+
 if man --help | grep -q -e --warnings
 then
   MAN_HAS_WARNINGS=1