]> TLD Linux GIT Repositories - packages/lvm2.git/blob - lvm2-thin.patch
- updated to 2.02.177, partial PLD merge
[packages/lvm2.git] / lvm2-thin.patch
1 --- LVM2.2.02.149/configure.in.orig     2016-04-06 16:05:03.799248008 +0200
2 +++ LVM2.2.02.149/configure.in  2016-04-06 20:23:12.388598015 +0200
3 @@ -463,7 +463,7 @@
4  AC_ARG_ENABLE(thin_check_needs_check,
5               AC_HELP_STRING([--disable-thin_check_needs_check],
6                              [required if thin_check version is < 0.3.0]),
7 -             THIN_CHECK_NEEDS_CHECK=$enableval, THIN_CHECK_NEEDS_CHECK=yes)
8 +             THIN_CHECK_NEEDS_CHECK=$enableval, THIN_CHECK_NEEDS_CHECK=autodetect)
9  
10  # Test if necessary thin tools are available
11  # if not - use plain defaults and warn user
12 @@ -478,7 +478,7 @@
13                         THIN_CONFIGURE_WARN=y
14                 fi
15         fi
16 -       if test "$THIN_CHECK_NEEDS_CHECK" = yes; then
17 +       if test "$THIN_CHECK_NEEDS_CHECK" = autodetect; then
18                 THIN_CHECK_VSN=`"$THIN_CHECK_CMD" -V 2>/dev/null`
19                 THIN_CHECK_VSN_MAJOR=`echo "$THIN_CHECK_VSN" | $AWK -F '.' '{print $1}'`
20                 THIN_CHECK_VSN_MINOR=`echo "$THIN_CHECK_VSN" | $AWK -F '.' '{print $2}'`
21 @@ -491,6 +491,8 @@
22                         AC_MSG_WARN([$THIN_CHECK_CMD: Old version "$THIN_CHECK_VSN" found])
23                         THIN_CHECK_VERSION_WARN=y
24                         THIN_CHECK_NEEDS_CHECK=no
25 +               else
26 +                       THIN_CHECK_NEEDS_CHECK=yes
27                 fi
28         fi
29         # Empty means a config way to ignore thin dumping
30 @@ -577,7 +579,7 @@
31  AC_ARG_ENABLE(cache_check_needs_check,
32               AC_HELP_STRING([--disable-cache_check_needs_check],
33                              [required if cache_check version is < 0.5]),
34 -             CACHE_CHECK_NEEDS_CHECK=$enableval, CACHE_CHECK_NEEDS_CHECK=yes)
35 +             CACHE_CHECK_NEEDS_CHECK=$enableval, CACHE_CHECK_NEEDS_CHECK=autodetect)
36  
37  # Test if necessary cache tools are available
38  # if not - use plain defaults and warn user
39 @@ -592,7 +594,7 @@
40                         CACHE_CONFIGURE_WARN=y
41                 fi
42         fi
43 -       if test "$CACHE_CHECK_NEEDS_CHECK" = yes; then
44 +       if test "$CACHE_CHECK_NEEDS_CHECK" = autodetect; then
45                 $CACHE_CHECK_CMD -V 2>/dev/null >conftest.tmp
46                 read -r CACHE_CHECK_VSN < conftest.tmp
47                 IFS=.- read -r CACHE_CHECK_VSN_MAJOR CACHE_CHECK_VSN_MINOR CACHE_CHECK_VSN_PATCH LEFTOVER < conftest.tmp
48 @@ -612,6 +614,8 @@
49                                 CACHE_CHECK_VERSION_WARN=y
50                                 CACHE_CHECK_NEEDS_CHECK=no
51                         fi
52 +               else
53 +                               CACHE_CHECK_NEEDS_CHECK=yes
54                 fi
55         fi
56         # Empty means a config way to ignore cache dumping