require working CGI::Untaint

[maypole.git] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index c623c120c65fdcb1ae489f80bdc3fc5ed3b82132..7881d363ce2cfdee3698159a2df2b553b6c1f3e7 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -16,21 +16,28 @@ WriteMakefile(
         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                              => 0,
         URI::QueryParam                  => 0,
         CGI::Simple                      => 0,
+        HTTP::Headers                    => 1.59,
+       HTTP::Body                       => 0.5,
         Template                         => 0,
         Template::Plugin::Class          => 0,
         Test::MockModule                 => 0,
+        Digest::MD5                     => 0,
+       File::MMagic::XS                => 0.08,
     },    # 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 <teejay#droogs.org>'
           )
         : ()
     ),
@@ -45,11 +52,14 @@ sub has_module {
 
 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 ) {