X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=Makefile.PL;h=55cf8b01dc5d9c1b8f07a553fa429771d34e2bfc;hb=033390785b526b9884cea44a9d684c5c3bac8d77;hp=345bf6bf8d1926979f4f73b1d84581da02f8192b;hpb=f9a6b47b3b916585d710eac141003fb8261d9c3c;p=maypole.git diff --git a/Makefile.PL b/Makefile.PL index 345bf6b..55cf8b0 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -19,19 +19,21 @@ WriteMakefile( CGI::Untaint => 0, UNIVERSAL::moniker => 0, UNIVERSAL::require => 0, + URI => 0, URI::QueryParam => 0, CGI::Simple => 0, - HTTP::Headers => 0, + HTTP::Headers => 1.59, Template => 0, Template::Plugin::Class => 0, Test::MockModule => 0, + Digest::MD5 => 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 ' + AUTHOR => 'Simon flack ' ) : () ), @@ -46,11 +48,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( '', () ); for my $statement ( split /;/, $sql ) {