2
1

0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch 2.2 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879
  1. From bc4a5deef9f820c55fdac3c0070364c17cd91cca 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. Upstream: https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=bc4a5deef9f820c55fdac3c0070364c17cd91cca
  7. Signed-off-by: Steve Dickson <steved@redhat.com>
  8. Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
  9. ---
  10. configure.ac | 38 +++++++++++++++-----------------------
  11. 1 file changed, 15 insertions(+), 23 deletions(-)
  12. diff --git a/configure.ac b/configure.ac
  13. index 9df52e9c..6fbcb974 100644
  14. --- a/configure.ac
  15. +++ b/configure.ac
  16. @@ -338,42 +338,34 @@ CPPFLAGS="${nfsutils_save_CPPFLAGS}"
  17. AC_CHECK_HEADER(uuid/uuid.h, ,
  18. AC_MSG_ERROR([Cannot find needed header file uuid/uuid.h. Install libuuid-devel]))
  19. +dnl check for libevent libraries and headers
  20. +AC_LIBEVENT
  21. +
  22. +dnl Check for sqlite3
  23. +AC_SQLITE3_VERS
  24. +
  25. +case $libsqlite3_cv_is_recent in
  26. +yes) ;;
  27. +unknown)
  28. + dnl do not fail when cross-compiling
  29. + AC_MSG_WARN([assuming sqlite is at least v3.3]) ;;
  30. +*)
  31. + AC_MSG_ERROR([nfsdcld requires sqlite-devel]) ;;
  32. +esac
  33. +
  34. if test "$enable_nfsv4" = yes; then
  35. - dnl check for libevent libraries and headers
  36. - AC_LIBEVENT
  37. dnl check for the keyutils libraries and headers
  38. AC_KEYUTILS
  39. - dnl Check for sqlite3
  40. - AC_SQLITE3_VERS
  41. -
  42. if test "$enable_nfsdcld" = "yes"; then
  43. AC_CHECK_HEADERS([libgen.h sys/inotify.h], ,
  44. AC_MSG_ERROR([Cannot find header needed for nfsdcld]))
  45. -
  46. - case $libsqlite3_cv_is_recent in
  47. - yes) ;;
  48. - unknown)
  49. - dnl do not fail when cross-compiling
  50. - AC_MSG_WARN([assuming sqlite is at least v3.3]) ;;
  51. - *)
  52. - AC_MSG_ERROR([nfsdcld requires sqlite-devel]) ;;
  53. - esac
  54. fi
  55. if test "$enable_nfsdcltrack" = "yes"; then
  56. AC_CHECK_HEADERS([libgen.h sys/inotify.h], ,
  57. AC_MSG_ERROR([Cannot find header needed for nfsdcltrack]))
  58. -
  59. - case $libsqlite3_cv_is_recent in
  60. - yes) ;;
  61. - unknown)
  62. - dnl do not fail when cross-compiling
  63. - AC_MSG_WARN([assuming sqlite is at least v3.3]) ;;
  64. - *)
  65. - AC_MSG_ERROR([nfsdcltrack requires sqlite-devel]) ;;
  66. - esac
  67. fi
  68. else
  69. --
  70. 2.34.1