Merge lp:~cjwatson/upstart/new-json-c into lp:upstart
Proposed by
Colin Watson
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 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Upstart Reviewers | 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.