| Patrick Williams | 2a25492 | 2023-08-11 09:48:11 -0500 | [diff] [blame] | 1 | From b62a3fe424026b73ec6b1934483b16863c7dff23 Mon Sep 17 00:00:00 2001 |
| 2 | From: Wiktor Jaskulski <wjaskulski@adva.com> |
| 3 | Date: Thu, 11 May 2023 15:28:23 -0400 |
| 4 | Subject: [PATCH] configure.ac: libevent and libsqlite3 checked when nfsv4 is |
| 5 | disabled |
| 6 | |
| 7 | Upstream-Status: Backport |
| 8 | (http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=bc4a5deef9f820c55fdac3c0070364c17cd91cca) |
| 9 | |
| 10 | Signed-off-by: Steve Dickson <steved@redhat.com> |
| 11 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> |
| 12 | --- |
| 13 | configure.ac | 38 +++++++++++++++----------------------- |
| 14 | 1 file changed, 15 insertions(+), 23 deletions(-) |
| 15 | |
| 16 | diff --git a/configure.ac b/configure.ac |
| 17 | index 4ade528d..519cacbf 100644 |
| 18 | --- a/configure.ac |
| 19 | +++ b/configure.ac |
| 20 | @@ -335,42 +335,34 @@ AC_CHECK_HEADER(rpc/rpc.h, , |
| 21 | AC_MSG_ERROR([Header file rpc/rpc.h not found - maybe try building with --enable-tirpc])) |
| 22 | CPPFLAGS="${nfsutils_save_CPPFLAGS}" |
| 23 | |
| 24 | +dnl check for libevent libraries and headers |
| 25 | +AC_LIBEVENT |
| 26 | + |
| 27 | +dnl Check for sqlite3 |
| 28 | +AC_SQLITE3_VERS |
| 29 | + |
| 30 | +case $libsqlite3_cv_is_recent in |
| 31 | +yes) ;; |
| 32 | +unknown) |
| 33 | + dnl do not fail when cross-compiling |
| 34 | + AC_MSG_WARN([assuming sqlite is at least v3.3]) ;; |
| 35 | +*) |
| 36 | + AC_MSG_ERROR([nfsdcld requires sqlite-devel]) ;; |
| 37 | +esac |
| 38 | + |
| 39 | if test "$enable_nfsv4" = yes; then |
| 40 | - dnl check for libevent libraries and headers |
| 41 | - AC_LIBEVENT |
| 42 | |
| 43 | dnl check for the keyutils libraries and headers |
| 44 | AC_KEYUTILS |
| 45 | |
| 46 | - dnl Check for sqlite3 |
| 47 | - AC_SQLITE3_VERS |
| 48 | - |
| 49 | if test "$enable_nfsdcld" = "yes"; then |
| 50 | AC_CHECK_HEADERS([libgen.h sys/inotify.h], , |
| 51 | AC_MSG_ERROR([Cannot find header needed for nfsdcld])) |
| 52 | - |
| 53 | - case $libsqlite3_cv_is_recent in |
| 54 | - yes) ;; |
| 55 | - unknown) |
| 56 | - dnl do not fail when cross-compiling |
| 57 | - AC_MSG_WARN([assuming sqlite is at least v3.3]) ;; |
| 58 | - *) |
| 59 | - AC_MSG_ERROR([nfsdcld requires sqlite-devel]) ;; |
| 60 | - esac |
| 61 | fi |
| 62 | |
| 63 | if test "$enable_nfsdcltrack" = "yes"; then |
| 64 | AC_CHECK_HEADERS([libgen.h sys/inotify.h], , |
| 65 | AC_MSG_ERROR([Cannot find header needed for nfsdcltrack])) |
| 66 | - |
| 67 | - case $libsqlite3_cv_is_recent in |
| 68 | - yes) ;; |
| 69 | - unknown) |
| 70 | - dnl do not fail when cross-compiling |
| 71 | - AC_MSG_WARN([assuming sqlite is at least v3.3]) ;; |
| 72 | - *) |
| 73 | - AC_MSG_ERROR([nfsdcltrack requires sqlite-devel]) ;; |
| 74 | - esac |
| 75 | fi |
| 76 | |
| 77 | else |
| 78 | -- |
| 79 | 2.41.0 |
| 80 | |