Bug#993785: FTBFS on most architectures

[Daniel Baumann]

Package: nfs-utils
Severity: serious
Version: 1:2.5.4-1~exp1
Hi Anibal,

thank so much for uploading a new nfs-utils version, much appreciated.

unfortunately it fails to build on most architectures, I can confirm 
that re-adding the dropped multiarch-patch fixes it (re-diffed patch 
applied).

Regards,
DanielAuthor: Luk Claes <l...@debian.org>
Description: Support multiarch kerberos paths (Closes: #642797).

diff -Naurp nfs-utils.orig/aclocal/kerberos5.m4 nfs-utils/aclocal/kerberos5.m4
--- nfs-utils.orig/aclocal/kerberos5.m4
+++ nfs-utils/aclocal/kerberos5.m4
@@ -29,6 +29,7 @@ AC_DEFUN([AC_KERBEROS_V5],[
     elif test -f "/usr/lib/mit/bin/krb5-config"; then
       K5CONFIG="/usr/lib/mit/bin/krb5-config"
     fi
+    MULTIARCH=`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null || true`
     if test "$K5CONFIG" != ""; then
       KRBCFLAGS=`$K5CONFIG --cflags`
       KRBLIBS=`$K5CONFIG --libs`
@@ -43,6 +44,7 @@ AC_DEFUN([AC_KERBEROS_V5],[
                    -f $dir/lib32/libgssapi_krb5.so -o \
                    -f $dir/lib64/libgssapi_krb5.a -o \
                    -f $dir/lib64/libgssapi_krb5.so -o \
+                   -f $dir/lib/$MULTIARCH/libgssapi_krb5.so -o \
                    -f $dir/lib/$(uname -m)-linux-gnu/libgssapi_krb5.a -o \
                    -f $dir/lib/$(uname -m)-linux-gnu/libgssapi_krb5.so \) ; then
          AC_DEFINE(HAVE_KRB5, 1, [Define this if you have MIT Kerberos libraries])