diff options
| author | Fabio M. Di Nitto <fdinitto@redhat.com> | 2009-09-01 19:11:45 +0000 |
|---|---|---|
| committer | Fabio M. Di Nitto <fdinitto@redhat.com> | 2009-09-01 19:11:45 +0000 |
| commit | 8c222979e5eb44dbaf32711f13276581885bf4ed (patch) | |
| tree | a2c9142014fcff549c56b0167969732619261c4e /configure.in | |
| parent | ac7d72072527b4408b9ea5e82ea8eca6c0947ad5 (diff) | |
| download | lvm2-8c222979e5eb44dbaf32711f13276581885bf4ed.tar.gz lvm2-8c222979e5eb44dbaf32711f13276581885bf4ed.tar.xz lvm2-8c222979e5eb44dbaf32711f13276581885bf4ed.zip | |
Fix --with-clvmd=all to deal with the case where no cluster managers are available.
Also simplify the check by removing an unnecessary variable and update
configure messages.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/configure.in b/configure.in index cf74d071..c8375661 100644 --- a/configure.in +++ b/configure.in @@ -326,7 +326,7 @@ dnl -- Build cluster LVM daemon AC_MSG_CHECKING(whether to build cluster LVM daemon) AC_ARG_WITH(clvmd, [ --with-clvmd=TYPE Build cluster LVM Daemon. - The following locking combinations are valid: + The following cluster manager combinations are valid: * cman,gulm (RHEL4 or equivalent) * cman (RHEL5 or equivalent) * cman,corosync,openais (or selection of them) @@ -522,31 +522,34 @@ fi dnl -- If we are autodetecting, we need to re-create dnl -- the depedencies checks and set a proper CLVMD. if test x$CLVMD = xall; then + CLVMD=none if test x$HAVE_CCS = xyes && \ test x$HAVE_GULM = xyes; then - AC_MSG_RESULT([Enabling clvmd gulm backend]) - NEWCLVMD="$NEWCLVMD,gulm" + AC_MSG_RESULT([Enabling clvmd gulm cluster manager]) + CLVMD="$CLVMD,gulm" fi if test x$HAVE_CMAN = xyes && \ test x$HAVE_DLM = xyes; then - AC_MSG_RESULT([Enabling clvmd cman backend]) - NEWCLVMD="$NEWCLVMD,cman" + AC_MSG_RESULT([Enabling clvmd cman cluster manager]) + CLVMD="$CLVMD,cman" fi if test x$HAVE_COROSYNC = xyes && \ test x$HAVE_QUORUM = xyes && \ test x$HAVE_CPG = xyes && \ test x$HAVE_DLM = xyes && \ test x$HAVE_CONFDB = xyes; then - AC_MSG_RESULT([Enabling clvmd corosync backend]) - NEWCLVMD="$NEWCLVMD,corosync" + AC_MSG_RESULT([Enabling clvmd corosync cluster manager]) + CLVMD="$CLVMD,corosync" fi if test x$HAVE_COROSYNC = xyes && \ test x$HAVE_CPG = xyes && \ test x$HAVE_SALCK = xyes; then - AC_MSG_RESULT([Enabling clvmd openais backend]) - NEWCLVMD="$NEWCLVMD,openais" + AC_MSG_RESULT([Enabling clvmd openais cluster manager]) + CLVMD="$CLVMD,openais" + fi + if test x$CLVMD = xnone; then + AC_MSG_RESULT([Disabling clvmd build. No cluster manager detected.]) fi - CLVMD="$NEWCLVMD" fi ################################################################################ |