we lost the check for uuid.h at some point, add back in cos its important

diff --git a/configure.in b/configure.in
index 1a13b105eedd7071414808d44a5b1416ac9ecac4..48391d1dad02bb421a0ac3df8c62bc36d40903db 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -102,13 +102,21 @@ test -z "$ECHO" && AC_PATH_PROG(ECHO, echo, /bin/echo)
 echo=$ECHO
 AC_SUBST(echo)
 
-dnl Checks for libraries.
-AC_CHECK_LIB(uuid, uuid_generate,,[
+dnl Checks for UUID header and library.
+AC_CHECK_HEADER(uuid/uuid.h,, [
        echo
-       echo "FATAL ERROR: could not find a valid UUID library."
-       echo "Install either the e2fsprogs-devel (rpm) or the uuid-dev (deb) package."
+       echo 'FATAL ERROR: could not find a valid UUID header.'
+       echo 'Install either the e2fsprogs-devel (rpm) or the uuid-dev (deb) package.'
        exit 1
 ])
+AC_CHECK_LIB(uuid, uuid_generate,, [
+       echo
+       echo 'FATAL ERROR: could not find a valid UUID library.'
+       echo 'Install either the e2fsprogs-devel (rpm) or the uuid-dev (deb) package.'
+       exit 1
+])
+libuuid="/usr/lib/libuuid.a"
+AC_SUBST(libuuid)
 
 dnl Checks for LVM library
 AC_MSG_CHECKING([for liblvm.a])

diff --git a/include/builddefs.in b/include/builddefs.in
index c84c38301b96657a1d90b92f4774e90a1ef24209..cba3bbab0ed1f832017bc23b26cf44dd90cda8cd 100644 (file)
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -39,7 +39,7 @@ DEBUG = @debug_build@
 OPTIMIZER = @opt_build@
 MALLOCLIB = @malloc_lib@
 
-LIBUUID = /usr/lib/libuuid.a
+LIBUUID = @libuuid@
 LIBXFS = -lxfs
 LIBHANDLE = -lhandle