Merge authors: Colin Watson (cjwatson) Related merge proposals: https://code.launchpad.net/~cjwatson/upstart/new-json-c/+merge/174952 proposed by: Colin Watson (cjwatson) ------------------------------------------------------------ revno: 1506 [merge] committer: Dmitrijs Ledkovs <[email protected]> branch nick: upstart timestamp: Tue 2013-07-16 10:38:15 +0100 message: Merge lp:~cjwatson/upstart/new-json-c modified: ChangeLog configure.ac
-- lp:upstart https://code.launchpad.net/~upstart-devel/upstart/trunk Your team Upstart Reviewers is subscribed to branch lp:upstart. To unsubscribe from this branch go to https://code.launchpad.net/~upstart-devel/upstart/trunk/+edit-subscription
=== modified file 'ChangeLog' --- ChangeLog 2013-07-04 14:49:10 +0000 +++ ChangeLog 2013-07-16 08:45:58 +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:45:58 +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
