configure: fix configure to set proper use_blkid_wiping if autodetected as disabled

If not using explicit --enable-blkid-wiping/--disable-blkid-wiping
configure option, the configure script tries to enable/disable blkid
wiping feature automatically based on blkid library version found.

The script incorrectly set default value for lvm.conf's
allocation/use_blkid_wiping" setting to "1" (enabled) if proper
blkid library version was not found or the version found was less
than the minimum required. It should be set to "0" in this case.

diff --git a/WHATS_NEW b/WHATS_NEW
index 6f909abf6cf6ff33da5f7769fe80468b8bc5e370..20f86d28fb2d15473eb1b42abb9f1deac0a64ff8 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.141 - 
 ====================================
+  Fix configure to set proper use_blkid_wiping if autodetected as disabled.
   Initialise udev in clvmd for use in device scanning. (2.02.116)
   Add seg_le_ranges report field for common format when displaying seg devices.
   Honour report/list_item_separator for seg_metadata_le_ranges report field.

diff --git a/aclocal.m4 b/aclocal.m4
index 67b2d59a06d16304b3091698ea89e753de0ccb1b..05e0ad53038eab41580ccd78bf580a156a15a750 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -15,7 +15,7 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun
 # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
 # serial 1 (pkg-config-0.24)
 # 
-# Copyright (c) 2004 Scott James Remnant <scott@netsplit.com>.
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/configure b/configure
index 8a9482de084e11daecd01a877901407844bb5c7b..f22a11e15519613fdb5d98bf3e637e10b96685e3 100755 (executable)
--- a/configure
+++ b/configure
@@ -11791,7 +11791,7 @@ fi
 $as_echo "#define BLKID_WIPING_SUPPORT 1" >>confdefs.h
 
        else
-               DEFAULT_USE_BLKID_WIPING=1
+               DEFAULT_USE_BLKID_WIPING=0
        fi
 else
        DEFAULT_USE_BLKID_WIPING=0

diff --git a/configure.in b/configure.in
index 8e04782d01e61752bdd8f2158565f6710164a61b..2cad902017cfb7e8e792a3a622d4dc8926b2f60e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1291,7 +1291,7 @@ if test "$BLKID_WIPING" != no; then
                DEFAULT_USE_BLKID_WIPING=1
                AC_DEFINE([BLKID_WIPING_SUPPORT], 1, [Define to 1 to use libblkid detection of signatures when wiping.])
        else
-               DEFAULT_USE_BLKID_WIPING=1
+               DEFAULT_USE_BLKID_WIPING=0
        fi
 else
        DEFAULT_USE_BLKID_WIPING=0