Re-add the "json" pkg-config file as a compatibility shim.

Also rename the json-c-uninstalled.pc file.

diff --git a/.gitignore b/.gitignore
index 8e603431ebd78858eb835c192fa0b818db328d3f..c3b5f804e8a140a0bf7d864d587cb4df3533d2a4 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -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 ee6ca164eb2a1e57d7ec94c6de6a059dfa67ac53..83bacd49957bf2ae39ffb89ab585b845450237e8 100644 (file)
--- 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 032dc8df1be6eef6b74eca2a331c51e488df3e08..5b2eea3d373224b7c9d8e339566454d0963da567 100644 (file)
--- 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
similarity index 100%
rename from json-uninstalled.pc.in
rename to json-c-uninstalled.pc.in

diff --git a/json.pc.in b/json.pc.in
new file mode 100644 (file)
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: