From: Gurusamy Sarathy <gsar@cpan.org>
Date: Fri, 1 Oct 1999 22:33:02 +0000 (+0000)
Subject: integrate cfgperl contents into mainline; resolve h2xs.PL conflict
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=51fac20b958150820bb3d04d5df0bd1d0272854e;p=p5sagit%2Fp5-mst-13.2.git

integrate cfgperl contents into mainline; resolve h2xs.PL conflict
by declaring new globals "our" (XXX this means h2xs generated code
won't run on earlier versions; a switch to generate compatible
source is needed)

p4raw-id: //depot/perl@4271
---

51fac20b958150820bb3d04d5df0bd1d0272854e
diff --cc utils/h2xs.PL
index ae266de,a9b8826..b3031c3
--- a/utils/h2xs.PL
+++ b/utils/h2xs.PL
@@@ -411,6 -627,6 +627,7 @@@ warn "Writing $ext$modpname/$modfname.p
  print PM <<"END";
  package $module;
  
++require 5.005_62;
  use strict;
  END
  
@@@ -459,10 -677,20 +678,20 @@@ print PM<<"END"
  # Items to export into callers namespace by default. Note: do not export
  # names by default without a very good reason. Use EXPORT_OK instead.
  # Do not simply export all your public functions/methods/constants.
+ 
+ # This allows declaration	use $module ':all';
+ # If you do not need this, moving things directly into \@EXPORT or \@EXPORT_OK
+ # will save memory.
 -%EXPORT_TAGS = ( 'all' => [ qw(
++our %EXPORT_TAGS = ( 'all' => [ qw(
+ 	@exported_names
+ ) ] );
+ 
 -\@EXPORT_OK = ( \@{ \$EXPORT_TAGS{'all'} } );
 -
 -\@EXPORT = (
++our \@EXPORT_OK = ( \@{ \$EXPORT_TAGS{'all'} } );
+ 
 +our \@EXPORT = qw(
 +	@const_names
  );
 -\$VERSION = '$TEMPLATE_VERSION';
 +our \$VERSION = '$TEMPLATE_VERSION';
  
  END