summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZdenek Kabelac <zkabelac@redhat.com>2014-11-21 16:33:48 +0100
committerZdenek Kabelac <zkabelac@redhat.com>2014-11-22 09:55:46 +0100
commit6ce8e579897929fceb9da7865160f2e7921ddc6a (patch)
tree6c3e7907c577bac23fcabe6a7c0cca760375b597
parent089bdc0be479dce8a886a50606b4bbb108614fb2 (diff)
downloadlvm2-6ce8e579897929fceb9da7865160f2e7921ddc6a.tar.gz
configure: fix CLVMD_PATH location
Commit d2c116058e72d365802eb5641be60a615daacb96 introduced regression with CLVMD_PATH. + CLVMD_PATH="$clvmd_prefix/sbin/clvmd" test "$prefix" != NONE && clvmd_prefix=$prefix It has set CLVMD_PATH before clvmd_prefix got its final value. Move it one line below.
-rw-r--r--WHATS_NEW1
-rwxr-xr-xconfigure2
-rw-r--r--configure.in2
3 files changed, 3 insertions, 2 deletions
diff --git a/WHATS_NEW b/WHATS_NEW
index 3ccb8dc48..31a1f3eb1 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.02.113 -
=====================================
+ Respect --prefix when setting CLMVD_PATH configure (2.02.89).
Default to configure --enable-udev-systemd-background-jobs for systemd>=205.
Fix ignore_vg() to properly react on various vg_read errors (2.02.112).
Failed recovery returns FAILED_RECOVERY status flag for vg_read().
diff --git a/configure b/configure
index a2a094cc4..df902c3ba 100755
--- a/configure
+++ b/configure
@@ -12433,8 +12433,8 @@ _ACEOF
if test "$CLVMD" != none; then
clvmd_prefix=$ac_default_prefix
- CLVMD_PATH="$clvmd_prefix/sbin/clvmd"
test "$prefix" != NONE && clvmd_prefix=$prefix
+ CLVMD_PATH="$clvmd_prefix/sbin/clvmd"
cat >>confdefs.h <<_ACEOF
#define CLVMD_PATH "$CLVMD_PATH"
diff --git a/configure.in b/configure.in
index d4e367d36..5b22b93df 100644
--- a/configure.in
+++ b/configure.in
@@ -1545,8 +1545,8 @@ AC_DEFINE_UNQUOTED(LVM_PATH, ["$LVM_PATH"], [Path to lvm binary.])
if test "$CLVMD" != none; then
clvmd_prefix=$ac_default_prefix
- CLVMD_PATH="$clvmd_prefix/sbin/clvmd"
test "$prefix" != NONE && clvmd_prefix=$prefix
+ CLVMD_PATH="$clvmd_prefix/sbin/clvmd"
AC_DEFINE_UNQUOTED(CLVMD_PATH, ["$CLVMD_PATH"], [Path to clvmd binary.])
fi