From: Rafael Kitover <rkitover@cpan.org>
Date: Thu, 17 Jun 2010 02:53:55 +0000 (-0400)
Subject: remove import of GetOptions symbol into Makefile.PL
X-Git-Tag: v0.08124~136
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=dbsrgits%2FDBIx-Class.git;a=commitdiff_plain;h=347275d1516a44a395e14c724bf15f7afa944c33

remove import of GetOptions symbol into Makefile.PL
---

diff --git a/Changes b/Changes
index 0f6aa20..336b4b3 100644
--- a/Changes
+++ b/Changes
@@ -3,6 +3,10 @@ Revision history for DBIx::Class
     * Fixes
         - Fixed rels ending with me breaking subqueried limit realiasing
 
+    * Misc
+        - Makefile.PL no longer imports GetOptions() to interoperate better
+          with Catalyst installers
+
 0.08123 2010-06-12 14:46 (UTC)
     * Fixes
         - Make sure Oracle identifier shortener applies to auto-generated
diff --git a/Makefile.PL b/Makefile.PL
index 7afb796..3d98f29 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -12,11 +12,15 @@ use lib "$FindBin::Bin/lib";
 use Config;
 $ENV{PERL5LIB} = join ($Config{path_sep}, @INC);
 
-use Getopt::Long qw/:config gnu_getopt bundling_override no_ignore_case pass_through/;
+use Getopt::Long ();
+
+my $getopt = Getopt::Long::Parser->new(
+  config => [qw/gnu_getopt bundling_override no_ignore_case pass_through/]
+);
 my $args = {
   skip_author_deps => undef,
 };
-GetOptions ($args, 'skip_author_deps');
+$getopt->getoptions($args, 'skip_author_deps');
 if (@ARGV) {
   warn "\nIgnoring unrecognized option(s): @ARGV\n\n";
 }