Changeset 24700 for main/trunk/greenstone2/perllib

Timestamp:

2011-09-30T14:37:20+13:00 (13 years ago)

Author:

sjm84

Message:

Commiting changes to XMLParser that will make it use a multithreaded version of the Expat.so file if necessary

File:

• main/trunk/greenstone2/perllib/XMLParser.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/XMLParser.pm

@@ -54 +54 @@
 
     if ($ENV{'GSDLOS'} !~ /^windows$/i) {
-    # Use push to put this on the end, so an existing XML::Parser will be used by default
-    push (@INC, "$ENV{'GSDLHOME'}/perllib/cpan/$perl_dir");
+        # Use push to put this on the end, so an existing XML::Parser will be used by default
+        if (-d "$ENV{'GSDLHOME'}/perllib/cpan/$perl_dir-mt" && $Config{usethreads}){
+            push (@INC, "$ENV{'GSDLHOME'}/perllib/cpan/$perl_dir-mt");
+        }
+        else{
+            push (@INC, "$ENV{'GSDLHOME'}/perllib/cpan/$perl_dir");
+        }
     }
 }
 
+use Config;
 use XML::Parser;
 use strict;