X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=Makefile.PL;h=d5e76ab93d7c2f622fecda6e92f0e929ce641570;hb=8617321ebf13ce6b63d41a65a003d153f2b5cc5e;hp=ad8fcdbcaac3289447e642be2edd7250c66c35da;hpb=24259799350483f32219fd3755e0bed54f909c54;p=maypole.git

diff --git a/Makefile.PL b/Makefile.PL
index ad8fcdb..d5e76ab 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -21,7 +21,7 @@ WriteMakefile(
         UNIVERSAL::require               => 0,
         URI::QueryParam                  => 0,
         CGI::Simple                      => 0,
-        HTTP::Headers                    => 0,
+        HTTP::Headers                    => 1.59,
         Template                         => 0,
         Template::Plugin::Class          => 0,
         Test::MockModule                 => 0,
@@ -46,17 +46,14 @@ sub has_module {
 
 if ( !-e "t/beerdb.db" ) {
     print "Making SQLite DB\n";
-    eval { require DBD::SQLite };
-    my $dbh;
-    if ($@) {
-        eval { require DBD::SQLite2 };
-        die "No, wait, we don't have SQLite installed. Never mind\n" if $@;
-        require DBI;
-        $dbh = DBI->connect("dbi:SQLite2:dbname=t/beerdb.db");
-    } else {
-        require DBI;
-        $dbh = DBI->connect("dbi:SQLite:dbname=t/beerdb.db");
-    }
+    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:$driver:dbname=t/beerdb.db");
     my $sql = join( '', (<DATA>) );
 
     for my $statement ( split /;/, $sql ) {