From: Steve Hay <SteveHay@planit.com>
Date: Sat, 14 Nov 2009 00:17:00 +0000 (+0000)
Subject: Revert core fixes for IO-Compress following IO-Compress update
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=88a6f4fc380d30c40;p=p5sagit%2Fp5-mst-13.2.git

Revert core fixes for IO-Compress following IO-Compress update

With commit 1725f55ba78fb58489ea39e2bc0cc1faffd32275 IO-Compress now puts
its .pm files in lib rather than archlib for perls later than 5.11.1, so
the core can now do likewise given that blead will next be released as
5.11.2, i.e. revert the Configure part of 4cc80fc4cbbd82e20f7b14b68abb53d552076022
and revert f4a6a713802da1b781d7108503156fa3a0fe219e.

This change should not be merged into 5.10.x because IO-Compress will
continue to put its .pm files into archlib for the sake of anyone upgrading
a 5.10.x installation in-place.
---

diff --git a/Configure b/Configure
index e67b461..bc78997 100755
--- a/Configure
+++ b/Configure
@@ -21733,9 +21733,7 @@ nonxs_extensions=''
 : Function to recursively find available extensions, ignoring DynaLoader
 : NOTE: recursion limit of 10 to prevent runaway in case of symlink madness
 : In 5.10.1 and later, extensions are stored in directories
-: like File-Glob instead of the older File/Glob/.  In this scheme,
-: IO-Compress does not appear to be an XS extension, but we want
-: to install it as one.  A.D.  8/2009.
+: like File-Glob instead of the older File/Glob/.
 find_extensions='
     for xxx in *; do
 	case "$xxx" in
@@ -21763,8 +21761,6 @@ find_extensions='
 		    known_extensions="$known_extensions $this_ext";
 		elif $contains "\.c$"  $$.tmp > /dev/null 2>&1; then
 		    known_extensions="$known_extensions $this_ext";
-		elif $test "$this_ext" = "IO/Compress"; then
-		    known_extensions="$known_extensions $this_ext";
 		elif $test -d $xxx; then
 		    nonxs_extensions="$nonxs_extensions $this_ext";
 		fi;
diff --git a/win32/FindExt.pm b/win32/FindExt.pm
index 4355a17..fe1febd 100644
--- a/win32/FindExt.pm
+++ b/win32/FindExt.pm
@@ -91,7 +91,7 @@ sub find_ext
 	# Temporary hack to cope with smokers that are not clearing directories:
         next if $ext{$this_ext};
 
-        if (has_xs_or_c("$ext_dir$item") or $this_ext eq 'IO/Compress') {
+        if (has_xs_or_c("$ext_dir$item")) {
             $ext{$this_ext} = $static{$this_ext} ? 'static' : 'dynamic';
         } else {
             $ext{$this_ext} = 'nonxs';