]> git.ipfire.org Git - thirdparty/knot-dns.git/commitdiff
configure: fix linking with libhiredis if --disable-redis
authorDaniel Salzman <daniel.salzman@nic.cz>
Fri, 26 Sep 2025 12:43:52 +0000 (14:43 +0200)
committerDaniel Salzman <daniel.salzman@nic.cz>
Sat, 27 Sep 2025 14:22:43 +0000 (16:22 +0200)
configure.ac

index 8a208f54602479f4a76d1008c9191fb9a2052776..c1ed5bc2a5c64a46bfb7c8547a9109a31d94ec54 100644 (file)
@@ -264,12 +264,10 @@ AC_ARG_ENABLE([redis],
    AS_HELP_STRING([--enable-redis=auto|yes|client|module|no], [enable Redis support [default=auto]]),
    [], [enable_redis=auto])
 
-PKG_CHECK_MODULES([hiredis], [hiredis], [have_hiredis=yes], [have_hiredis=no])
-
 AS_CASE([$enable_redis],
-   [auto],   [AS_IF([test "$have_hiredis" = "yes"], [enable_redis=yes], [enable_redis=no])],
-   [yes],    [AS_IF([test "$have_hiredis" = "yes"], [enable_redis=yes], [AC_MSG_ERROR([libhiredis not available])])],
-   [client], [AS_IF([test "$have_hiredis" = "yes"], [enable_redis=client], [AC_MSG_ERROR([libhiredis not available])])],
+   [auto],   [PKG_CHECK_MODULES([hiredis], [hiredis], [enable_redis=yes], [enable_redis=no])],
+   [yes],    [PKG_CHECK_MODULES([hiredis], [hiredis], [enable_redis=yes], [AC_MSG_ERROR([libhiredis not available])])],
+   [client], [PKG_CHECK_MODULES([hiredis], [hiredis], [enable_redis=client], [AC_MSG_ERROR([libhiredis not available])])],
    [module], [AS_IF([test "$enable_shared" = "yes"], [enable_redis=module], [AC_MSG_ERROR([link mode has to be 'shared'])])],
    [no], [],
    [*], [AC_MSG_ERROR([Invalid value of --enable-redis.])]