Merge #12666: configure: UniValue 1.0.4 is required for pushKV(, bool)

laanwj · laanwj · commit 05042d38ba56 · 2018-03-14T15:22:23.000+01:00
8172d3a configure: UniValue 1.0.4 is required for pushKV(, bool) (Luke Dashjr) Pull request description: The breaking changes (#12193) are already merged, so this blocks 0.17.0. It depends on jgarzik/univalue#42 or jgarzik/univalue#50 being merged and released in UniValue 1.0.4. Tree-SHA512: 3a21bbc72d6632bd07ee60ad7780b9ee95908357bcf59b4795b693d8a5d8c88943d6451482f11916ff5417e3bdbb9916062f87d0d73e79f50eb95ddabe21f943
diff --git a/configure.ac b/configure.ac
@@ -1055,7 +1055,7 @@ if test x$system_univalue != xno ; then
     m4_ifdef(
       [PKG_CHECK_MODULES],
       [
-        PKG_CHECK_MODULES([UNIVALUE],[libunivalue],[found_univalue=yes],[true])
+        PKG_CHECK_MODULES([UNIVALUE],[libunivalue >= 1.0.4],[found_univalue=yes],[true])
       ]
     )
   else

Original file line number	Diff line number	Diff line change
`@@ -1055,7 +1055,7 @@ if test x$system_univalue != xno ; then`
`1055`	`1055`	`m4_ifdef(`
`1056`	`1056`	`[PKG_CHECK_MODULES],`
`1057`	`1057`	`[`
`1058`		`- PKG_CHECK_MODULES([UNIVALUE],[libunivalue],[found_univalue=yes],[true])`
	`1058`	`+ PKG_CHECK_MODULES([UNIVALUE],[libunivalue >= 1.0.4],[found_univalue=yes],[true])`
`1059`	`1059`	`]`
`1060`	`1060`	`)`
`1061`	`1061`	`else`