[lfs-patches] r2552 - trunk/nfs-utils

bdubbs at linuxfromscratch.org bdubbs at linuxfromscratch.org
Thu Nov 1 13:57:53 PDT 2012


Author: bdubbs
Date: 2012-11-01 14:57:48 -0600 (Thu, 01 Nov 2012)
New Revision: 2552

Added:
   trunk/nfs-utils/nfs-utils-1.2.6-fix_configure-1.patch
Log:
Fix configure for nfs-utils

Added: trunk/nfs-utils/nfs-utils-1.2.6-fix_configure-1.patch
===================================================================
--- trunk/nfs-utils/nfs-utils-1.2.6-fix_configure-1.patch	                        (rev 0)
+++ trunk/nfs-utils/nfs-utils-1.2.6-fix_configure-1.patch	2012-11-01 20:57:48 UTC (rev 2552)
@@ -0,0 +1,51 @@
+Submitted By: Bruce Dubbs <bdubbs at linuxfromscratch dot org>
+Date: 2012-11-01
+Initial Package Version: 1.2.6
+Upstream Status: committed
+Origin: http://www.spinics.net/lists/linux-nfs/msg30287.html
+Description: 
+Automake does not support conditional AM_CONDITIONAL calls; what that
+means is that you always have to execute AM_CONDITIONAL one way or the
+other. Both the libsqlite3.m4 file and the nfsdcld conditionals are
+executed only when NFSv4 is enabled, which breaks building with
+--disable-nfsv4.
+
+Remove the SQLite3 conditional altogether as it's never used, and move
+the nfsdcld conditional outside of the conditional code.
+
+Signed-off-by: Diego Elio Pettenò <flameeyes at xxxxxxxxxxxx>
+---
+ aclocal/libsqlite3.m4 |    1 -
+ configure.ac          |    3 +--
+ 2 files changed, 1 insertions(+), 3 deletions(-)
+
+diff --git a/aclocal/libsqlite3.m4 b/aclocal/libsqlite3.m4
+index 73d1e46..8c38993 100644
+--- a/aclocal/libsqlite3.m4
++++ b/aclocal/libsqlite3.m4
+@@ -29,5 +29,4 @@ AC_DEFUN([AC_SQLITE3_VERS], [
+     LIBS="$saved_LIBS"])
+ 
+   AC_MSG_RESULT($libsqlite3_cv_is_recent)
+-  AM_CONDITIONAL(CONFIG_SQLITE3, [test "$libsqlite3_cv_is_recent" = "yes"])
+ ])dnl
+diff --git a/configure.ac b/configure.ac
+index 9ba53e2..b408f1b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -278,8 +278,6 @@ if test "$enable_nfsv4" = yes; then
+   fi
+   fi
+ 
+-  AM_CONDITIONAL(CONFIG_NFSDCLD, [test "$enable_nfsdcld" = "yes" ])
+-
+   dnl librpcsecgss already has a dependency on libgssapi,
+   dnl but we need to make sure we get the right version
+   if test "$enable_gss" = yes; then
+@@ -293,6 +291,7 @@ if test "$enable_nfsv41" = yes; then
+ fi
+ 
+ dnl enable nfsidmap when its support by libnfsidmap
++AM_CONDITIONAL(CONFIG_NFSDCLD, [test "$enable_nfsdcld" = "yes" ])
+ AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyes"])
+ 




More information about the patches mailing list