Merge pull request #1330 from SaberUK/insp20+mm-inc

[2.0] Fix ModuleManager not being able to find make::configure.

1 files changed, 7 insertions, 2 deletions

diff --git a/modulemanager b/modulemanager
index b107f2c1f..42566d3b1 100755
--- a/modulemanager
+++ b/modulemanager
@@ -22,10 +22,15 @@
 use strict;
 use warnings FATAL => qw(all);
 
-use make::configure;
-
 BEGIN {
+	require 5.8.0;
 	push @INC, '.';
+}
+
+BEGIN {
+	# HACK: for some reason this needs to be in a second BEGIN block
+	# or it doesn't receive the updated @INC from above.
+	use make::configure;
 	unless (module_installed("LWP::Simple")) {
 		die "Your system is missing the LWP::Simple Perl module!";
 	}