From 1f9d199522af1b6fb61df3f60dc1a68d6c7e0e72 Mon Sep 17 00:00:00 2001 From: Eric Haszlakiewicz Date: Sun, 29 Jul 2012 18:25:09 -0500 Subject: [PATCH] Re-add the "json" pkg-config file as a compatibility shim. Also rename the json-c-uninstalled.pc file. --- .gitignore | 3 ++- Makefile.am | 3 +++ configure.in | 3 ++- json-uninstalled.pc.in => json-c-uninstalled.pc.in | 0 json.pc.in | 11 +++++++++++ 5 files changed, 18 insertions(+), 2 deletions(-) rename json-uninstalled.pc.in => json-c-uninstalled.pc.in (100%) create mode 100644 json.pc.in diff --git a/.gitignore b/.gitignore index 8e603431eb..c3b5f804e8 100644 --- 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 ee6ca164eb..83bacd4995 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 032dc8df1b..5b2eea3d37 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 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 index 0000000000..80e75d141a --- /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: