--- configure.ac.orig	Sat Apr 30 20:39:54 2011
+++ configure.ac	Thu May  5 18:26:32 2011
@@ -70,14 +70,11 @@ PKG_CHECK_MODULES(LIBXML, [libxml-2.0])
 PKG_CHECK_MODULES(LIBXSLT, [libxslt])
 PKG_CHECK_MODULES(GCONF, [gconf-2.0])
 PKG_CHECK_MODULES(PCRE, [libpcrecpp])
+PKG_CHECK_MODULES(UUID, [e2fs-uuid])
 
 PKG_CHECK_EXISTS(gtkmm-2.4 >= 2.14.0,
   [AC_DEFINE(HAVE_CLASS_GTK__WIDGET_SIGNAL_POPUP_MENU, 1, [Define to 1 if class Gtk::Widget has signal_popup_menu])],
   [])
-
-dnl check for the ext2 uuid library. TODO replace it with something more portable
-AC_CHECK_HEADER(uuid/uuid.h,,[AC_MSG_ERROR("uuid header is missing")])
-AC_CHECK_LIB(uuid,uuid_unparse_lower, ,[AC_MSG_ERROR("libuuid library is missing")])
 
 AC_ARG_ENABLE([applet],
 	AS_HELP_STRING([--disable-applet],[Disable panel applet]),
--- src/Makefile.am.orig	Thu May  5 19:28:40 2011
+++ src/Makefile.am	Thu May  5 19:28:51 2011
@@ -11,6 +11,7 @@ AM_CPPFLAGS=@LIBGTKMM_CFLAGS@ @LIBGLIBMM_CFLAGS@ \
 	@LIBXSLT_CFLAGS@ \
 	@PCRE_CFLAGS@ \
 	@DBUS_CFLAGS@ \
+	@UUID_CFLAGS@ \
 	-DGNOTE_LOCALEDIR=\"@GNOTE_LOCALEDIR@\" \
 	-DDATADIR=\"$(datadir)\" -DLIBDIR=\"$(libdir)\"
 
@@ -23,7 +24,7 @@ GNOTE_LIBS = libgnote.a $(top_builddir)/libtomboy/libt
 	@PCRE_LIBS@ \
 	@DBUS_LIBS@ \
 	@GTKSPELL_LIBS@ @GTK_LIBS@ \
-	-luuid
+	@UUID_LIBS@
 
 noinst_LIBRARIES = libgnote.a
 bin_PROGRAMS = gnote
--- src/sharp/uuid.hpp.orig	Thu May  5 19:18:28 2011
+++ src/sharp/uuid.hpp	Thu May  5 19:18:35 2011
@@ -28,7 +28,7 @@
 #ifndef __SHARP_UUID_HPP_
 #define __SHARP_UUID_HPP_
 
-#include <uuid/uuid.h>
+#include <uuid.h>
 #include <string>
 
 namespace sharp {
