From 5a29bbc1dae0a49602f7e4da29dc023b27c17ad2 Mon Sep 17 00:00:00 2001 From: Jonathan Leto Date: Fri, 13 Jun 2008 22:07:12 -0700 Subject: [PATCH] Some Build.PL tweaks to improve error reporting when the proper modules are not found, removed traces of Permute and fixed bug in 01-pod.t --- Build.PL | 20 ++++++++++++++------ MANIFEST | 1 - lib/Math/GSL.pm | 2 +- t/01-pod.t | 1 + 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/Build.PL b/Build.PL index 5e39cf9..4c3a87b 100644 --- a/Build.PL +++ b/Build.PL @@ -1,5 +1,8 @@ #!/usr/bin/perl -w -# $Id: Build.PL,v 1.25 2006/08/05 08:48:12 rocky Exp $ + +# This script has been heavily modified from the Device::Cdio Build.PL +# Jonathan Leto + # Copyright (C) 2006 Rocky Bernstein # # This program is free software; you can redistribute it and/or modify @@ -17,11 +20,17 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA use strict; use warnings; -use Module::Build; -use ExtUtils::PkgConfig; use Config; use Data::Dumper; +BEGIN { + eval { + require Module::Build; + require ExtUtils::PkgConfig; + }; + die "Math::GSL requires Module::Build and ExtUtils::PkgConfig, please install these first.\n" if $@; +} + my $code = <<'EOC'; use Config; use File::Copy; @@ -354,7 +363,7 @@ my $builder = $class->new( swig_installed => $swig_installed, license => 'gpl', requires => { - 'ExtUtils::PkgConfig' => '1.03', + 'ExtUtils::PkgConfig' => '1.03', 'Scalar::Util' => 0, 'Test::More' => 0, 'Test::Class' => 0, @@ -363,8 +372,7 @@ my $builder = $class->new( }, sign => 1, swig_source => [ - map { [ "$_.i" ] } - qw/ + map { [ "$_.i" ] } sort qw/ BLAS Diff Machine Statistics Block Eigen Matrix Poly Sum BSpline Errno PowInt Sys diff --git a/MANIFEST b/MANIFEST index acb6f62..7119ade 100644 --- a/MANIFEST +++ b/MANIFEST @@ -51,7 +51,6 @@ Multiroots.i NTuple.i ODEIV.i Permutation.i -Permute.i Poly.i PowInt.i Precision.i diff --git a/lib/Math/GSL.pm b/lib/Math/GSL.pm index ff825f5..2490400 100644 --- a/lib/Math/GSL.pm +++ b/lib/Math/GSL.pm @@ -155,7 +155,7 @@ sub new sub subsystems { return qw/ - BLAS Diff Machine Permute Statistics + BLAS Diff Machine Statistics Block Eigen Matrix Poly Sum BSpline Errno PowInt Sys CBLAS FFT Min IEEEUtils diff --git a/t/01-pod.t b/t/01-pod.t index 4205418..83d5127 100644 --- a/t/01-pod.t +++ b/t/01-pod.t @@ -1,3 +1,4 @@ +use Test::More tests => 1; eval 'use Test::Pod 1.00'; if ($@){ ok(1, 'Test::Pod 1.00 required for testing POD') -- 2.11.4.GIT