Colin Watson has proposed merging lp:~cjwatson/upstart/new-json-c into lp:upstart.
Requested reviews: Upstart Reviewers (upstart-reviewers) For more details, see: https://code.launchpad.net/~cjwatson/upstart/new-json-c/+merge/174952 json-c >= 0.11 calls its pkg-config file json-c rather than json. This branch adapts to that so that we aren't reliant on the compatibility layer staying around (but still works if only the old name is available). -- https://code.launchpad.net/~cjwatson/upstart/new-json-c/+merge/174952 Your team Upstart Reviewers is requested to review the proposed merge of lp:~cjwatson/upstart/new-json-c into lp:upstart.
=== modified file 'ChangeLog' --- ChangeLog 2013-07-04 14:49:10 +0000 +++ ChangeLog 2013-07-16 08:48:28 +0000 @@ -1,3 +1,7 @@ +2013-07-16 Colin Watson <[email protected]> + + * configure.ac: Use json-c rather than json if available. + 2013-07-04 James Hunt <[email protected]> * NEWS: Release 1.9.1 === modified file 'configure.ac' --- configure.ac 2013-07-04 15:52:43 +0000 +++ configure.ac 2013-07-16 08:48:28 +0000 @@ -49,7 +49,8 @@ # 2) New json_tokener_parse_verbose() function required to detect invalid # JSON (!) # -PKG_CHECK_MODULES([JSON], [json >= 0.10]) +PKG_CHECK_MODULES([JSON], [json-c], [], + [PKG_CHECK_MODULES([JSON], [json >= 0.10])]) AC_ARG_ENABLE([abi-check], AS_HELP_STRING([--disable-abi-check],
-- upstart-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/upstart-devel
