We now have to use part of the vendor supplied xdr_func.c.

util renamed to strutil to be more clear of its purpose.

usr.sbin/amd/libamu/Makefile

@@ -13,14 +13,14 @@
 LIB=	amu
 INTERNALLIB=
 SRCS=	hasmntopt.c misc_rpc.c mount_fs.c mtab.c nfs_prot_xdr.c \
-	util.c wire.c xutil.c
+	strutil.c wire.c xutil.c
 
 #	These would be links created by the GNU-style configure
 SRCS+=	transp_sockets.c mtab_bsd.c umount_bsd44.c
 
 #		Generated at compile time (replaces supplied xdr_func.c)
-SRCS+=		nfs_prot_x.c
-CLEANFILES+=	nfs_prot_x.c
+SRCS+=		nfs_prot_x.c xdr_func_%undef.c
+CLEANFILES+=	nfs_prot_x.c xdr_func_%undef.c
 
 CFLAGS+= -I${.CURDIR}/../../../contrib/amd/libamu \
 	 -I${DESTDIR}/usr/include/rpcsvc
@@ -28,4 +28,9 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/amd/libamu \
 nfs_prot_x.c: ${NFS_PROT_X}
 	${RPCCOM} -c -C -DWANT_NFS3 ${NFS_PROT_X} -o ${.TARGET}
 
+XDRDEFS!= grep 'ifndef.*HAVE_XDR' ${.CURDIR}/../../../contrib/amd/libamu/xdr_func.c | awk '{print "-D"$$2}'
+
+xdr_func_%undef.c: xdr_func.c
+	-unifdef ${XDRDEFS} < ${.ALLSRC} > ${.TARGET}
+
 .include <bsd.lib.mk>