From patchwork Fri Nov 19 17:39:03 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Dickson X-Patchwork-Id: 340571 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oAJHd91I017763 for ; Fri, 19 Nov 2010 17:39:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755912Ab0KSRjH (ORCPT ); Fri, 19 Nov 2010 12:39:07 -0500 Received: from 4dicksons.org ([207.22.49.45]:45413 "EHLO Dobby.Home.4dicksons.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755909Ab0KSRjG (ORCPT ); Fri, 19 Nov 2010 12:39:06 -0500 Received: from tophat.home.4dicksons.org ([192.168.62.20]) by Dobby.Home.4dicksons.org with esmtp (Exim 4.63) (envelope-from ) id 1PJUvR-0005fG-3h for linux-nfs@vger.kernel.org; Fri, 19 Nov 2010 12:39:05 -0500 From: Steve Dickson To: Linux NFS Mailing List Subject: [PATCH 2/2] Enable nfsidmap to compile Date: Fri, 19 Nov 2010 12:39:03 -0500 Message-Id: <1290188343-10579-3-git-send-email-steved@redhat.com> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1290188343-10579-1-git-send-email-steved@redhat.com> References: <1290188343-10579-1-git-send-email-steved@redhat.com> X-Spam-Score: 2.4 (++) Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Fri, 19 Nov 2010 17:39:10 +0000 (UTC) diff --git a/aclocal/libnfsidmap.m4 b/aclocal/libnfsidmap.m4 index cfcde2f..e636604 100644 --- a/aclocal/libnfsidmap.m4 +++ b/aclocal/libnfsidmap.m4 @@ -14,4 +14,8 @@ AC_DEFUN([AC_LIBNFSIDMAP], [ [AC_DEFINE([HAVE_NFS4_SET_DEBUG], 1, [Define to 1 if you have the `nfs4_set_debug' function.])]) + dnl only enable nfsidmap when libnfsidmap supports it + AC_CHECK_LIB([nfsidmap], [nfs4_owner_to_uid], [enable_nfsidmap=1], + [enable_nfsidmap=0]) + ])dnl diff --git a/configure.ac b/configure.ac index b39dbcd..92833e3 100644 --- a/configure.ac +++ b/configure.ac @@ -247,6 +247,9 @@ if test "$enable_nfsv4" = yes; then dnl check for nfsidmap libraries and headers AC_LIBNFSIDMAP + dnl enable nfsidmap when its support by libnfsidmap + AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$enable_nfsidmap" = "yes"]) + dnl check for the keyutils libraries and headers AC_KEYUTILS diff --git a/utils/Makefile.am b/utils/Makefile.am index 8665183..a0ea116 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -4,6 +4,9 @@ OPTDIRS = if CONFIG_NFSV4 OPTDIRS += idmapd +if CONFIG_NFSIDMAP +OPTDIRS += nfsidmap +endif endif if CONFIG_GSS