André Hentschel : winemaker: Improved check for libXML at runtime.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 6fb4e062984fc3fe49ebc396698d1f805b0b3906
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6fb4e062984fc3fe49ebc39669...

Author: André Hentschel 
Date:   Thu Aug  8 00:10:43 2013 +0200

winemaker: Improved check for libXML at runtime.

---

tools/winemaker |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/tools/winemaker b/tools/winemaker
index c6eb480..af26243 100755
--- 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)
-        require XML::LibXML;
+        eval {
+            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);