Merge branch '0.1.x' into 0.2.x

Makefile.am

@@ -18,13 +18,17 @@ libblkmaker_include_HEADERS = \
 
 libblkmaker_jansson_@LIBBLKMAKER_API_VERSION@_la_SOURCES = blkmaker_jansson.c
 libblkmaker_jansson_@LIBBLKMAKER_API_VERSION@_la_DEPENDENCIES = libblkmaker-$(LIBBLKMAKER_API_VERSION).la
+libblkmaker_jansson_@LIBBLKMAKER_API_VERSION@_la_CFLAGS = $(JANSSON_CFLAGS)
 libblkmaker_jansson_@LIBBLKMAKER_API_VERSION@_la_LDFLAGS = \
 	-L.libs \
 	-lblkmaker-$(LIBBLKMAKER_API_VERSION) \
-	-ljansson \
+	$(JANSSON_LIBS) \
 	-no-undefined \
 	-version-info $(LIBBLKMAKER_SO_VERSION)
 
+libblkmaker_jansson_includedir = $(includedir)/libblkmaker-$(LIBBLKMAKER_API_VERSION)
+libblkmaker_jansson_include_HEADERS = \
+	blkmaker_jansson.h
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = \

configure.ac

@@ -20,6 +20,27 @@ AC_CONFIG_FILES([Makefile
 	libblkmaker_jansson-${LIBBLKMAKER_API_VERSION}.pc:libblkmaker_jansson.pc.in
 ])
 
+PKG_CHECK_MODULES([JANSSON],[jansson],[
+	true
+],[
+	AC_MSG_CHECKING([for jansson in system-default locations])
+	LIBS="$LIBS -ljansson"
+	AC_TRY_LINK([
+		#include <jansson.h>
+	],[
+		json_object();
+	],[
+		AC_MSG_RESULT([found])
+		JANSSON_LIBS=-ljansson
+	],[
+		AC_MSG_RESULT([not found])
+		AC_MSG_ERROR([Could not find jansson library])
+	])
+	LIBS="${save_LIBS}"
+])
+AC_SUBST(JANSSON_CFLAGS)
+AC_SUBST(JANSSON_LIBS)
+
 AC_CHECK_LIB([ws2_32], [strchr])
 
 AC_OUTPUT