[syslog-ng] [PATCH (3.4) 1/2] configure: Fix --with-json=json-c/json-glib handling.

Gergely Nagy algernon at balabit.hu
Fri Mar 23 12:22:35 CET 2012


The tests that decide whether the user wanted to select json-c or
json-glib were a little bit off, which resulted in anything other than
--with-json=auto failing.

This has now been corrected.

Reported-by: Peter Czanik <czanik at balabit.hu>
Signed-off-by: Gergely Nagy <algernon at balabit.hu>
---
 configure.in |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.in b/configure.in
index 995c202..f766888 100644
--- a/configure.in
+++ b/configure.in
@@ -606,11 +606,11 @@ fi
 dnl ***************************************************************************
 dnl json headers/libraries
 dnl ***************************************************************************
-if test "x$with_json" = "xauto" || test "x$with_json" = "json-c"; then
-   PKG_CHECK_MODULES(JSON_C, json >= $JSON_C_MIN_VERSION,, JSON_C_LIBS="")
+if test "x$with_json" = "xauto" || test "x$with_json" = "xjson-c"; then
+   PKG_CHECK_MODULES(JSON_C, json >= $JSON_C_MIN_VERSION)
 fi
-if test "x$with_json" = "xauto" || test "x$with_json" = "json-glib"; then
-   PKG_CHECK_MODULES(JSON_GLIB, json-glib-1.0 >= $JSON_GLIB_MIN_VERSION,, JSON_GLIB_LIBS="")
+if test "x$with_json" = "xauto" || test "x$with_json" = "xjson-glib"; then
+   PKG_CHECK_MODULES(JSON_GLIB, json-glib-1.0 >= $JSON_GLIB_MIN_VERSION)
 fi
 
 dnl ***************************************************************************
-- 
1.7.9




More information about the syslog-ng mailing list