Fix configure script to handle multiple clvmd selections.

diff --git a/WHATS_NEW b/WHATS_NEW
index e31ebdfc0264de915a07e6dd1cba722eddf770db..750d845ee0bf5c8407843e0c636197124541a19c 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.51 - 
 ================================
+  Fix configure script to handle multiple clvmd selections.
   Fix lvm2app.pc installation filename.
   Remove pv_t, vg_t & lv_t handles from lib.  Only liblvm uses them.
   Rename lvm.h to lvm2app.h for now.

diff --git a/configure b/configure
index df4873231072259e7b341d0a8aab96936ecc15dd..03af9d165510da51de08e1f42b2d9c227ce928dd 100755 (executable)
--- a/configure
+++ b/configure
@@ -9190,7 +9190,7 @@ if  test x$CLVMD != xnone && test x$CLUSTER = xnone; then
        CLUSTER=internal
 fi
 
-if [ "x$CLVMD" = xcorosync -o "x$CLVMD" = xall ]; then
+if [ "x$CLVMD" = xall -o `expr x"$CLVMD" : '.*cman.*'` != 0 ]; then
 
 
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then

diff --git a/configure.in b/configure.in
index 7a865ff21dbf697a3546aef937537382281239db..ba5d72ec1fb1b40fae73b3599a7c30cb37b3b7b3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -340,7 +340,7 @@ if  test x$CLVMD != xnone && test x$CLUSTER = xnone; then
 fi
 
 dnl -- Look for corosync libraries if required.
-if [[ "x$CLVMD" = xcorosync -o "x$CLVMD" = xall ]]; then
+if [[ "x$CLVMD" = xall -o `expr x"$CLVMD" : '.*cman.*'` != 0 ]]; then
        PKG_CHECK_MODULES(QUORUM, libquorum, [],
                [AC_MSG_RESULT([no pkg for quorum library, using -lquorum]);
                QUORUM_LIBS="-lquorum"])