X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=configure.ac;h=4d7ccaece38ca902af25d737637652931599779d;hp=c39c4af2fc726a3779b641954e054781a9d76430;hb=0a3dd5b9b97e25156412a95bcecf25f8d75c72fc;hpb=b59edbb81af9c2c1a2cb27bb96fc205e32b1deae

diff --git a/configure.ac b/configure.ac
index c39c4af..4d7ccae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -446,6 +446,9 @@ if test "x$have_struct_ucred" != "xyes"; then
 	AC_MSG_RESULT([$have_struct_ucred])
 fi
 
+dnl Only check this after potentially defining _GNU_SOURCE.
+AC_FUNC_STRERROR_R
+
 dnl Testing.
 PKG_CHECK_MODULES([CHECK], [check >= 0.9.4],
 		[unit_tests="yes"], [unit_tests="no"])
@@ -473,6 +476,17 @@ if test "x$with_libdbi" = "xyes"; then
 fi
 AM_CONDITIONAL([BUILD_WITH_LIBDBI], test "x$with_libdbi" = "xyes")
 
+AC_ARG_WITH([libyajl],
+		[AS_HELP_STRING([--with-liyajl], [libyajl support (default: auto)])],
+		[with_libyajl="$withval"],
+		[with_libyajl="yes"])
+if test "x$with_libyajl" = "xyes" || test "x$with_libyajl" = "xauto"; then
+	PKG_CHECK_MODULES([YAJL], [yajl], [have_libyajl="yes"], [have_libyajl="no"])
+fi
+if test "x$have_libyajl" = "xyes"; then
+	AC_DEFINE([HAVE_LIBYAJL], 1, [Define to 1 if you have the 'yajl' library.])
+fi
+
 dnl Required for mocking FILE related functions.
 orig_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -D_GNU_SOURCE"
@@ -730,6 +744,10 @@ librrd_info="$have_librrd"
 if test "x$have_librrd" = "xyes"; then
 	librrd_info="yes (version `$PKG_CONFIG --modversion librrd`)"
 fi
+libyajl_info="$have_libyajl"
+if test "x$have_libyajl" = "xyes"; then
+	libyajl_info="yes (version `$PKG_CONFIG --modversion yajl`)"
+fi
 
 AC_MSG_RESULT()
 AC_MSG_RESULT([$PACKAGE_NAME has been configured successfully.])
@@ -760,6 +778,7 @@ AC_MSG_RESULT([    libedit:  . . . . . . . . . $libedit_info])
 AC_MSG_RESULT([    libopenssl: . . . . . . . . $openssl_info])
 AC_MSG_RESULT([    libreadline:  . . . . . . . $have_libreadline])
 AC_MSG_RESULT([    librrd: . . . . . . . . . . $librrd_info])
+AC_MSG_RESULT([    libyajl:  . . . . . . . . . $libyajl_info])
 AC_MSG_RESULT()
 AC_MSG_RESULT([  Backends:])
 AC_MSG_RESULT([    collectd::unixsock: . . . . $enable_collectd_unixsock])