Revert "Allow to specify wipe command and flags at configure time"

[ganeti-local] / configure.ac

diff --git a/configure.ac b/configure.ac
index ac4d57b..0cd5170 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], [0])
-m4_define([gnt_version_suffix], [~beta0])
+m4_define([gnt_version_revision], [1])
+m4_define([gnt_version_suffix], [])
 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";
@@ -297,6 +297,17 @@ fi
 
 AC_SUBST(SOCAT_USE_ESCAPE)
 
+if man --help | grep -q -e --warnings
+then
+  MAN_HAS_WARNINGS=1
+else
+  MAN_HAS_WARNINGS=
+  AC_MSG_WARN([man doesn't support --warnings, man pages checks
+               will not be possible])
+fi
+
+AC_SUBST(MAN_HAS_WARNINGS)
+
 # Check for Python
 AM_PATH_PYTHON(2.4)
 
@@ -306,6 +317,13 @@ AC_PYTHON_MODULE(pyparsing, t)
 AC_PYTHON_MODULE(pyinotify, t)
 AC_PYTHON_MODULE(pycurl, t)
 
+# This is optional but then we've limited functionality
+AC_PYTHON_MODULE(paramiko)
+if test "$HAVE_PYMOD_PARAMIKO" = "no"; then
+  AC_MSG_WARN([You do not have paramiko installed. While this is optional you
+               have to setup SSH and noded on the joining nodes yourself.])
+fi
+
 AC_CONFIG_FILES([ Makefile ])
 
 AC_OUTPUT