diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2013-01-17 09:02:21 +0100 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-01-17 15:31:20 +0100 |
commit | 91e63e3472f7b91f227bf397f833fabc8489279b (patch) | |
tree | 4cba83a158332ff025fb00d7d36bb0ad042a3383 /tools | |
parent | 07119d1476db0a7568f79cbc855a888007dc7400 (diff) | |
download | msitools-91e63e3472f7b91f227bf397f833fabc8489279b.tar.gz msitools-91e63e3472f7b91f227bf397f833fabc8489279b.tar.xz msitools-91e63e3472f7b91f227bf397f833fabc8489279b.zip |
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.
Diffstat (limited to 'tools')
-rw-r--r-- | tools/msibuild.c | 26 |
1 files changed, 10 insertions, 16 deletions
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; } |