Skip to contentSkip to conversation

libevent and libsqlite3 checked when nfsv4 is disabled

PATCH In review Wiktor Jaskulski 2 participants 2 messages May 10, 2023 – May 11, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libevent and libsqlite3 checked when nfsv4 is disabled

From: wjaskulski <[email protected]>

Even if nfsv4 is disabled component fsidd has libevent and libsqlite3 as dependencies.

Problems with compilation and error logs can be found at:
https://github.com/gentoo/gentoo/pull/30789
https://bugs.gentoo.org/904718

---
 configure.ac | 38 +++++++++++++++-----------------------
 1 file changed, 15 insertions(+), 23 deletions(-)
configure.ac +15 -23
index 4ade528d..519cacbf 100644
@@ -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
Signature · 1 line
2.34.1
#1 lore raw
Quoted 9 lines · Wiktor Jaskulski

From: wjaskulski <[email protected]>

Even if nfsv4 is disabled component fsidd has libevent and libsqlite3 as dependencies.

Problems with compilation and error logs can be found at:
https://github.com/gentoo/gentoo/pull/30789
https://bugs.gentoo.org/904718

Committed... (tag: nfs-utils-2-6-4-rc1)

steved

Quoted 66 lines
---
  configure.ac | 38 +++++++++++++++-----------------------
  1 file changed, 15 insertions(+), 23 deletions(-)
configure.ac +15 -23
index 4ade528d..519cacbf 100644
@@ -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