ensure we always produce the same Imager::Regops

[imager.git] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 8513bf3c12b1178b091c8e5717b8f3cac6855679..35d80babd04a61f54a89f0decaaf52f1b58d66cf 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -162,12 +162,13 @@ if ($^O eq 'hpux')                { $OSLIBS .= ' -ldld'; }
 if (defined $Config{'d_dlsymun'}) { $OSDEF  .= ' -DDLSYMUN'; }
 
 my @objs = qw(Imager.o context.o draw.o polygon.o image.o io.o iolayer.o
-              log.o gaussian.o conv.o pnm.o raw.o feat.o font.o combine.o
+              log.o gaussian.o conv.o pnm.o raw.o feat.o combine.o
               filters.o dynaload.o stackmach.o datatypes.o
               regmach.o trans2.o quant.o error.o convert.o
               map.o tags.o palimg.o maskimg.o img8.o img16.o rotate.o
               bmp.o tga.o color.o fills.o imgdouble.o limits.o hlines.o
-              imext.o scale.o rubthru.o render.o paste.o compose.o flip.o);
+              imext.o scale.o rubthru.o render.o paste.o compose.o flip.o
+             perlio.o);
 
 if ($Config{useithreads}) {
   if ($Config{i_pthread}) {
@@ -181,6 +182,9 @@ if ($Config{useithreads}) {
   else {
     print "Unsupported threading model\n";
     push @objs, "mutexnull.o";
+    if ($ENV{AUTOMATED_TESTING}) {
+      die "OS unsupported: no threading support code for this platform\n";
+    }
   }
 }
 else {
@@ -197,6 +201,11 @@ if ($trace_context) {
   $CFLAGS .= " -DIMAGER_TRACE_CONTEXT";
 }
 
+my $tests = 't/*.t t/*/*.t';
+if (-d "xt" && scalar(() = glob("xt/*.t"))) {
+  $tests .= " xt/*.t";
+}
+
 my %opts=
   (
    'NAME'         => 'Imager',
@@ -214,6 +223,7 @@ my %opts=
     'XSLoader'    => 0,
    },
    TYPEMAPS       => \@typemaps,
+   test =>        { TESTS => $tests },
   );
 
 if ($coverage) {
@@ -546,7 +556,7 @@ sub init {
                        && !-e catfile($_[0], 'fterrors.h') },
      libcheck=>sub { $_[0] eq "libttf$aext" or $_[0] eq "libttf.$lext" },
      libfiles=>'-lttf',
-     objfiles=>'',
+     objfiles=>'fontft1.o',
      code => \&freetype1_probe,
      docs=>q{
 Truetype fonts are scalable fonts. They can include