summaryrefslogtreecommitdiffstats
path: root/debian/patches/multiarch-kerberos-paths.patch
blob: ed63325f948aabf2555fafeb6c4d499c7f25c545 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
Author: Luk Claes <luk@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])