From c3c1d2c8c92e343d43e1a194176d74e28005d05e Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Sat, 11 Oct 2008 22:44:00 -0700 Subject: [PATCH] Prevent accidentally trying to call SWIG from a CPAN distro --- Build.PL | 2 ++ inc/GSLBuilder.pm | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Build.PL b/Build.PL index b271b28..a8256c8 100644 --- a/Build.PL +++ b/Build.PL @@ -194,6 +194,8 @@ my $builder = GSLBuilder->new( include_dirs => q{}, extra_linker_flags => '-shared ' . $ldflags, extra_compiler_flags=> $ccflags, + # Set to true for CPAN releases to prevent breakage + swig_disabled => 1, swig_flags => $swig_flags, license => 'gpl', requires => { diff --git a/inc/GSLBuilder.pm b/inc/GSLBuilder.pm index d9ff0e2..defa888 100644 --- a/inc/GSLBuilder.pm +++ b/inc/GSLBuilder.pm @@ -26,8 +26,11 @@ sub process_swig { (my $file_base = $main_swig_file) =~ s/\.[^.]+$//; my $c_file = "${file_base}_wrap.c"; - $self->compile_swig($main_swig_file, $c_file) - unless($self->up_to_date( [$main_swig_file,defined $deps_ref ? @$deps_ref : () ],$c_file)); + my @deps = defined $deps_ref ? @$deps_ref : (); + + if ( !$p->{swig_disabled} && $self->up_to_date( [$main_swig_file,@deps ], $c_file) ) { + $self->compile_swig($main_swig_file, $c_file); + } # .c -> .o my $obj_file = $self->compile_c($c_file); -- 2.11.4.GIT