[syslog-ng] [PATCH (3.4) 1/2] configure: Fix --with-json=auto.
Gergely Nagy
algernon at balabit.hu
Mon Mar 26 17:48:27 CEST 2012
One of the previous patches broke --with-json=auto, making configure
try to detect BOTH json-c and json-glib, and failing if any of them
were missing.
Signed-off-by: Gergely Nagy <algernon at balabit.hu>
---
configure.in | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.in b/configure.in
index e9e09a8..d1a6ae1 100644
--- a/configure.in
+++ b/configure.in
@@ -607,10 +607,10 @@ dnl ***************************************************************************
dnl json headers/libraries
dnl ***************************************************************************
if test "x$with_json" = "xauto" || test "x$with_json" = "xjson-c"; then
- PKG_CHECK_MODULES(JSON_C, json >= $JSON_C_MIN_VERSION)
+ PKG_CHECK_MODULES(JSON_C, json >= $JSON_C_MIN_VERSION,, JSON_C_LIBS="")
fi
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)
+ PKG_CHECK_MODULES(JSON_GLIB, json-glib-1.0 >= $JSON_GLIB_MIN_VERSION,, JSON_GLIB_LIBS="")
fi
dnl ***************************************************************************
--
1.7.9
More information about the syslog-ng
mailing list