Merge pull request #280 from vaibhav92/fix_build

chilli: Fix a build error with --enable-json

.travis.yml

@@ -1,7 +1,7 @@
 language: c
 before_install: 
  - sudo apt-get update -qq
- - sudo apt-get install -y gengetopt
+ - sudo apt-get install -y gengetopt libjson0-dev
  - ./bootstrap
 script:
  - ./configure --enable-largelimits --enable-proxyvsa --enable-miniportal

configure.ac

@@ -210,6 +210,12 @@ AC_ARG_ENABLE(json, [AS_HELP_STRING([--enable-json],[Enable support for JSON])],
 
 if test x"$enable_json" = xyes; then
    AC_DEFINE(ENABLE_JSON,1,[Define to enable Chilli JSON])
+   AC_CHECK_LIB([json-c], [json_object_new_object],
+	      [AC_SUBST([LIBJSON], ["-ljson-c"])],
+				   [AC_CHECK_LIB([json], [json_object_new_object],
+				   [AC_SUBST([LIBJSON], ["-ljson"])],
+				   [AC_MSG_FAILURE(
+				   [--enable-json was given, but test for libjson failed])],)])
 fi
 
 AC_ARG_ENABLE(debug, [AS_HELP_STRING([--disable-debug],[Disable debugging messages])], 

src/Makefile.am

@@ -39,7 +39,7 @@ chilli_query_SOURCES = main-query.c
 chilli_opt_SOURCES = main-opt.c 
 
 libchilli_la_LIBADD = $(top_builddir)/bstring/libbstring.la 
-LDADD = libchilli.la ${LIBRT} $(top_builddir)/bstring/libbstring.la 
+LDADD = libchilli.la ${LIBRT} $(top_builddir)/bstring/libbstring.la ${LIBJSON}
 
 if WITH_MINICONFIG
 chilli_opt_SOURCES += cmdline.mini.c