Fixup weirdness in couchbase configure.ac

diff --git a/src/modules/rlm_couchbase/configure b/src/modules/rlm_couchbase/configure
index aec61c9..c98f6da 100755 (executable)
--- a/src/modules/rlm_couchbase/configure
+++ b/src/modules/rlm_couchbase/configure
@@ -3480,6 +3480,8 @@ fi
 
                if test "x$ac_cv_lib_json_json_tokener_new" != "xyes"; then
                        have_json="no"
+                       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: json-c libraries not found. Use --with-jsonc-lib-dir=<path>." >&5
+$as_echo "$as_me: WARNING: json-c libraries not found. Use --with-jsonc-lib-dir=<path>." >&2;}
                fi
        fi
 
@@ -3979,11 +3981,7 @@ fi
 $as_echo "$as_me: WARNING: libcouchbase libraries not found. Use --with-libcouchbase-lib-dir=<path>." >&2;}
        fi
 
-       if test "x$have_couchbase" != "xyes"; then
-               fail="$fail json-c"
-       fi
-
-       if test "x$have_couchbase" = "xno"; then
+       if test x"$have_couchbase" != x"yes"; then
                fail="$fail libcouchbase"
        fi
 

diff --git a/src/modules/rlm_couchbase/configure.ac b/src/modules/rlm_couchbase/configure.ac
index 0a9db62..d79f7c5 100644 (file)
--- a/src/modules/rlm_couchbase/configure.ac
+++ b/src/modules/rlm_couchbase/configure.ac
@@ -93,6 +93,7 @@ if test x$with_[]modname != xno; then
                FR_SMART_CHECK_LIB([json], [json_tokener_new])
                if test "x$ac_cv_lib_json_json_tokener_new" != "xyes"; then
                        have_json="no"
+                       AC_MSG_WARN([json-c libraries not found. Use --with-jsonc-lib-dir=<path>.])
                fi
        fi
 
@@ -189,11 +190,7 @@ if test x$with_[]modname != xno; then
                AC_MSG_WARN([libcouchbase libraries not found. Use --with-libcouchbase-lib-dir=<path>.])
        fi
 
-       if test "x$have_couchbase" != "xyes"; then
-               fail="$fail json-c"
-       fi
-
-       if test "x$have_couchbase" = "xno"; then
+       if test x"$have_couchbase" != x"yes"; then
                fail="$fail libcouchbase"
        fi