From b62a3fe424026b73ec6b1934483b16863c7dff23 Mon Sep 17 00:00:00 2001 From: Wiktor Jaskulski Date: Thu, 11 May 2023 15:28:23 -0400 Subject: [PATCH] configure.ac: libevent and libsqlite3 checked when nfsv4 is disabled Upstream-Status: Backport (http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=bc4a5deef9f820c55fdac3c0070364c17cd91cca) Signed-off-by: Steve Dickson Signed-off-by: Trevor Gamblin --- configure.ac | 38 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/configure.ac b/configure.ac index 4ade528d..519cacbf 100644 --- a/configure.ac +++ b/configure.ac @@ -335,42 +335,34 @@ AC_CHECK_HEADER(rpc/rpc.h, , AC_MSG_ERROR([Header file rpc/rpc.h not found - maybe try building with --enable-tirpc])) CPPFLAGS="${nfsutils_save_CPPFLAGS}" +dnl check for libevent libraries and headers +AC_LIBEVENT + +dnl Check for sqlite3 +AC_SQLITE3_VERS + +case $libsqlite3_cv_is_recent in +yes) ;; +unknown) + dnl do not fail when cross-compiling + AC_MSG_WARN([assuming sqlite is at least v3.3]) ;; +*) + AC_MSG_ERROR([nfsdcld requires sqlite-devel]) ;; +esac + if test "$enable_nfsv4" = yes; then - dnl check for libevent libraries and headers - AC_LIBEVENT dnl check for the keyutils libraries and headers AC_KEYUTILS - dnl Check for sqlite3 - AC_SQLITE3_VERS - if test "$enable_nfsdcld" = "yes"; then AC_CHECK_HEADERS([libgen.h sys/inotify.h], , AC_MSG_ERROR([Cannot find header needed for nfsdcld])) - - case $libsqlite3_cv_is_recent in - yes) ;; - unknown) - dnl do not fail when cross-compiling - AC_MSG_WARN([assuming sqlite is at least v3.3]) ;; - *) - AC_MSG_ERROR([nfsdcld requires sqlite-devel]) ;; - esac fi if test "$enable_nfsdcltrack" = "yes"; then AC_CHECK_HEADERS([libgen.h sys/inotify.h], , AC_MSG_ERROR([Cannot find header needed for nfsdcltrack])) - - case $libsqlite3_cv_is_recent in - yes) ;; - unknown) - dnl do not fail when cross-compiling - AC_MSG_WARN([assuming sqlite is at least v3.3]) ;; - *) - AC_MSG_ERROR([nfsdcltrack requires sqlite-devel]) ;; - esac fi else -- 2.41.0