mirror of
git://sourceware.org/git/lvm2.git
synced 2024-12-22 17:35:59 +03:00
configure: --clear-need-check-flag needs 0.5.4
Require version 5.4 of cache_check tool where this option will work correctly.
This commit is contained in:
parent
3ea396e9d2
commit
664a9f4830
@ -1,5 +1,6 @@
|
|||||||
Version 2.02.128 -
|
Version 2.02.128 -
|
||||||
===================================
|
===================================
|
||||||
|
Require cache_check 0.5.4 for use of --clear-needs-check-flag.
|
||||||
Fix lvmetad udev rules to not override SYSTEMD_WANTS, add the service instead.
|
Fix lvmetad udev rules to not override SYSTEMD_WANTS, add the service instead.
|
||||||
|
|
||||||
Version 2.02.127 - 10th August 2015
|
Version 2.02.127 - 10th August 2015
|
||||||
|
23
configure
vendored
23
configure
vendored
@ -8813,20 +8813,27 @@ $as_echo "$as_me: WARNING: cache_check not found in path $PATH" >&2;}
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
if test "$CACHE_CHECK_NEEDS_CHECK" = yes; then
|
if test "$CACHE_CHECK_NEEDS_CHECK" = yes; then
|
||||||
CACHE_CHECK_VSN=`"$CACHE_CHECK_CMD" -V 2>/dev/null`
|
$CACHE_CHECK_CMD -V 2>/dev/null >conftest.tmp
|
||||||
CACHE_CHECK_VSN_MAJOR=`echo "$CACHE_CHECK_VSN" | $AWK -F '.' '{print $1}'`
|
read -r CACHE_CHECK_VSN < conftest.tmp
|
||||||
CACHE_CHECK_VSN_MINOR=`echo "$CACHE_CHECK_VSN" | $AWK -F '.' '{print $2}'`
|
IFS=. read -r CACHE_CHECK_VSN_MAJOR CACHE_CHECK_VSN_MINOR CACHE_CHECK_VSN_PATCH < conftest.tmp
|
||||||
|
rm -f conftest.tmp
|
||||||
|
|
||||||
if test -z "$CACHE_CHECK_VSN_MAJOR" -o -z "$CACHE_CHECK_VSN_MINOR"; then
|
# Require version >= 0.5.4 for --clear-needs-check-flag
|
||||||
|
if test -z "$CACHE_CHECK_VSN_MAJOR" \
|
||||||
|
|| test -z "$CACHE_CHECK_VSN_MINOR" \
|
||||||
|
|| test -z "$CACHE_CHECK_VSN_PATCH"; then
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $CACHE_CHECK_CMD: Bad version \"$CACHE_CHECK_VSN\" found" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $CACHE_CHECK_CMD: Bad version \"$CACHE_CHECK_VSN\" found" >&5
|
||||||
$as_echo "$as_me: WARNING: $CACHE_CHECK_CMD: Bad version \"$CACHE_CHECK_VSN\" found" >&2;}
|
$as_echo "$as_me: WARNING: $CACHE_CHECK_CMD: Bad version \"$CACHE_CHECK_VSN\" found" >&2;}
|
||||||
CACHE_CHECK_VERSION_WARN=y
|
CACHE_CHECK_VERSION_WARN=y
|
||||||
CACHE_CHECK_NEEDS_CHECK=no
|
CACHE_CHECK_NEEDS_CHECK=no
|
||||||
elif test "$CACHE_CHECK_VSN_MAJOR" -eq 0 -a "$CACHE_CHECK_VSN_MINOR" -lt 5; then
|
elif test "$CACHE_CHECK_VSN_MAJOR" -eq 0 ; then
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $CACHE_CHECK_CMD: Old version \"$CACHE_CHECK_VSN\" found" >&5
|
if test "$CACHE_CHECK_VSN_MINOR" -lt 5 \
|
||||||
|
|| test "$CACHE_CHECK_VSN_MINOR" -eq 5 -a "$CACHE_CHECK_VSN_PATCH" -lt 4; then
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $CACHE_CHECK_CMD: Old version \"$CACHE_CHECK_VSN\" found" >&5
|
||||||
$as_echo "$as_me: WARNING: $CACHE_CHECK_CMD: Old version \"$CACHE_CHECK_VSN\" found" >&2;}
|
$as_echo "$as_me: WARNING: $CACHE_CHECK_CMD: Old version \"$CACHE_CHECK_VSN\" found" >&2;}
|
||||||
CACHE_CHECK_VERSION_WARN=y
|
CACHE_CHECK_VERSION_WARN=y
|
||||||
CACHE_CHECK_NEEDS_CHECK=no
|
CACHE_CHECK_NEEDS_CHECK=no
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
# Empty means a config way to ignore cache dumping
|
# Empty means a config way to ignore cache dumping
|
||||||
|
23
configure.in
23
configure.in
@ -584,18 +584,25 @@ case "$CACHE" in
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
if test "$CACHE_CHECK_NEEDS_CHECK" = yes; then
|
if test "$CACHE_CHECK_NEEDS_CHECK" = yes; then
|
||||||
CACHE_CHECK_VSN=`"$CACHE_CHECK_CMD" -V 2>/dev/null`
|
$CACHE_CHECK_CMD -V 2>/dev/null >conftest.tmp
|
||||||
CACHE_CHECK_VSN_MAJOR=`echo "$CACHE_CHECK_VSN" | $AWK -F '.' '{print $1}'`
|
read -r CACHE_CHECK_VSN < conftest.tmp
|
||||||
CACHE_CHECK_VSN_MINOR=`echo "$CACHE_CHECK_VSN" | $AWK -F '.' '{print $2}'`
|
IFS=. read -r CACHE_CHECK_VSN_MAJOR CACHE_CHECK_VSN_MINOR CACHE_CHECK_VSN_PATCH < conftest.tmp
|
||||||
|
rm -f conftest.tmp
|
||||||
|
|
||||||
if test -z "$CACHE_CHECK_VSN_MAJOR" -o -z "$CACHE_CHECK_VSN_MINOR"; then
|
# Require version >= 0.5.4 for --clear-needs-check-flag
|
||||||
|
if test -z "$CACHE_CHECK_VSN_MAJOR" \
|
||||||
|
|| test -z "$CACHE_CHECK_VSN_MINOR" \
|
||||||
|
|| test -z "$CACHE_CHECK_VSN_PATCH"; then
|
||||||
AC_MSG_WARN([$CACHE_CHECK_CMD: Bad version "$CACHE_CHECK_VSN" found])
|
AC_MSG_WARN([$CACHE_CHECK_CMD: Bad version "$CACHE_CHECK_VSN" found])
|
||||||
CACHE_CHECK_VERSION_WARN=y
|
CACHE_CHECK_VERSION_WARN=y
|
||||||
CACHE_CHECK_NEEDS_CHECK=no
|
CACHE_CHECK_NEEDS_CHECK=no
|
||||||
elif test "$CACHE_CHECK_VSN_MAJOR" -eq 0 -a "$CACHE_CHECK_VSN_MINOR" -lt 5; then
|
elif test "$CACHE_CHECK_VSN_MAJOR" -eq 0 ; then
|
||||||
AC_MSG_WARN([$CACHE_CHECK_CMD: Old version "$CACHE_CHECK_VSN" found])
|
if test "$CACHE_CHECK_VSN_MINOR" -lt 5 \
|
||||||
CACHE_CHECK_VERSION_WARN=y
|
|| test "$CACHE_CHECK_VSN_MINOR" -eq 5 -a "$CACHE_CHECK_VSN_PATCH" -lt 4; then
|
||||||
CACHE_CHECK_NEEDS_CHECK=no
|
AC_MSG_WARN([$CACHE_CHECK_CMD: Old version "$CACHE_CHECK_VSN" found])
|
||||||
|
CACHE_CHECK_VERSION_WARN=y
|
||||||
|
CACHE_CHECK_NEEDS_CHECK=no
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
# Empty means a config way to ignore cache dumping
|
# Empty means a config way to ignore cache dumping
|
||||||
|
Loading…
Reference in New Issue
Block a user