From: Matthias Koenig <mkoenig@suse.de>
Date: Mon, 7 May 2007 08:56:50 +0000 (+0200)
Subject: disk-utils: fix libuuid usage in mkswap
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=766dd75716dbd76ad338d8863ff25ed934a4a0e3;p=util-linux

disk-utils: fix libuuid usage in mkswap

Fix libuuid usage in mkswap.

Signed-off-by: Matthias Koenig <mkoenig@suse.de>
---

diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c
index 97064101..8cafd8f6 100644
--- a/disk-utils/mkswap.c
+++ b/disk-utils/mkswap.c
@@ -50,7 +50,7 @@
 #include "xstrncpy.h"
 #include "nls.h"
 
-#ifdef HAVE_UUID_UUID_H
+#ifdef HAVE_LIBUUID
 #include <uuid/uuid.h>
 #endif
 
@@ -240,7 +240,7 @@ write_uuid_and_label(char *uuid, char *volume_name) {
 			printf("LABEL=%s, ", h->volume_name);
 		else
 			printf(_("no label, "));
-#ifdef HAVE_UUID_UUID_H
+#ifdef HAVE_LIBUUID
 		if (uuid) {
 			char uuid_string[37];
 			uuid_unparse(uuid, uuid_string);
@@ -521,7 +521,7 @@ main(int argc, char ** argv) {
 	char *pp;
 	char *opt_label = NULL;
 	char *uuid = NULL;
-#ifdef HAVE_UUID_UUID_H
+#ifdef HAVE_LIBUUID
 	uuid_t uuid_dat;
 #endif
 
@@ -577,7 +577,7 @@ main(int argc, char ** argv) {
 			usage();
 	}
 
-#ifdef HAVE_UUID_UUID_H
+#ifdef HAVE_LIBUUID
 	uuid_generate(uuid_dat);
 	uuid = uuid_dat;
 #endif