Merge branch '1.1'

Conflicts:
	Makefile.am

diff --git a/.gitignore b/.gitignore
index a2baa14..4c4115c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ missing
 *.la
 stamp-h1
 *.pyc
+*.pc

diff --git a/Makefile.am b/Makefile.am
index 185eaab..a141cd5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,3 +2,6 @@ EXTRA_DIST = CHANGES LICENSE README.rst
 SUBDIRS = doc src test
 
 check-local: html
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = jansson.pc

diff --git a/configure.ac b/configure.ac
index d28a5e4..917c04a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -19,6 +19,7 @@ AC_PROG_LIBTOOL
 # Checks for library functions.
 
 AC_CONFIG_FILES([
+        jansson.pc
         Makefile
         doc/Makefile
         src/Makefile

diff --git a/jansson.pc.in b/jansson.pc.in
new file mode 100644 (file)
index 0000000..d9bf4da
--- /dev/null
+++ b/jansson.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=${prefix}/include
+
+Name: Jansson
+Description: Library for encoding, decoding and manipulating JSON data
+Version: @VERSION@
+Libs: -L${libdir} -ljansson
+Cflags: -I${includedir}