Merge lp:~cjwatson/upstart/new-json-c into lp:upstart

Proposed by Colin Watson on 2013-07-16
Status: Merged
Merged at revision: 1506
Proposed branch: lp:~cjwatson/upstart/new-json-c
Merge into: lp:upstart
Diff against target: 25 lines (+6/-1)
2 files modified
ChangeLog (+4/-0)
configure.ac (+2/-1)
To merge this branch: bzr merge lp:~cjwatson/upstart/new-json-c
Reviewer Review Type Date Requested Status
Upstart Reviewers 2013-07-16 Pending
Review via email: mp+174952@code.launchpad.net

Description of the change

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).

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2013-07-04 14:49:10 +0000
3+++ ChangeLog 2013-07-16 08:53:27 +0000
4@@ -1,3 +1,7 @@
5+2013-07-16 Colin Watson <cjwatson@ubuntu.com>
6+
7+ * configure.ac: Use json-c rather than json if available.
8+
9 2013-07-04 James Hunt <james.hunt@ubuntu.com>
10
11 * NEWS: Release 1.9.1
12
13=== modified file 'configure.ac'
14--- configure.ac 2013-07-04 15:52:43 +0000
15+++ configure.ac 2013-07-16 08:53:27 +0000
16@@ -49,7 +49,8 @@
17 # 2) New json_tokener_parse_verbose() function required to detect invalid
18 # JSON (!)
19 #
20-PKG_CHECK_MODULES([JSON], [json >= 0.10])
21+PKG_CHECK_MODULES([JSON], [json-c], [],
22+ [PKG_CHECK_MODULES([JSON], [json >= 0.10])])
23
24 AC_ARG_ENABLE([abi-check],
25 AS_HELP_STRING([--disable-abi-check],

Subscribers

People subscribed via source and target branches