[svn:dbd-oracle] r14621 - dbd-oracle/branches/mjevans

Author: mjevans
Date: Thu Dec 30 08:34:46 2010
New Revision: 14621

Modified:
   dbd-oracle/branches/mjevans/MANIFEST
   dbd-oracle/branches/mjevans/Makefile.PL

Log:
Forgot to add new test file to manifest
Various minor Makefile changes:
  add build_requires
  workaround ExtUtils::MakeMaker problems with development releases and
    comparison with version string
  added LICENSE


Modified: dbd-oracle/branches/mjevans/MANIFEST
==============================================================================
--- dbd-oracle/branches/mjevans/MANIFEST	(original)
+++ dbd-oracle/branches/mjevans/MANIFEST	Thu Dec 30 08:34:46 2010
@@ -97,6 +97,7 @@
 t/70meta.t
 t/80ora_charset.t
 t/nchar_test_lib.pl
+t/rt64206.t
 test.pl
 Todo
 typemap

Modified: dbd-oracle/branches/mjevans/Makefile.PL
==============================================================================
--- dbd-oracle/branches/mjevans/Makefile.PL	(original)
+++ dbd-oracle/branches/mjevans/Makefile.PL	Thu Dec 30 08:34:46 2010
@@ -59,16 +59,22 @@
 	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 ([email protected])';
     $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/;