0001-build-avoid-AM_CONDITIONAL-in-conditional-execution.patch 2.0 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657
  1. From 2a44ed7558f981e15db58dcda799ff7cd3827a6e Mon Sep 17 00:00:00 2001
  2. From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
  3. Date: Thu, 17 May 2012 16:26:44 -0700
  4. Subject: [PATCH] build: avoid AM_CONDITIONAL in conditional execution.
  5. MIME-Version: 1.0
  6. Content-Type: text/plain; charset=UTF-8
  7. Content-Transfer-Encoding: 8bit
  8. Automake does not support conditional AM_CONDITIONAL calls; what that
  9. means is that you always have to execute AM_CONDITIONAL one way or the
  10. other. Both the libsqlite3.m4 file and the nfsdcld conditionals are
  11. executed only when NFSv4 is enabled, which breaks building with
  12. --disable-nfsv4.
  13. Remove the SQLite3 conditional altogether as it's never used, and move
  14. the nfsdcld conditional outside of the conditional code.
  15. Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
  16. ---
  17. aclocal/libsqlite3.m4 | 1 -
  18. configure.ac | 3 +--
  19. 2 files changed, 1 insertion(+), 3 deletions(-)
  20. diff --git a/aclocal/libsqlite3.m4 b/aclocal/libsqlite3.m4
  21. index 73d1e46..8c38993 100644
  22. --- a/aclocal/libsqlite3.m4
  23. +++ b/aclocal/libsqlite3.m4
  24. @@ -29,5 +29,4 @@ AC_DEFUN([AC_SQLITE3_VERS], [
  25. LIBS="$saved_LIBS"])
  26. AC_MSG_RESULT($libsqlite3_cv_is_recent)
  27. - AM_CONDITIONAL(CONFIG_SQLITE3, [test "$libsqlite3_cv_is_recent" = "yes"])
  28. ])dnl
  29. diff --git a/configure.ac b/configure.ac
  30. index 9ba53e2..b408f1b 100644
  31. --- a/configure.ac
  32. +++ b/configure.ac
  33. @@ -278,8 +278,6 @@ if test "$enable_nfsv4" = yes; then
  34. fi
  35. fi
  36. - AM_CONDITIONAL(CONFIG_NFSDCLD, [test "$enable_nfsdcld" = "yes" ])
  37. -
  38. dnl librpcsecgss already has a dependency on libgssapi,
  39. dnl but we need to make sure we get the right version
  40. if test "$enable_gss" = yes; then
  41. @@ -293,6 +291,7 @@ if test "$enable_nfsv41" = yes; then
  42. fi
  43. dnl enable nfsidmap when its support by libnfsidmap
  44. +AM_CONDITIONAL(CONFIG_NFSDCLD, [test "$enable_nfsdcld" = "yes" ])
  45. AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyes"])
  46. --
  47. 1.7.9.5