Add missing options to feature-test utility

(cherry picked from commit e22d27da71bf24625bff009d6e11bc9fae70452c)

diff --git a/bin/tests/system/feature-test.c b/bin/tests/system/feature-test.c
index 99e1b80bb1da59340b3973e850bd7636540720fc..161a80c65bf772e066cf1e44a75d3071c5711329 100644 (file)
--- a/bin/tests/system/feature-test.c
+++ b/bin/tests/system/feature-test.c
@@ -42,12 +42,14 @@ usage() {
        fprintf(stderr, "\t--gssapi\n");
        fprintf(stderr, "\t--have-dlopen\n");
        fprintf(stderr, "\t--have-geoip2\n");
+       fprintf(stderr, "\t--have-json-c\n");
        fprintf(stderr, "\t--have-libxml2\n");
        fprintf(stderr, "\t--ipv6only=no\n");
        fprintf(stderr, "\t--tsan\n");
        fprintf(stderr, "\t--with-dlz-filesystem\n");
        fprintf(stderr, "\t--with-idn\n");
        fprintf(stderr, "\t--with-lmdb\n");
+       fprintf(stderr, "\t--with-zlib\n");
 }
 
 int
@@ -135,6 +137,14 @@ main(int argc, char **argv) {
 #endif /* ifdef HAVE_GEOIP2 */
        }
 
+       if (strcmp(argv[1], "--have-json-c") == 0) {
+#ifdef HAVE_JSON_C
+               return (0);
+#else  /* ifdef HAVE_JSON_C */
+               return (1);
+#endif /* ifdef HAVE_JSON_C */
+       }
+
        if (strcmp(argv[1], "--have-libxml2") == 0) {
 #ifdef HAVE_LIBXML2
                return (0);
@@ -201,6 +211,14 @@ main(int argc, char **argv) {
 #endif /* ifdef HAVE_LMDB */
        }
 
+       if (strcmp(argv[1], "--with-zlib") == 0) {
+#ifdef HAVE_ZLIB
+               return (0);
+#else  /* ifdef HAVE_ZLIB */
+               return (1);
+#endif /* ifdef HAVE_ZLIB */
+       }
+
        fprintf(stderr, "unknown arg: %s\n", argv[1]);
        usage();
        return (1);