X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=makefile;h=41eee4253a0c70feeb7e4c96c6d16c2d419d9543;hb=ac474f1b8a669fcca9757cc53cf48146f08f9828;hp=9efe2622d9fc1750f21d27cf265bc40bd1bdd022;hpb=ce64b6a4f43fc6bed73872e76805389e7558fd81;p=ckermit.git

diff --git a/makefile b/makefile
index 9efe262..41eee42 100644
--- a/makefile
+++ b/makefile
@@ -6100,10 +6100,14 @@ linux:
 	   test -f /usr/lib/libncurses.a  || \
 	   test -f /usr/lib/libncurses.so; then \
 	  HAVE_LIBCURSES='-lncurses'; \
+	else if test -f /usr/lib/$(MULTIARCH)/libncurses.so || \
+	   test -f /usr/lib/$(MULTIARCH)/libncurses.a  || \
+	   test -f /usr/lib/$(MULTIARCH)/libncurses.so; then \
+	  HAVE_LIBCURSES='-lncurses'; \
 	else if test -f /usr/lib64/libcurses.so || \
 	   test -f /usr/lib/libcurses.a || \
 	   test -f /usr/lib/libcurses.so; then \
-	     HAVE_LIBCURSES='-lcurses'; fi; fi; \
+	     HAVE_LIBCURSES='-lcurses'; fi; fi; fi; \
 	HAVE_CURSES=''; \
 	if test -n '$$HAVE_LIBCURSES'; then \
 	  if test -f /usr/include/ncurses.h; then \
@@ -6130,16 +6134,19 @@ linux:
 	|| test -f /usr/lib/libresolv.a || test -f /usr/lib/libresolv.so \
 	|| test -f /usr/lib/i386-linux-gnu/libresolv.a \
 	|| test -f /usr/lib/i386-linux-gnu/libresolv.so \
+	|| ls /lib/$(MULTIARCH)/libresolv.* > /dev/null 2> /dev/null \
 	|| ls /lib/x86_64-linux-gnu/libresolv.* > /dev/null 2> /dev/null; \
 	then echo -lresolv; fi` \
 	`if test -f /usr/lib64/libcrypt.a || test -f /usr/lib64/libcrypt.so \
 	|| test -f /usr/lib/libcrypt.a || test -f /usr/lib/libcrypt.so \
+	|| ls /lib/$(MULTIARCH)/libcrypt.* > /dev/null 2> /dev/null \
 	|| ls /lib/x86_64-linux-gnu/libcrypt.* > /dev/null 2> /dev/null; \
 	then echo -lcrypt; fi` \
 	`if test -f /usr/lib64/liblockdev.a || \
 	test -f /usr/lib64/liblockdev.so || \
 	test -f /usr/lib/liblockdev.a || \
-	test -f /usr/lib/liblockdev.so; \
+	test -f /usr/lib/liblockdev.so \
+	ls /usr/lib/$(MULTIARCH)/liblockdev.* > /dev/null 2> /dev/null; \
 	then echo -llockdev; fi`" \
 	linuxa
 
@@ -6309,15 +6316,19 @@ linux+krb5+ssl linux+krb5+openssl:
 		K5CRYPTO='-lk5crypto'; \
         else if ls /usr/lib64/libk5crypto* > /dev/null 2> /dev/null; then \
                 K5CRYPTO='-lk5crypto'; \
-	fi; fi; fi; \
+	        else if ls /usr/lib/$(MULTIARCH)/libk5crypto* > /dev/null 2> /dev/null; then \
+					K5CRYPTO='-lk5crypto'; \
+	fi; fi; fi; fi; \
 	COM_ERR=''; \
 	if ls /lib/libcom_err* > /dev/null 2> /dev/null; then \
 		COM_ERR='-lcom_err'; \
-	fi; \
+	else if ls /lib/$(MULTIARCH)/libcom_err* > /dev/null 2> /dev/null; then \
+		COM_ERR='-lcom_err'; \
+	fi; fi; \
 	GSSAPILIB='-lgssapi'; \
 	if ls /lib/libgssapi_krb5* > /dev/null 2> /dev/null; then \
 		GSSAPILIB='-lgssapi_krb5'; \
-	else if ls /usr/lib/libgssapi_krb5* > /dev/null 2> /dev/null; then \
+	else if ls /usr/lib/$(MULTIARCH)/libgssapi_krb5* > /dev/null 2> /dev/null; then \
 		GSSAPILIB='-lgssapi_krb5'; \
 	else K5DIR=`echo $(K5LIB) | sed 's|-L||'`; \
 		if ls $$K5DIR/libgssapi_krb5* > /dev/null 2> /dev/null; then \