From d4e203dc17a22660eacfb1748045e29be90e25e3 Mon Sep 17 00:00:00 2001
From: byterock <byterock@50811bd7-b8ce-0310-adc1-d9db26280581>
Date: Thu, 27 Jan 2011 13:32:17 +0000
Subject: [PATCH] Added DBI to PREREQ_PM in Makefile.PL by Martin J. Evans
 Added build_requires in Makefile.PL by Martin J. Evans Added workaround for
 ExtUtils::MakeMaker problems by Martin J. Evans Added LICENSE to Makefile.PL
 by Martin J. Evans

git-svn-id: http://svn.perl.org/modules/dbd-oracle/trunk@14655 50811bd7-b8ce-0310-adc1-d9db26280581
---
 Changes     |  8 ++++++++
 Makefile.PL | 18 ++++++++++++------
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/Changes b/Changes
index 9bdfaf71..3e669b90 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,11 @@
+=head1 Changes in DBD-Oracle 1.28 (svn rev 14583)
+
+  Added DBI to PREREQ_PM in Makefile.PL by Martin J. Evans
+  Added build_requires in Makefile.PL by Martin J. Evans
+  Added workaround for ExtUtils::MakeMaker problems by Martin J. Evans
+  Added LICENSE to Makefile.PL by Martin J. Evans
+
+
 =head1 Changes in DBD-Oracle 1.27 (svn rev 14583)
 
   This version removes ‘PERL_POLLUTE’ and adds in PL_ where required so it will be fully compatible with Perl 5.13
diff --git a/Makefile.PL b/Makefile.PL
index 09495d99..6578ad61 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -46,7 +46,8 @@ $| = 1;
 my %opts = (
     NAME => 'DBD::Oracle',
     VERSION_FROM => 'Oracle.pm',
-    PREREQ_PM => { "Test::Simple" => 0.40 }, # actually Test::More pkg in T::S dist
+    PREREQ_PM => { "Test::Simple" => 0.40, # actually Test::More pkg in T::S dist
+                   "DBI"          => 1.51},
     EXE_FILES => [ "ora_explain$exe_ext" ],
     OBJECT => '$(O_FILES)',
     DEFINE => '',
@@ -58,16 +59,22 @@ my %opts = (
 	COMPRESS	=> 'gzip -v9', SUFFIX => 'gz',
     },
     META_MERGE => {
-       configure_requires => { DBI => '1.51' }
+       configure_requires => { "DBI" => '1.51' },
+       build_requires => {"DBI" => '1.51',
+                          "ExtUtils::MakeMaker" => 0}
     },
 );
-if ($ExtUtils::MakeMaker::VERSION >= 5.43) {
+my $eumm = $ExtUtils::MakeMaker::VERSION;
+$eumm =~ tr/_//d;
+
+if ($eumm >= 5.43) {
     $opts{AUTHOR} = 'Tim Bunce (dbi-users@perl.org)';
     $opts{ABSTRACT_FROM} = 'Oracle.pm';
     $opts{PREREQ_PM} = { DBI => 1.51 };
     $opts{CAPI} = 'TRUE' if $Config{archname} =~ /-object\b/i;
 }
 
+$opts{LICENSE} = 'perl' if $eumm >= 6.3002;
 $opts{CCFLAGS} = "-P $Config{ccflags}" if $Config{cc} eq 'bcc32';  # force C++
 $opts{LINKTYPE} = 'static' if $Config{dlsrc} =~ /dl_none/;
 
@@ -282,11 +289,10 @@ elsif (($os eq 'MSWin32') or ($os =~ /cygwin/i)) {
   
       print "Using $OCIDIR/lib/$oci_compiler_dir/$OCILIB.lib\n";
       $opts{LIBS} = [ "-L$OH/$OCIDIR/LIB/$oci_compiler_dir $OCILIB" ];
-      
     };
 
-    my $OCIINCLUDE = "-I\"$OH/$OCIDIR/include\" -I\"$OH/rdbms/demo\"";
-    $opts{INC}     = "$OCIINCLUDE -I\"$dbi_arch_dir\"";
+    my $OCIINCLUDE = "-I$OH/$OCIDIR/include -I$OH/rdbms/demo";
+    $opts{INC}  = "$OCIINCLUDE -I$dbi_arch_dir";
 }
 
 # --- UNIX Variants ---