Index: util-linux-ng-2.12r+git20070330/mount/Makefile.am
===================================================================
--- util-linux-ng-2.12r+git20070330.orig/mount/Makefile.am
+++ util-linux-ng-2.12r+git20070330/mount/Makefile.am
@@ -17,11 +17,11 @@ MNTHDRS = fstab.h linux_fs.h mount_mnten
 mount_SOURCES = mount.c fstab.c sundries.c xmalloc.c realpath.c mount_mntent.c \
 	get_label_uuid.c mount_by_label.c mount_blkid.c mount_guess_fstype.c \
 	getusername.c \
-	nfsmount.c nfsmount_xdr.c nfsmount_clnt.c nfs4mount.c \
+	nfsmount.c nfsmount_clnt.c nfs4mount.c \
 	lomount.c \
 	$(MNTHDRS)
 
-mount_LDADD = $(top_srcdir)/lib/libenv.a $(top_srcdir)/lib/libsetproctitle.a
+mount_LDADD = $(top_srcdir)/lib/libenv.a $(top_srcdir)/lib/libsetproctitle.a libnfsmount_xdr.a
 
 umount_SOURCES = umount.c fstab.c sundries.c xmalloc.c realpath.c mount_mntent.c \
 	getusername.c get_label_uuid.c mount_by_label.c mount_blkid.c \
@@ -60,6 +60,9 @@ swapargs.h:
 clean-local:
 	rm -f swapargs.h
 
+noinst_LIBRARIES = libnfsmount_xdr.a
+libnfsmount_xdr_a_SOURCES = nfsmount_xdr.c
+libnfsmount_xdr_a_CFLAGS = -fno-strict-aliasing
 
 install-exec-hook:
 	chmod 4755 $(DESTDIR)$(bindir)/mount