Merge branch 'c++-api'

diff --combined configure.ac
index 95a207e,43ce1d0..5290793
--- 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.2], [petri@digip.org])
  
  AM_INIT_AUTOMAKE([1.10 foreign])
  
@@@ -8,6 -8,7 +8,7 @@@ AC_CONFIG_HEADERS([config.h]
  
  # Checks for programs.
  AC_PROG_CC
+ AC_PROG_CXX
  AC_PROG_LIBTOOL
  
  # Checks for libraries.
@@@ -19,7 -20,6 +20,7 @@@
  # Checks for library functions.
  
  AC_CONFIG_FILES([
 +        jansson.pc
          Makefile
          doc/Makefile
          src/Makefile

diff --combined src/Makefile.am
index e70077b,d5c20e8..460b26a
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -1,4 -1,4 +1,4 @@@
- include_HEADERS = jansson.h
+ include_HEADERS = jansson.h jansson.hpp jansson-impl.hpp
  
  lib_LTLIBRARIES = libjansson.la
  libjansson_la_SOURCES = \
@@@ -15,6 -15,6 +15,6 @@@
        value.c
  libjansson_la_LDFLAGS = \
        -export-symbols-regex '^json_' \
 -      -version-info 1:2:1
 +      -version-info 2:0:2
  
  AM_CFLAGS = -Wall -Wextra -Werror

diff --combined test/suites/api/Makefile.am
index 64523c0,35f1ee0..ddeb147
--- 1/test/suites/api/Makefile.am
--- 2/test/suites/api/Makefile.am
+++ b/test/suites/api/Makefile.am
@@@ -1,5 -1,3 +1,5 @@@
 +EXTRA_DIST = run
 +
  check_PROGRAMS = \
        test_array \
        test_equal \
@@@ -7,7 -5,8 +7,8 @@@
        test_load \
        test_simple \
        test_number \
-       test_object
+       test_object \
+       test_cpp
  
  test_array_SOURCES = test_array.c util.h
  test_copy_SOURCES = test_copy.c util.h
@@@ -15,6 -14,7 +16,7 @@@ test_load_SOURCES = test_load.c util.
  test_simple_SOURCES = test_simple.c util.h
  test_number_SOURCES = test_number.c util.h
  test_object_SOURCES = test_object.c util.h
+ test_cpp_SOURCES = test_cpp.cpp
  
  AM_CPPFLAGS = -I$(top_srcdir)/src
  AM_CFLAGS = -Wall -Werror