From fe008197e415e10994e1fd96a9ff060be77ac6c4 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Tue, 2 Sep 2014 15:54:13 +0200 Subject: AUTOCONF: Update detection of libnfsidmap MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Michal Židek Reviewed-by: Roland Mainz --- src/external/libnfsidmap.m4 | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'src/external') diff --git a/src/external/libnfsidmap.m4 b/src/external/libnfsidmap.m4 index 5bb6d868..56c7b55b 100644 --- a/src/external/libnfsidmap.m4 +++ b/src/external/libnfsidmap.m4 @@ -2,16 +2,19 @@ AC_SUBST(NFSIDMAP_OBJ) AC_SUBST(NFSIDMAP_CFLAGS) AC_SUBST(NFSIDMAP_LIBS) -PKG_CHECK_MODULES([NFSIDMAP], [libnfsidmap], [found_nfsidmap=yes], - [found_nfsidmap=no]) +AS_IF([test x"$with_nfsv4_idmap" = xyes], [ + PKG_CHECK_MODULES([NFSIDMAP], [libnfsidmap], [found_nfsidmap=yes], + [found_nfsidmap=no]) -SSS_AC_EXPAND_LIB_DIR() -AS_IF([test x"$with_nfs" = xyes -a x"$found_nfsidmap" != xyes], - [AC_CHECK_HEADER([nfsidmap.h], - [AC_CHECK_LIB([nfsidmap], - [nfs4_init_name_mapping], - [NFSIDMAP_LIBS="-L$sss_extra_libdir -lnfsidmap"], - [AC_MSG_ERROR([libnfsidmap missing nfs4_init_name_mapping])], - [-L$sss_extra_libdir])], - [AC_MSG_ERROR([libnfsidmap header files are not installed])])] -) + SSS_AC_EXPAND_LIB_DIR() + AS_IF([test x"$found_nfsidmap" != xyes], + [AC_CHECK_HEADER([nfsidmap.h], + [AC_CHECK_LIB([nfsidmap], + [nfs4_init_name_mapping], + [NFSIDMAP_LIBS="-L$sss_extra_libdir -lnfsidmap"], + [AC_MSG_ERROR([libnfsidmap missing nfs4_init_name_mapping])], + [-L$sss_extra_libdir])], + [AC_MSG_ERROR([libnfsidmap header files are not installed] +If you want to build sssd without nfs idmap pluging then specify +--without-nfsv4-idmapd-plugin when running configure.)])]) +]) -- cgit