Merge branch '1.1'

Conflicts: Makefile.am
2010-01-17 13:57:20 +02:00 · 2010-01-17 13:57:20 +02:00 · f9febb64c5
commit f9febb64c5
parent b76ee75aad aeb5b481c9
4 changed files with 15 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -22,3 +22,4 @@ missing
 *.la
 stamp-h1
 *.pyc
+*.pc
--- 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
--- 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
--- a/jansson.pc.in
+++ 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}