From: Klas Lindfors <klas@yubico.com>
Date: Wed, 10 Apr 2013 11:57:09 +0000 (+0200)
Subject: add dependency on libjson
X-Git-Tag: v1.13.0~66
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8043da8009619eb6e7404e404abc896238efc45f;p=yubikey-personalization

add dependency on libjson
---

diff --git a/Makefile.am b/Makefile.am
index 3b78c17..febf697 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,6 +35,8 @@ ACLOCAL_AMFLAGS = -I m4
 AM_CPPFLAGS = -I$(srcdir)/ykcore -I$(srcdir)/rfc4634
 AM_CFLAGS = $(WARN_CFLAGS)
 
+AM_CFLAGS += $(libjson_CFLAGS)
+
 # The library.
 
 ykpers_includedir=$(includedir)/ykpers-1
@@ -48,7 +50,7 @@ libykpers_1_la_SOURCES += rfc4634/hmac.c rfc4634/usha.c rfc4634/sha.h	\
 	rfc4634/sha1.c rfc4634/sha224-256.c rfc4634/sha384-512.c	\
 	rfc4634/sha-private.h
 libykpers_1_la_SOURCES += ykpers-1.pc.in libykpers-1.map
-libykpers_1_la_LIBADD = $(LTLIBYUBIKEY) ./ykcore/libykcore.la
+libykpers_1_la_LIBADD = $(LTLIBYUBIKEY) ./ykcore/libykcore.la $(libjson_LIBS)
 libykpers_1_la_LDFLAGS = -no-undefined \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 EXTRA_libykpers_1_la_DEPENDENCIES = libykpers-1.map
diff --git a/configure.ac b/configure.ac
index aa4a994..8bf804a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -125,6 +125,8 @@ AM_CONDITIONAL([BACKEND_LIBUSB_1_0], test x$with_backend = xlibusb-1.0)
 AM_CONDITIONAL([BACKEND_OSX], test x$with_backend = xosx)
 AM_CONDITIONAL([BACKEND_WINDOWS], test x$with_backend = xwindows)
 
+PKG_CHECK_MODULES([libjson], [json])
+
 AC_ARG_WITH([udevrulesdir],
   AS_HELP_STRING([--with-udevrulesdir=DIR], [Install udev rules into this directory]),
   [], [])