winemaker: Improved check for libXML at runtime.

6fb4e062 · André Hentschel · Alexandre Julliard · 1151546c · 6fb4e062
Commit 6fb4e062 authored Aug 08, 2013 by André Hentschel Committed by Alexandre Julliard Aug 15, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

winemaker tools/winemaker +6 -2

No files found.
--- a/tools/winemaker
+++ b/tools/winemaker
@@ -873,8 +873,12 @@ sub source_scan_project_file($$$)
        push @{@$project_settings[$T_DEFINES]},$prj_target_defines;
        push @{@$project_settings[$T_LDFLAGS]},$prj_target_ldflags;
    } elsif ($filename =~ /.vcproj$/i) {
-        # Import XML::LibXML, you need the libxml package (deb: libxml-libxml-perl, rpm: perl-libxml-perl)
+        eval {
-        require XML::LibXML;
+            require XML::LibXML;
+        };
+        if ($@) {
+            die "Error: You need the libxml package (deb: libxml-libxml-perl, rpm: perl-libxml-perl)";
+        }
        my $xmlparser = XML::LibXML->new();
        my $project_xml = $xmlparser->parse_file($filename);