Merge branch '1.1'

Conflicts:
	Makefile.am

diff --combined Makefile.am
index 185eaab,2a69f16..a141cd5
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -1,4 -1,10 +1,7 @@@
  EXTRA_DIST = CHANGES LICENSE README.rst
  SUBDIRS = doc src test
  
 -
 -distcheck-hook:
 -      sphinx-build -b html -W \
 -              $(distdir)/doc \
 -              $(distdir)/_build/doc/.build/html
 +check-local: html
++
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = jansson.pc

diff --combined configure.ac
index d28a5e4,1bda9de..917c04a
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -1,5 -1,5 +1,5 @@@
  AC_PREREQ([2.59])
 -AC_INIT([jansson], [1.1.3], [petri@digip.org])
 +AC_INIT([jansson], [1.1.3+], [petri@digip.org])
  
  AM_INIT_AUTOMAKE([1.10 foreign])
  
@@@ -19,12 -19,12 +19,13 @@@ AC_PROG_LIBTOO
  # Checks for library functions.
  
  AC_CONFIG_FILES([
+         jansson.pc
          Makefile
          doc/Makefile
          src/Makefile
          test/Makefile
 -        test/testdata/Makefile
 -        test/testprogs/Makefile
 +        test/bin/Makefile
 +        test/suites/Makefile
 +        test/suites/api/Makefile
  ])
  AC_OUTPUT