diff options
| author | Eric Haszlakiewicz <erh+git@nimenees.com> | 2012-07-29 18:25:09 -0500 |
|---|---|---|
| committer | Eric Haszlakiewicz <erh+git@nimenees.com> | 2012-07-29 18:25:09 -0500 |
| commit | 1f9d199522af1b6fb61df3f60dc1a68d6c7e0e72 (patch) | |
| tree | c7ca9cb47565e8adf36c1b4ac6b9ab2f311a3e56 | |
| parent | 9f16e25a3e7bb38d89f6f92758da905dd3476db7 (diff) | |
Re-add the "json" pkg-config file as a compatibility shim.
Also rename the json-c-uninstalled.pc file.
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | json-c-uninstalled.pc.in (renamed from json-uninstalled.pc.in) | 0 | ||||
| -rw-r--r-- | json.pc.in | 11 |
5 files changed, 18 insertions, 2 deletions
@@ -11,8 +11,9 @@ /configure /depcomp /install-sh +/json.pc /json-c.pc -/json-uninstalled.pc +/json-c-uninstalled.pc /libtool /ltmain.sh /Makefile diff --git a/Makefile.am b/Makefile.am index ee6ca16..83bacd4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,6 +10,9 @@ endif pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = json-c.pc +if ENABLE_OLDNAME_COMPAT +pkgconfig_DATA += json.pc +endif libjson_cincludedir = $(includedir)/json-c libjson_cinclude_HEADERS = \ diff --git a/configure.in b/configure.in index 032dc8d..5b2eea3 100644 --- a/configure.in +++ b/configure.in @@ -41,9 +41,10 @@ AM_PROG_LIBTOOL AC_CONFIG_FILES([ Makefile +json.pc json-c.pc tests/Makefile -json-uninstalled.pc +json-c-uninstalled.pc ]) AC_OUTPUT diff --git a/json-uninstalled.pc.in b/json-c-uninstalled.pc.in index dab2bab..dab2bab 100644 --- a/json-uninstalled.pc.in +++ b/json-c-uninstalled.pc.in diff --git a/json.pc.in b/json.pc.in new file mode 100644 index 0000000..80e75d1 --- /dev/null +++ b/json.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: json-c +Description: JSON implementation in C, compat shim. Use json-c instead. +Version: @VERSION@ +Requires: json-c +Libs: +Cflags: |