blkid: make libuuid optional

read.c:28:23: error: uuid/uuid.h: No such file or directory
make[3]: *** [read.lo] Error 1
make[3]: *** Waiting for unfinished jobs....

Reported-by: Olaf <mailinglists@ban-solms.de>
Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/libs/blkid/src/config.c b/libs/blkid/src/config.c
index 2e5921819201d2fd5001a0a91a52e99e2fbadbea..9091736bea6b712422c99c703446a8f9a16d09ad 100644 (file)
--- a/libs/blkid/src/config.c
+++ b/libs/blkid/src/config.c
@@ -24,9 +24,6 @@
 #include <errno.h>
 #endif
 #include <stdint.h>
-#ifdef HAVE_LIBUUID
-#include <uuid/uuid.h>
-#endif
 #include <stdarg.h>
 
 #include "blkdev.h"

diff --git a/libs/blkid/src/evaluate.c b/libs/blkid/src/evaluate.c
index a9c9fbab2e079dd05861a8ac612548eb9634eb28..f0ae1266959f7558c83644e261e145eb325c73ca 100644 (file)
--- a/libs/blkid/src/evaluate.c
+++ b/libs/blkid/src/evaluate.c
@@ -27,9 +27,6 @@
 #include <errno.h>
 #endif
 #include <stdint.h>
-#ifdef HAVE_LIBUUID
-#include <uuid/uuid.h>
-#endif
 #include <stdarg.h>
 
 #include "pathnames.h"

diff --git a/libs/blkid/src/read.c b/libs/blkid/src/read.c
index 4163874563e6bf8bf99590908156795c86ef46c1..b5e9cd02435af915af5e774ab8a0fa8083faa7e8 100644 (file)
--- a/libs/blkid/src/read.c
+++ b/libs/blkid/src/read.c
@@ -25,7 +25,6 @@
 #endif
 
 #include "blkidP.h"
-#include "uuid/uuid.h"
 
 #ifdef HAVE_STRTOULL
 #define STRTOULL strtoull /* defined in stdlib.h if you try hard enough */