From 91e63e3472f7b91f227bf397f833fabc8489279b Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <pbonzini@redhat.com>
Date: Thu, 17 Jan 2013 09:02:21 +0100
Subject: build: libuuid dependency is now mandatory

This was just a hack because Fedora mingw does not have a libuuid
port.  It can go.  And we can also always build wixl.
---
 tools/msibuild.c | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

(limited to 'tools')

diff --git a/tools/msibuild.c b/tools/msibuild.c
index a80af2c..140e0a7 100644
--- a/tools/msibuild.c
+++ b/tools/msibuild.c
@@ -25,15 +25,15 @@
 #include <sys/stat.h>
 #include <libmsi.h>
 #include <limits.h>
-
-#ifdef HAVE_LIBUUID
 #include <uuid.h>
-#endif
 
 #include "sqldelim.h"
 
 static gboolean init_suminfo(LibmsiSummaryInfo *si, GError **error)
 {
+    uuid_t uu;
+    char uustr[40];
+
     if (!libmsi_summary_info_set_string(si, LIBMSI_PROPERTY_TITLE,
                                         "Installation Database", error))
         return FALSE;
@@ -62,19 +62,13 @@ static gboolean init_suminfo(LibmsiSummaryInfo *si, GError **error)
                                      0, error))
         return FALSE;
 
-#ifdef HAVE_LIBUUID
-    {
-        uuid_t uu;
-        char uustr[40];
-        uuid_generate(uu);
-        uustr[0] = '{';
-        uuid_unparse_upper(uu, uustr + 1);
-        strcat(uustr, "}");
-        if (!libmsi_summary_info_set_string(si, LIBMSI_PROPERTY_UUID,
-                                            uustr, error))
-            return FALSE;
-    }
-#endif
+    uuid_generate(uu);
+    uustr[0] = '{';
+    uuid_unparse_upper(uu, uustr + 1);
+    strcat(uustr, "}");
+    if (!libmsi_summary_info_set_string(si, LIBMSI_PROPERTY_UUID,
+                                        uustr, error))
+        return FALSE;
 
     return TRUE;
 }
-- 
cgit