Index: lib/uuid/Makefile.in
--- lib/uuid/Makefile.in.orig	2009-08-13 03:39:57 +0200
+++ lib/uuid/Makefile.in	2009-09-18 09:27:03 +0200
@@ -1,14 +1,20 @@
 # Makefile for the UUID library
 #
 
+ALL_CFLAGS = @CFLAGS@ -I. -I..
+ALL_LDFLAGS = @LDFLAGS@
+LIBUUID = libuuid.a
+STATIC_LIBUUID = libuuid.a
+SUBSTITUTE = cp
+SUBSTITUTE_UPTIME = cp
+
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 top_builddir = ../..
 my_dir = lib/uuid
-INSTALL = @INSTALL@
-
-@MCONFIG@
+E=@echo
+Q=
 
 all:: 
 
@@ -53,21 +59,15 @@
 BSDLIB_MYDIR = uuid
 BSDLIB_INSTALL_DIR = $(root_libdir)
 
-@MAKEFILE_LIBRARY@
-@MAKEFILE_ELF@
-@MAKEFILE_BSDLIB@
-@MAKEFILE_PROFILE@
-@MAKEFILE_CHECKER@
-
 .c.o:
 	$(E) "	CC $<"
 	$(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
-@PROFILE_CMT@	$(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
-@CHECKER_CMT@	$(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
-@ELF_CMT@	$(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
-@BSDLIB_CMT@	$(Q) $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
 
-all:: tst_uuid uuid_time $(SMANPAGES) uuid.pc
+libuuid.a: $(OBJS)
+	ar cr libuuid.a $(OBJS)
+	ranlib libuuid.a
+  
+all:: tst_uuid uuid_time $(SMANPAGES)
 
 $(top_builddir)/lib/uuid/uuid_types.h: $(srcdir)/uuid_types.h.in $(top_builddir)/config.status
 	cd $(top_builddir); CONFIG_FILES=$(my_dir)/uuid_types.h ./config.status
@@ -172,15 +172,6 @@
 	$(RM) -f .depend Makefile uuid.pc \
 		$(srcdir)/TAGS $(srcdir)/Makefile.in.old
 
-#
-# Hack to parallel makes recognize dependencies correctly.
-#
-../../lib/libuuid.a: libuuid.a
-../../lib/libuuid.so: image
-../../lib/libuuid.dylib: image
-
-$(OBJS): subdirs
-
 # +++ Dependency line eater +++
 # 
 # Makefile dependencies follow.  This must be the last section in
Index: lib/uuid/configure.in
--- lib/uuid/configure.in.orig	2009-08-13 03:39:57 +0200
+++ lib/uuid/configure.in	2009-09-18 09:26:44 +0200
@@ -7,4 +7,31 @@
 
 AC_CHECK_HEADERS(stdlib.h unistd.h sys/sockio.h net/if.h netinet/in.h)
 AC_CHECK_FUNCS(srandom)
-AC_OUTPUT(Makefile)
+
+dnl
+dnl Word sizes...
+dnl
+if test "$cross_compiling" = yes -a "$ac_cv_sizeof_long" = ""; then
+  # if cross-compiling, with no cached values, just assume something common. 
+  ac_cv_sizeof_short=2
+  ac_cv_sizeof_int=4
+  ac_cv_sizeof_long=4
+  ac_cv_sizeof_long_long=8
+  AC_MSG_WARN([Cross-compiling, so cannot check type sizes; assuming short=2, int=4, long=4, long long=8])
+fi
+AC_CHECK_SIZEOF(short)
+AC_CHECK_SIZEOF(int)
+AC_CHECK_SIZEOF(long)
+AC_CHECK_SIZEOF(long long)
+SIZEOF_SHORT=$ac_cv_sizeof_short
+SIZEOF_INT=$ac_cv_sizeof_int
+SIZEOF_LONG=$ac_cv_sizeof_long
+SIZEOF_LONG_LONG=$ac_cv_sizeof_long_long
+AC_SUBST(SIZEOF_SHORT)
+AC_SUBST(SIZEOF_INT)
+AC_SUBST(SIZEOF_LONG)
+AC_SUBST(SIZEOF_LONG_LONG)
+AC_C_BIGENDIAN
+
+AC_OUTPUT(Makefile uuid_types.h)
+
Index: lib/uuid/gen_uuid.c
--- lib/uuid/gen_uuid.c.orig	2009-08-13 03:39:57 +0200
+++ lib/uuid/gen_uuid.c	2009-09-18 09:28:51 +0200
@@ -53,6 +53,7 @@
 #include <string.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <limits.h>
 #include <sys/types.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>