From: Nicholas Clark Date: Mon, 9 Feb 2009 21:49:11 +0000 (+0000) Subject: Remove special casing for extensions nested inside other extensions. X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=abd7186c6748d276ced6dd10e94e6c04ba10b768;p=p5sagit%2Fp5-mst-13.2.git Remove special casing for extensions nested inside other extensions. (Incorporates "[PATCH] Don't include Hash::Utils::FieldHash twice" from Jerry Hedden.) --- diff --git a/Configure b/Configure index 67c20b5..0d72a68 100755 --- a/Configure +++ b/Configure @@ -21642,12 +21642,6 @@ cd "$rsrc/ext" set X shift eval $find_extensions -# Special case: Add in modules that nest beyond the first level. -# Currently threads/shared and Hash/Util/FieldHash, since they are -# not picked up by the recursive find above (and adding in general -# recursive finding breaks SDBM_File/sdbm). -# A.D. 20011025 (SDBM), ajgough 20071008 (FieldHash) -known_extensions="$known_extensions threads/shared Hash/Util/FieldHash" set X $known_extensions shift known_extensions="$*" diff --git a/win32/FindExt.pm b/win32/FindExt.pm index da0bf54..5c5a94f 100644 --- a/win32/FindExt.pm +++ b/win32/FindExt.pm @@ -91,19 +91,6 @@ sub find_ext } $ext{$this_ext} = 'known' if $ext{$this_ext} && $item =~ $no; } - -# Special case: Add in modules that nest beyond the first level. -# Currently threads/shared and Hash/Util/FieldHash, since they are -# not picked up by the recursive find above (and adding in general -# recursive finding breaks SDBM_File/sdbm). -# A.D. 20011025 (SDBM), ajgough 20071008 (FieldHash) - - if (!$prefix && -d "${ext_dir}threads/shared") { - $ext{"threads/shared"} = 'dynamic'; - } - if (!$prefix && -d "${ext_dir}Hash/Util/FieldHash") { - $ext{"Hash/Util/FieldHash"} = 'dynamic'; - } } 1;