Revert "bash_completion: Always enable extglob"

[ganeti-local] / configure.ac

diff --git a/configure.ac b/configure.ac
index 46ca42f..5bb14af 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 m4_define([gnt_version_major], [2])
 m4_define([gnt_version_minor], [6])
 m4_define([gnt_version_revision], [0])
-m4_define([gnt_version_suffix], [~rc2])
+m4_define([gnt_version_suffix], [])
 m4_define([gnt_version_full],
           m4_format([%d.%d.%d%s],
                     gnt_version_major, gnt_version_minor,
@@ -176,20 +176,39 @@ AC_ARG_WITH([lvm-stripecount],
   [lvm_stripecount="1"])
 AC_SUBST(LVM_STRIPECOUNT, $lvm_stripecount)
 
+# --with-default-user=...
+AC_ARG_WITH([default-user],
+  [AS_HELP_STRING([--with-default-user=USERNAME],
+    [default user for daemons]
+    [ (default is to run all daemons as root)]
+  )],
+  [user_default="$withval"],
+  [user_default=root])
+
+# --with-default-group=...
+AC_ARG_WITH([default-group],
+  [AS_HELP_STRING([--with-default-group=GROUPNAME],
+    [default group for daemons]
+    [ (default is to run all daemons under group root)]
+  )],
+  [group_default="$withval"],
+  [group_default=root])
+
 # --with-user-prefix=...
 AC_ARG_WITH([user-prefix],
   [AS_HELP_STRING([--with-user-prefix=PREFIX],
     [prefix for daemon users]
-    [ (default is to run all daemons as root)]
+    [ (default is to run all daemons as root; use --with-default-user]
+    [ to change the default)]
   )],
   [user_masterd="${withval}masterd";
    user_rapi="${withval}rapi";
    user_confd="${withval}confd";
-   user_noded="root"],
-  [user_masterd="root";
-   user_rapi="root";
-   user_confd="root";
-   user_noded="root"])
+   user_noded="$user_default"],
+  [user_masterd="$user_default";
+   user_rapi="$user_default";
+   user_confd="$user_default";
+   user_noded="$user_default"])
 AC_SUBST(MASTERD_USER, $user_masterd)
 AC_SUBST(RAPI_USER, $user_rapi)
 AC_SUBST(CONFD_USER, $user_confd)
@@ -199,20 +218,21 @@ AC_SUBST(NODED_USER, $user_noded)
 AC_ARG_WITH([group-prefix],
   [AS_HELP_STRING([--with-group-prefix=PREFIX],
     [prefix for daemon POSIX groups]
-    [ (default is to run all daemons under group root)]
+    [ (default is to run all daemons under group root; use]
+    [ --with-default-group to change the default)]
   )],
   [group_rapi="${withval}rapi";
    group_admin="${withval}admin";
    group_confd="${withval}confd";
    group_masterd="${withval}masterd";
-   group_noded="root";
+   group_noded="$group_default";
    group_daemons="${withval}daemons";],
-  [group_rapi="root";
-   group_admin="root";
-   group_confd="root";
-   group_masterd="root";
-   group_noded="root";
-   group_daemons="root"])
+  [group_rapi="$group_default";
+   group_admin="$group_default";
+   group_confd="$group_default";
+   group_masterd="$group_default";
+   group_noded="$group_default";
+   group_daemons="$group_default"])
 AC_SUBST(RAPI_GROUP, $group_rapi)
 AC_SUBST(ADMIN_GROUP, $group_admin)
 AC_SUBST(CONFD_GROUP, $group_confd)
@@ -288,7 +308,7 @@ AC_ARG_ENABLE([htools-rapi],
         [],
         [enable_htools_rapi=no])
 
-# --enable-htools
+# --enable-confd
 ENABLE_CONFD=
 AC_ARG_ENABLE([confd],
   [AS_HELP_STRING([--enable-confd],
@@ -324,6 +344,31 @@ AM_CONDITIONAL([WANT_CONFD], [test x$enable_confd = xTrue])
 AM_CONDITIONAL([PY_CONFD], [test x$py_confd = xTrue])
 AM_CONDITIONAL([HS_CONFD], [test x$hs_confd = xTrue])
 
+# --enable-split-query
+ENABLE_SPLIT_QUERY=
+AC_ARG_ENABLE([split-query],
+  [AS_HELP_STRING([--enable-split-query],
+  [enable use of custom query daemon via Haskell confd])],
+  [[case "$enableval" in
+      no)
+        enable_split_query=False
+        ;;
+      yes)
+        enable_split_query=True
+        ;;
+      *)
+        echo "Invalid value for enable-confd '$enableval'"
+        exit 1
+        ;;
+    esac
+  ]],
+  [enable_split_query=False])
+AC_SUBST(ENABLE_SPLIT_QUERY, $enable_split_query)
+
+if test x$enable_split_query = xTrue -a x$hs_confd != xTrue; then
+  AC_MSG_ERROR([Split queries require the Haskell confd])
+fi
+
 # --with-disk-separator=...
 AC_ARG_WITH([disk-separator],
   [AS_HELP_STRING([--with-disk-separator=STRING],