From 82c445b01d85df6cf9558ce7203e74e78841a377 Mon Sep 17 00:00:00 2001 From: Alasdair Kergon Date: Thu, 30 Jul 2009 12:25:42 +0000 Subject: [PATCH] Fix configure script to handle multiple clvmd selections. --- WHATS_NEW | 1 + configure | 2 +- configure.in | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index e31ebdfc0..750d845ee 100644 --- 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 df4873231..03af9d165 100755 --- 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 7a865ff21..ba5d72ec1 100644 --- 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"]) -- 2.43.5