From d452840e9800e9f29fcb0a9e0117f42cee31e5f8 Mon Sep 17 00:00:00 2001
From: "justdave%bugzilla.org" <>
Date: Tue, 14 Sep 2004 12:48:53 +0000
Subject: Bug 257534: Require Perl 5.8.1 or later when running on Windows with
 ActiveState Perl (there is no official CGI ppm build with a new enough
 version for Bugzilla on any earlier version of ActiveState Perl) Patch by
 Byron Jones <bugzilla@glob.com.au> r=justdave, a=justdave

---
 checksetup.pl | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

(limited to 'checksetup.pl')

diff --git a/checksetup.pl b/checksetup.pl
index 68dd308e6..6b9b1042c 100755
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -151,6 +151,12 @@ if ($ARGV[0] && ($ARGV[0] !~ /^--/)) {
 #
 
 print "\nChecking perl modules ...\n" unless $silent;
+if ($^O =~ /MSWin32/i) {
+    unless ($] >= 5.008001) {
+        die "Sorry, you need at least ActiveState Perl build 5.8.1\n";
+        # for CGI 2.93 or higher
+    }
+}
 unless ($] >= 5.006) {
     die "Sorry, you need at least Perl 5.6\n";
 }
@@ -315,26 +321,11 @@ my $patchreader = have_vers("PatchReader","0.9.4");
 print "\n" unless $silent;
 
 if ($^O =~ /MSWin32/i && !$silent) {
-    if ($^V lt pack('U*',5,8,0)) {
-        # If something older than 5.8 is detected, then point to the oi
-        # repository using ppm version 2 commands (which is the default
-        # for Perl 5.6)
-
-        print "The required ActivePerl modules are available at OpenInteract's ppm repository.\n";
-        print "You can add the repository with the following command:\n";
-        print "    ppm set rep oi http://openinteract.sourceforge.net/ppmpackages/\n";
-        print "You can then save the changes by typing:\n";
-        print "    ppm set save\n\n";
-    } else {
-        # For Perl 5.8 or higher, point the user to a 5.8 repository,
-        # using ppm version 3 commands (which is the default for Perl 5.8)
-
-        print "Most ActivePerl modules are available at Apache's ppm repository.\n";
-        print "A list of mirrors is available at\n";
-        print "    http://www.apache.org/dyn/closer.cgi/perl/win32-bin/ppms/\n";
-        print "You can add the repository with the following command:\n";
-        print "    ppm rep add apache http://www.apache.org/dist/perl/win32-bin/ppms/\n\n";
-    }
+    print "Most ActivePerl modules are available at Apache's ppm repository.\n";
+    print "A list of mirrors is available at\n";
+    print "    http://www.apache.org/dyn/closer.cgi/perl/win32-bin/ppms/\n";
+    print "You can add the repository with the following command:\n";
+    print "    ppm rep add apache http://www.apache.org/dist/perl/win32-bin/ppms/\n\n";
 }
 
 if ((!$gd || !$chartbase) && !$silent) {
-- 
cgit v1.2.3-24-g4f1b