Merge pull request #431 from dwrensha/build-conf

remove unneeded kj-async dependency in Makefile.am and capnp-json.pc.in

c++/Makefile.am

@@ -279,7 +279,7 @@ libcapnp_rpc_la_SOURCES=                                       \
   src/capnp/persistent.capnp.c++                               \
   src/capnp/ez-rpc.c++
 
-libcapnp_json_la_LIBADD = libcapnp.la libkj-async.la libkj.la $(PTHREAD_LIBS)
+libcapnp_json_la_LIBADD = libcapnp.la libkj.la $(PTHREAD_LIBS)
 libcapnp_json_la_LDFLAGS = -release $(SO_VERSION) -no-undefined
 libcapnp_json_la_SOURCES=                                      \
   src/capnp/compat/json.c++                                    \

c++/capnp-json.pc.in

@@ -7,5 +7,5 @@ Name: Cap'n Proto JSON
 Description: JSON encoder and decoder for Cap'n Proto objects
 Version: @VERSION@
 Libs: -L${libdir} -lcapnp-json
-Requires: capnp = @VERSION@ kj-async = @VERSION@
+Requires: capnp = @VERSION@ kj = @VERSION@
 Cflags: -I${includedir}