diff -abBru xfsprogs-3.1.0.orig/configure.in xfsprogs-3.1.0.mod/configure.in
--- xfsprogs-3.1.0.orig/configure.in	2010-01-13 02:53:28.000000000 +0100
+++ xfsprogs-3.1.0.mod/configure.in	2010-01-14 15:34:34.314979793 +0100
@@ -86,7 +86,7 @@
 AC_PACKAGE_NEED_LIO_LISTIO
 
 AC_PACKAGE_NEED_UUID_H
-AC_PACKAGE_NEED_UUIDCOMPARE
+AC_PACKAGE_NEED_UUIDUNPARSE
 
 AC_PACKAGE_NEED_PTHREAD_H
 AC_PACKAGE_NEED_PTHREADMUTEXINIT
@@ -98,7 +98,7 @@
 AC_HAVE_GETMNTENT
 AC_HAVE_GETMNTINFO
 AC_HAVE_FALLOCATE
-AC_HAVE_BLKID_TOPO($enable_blkid)
+# AC_HAVE_BLKID_TOPO($enable_blkid)
 
 AC_TYPE_PSINT
 AC_TYPE_PSUNSIGNED
diff -abBru xfsprogs-3.1.0.orig/include/linux.h xfsprogs-3.1.0.mod/include/linux.h
--- xfsprogs-3.1.0.orig/include/linux.h	2010-01-13 02:53:28.000000000 +0100
+++ xfsprogs-3.1.0.mod/include/linux.h	2010-01-14 15:02:57.501666645 +0100
@@ -17,7 +17,14 @@
 #ifndef __XFS_LINUX_H__
 #define __XFS_LINUX_H__
 
+#if defined(HAVE_UUID_H)
+#include <uuid.h>
+#elif defined(HAVE_SYS_UUID_H)
+#include <sys/uuid.h>
+#elif defined(HAVE_UUID_UUID_H)
 #include <uuid/uuid.h>
+#endif
+
 #include <sys/vfs.h>
 #include <sys/ioctl.h>
 #include <sys/param.h>
@@ -58,6 +65,8 @@
 	optind = 0;
 }
 
+#if defined(HAVE_UUID_H) || defined(HAVE_SYS_UUID_H) || defined(HAVE_UUID_UUID_H)
+
 static __inline__ int platform_uuid_compare(uuid_t *uu1, uuid_t *uu2)
 {
 	return uuid_compare(*uu1, *uu2);
@@ -93,6 +102,8 @@
 	uuid_copy(*dst, *src);
 }
 
+#endif /* defined(HAVE_UUID_H) || defined(HAVE_SYS_UUID_H) || defined(HAVE_UUID_UUID_H) */
+
 #ifndef BLKDISCARD
 #define BLKDISCARD	_IO(0x12,119)
 #endif
diff -abBru xfsprogs-3.1.0.orig/include/platform_defs.h.in xfsprogs-3.1.0.mod/include/platform_defs.h.in
--- xfsprogs-3.1.0.orig/include/platform_defs.h.in	2010-01-13 02:53:28.000000000 +0100
+++ xfsprogs-3.1.0.mod/include/platform_defs.h.in	2010-01-14 15:03:22.265599175 +0100
@@ -62,6 +62,10 @@
 
 typedef struct filldir		filldir_t;
 
+#undef HAVE_UUID_H
+#undef HAVE_SYS_UUID_H
+#undef HAVE_UUID_UUID_H
+
 #if defined(__linux__)
 #include <xfs/linux.h>
 #elif defined(__FreeBSD__)
diff -abBru xfsprogs-3.1.0.orig/m4/package_uuiddev.m4 xfsprogs-3.1.0.mod/m4/package_uuiddev.m4
--- xfsprogs-3.1.0.orig/m4/package_uuiddev.m4	2010-01-13 02:53:28.000000000 +0100
+++ xfsprogs-3.1.0.mod/m4/package_uuiddev.m4	2010-01-14 15:39:41.896758827 +0100
@@ -4,23 +4,21 @@
 	    $ac_cv_header_sys_uuid_h = no -a \
 	    $ac_cv_header_uuid_uuid_h = no; then
 	echo
-	echo 'FATAL ERROR: could not find a valid UUID header.'
+	echo 'WARNING: could not find a valid UUID header.'
 	echo 'Install the Universally Unique Identifiers development package.'
-	exit 1
     fi
   ])
 
-AC_DEFUN([AC_PACKAGE_NEED_UUIDCOMPARE],
-  [ AC_CHECK_FUNCS(uuid_compare)
-    if test $ac_cv_func_uuid_compare = yes; then
-	libuuid=""
+AC_DEFUN([AC_PACKAGE_NEED_UUIDUNPARSE],
+  [ AC_CHECK_FUNCS(uuid_unparse)
+    if test $ac_cv_func_uuid_unparse = yes; then
+	libuuid="-luuid"
     else
-	AC_CHECK_LIB(uuid, uuid_compare,, [
+	AC_CHECK_LIB(uuid, uuid_unparse,, [
 	    echo
-	    echo 'FATAL ERROR: could not find a valid UUID library.'
-	    echo 'Install the Universally Unique Identifiers library package.'
-	    exit 1])
-	libuuid="-luuid"
+	    echo 'WARNING: could not find a valid UUID library.'
+	    echo 'Install the Universally Unique Identifiers library package.'])
+	libuuid=""
     fi
     AC_SUBST(libuuid)
   ])