[packages/lvm2.git] / lvm2-thin.patch

--- LVM2.2.02.181/configure.ac.orig	2018-09-07 21:39:53.148246839 +0200
+++ LVM2.2.02.181/configure.ac	2018-09-07 21:40:01.548246741 +0200
@@ -397,7 +397,7 @@
 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)
+	      THIN_CHECK_NEEDS_CHECK=$enableval, THIN_CHECK_NEEDS_CHECK=autodetect)
 
 # Test if necessary thin tools are available
 # if not - use plain defaults and warn user
@@ -412,7 +412,7 @@
 			THIN_CONFIGURE_WARN=y
 		fi
 	fi
-	if test "$THIN_CHECK_NEEDS_CHECK" = yes; then
+	if test "$THIN_CHECK_NEEDS_CHECK" = autodetect; 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}'`
@@ -425,6 +425,8 @@
 			AC_MSG_WARN([$THIN_CHECK_CMD: Old version "$THIN_CHECK_VSN" found])
 			THIN_CHECK_VERSION_WARN=y
 			THIN_CHECK_NEEDS_CHECK=no
+		else
+			THIN_CHECK_NEEDS_CHECK=yes
 		fi
 	fi
 	# Empty means a config way to ignore thin dumping
@@ -511,7 +513,7 @@
 AC_ARG_ENABLE(cache_check_needs_check,
 	      AC_HELP_STRING([--disable-cache_check_needs_check],
 			     [required if cache_check version is < 0.5]),
-	      CACHE_CHECK_NEEDS_CHECK=$enableval, CACHE_CHECK_NEEDS_CHECK=yes)
+	      CACHE_CHECK_NEEDS_CHECK=$enableval, CACHE_CHECK_NEEDS_CHECK=autodetect)
 
 # Test if necessary cache tools are available
 # if not - use plain defaults and warn user
@@ -526,7 +528,7 @@
 			CACHE_CONFIGURE_WARN=y
 		fi
 	fi
-	if test "$CACHE_CHECK_NEEDS_CHECK" = yes; then
+	if test "$CACHE_CHECK_NEEDS_CHECK" = autodetect; then
 		$CACHE_CHECK_CMD -V 2>/dev/null >conftest.tmp
 		read -r CACHE_CHECK_VSN < conftest.tmp
 		IFS=.- read -r CACHE_CHECK_VSN_MAJOR CACHE_CHECK_VSN_MINOR CACHE_CHECK_VSN_PATCH LEFTOVER < conftest.tmp
@@ -550,6 +552,8 @@
 				AC_MSG_WARN([$CACHE_CHECK_CMD: Old version "$CACHE_CHECK_VSN" does not support new cache format V2])
 				CACHE_CHECK_VERSION_WARN=y
 			fi
+		else
+				CACHE_CHECK_NEEDS_CHECK=yes
 		fi
 	fi
 	# Empty means a config way to ignore cache dumping
Commit	Line	Data
dab0ac18 JB	1	--- LVM2.2.02.181/configure.ac.orig 2018-09-07 21:39:53.148246839 +0200
	2	+++ LVM2.2.02.181/configure.ac 2018-09-07 21:40:01.548246741 +0200
	3	@@ -397,7 +397,7 @@
e2727f8c JB	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
dab0ac18	12	@@ -412,7 +412,7 @@
e2727f8c JB	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}'`
dab0ac18	21	@@ -425,6 +425,8 @@
e2727f8c JB	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
dab0ac18	30	@@ -511,7 +513,7 @@
e2727f8c JB	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
dab0ac18	39	@@ -526,7 +528,7 @@
e2727f8c JB	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
dab0ac18 JB	48	@@ -550,6 +552,8 @@
dab0ac18 JB	49	AC_MSG_WARN([$CACHE_CHECK_CMD: Old version "$CACHE_CHECK_VSN" does not support new cache format V2])
e2727f8c	50	CACHE_CHECK_VERSION_WARN=y
e2727f8c JB	51	fi
	52	+ else
	53	+ CACHE_CHECK_NEEDS_CHECK=yes
	54	fi
	55	fi
	56	# Empty means a config way to ignore cache dumping