mirror of
git://sourceware.org/git/lvm2.git
synced 2024-12-21 13:34:40 +03:00
configure: improve needs_check thin_check test
Improve testing for needs_check - when old tools are installed, issue proper warning from configure, but stop sending needs_check flag to the old tool.
This commit is contained in:
Zdenek Kabelac
parent
5b787a24f0
commit
2e1192f691
53
configure
vendored
53
configure
vendored
@ -7208,8 +7208,6 @@ $as_echo "#define THIN_INTERNAL 1" >>confdefs.h
|
||||
*) as_fn_error $? "--with-thin parameter invalid ($THIN)" "$LINENO" 5 ;;
|
||||
esac
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether thin_check supports the needs-check flag" >&5
|
||||
$as_echo_n "checking whether thin_check supports the needs-check flag... " >&6; }
|
||||
# Check whether --enable-thin_check_needs_check was given.
|
||||
if test "${enable_thin_check_needs_check+set}" = set; then :
|
||||
enableval=$enable_thin_check_needs_check; THIN_CHECK_NEEDS_CHECK=$enableval
|
||||
@ -7217,14 +7215,6 @@ else
|
||||
THIN_CHECK_NEEDS_CHECK=yes
|
||||
fi
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIN_CHECK_NEEDS_CHECK" >&5
|
||||
$as_echo "$THIN_CHECK_NEEDS_CHECK" >&6; }
|
||||
|
||||
if test x$THIN_CHECK_NEEDS_CHECK = xyes; then
|
||||
|
||||
$as_echo "#define THIN_CHECK_NEEDS_CHECK 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
|
||||
# Test if necessary thin tools are available
|
||||
# if not - use plain defaults and warn user
|
||||
@ -7335,24 +7325,23 @@ fi
|
||||
$as_echo "$as_me: WARNING: thin_check not found in path $PATH" >&2;}
|
||||
THIN_CHECK_CMD=/usr/sbin/thin_check
|
||||
THIN_CONFIGURE_WARN=y
|
||||
else
|
||||
if test x$THIN_CHECK_NEEDS_CHECK = xyes; then
|
||||
THIN_CHECK_VSN=`"$THIN_CHECK_CMD" -V 2>/dev/null`
|
||||
THIN_CHECK_VSN_MAJOR=`echo "$THIN_CHECK_VSN" | $AWK -F '.' '{print $1}'`
|
||||
THIN_CHECK_VSN_MINOR=`echo "$THIN_CHECK_VSN" | $AWK -F '.' '{print $2}'`
|
||||
fi
|
||||
fi
|
||||
if test "$THIN_CHECK_NEEDS_CHECK" = yes; then
|
||||
THIN_CHECK_VSN=`"$THIN_CHECK_CMD" -V 2>/dev/null`
|
||||
THIN_CHECK_VSN_MAJOR=`echo "$THIN_CHECK_VSN" | $AWK -F '.' '{print $1}'`
|
||||
THIN_CHECK_VSN_MINOR=`echo "$THIN_CHECK_VSN" | $AWK -F '.' '{print $2}'`
|
||||
|
||||
if test -z "$THIN_CHECK_VSN_MAJOR" -o -z "$THIN_CHECK_VSN_MINOR" ; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found thin_check version \"$THIN_CHECK_VSN\"" >&5
|
||||
$as_echo "$as_me: WARNING: Found thin_check version \"$THIN_CHECK_VSN\"" >&2;}
|
||||
THIN_CHECK_VERSION_WARN=y
|
||||
else
|
||||
if test "$THIN_CHECK_VSN_MAJOR" -eq 0 -a "$THIN_CHECK_VSN_MINOR" -lt 3 ; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found thin_check version \"$THIN_CHECK_VSN\"" >&5
|
||||
$as_echo "$as_me: WARNING: Found thin_check version \"$THIN_CHECK_VSN\"" >&2;}
|
||||
THIN_CHECK_VERSION_WARN=y
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
if test -z "$THIN_CHECK_VSN_MAJOR" -o -z "$THIN_CHECK_VSN_MINOR"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $THIN_CHECK_CMD: Bad version \"$THIN_CHECK_VSN\" found" >&5
|
||||
$as_echo "$as_me: WARNING: $THIN_CHECK_CMD: Bad version \"$THIN_CHECK_VSN\" found" >&2;}
|
||||
THIN_CHECK_VERSION_WARN=y
|
||||
THIN_CHECK_NEEDS_CHECK=no
|
||||
elif test "$THIN_CHECK_VSN_MAJOR" -eq 0 -a "$THIN_CHECK_VSN_MINOR" -lt 3; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $THIN_CHECK_CMD: Old version \"$THIN_CHECK_VSN\" found" >&5
|
||||
$as_echo "$as_me: WARNING: $THIN_CHECK_CMD: Old version \"$THIN_CHECK_VSN\" found" >&2;}
|
||||
THIN_CHECK_VERSION_WARN=y
|
||||
THIN_CHECK_NEEDS_CHECK=no
|
||||
fi
|
||||
fi
|
||||
# Empty means a config way to ignore thin checking
|
||||
@ -7572,6 +7561,16 @@ $as_echo "$as_me: WARNING: thin_repair not found in path $PATH" >&2;}
|
||||
;;
|
||||
esac
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether thin_check supports the needs-check flag" >&5
|
||||
$as_echo_n "checking whether thin_check supports the needs-check flag... " >&6; }
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIN_CHECK_NEEDS_CHECK" >&5
|
||||
$as_echo "$THIN_CHECK_NEEDS_CHECK" >&6; }
|
||||
if test "$THIN_CHECK_NEEDS_CHECK" = yes; then
|
||||
|
||||
$as_echo "#define THIN_CHECK_NEEDS_CHECK 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define THIN_CHECK_CMD "$THIN_CHECK_CMD"
|
||||
|
||||
41
configure.in
41
configure.in
@ -433,16 +433,10 @@ case "$THIN" in
|
||||
esac
|
||||
|
||||
dnl -- thin_check needs-check flag
|
||||
AC_MSG_CHECKING(whether thin_check supports the needs-check flag)
|
||||
AC_ARG_ENABLE(thin_check_needs_check,
|
||||
AC_HELP_STRING([--disable-thin_check_needs_check],
|
||||
[required if thin_check version is < 0.3.0]),
|
||||
THIN_CHECK_NEEDS_CHECK=$enableval, THIN_CHECK_NEEDS_CHECK=yes)
|
||||
AC_MSG_RESULT($THIN_CHECK_NEEDS_CHECK)
|
||||
|
||||
if test x$THIN_CHECK_NEEDS_CHECK = xyes; then
|
||||
AC_DEFINE([THIN_CHECK_NEEDS_CHECK], 1, [Define to 1 if the external 'thin_check' tool requires the --clear-needs-check-flag option])
|
||||
fi
|
||||
|
||||
# Test if necessary thin tools are available
|
||||
# if not - use plain defaults and warn user
|
||||
@ -455,22 +449,21 @@ case "$THIN" in
|
||||
AC_MSG_WARN([thin_check not found in path $PATH])
|
||||
THIN_CHECK_CMD=/usr/sbin/thin_check
|
||||
THIN_CONFIGURE_WARN=y
|
||||
else
|
||||
if test x$THIN_CHECK_NEEDS_CHECK = xyes; then
|
||||
THIN_CHECK_VSN=`"$THIN_CHECK_CMD" -V 2>/dev/null`
|
||||
THIN_CHECK_VSN_MAJOR=`echo "$THIN_CHECK_VSN" | $AWK -F '.' '{print $1}'`
|
||||
THIN_CHECK_VSN_MINOR=`echo "$THIN_CHECK_VSN" | $AWK -F '.' '{print $2}'`
|
||||
fi
|
||||
fi
|
||||
if test "$THIN_CHECK_NEEDS_CHECK" = yes; then
|
||||
THIN_CHECK_VSN=`"$THIN_CHECK_CMD" -V 2>/dev/null`
|
||||
THIN_CHECK_VSN_MAJOR=`echo "$THIN_CHECK_VSN" | $AWK -F '.' '{print $1}'`
|
||||
THIN_CHECK_VSN_MINOR=`echo "$THIN_CHECK_VSN" | $AWK -F '.' '{print $2}'`
|
||||
|
||||
if test -z "$THIN_CHECK_VSN_MAJOR" -o -z "$THIN_CHECK_VSN_MINOR" ; then
|
||||
AC_MSG_WARN(Found thin_check version "$THIN_CHECK_VSN")
|
||||
THIN_CHECK_VERSION_WARN=y
|
||||
else
|
||||
if test "$THIN_CHECK_VSN_MAJOR" -eq 0 -a "$THIN_CHECK_VSN_MINOR" -lt 3 ; then
|
||||
AC_MSG_WARN(Found thin_check version "$THIN_CHECK_VSN")
|
||||
THIN_CHECK_VERSION_WARN=y
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
if test -z "$THIN_CHECK_VSN_MAJOR" -o -z "$THIN_CHECK_VSN_MINOR"; then
|
||||
AC_MSG_WARN([$THIN_CHECK_CMD: Bad version "$THIN_CHECK_VSN" found])
|
||||
THIN_CHECK_VERSION_WARN=y
|
||||
THIN_CHECK_NEEDS_CHECK=no
|
||||
elif test "$THIN_CHECK_VSN_MAJOR" -eq 0 -a "$THIN_CHECK_VSN_MINOR" -lt 3; then
|
||||
AC_MSG_WARN([$THIN_CHECK_CMD: Old version "$THIN_CHECK_VSN" found])
|
||||
THIN_CHECK_VERSION_WARN=y
|
||||
THIN_CHECK_NEEDS_CHECK=no
|
||||
fi
|
||||
fi
|
||||
# Empty means a config way to ignore thin checking
|
||||
@ -494,6 +487,12 @@ case "$THIN" in
|
||||
;;
|
||||
esac
|
||||
|
||||
AC_MSG_CHECKING([whether thin_check supports the needs-check flag])
|
||||
AC_MSG_RESULT([$THIN_CHECK_NEEDS_CHECK])
|
||||
if test "$THIN_CHECK_NEEDS_CHECK" = yes; then
|
||||
AC_DEFINE([THIN_CHECK_NEEDS_CHECK], 1, [Define to 1 if the external 'thin_check' tool requires the --clear-needs-check-flag option])
|
||||
fi
|
||||
|
||||
AC_DEFINE_UNQUOTED([THIN_CHECK_CMD], ["$THIN_CHECK_CMD"],
|
||||
[The path to 'thin_check', if available.])
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user