Rework the perl fallback functionality

[oweals/openssl.git] / util / dofile.pl

diff --git a/util/dofile.pl b/util/dofile.pl
index 10a1ad8cf003dd53372022e1a29a850770c47b5a..8cf66cd742aa7461c4e9dfe4ded35c360c4065ab 100644 (file)
--- a/util/dofile.pl
+++ b/util/dofile.pl
@@ -14,8 +14,9 @@
 use strict;
 use warnings;
 
-use FindBin;
 use Getopt::Std;
+use FindBin;
+use lib "$FindBin::Bin/perl";
 
 # We actually expect to get the following hash tables from configdata:
 #
@@ -37,10 +38,8 @@ package OpenSSL::Template;
 
 # Because we know that Text::Template isn't a core Perl module, we use
 # a fallback in case it's not installed on the system
-use File::Basename;
-use File::Spec::Functions;
-use lib "$FindBin::Bin/perl";
-use with_fallback "Text::Template 1.46";
+use OpenSSL::fallback "$FindBin::Bin/../external/perl/MODULES.txt";
+use Text::Template 1.46;
 
 #use parent qw/Text::Template/;
 use vars qw/@ISA/;