X-Git-Url: https://git.decadent.org.uk/gitweb/?p=maypole.git;a=blobdiff_plain;f=Makefile.PL;h=5b7ca8b27547bd88f4a6fb4d81d6fa6fd15c08b2;hp=1740dd5b42bb762e20a218f68491ed6f7be04925;hb=eff1964310020ec4399e77ebed0ce47113056c69;hpb=5e9b1336d1f20d57953e3e419fa7d68e79723528

diff --git a/Makefile.PL b/Makefile.PL
index 1740dd5..5b7ca8b 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -11,39 +11,52 @@ WriteMakefile(
         Class::DBI::AbstractSearch       => 0,
         Class::DBI::Pager                => 0,
         Class::DBI::Plugin::RetrieveAll  => 0,
-        Class::DBI::AsForm               => 2.2,
-        Class::DBI::FromCGI              => 0.94,
         Class::DBI::Loader::Relationship => 0,
         Class::DBI                       => 0.96,
-        Class::DBI::SQLite               => 0,
-        CGI::Untaint                     => 0,
+        CGI::Untaint                     => 1.26,
+	CGI::Untaint::date		 => 0,
+	CGI::Untaint::email		 => 0,
         UNIVERSAL::moniker               => 0,
         UNIVERSAL::require               => 0,
-        URI::QueryParam                  => 0,
+        URI                              => 0,
         CGI::Simple                      => 0,
+ 	HTTP::Body			 => 0.5,
+	HTML::Tree        		 => 0,
         Template                         => 0,
         Template::Plugin::Class          => 0,
-	Test::MockModule		 => 0,
-	Test::MockObject		 => 0,
+        Test::MockModule                 => 0,
+        Digest::MD5			 => 0,
+	File::MMagic::XS		 => 0.08,
+	Class::DBI::Plugin::Type	 => 0,
     },    # e.g., Module::Name => 1.1
     (
         $] >= 5.005
         ?    ## Add these new keywords supported since 5.005
           (
             ABSTRACT_FROM => 'lib/Maypole.pm',   # retrieve abstract from module
-            AUTHOR => 'Simon Cozens <simon@simon-cozens.org>'
+            AUTHOR => 'Aaron TEEJAY Trevena <aaron@aarontrevena.co.uk>'
           )
         : ()
     ),
 );
 
+sub has_module {
+    my ($module, $version) = @_;
+    (my $file = "$module.pm") =~ s/::/\//g;
+    eval {require $file} or return;
+    return ($module->VERSION || 0) >= $version;
+}
+
 if ( !-e "t/beerdb.db" ) {
     print "Making SQLite DB\n";
-    eval { require DBD::SQLite };
-    die "No, wait, we don't have SQLite installed. Never mind\n" if $@;
+    my $driver = 'SQLite';
+    eval { require DBD::SQLite } or do {
+        print "Error loading DBD::SQLite, trying DBD::SQLite2\n";
+        eval {require DBD::SQLite2} ? $driver = 'SQLite2'
+            : die "DBD::SQLite2 is not installed";
+    };
     require DBI;
-    my $dbh = DBI->connect("dbi:SQLite:dbname=t/beerdb.db");
-
+    my $dbh = DBI->connect("dbi:$driver:dbname=t/beerdb.db");
     my $sql = join( '', (<DATA>) );
 
     for my $statement ( split /;/, $sql ) {
@@ -70,7 +83,7 @@ create table beer (
     style integer,
     name varchar(30),
     url varchar(120),
-#    tasted date,
+    tasted date,
     score integer(2),
     price varchar(12),
     abv varchar(10),