1.005 release

[imager.git] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 7e01cccb29a201119a57cc5a11f45ad1f5b956fc..abf50602c956d6dd4b5ef274026e115e051f060d 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,12 +1,22 @@
 #!perl -w
 #!perl -w

+use strict;

 use ExtUtils::MakeMaker;
 use Cwd;
 use Config;
 use File::Spec;
 use Getopt::Long;
 use ExtUtils::MakeMaker;
 use Cwd;
 use Config;
 use File::Spec;
 use Getopt::Long;

-use vars qw(%Recommends);
-require "metafile.pl";

 use ExtUtils::Manifest qw(maniread);
 use ExtUtils::Manifest qw(maniread);

+use ExtUtils::Liblist;
+use vars qw(%formats $VERBOSE $INCPATH $LIBPATH $NOLOG $DEBUG_MALLOC $MANUAL $CFLAGS $LFLAGS $DFLAGS);
+use lib 'inc', 'lib';
+use Imager::Probe;
+
+# EU::MM runs Makefile.PL all in the same process, so sub-modules will
+# see this
+our $BUILDING_IMAGER = 1;
+
+# used to display a summary after we've probed the world
+our %IMAGER_LIBS;

 
 #
 # IM_INCPATH      colon seperated list of paths to extra include paths
 
 #
 # IM_INCPATH      colon seperated list of paths to extra include paths


@@ -23,26 +33,53 @@ use ExtUtils::Manifest qw(maniread);
 # IM_CFLAGS       Extra flags to pass to the compiler
 # IM_LFLAGS       Extra flags to pass to the linker
 # IM_DFLAGS       Extra flags to pass to the preprocessor
 # IM_CFLAGS       Extra flags to pass to the compiler
 # IM_LFLAGS       Extra flags to pass to the linker
 # IM_DFLAGS       Extra flags to pass to the preprocessor

-# IM_SUPPRESS_PROMPT  Suppress the prompt asking about gif support
+
+my $KEEP_FILES = $ENV{IMAGER_KEEP_FILES};
+
+# make sure --verbose will dump environment settings
+if (grep $_ =~ /^--?v(?:erbose)?$/, @ARGV) {
+  $VERBOSE = 1;
+}
+
+# modules/features bundled with Imager that can be enabled/disabled
+# withs --enable/--disable
+my @bundled = qw(FT1 FT2 GIF JPEG PNG T1 TIFF W32);
+
+# extra modules bundled with Imager not available on CPAN
+my @extras = qw(CountColor DynTest ICO SGI Mandelbrot Flines);
+
+# alternate names for modules
+my %bundled_names = qw(win32 w32 tt ft1);

 
 getenv();     # get environment variables
 
 
 getenv();     # get environment variables
 

-my $help;
-my @enable;
-my @disable;
-my @incpaths;
-my @libpaths;
-my $noprobe;
-my $noexif;
+my $lext=$Config{'so'};   # Get extensions of libraries
+my $aext=$Config{'_a'};
+
+my $help; # display help if set
+my @enable; # list of drivers to enable
+my @disable; # or list of drivers to disable
+my @incpaths; # places to look for headers
+my @libpaths; # places to look for libraries
+my $coverage; # build for coverage testing
+my $assert; # build with assertions
+my $trace_context; # trace context management to stderr

 GetOptions("help" => \$help,
            "enable=s" => \@enable,
            "disable=s" => \@disable,
            "incpath=s", \@incpaths,
            "libpath=s" => \@libpaths,
 GetOptions("help" => \$help,
            "enable=s" => \@enable,
            "disable=s" => \@disable,
            "incpath=s", \@incpaths,
            "libpath=s" => \@libpaths,

-           "noprobe" => \$noprobe,

            "verbose|v" => \$VERBOSE,
            "nolog" => \$NOLOG,
            "verbose|v" => \$VERBOSE,
            "nolog" => \$NOLOG,

-          "noexif" => \$noexif);
+          'coverage' => \$coverage,
+          "assert|a" => \$assert,
+          "tracecontext" => \$trace_context);
+
+setenv();
+
+if ($ENV{AUTOMATED_TESTING}) {
+  $assert = 1;
+}

 
 if ($VERBOSE) { 
   print "Verbose mode\n"; 
 
 if ($VERBOSE) { 
   print "Verbose mode\n"; 


@@ -61,6 +98,10 @@ else {
   push @defines, [ IMAGER_LOG => 1, "Logging system" ];
 }
 
   push @defines, [ IMAGER_LOG => 1, "Logging system" ];
 }
 

+if ($assert) {
+  push @defines, [ IM_ASSERT => 1, "im_assert() are effective" ];
+}
+

 if ($DEBUG_MALLOC) {
   push @defines, [ IMAGER_DEBUG_MALLOC => 1, "Use Imager's DEBUG malloc()" ];
   print "Malloc debugging enabled\n";
 if ($DEBUG_MALLOC) {
   push @defines, [ IMAGER_DEBUG_MALLOC => 1, "Use Imager's DEBUG malloc()" ];
   print "Malloc debugging enabled\n";


@@ -71,23 +112,28 @@ if (@enable && @disable) {
   exit 1;
 }
 
   exit 1;
 }
 

+my %definc;
+my %deflib;
+my @incs; # all the places to look for headers
+my @libs; # all the places to look for libraries
+

 init();       # initialize global data
 pathcheck();  # Check if directories exist
 
 init();       # initialize global data
 pathcheck();  # Check if directories exist
 

+my @enabled_bundled;

 if (exists $ENV{IM_ENABLE}) {
 if (exists $ENV{IM_ENABLE}) {

-  my %en = map { $_, 1 } split ' ', $ENV{IM_ENABLE};
-  for my $key (keys %formats) {
-    delete $formats{$key} unless $en{$key};
-  }
+  push @enable, split ' ', $ENV{IM_ENABLE};

 }
 if (@enable) {
 }
 if (@enable) {

-  my %en = map { $_ => 1 } map { split /,/ } @enable;
-  for my $key (keys %formats) {
-    delete $formats{$key} unless $en{$key};
-  }
+  my %en = map { lc $_ => 1 } map_bundled(@enable);
+  @enabled_bundled = grep $en{lc $_}, @bundled;

 }
 elsif (@disable) {
 }
 elsif (@disable) {

-  delete @formats{map { split /,/ } @disable};
+  my %dis = map { lc $_ => 1 } map_bundled(@disable);
+  @enabled_bundled = grep !$dis{lc $_}, @bundled;
+}
+else {
+  @enabled_bundled = @bundled;

 }
 
 # Pick what libraries are used
 }
 
 # Pick what libraries are used


@@ -97,74 +143,175 @@ if ($MANUAL) {
   automatic();
 }
 
   automatic();
 }
 

-# Make sure there isn't a clash between the gif libraries.
-gifcheck();
-
-my $lib_cflags = '';
-my $F_LIBS = '';
-my $F_OBJECT = '';
-for my $frmkey (keys %formats) {
+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 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
+             perlio.o);
+
+my $lib_define = '';
+my $lib_inc = '';
+my $lib_libs = '';
+for my $frmkey (sort { $formats{$a}{order} <=> $formats{$b}{order} } keys %formats) {

   my $frm = $formats{$frmkey};
   my $frm = $formats{$frmkey};

-  push @defines, [ $frm->{def}, 1, "$frmkey available" ];
-  $F_LIBS   .= ' '  .$frm->{libfiles};
-  $F_OBJECT .= ' '  .$frm->{objfiles};
-  $lib_cflags   .= ' '  .$frm->{cflags} if $frm->{cflags};
-}
-unless ($noexif) {
-  print "EXIF support enabled\n";
-  push @defines, [ 'IMEXIF_ENABLE', 1, "Enable experimental EXIF support" ];
-  $F_OBJECT .= ' imexif.o';
+  if ($frm->{enabled}) {
+    push @defines, [ $frm->{def}, 1, "$frmkey available" ];
+    push @objs, $frm->{objfiles};
+    $lib_define .= " $frm->{DEFINE}" if $frm->{DEFINE};
+    $lib_inc    .= " $frm->{INC}"    if $frm->{INC};
+    $lib_libs   .= " $frm->{LIBS}"   if $frm->{LIBS};
+  }

 }
 
 }
 

-$F_INC  = join ' ', map "-I$_", map / / ? qq{"$_"} : $_, 
-  grep !exists $definc{$_}, @incs;
-$F_LIBS = join(' ',map "-L$_", map / / ? qq{"$_"} : $_, @libs) . $F_LIBS;
-
-$OSLIBS = '';
-$OSDEF  = "-DOS_$^O";
+my $OSLIBS = '';
+my $OSDEF  = "-DOS_$^O";

 
 if ($^O eq 'hpux')                { $OSLIBS .= ' -ldld'; }
 if (defined $Config{'d_dlsymun'}) { $OSDEF  .= ' -DDLSYMUN'; }
 
 
 if ($^O eq 'hpux')                { $OSLIBS .= ' -ldld'; }
 if (defined $Config{'d_dlsymun'}) { $OSDEF  .= ' -DDLSYMUN'; }
 

-@objs = qw(Imager.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
-          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 img16.o rotate.o
-           bmp.o tga.o rgb.o color.o fills.o imgdouble.o limits.o hlines.o
-           imext.o);
-
-$Recommends{Imager} =
-  { 'Parse::RecDescent' => 0 };
-
-%opts=(
-       'NAME'         => 'Imager',
-       'VERSION_FROM' => 'Imager.pm',
-       'LIBS'         => "$LFLAGS -lm $OSLIBS $F_LIBS",
-       'DEFINE'       => "$OSDEF $CFLAGS",
-       'INC'          => "$lib_cflags $DFLAGS $F_INC",
-       'OBJECT'       => join(' ', @objs, $F_OBJECT),
-       clean          => { FILES=>'testout meta.tmp' },
-       PM             => gen_PM(),
-      );
+if ($Config{useithreads}) {
+  if ($Config{i_pthread}) {
+    print "POSIX threads\n";
+    push @objs, "mutexpthr.o";
+  }
+  elsif ($^O eq 'MSWin32') {
+    print "Win32 threads\n";
+    push @objs, "mutexwin.o";
+  }
+  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 {
+  print "No threads\n";
+  push @objs, "mutexnull.o";
+}
+
+my @typemaps = qw(typemap.local typemap);
+if ($] < 5.008) {
+    unshift @typemaps, "typemap.oldperl";
+}
+
+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',
+   VERSION_FROM => 'Imager.pm',
+   LIBS         => "$LFLAGS -lm $lib_libs $OSLIBS",
+   DEFINE       => "$OSDEF $lib_define $CFLAGS",
+   INC          => "$lib_inc $DFLAGS",
+   OBJECT       => join(' ', @objs),
+   DIR          => [ sort grep -d, @enabled_bundled, @extras ],
+   clean          => { FILES=>'testout rubthru.c scale.c conv.c  filters.c gaussian.c render.c rubthru.c' },
+   PM             => gen_PM(),
+   PREREQ_PM      =>
+   { 
+    'Test::More' => 0.99,
+    'Scalar::Util' => 1.00,
+    'XSLoader'    => 0,
+   },
+   TYPEMAPS       => \@typemaps,
+   test =>        { TESTS => $tests },
+  );
+
+if ($coverage) {
+    if ($Config{gccversion}) {
+       push @ARGV, 'OPTIMIZE=-ftest-coverage -fprofile-arcs -g';
+       $opts{dynamic_lib} = { OTHERLDFLAGS => '-ftest-coverage -fprofile-arcs' };
+    }
+    else {
+       die "Don't know the coverage C flags for your compiler\n";
+    }
+}

 
 

-if ($ExtUtils::MakeMaker::VERSION > 6.06) {
-  $opts{AUTHOR} = 'Tony Cook <tony@imager.perl.org>, Arnar M. Hrafnkelsson';
+# eval to prevent warnings about versions with _ in them
+my $MM_ver = eval $ExtUtils::MakeMaker::VERSION;
+if ($MM_ver > 6.06) {
+  $opts{AUTHOR} = 'Tony Cook <tonyc@cpan.org>, Arnar M. Hrafnkelsson';

   $opts{ABSTRACT} = 'Perl extension for Generating 24 bit Images';
 }
 
   $opts{ABSTRACT} = 'Perl extension for Generating 24 bit Images';
 }
 

+if ($MM_ver >= 6.46) {
+  $opts{META_MERGE} =
+    {
+     recommends =>
+     {
+      "Parse::RecDescent" => 0
+     },
+     license => "perl",
+     dynamic_config => 1,
+     no_index =>
+     {
+      directory =>
+      [
+       "PNG",
+       "GIF",
+       "TIFF",
+       "JPEG",
+       "W32",
+       "FT2",
+       "T1",
+      ],
+     },
+     resources =>
+     {
+      homepage => "http://imager.perl.org/",
+      repository => "git://git.imager.perl.org/imager.git",
+      bugtracker => "http://rt.cpan.org/NoAuth/Bugs.html?Dist=Imager",
+     },
+    };
+}
+

 make_imconfig(\@defines);
 
 if ($VERBOSE) { print Dumper(\%opts); }
 mkdir('testout',0777); # since we cannot include it in the archive.
 make_imconfig(\@defines);
 
 if ($VERBOSE) { print Dumper(\%opts); }
 mkdir('testout',0777); # since we cannot include it in the archive.

+
+-d "probe" and rmdir "probe";
+

 WriteMakefile(%opts);
 
 WriteMakefile(%opts);
 

+my @good;
+my @bad;
+for my $name (sort { lc $a cmp lc $b } keys %IMAGER_LIBS) {
+  if ($IMAGER_LIBS{$name}) {
+    push @good, $name;
+  }
+  else {
+    push @bad, $name;
+  }
+}
+
+print "\n";
+print "Libraries found:\n" if @good;
+print "  $_\n" for @good;
+print "Libraries *not* found:\n" if @bad;
+print "  $_\n" for @bad;
+

 exit;
 
 
 sub MY::postamble {
     my $self = shift;
     my $perl = $self->{PERLRUN} ? '$(PERLRUN)' : '$(PERL)';
 exit;
 
 
 sub MY::postamble {
     my $self = shift;
     my $perl = $self->{PERLRUN} ? '$(PERLRUN)' : '$(PERL)';

+    my $mani = maniread;
+
+    my @ims = grep /\.im$/, keys %$mani;

 '
 dyntest.$(MYEXTLIB) : dynfilt/Makefile
        cd dynfilt && $(MAKE) $(PASTHRU)
 '
 dyntest.$(MYEXTLIB) : dynfilt/Makefile
        cd dynfilt && $(MAKE) $(PASTHRU)


@@ -177,10 +324,23 @@ imconfig.h : Makefile.PL
        $(PERLRUN) Makefile.PL
        $(ECHO) "==> Your Makefile has been rebuilt - re-run your make command <=="
 '.qq!
        $(PERLRUN) Makefile.PL
        $(ECHO) "==> Your Makefile has been rebuilt - re-run your make command <=="
 '.qq!

-lib/Imager/APIRef.pm : \$(C_FILES) apidocs.perl
-       $perl apidocs.perl lib/Imager/APIRef.pm
+lib/Imager/APIRef.pod : \$(C_FILES) \$(H_FILES) apidocs.perl
+       $perl apidocs.perl lib/Imager/APIRef.pod

 
 

-!;
+!.join('', map _im_rule($perl, $_), @ims)
+
+}
+
+sub _im_rule {
+  my ($perl, $im) = @_;
+
+  (my $c = $im) =~ s/\.im$/.c/;
+  return <<MAKE;
+
+$c: $im lib/Imager/Preprocess.pm
+       $perl -Ilib -MImager::Preprocess -epreprocess $im $c
+
+MAKE

 
 }
 
 
 }
 


@@ -192,6 +352,10 @@ sub manual {
       Please answer the following questions about
       which formats are avaliable on your computer
 
       Please answer the following questions about
       which formats are avaliable on your computer
 

+      Warning: if you use manual configuration you are responsible for
+      configuring extra include/library directories as necessary using
+      INC and LIBS command-line assignments.
+

 press <return> to continue
 EOF
 
 press <return> to continue
 EOF
 


@@ -201,12 +365,12 @@ EOF
   SWX:
     if ($formats{$frm}{docs}) { print "\n",$formats{$frm}{docs},"\n\n"; }
     print "Enable $frm support: ";
   SWX:
     if ($formats{$frm}{docs}) { print "\n",$formats{$frm}{docs},"\n\n"; }
     print "Enable $frm support: ";

-    $gz = <STDIN>;
+    my $gz = <STDIN>;

     chomp($gz);
     if ($gz =~ m/^(y|yes|n|no)/i) {
     chomp($gz);
     if ($gz =~ m/^(y|yes|n|no)/i) {

-      $gz=substr(lc($gz),0,1);
-      if ($gz eq 'n') {
-       delete $formats{$frm};
+      if ($gz =~ /y/i) {
+       $formats{$frm}{enabled} = 1;
+       $IMAGER_LIBS{$frm} = 1;

       }
     } else { goto SWX; }
   }
       }
     } else { goto SWX; }
   }


@@ -216,118 +380,36 @@ EOF
 # automatic configuration of helper libraries
 
 sub automatic {
 # automatic configuration of helper libraries
 
 sub automatic {

-  for $frm(keys %formats) {
-    delete $formats{$frm} if !checkformat($frm);       
-  }
-}
-
-
-sub gifcheck {
-  if ($formats{'gif'} and $formats{'ungif'}) {
-    print "ungif and gif can not coexist - removing ungif support\n";
-    delete $formats{'ungif'};
-  }
-
- RETR:
-  if (($formats{'gif'} or $formats{'ungif'}) && !$ENV{IM_SUPPRESS_PROMPT}) {
-    print <<EOFF;
-
-You have libgif or libungif installed.  They are both known to have
-bugs.  Imager can crash or display other strange behaviour after
-reading or writing gif images.  Some of the gif tests can even fail
-since they stress some parts of the buggy code.
-
-libungif 4.1.2 and later is safe.  giflib 4.1.3 needs at least one
-patch to have all the bugs fixed, see README for details.
-
-Of course it's possible your operating system distributor has patched
-all of these problems and you have nothing to worry about.
-
-Do you want to remove gif support? [Y/n]
-EOFF
-    my $resp = <STDIN>;
-    chomp($resp);
-    if ($resp ne "n") {
-      delete $formats{'gif'};
-      delete $formats{'ungif'};
-      return;
-    }
-  }
-
-  for my $frm (qw(gif ungif)) {
-    checkformat($frm) if ($MANUAL and $formats{$frm});
-  }
-
-  my @dirs;
-  for my $frm (grep $formats{$_}, qw(gif ungif)) {
-    push(@dirs, @{$formats{$frm}{incdir}}) if $formats{$frm}{incdir};
-  }
-  my $minor = 0;
-  my $major = 0;
-  FILES: for my $dir (@dirs) {
-    my $h = "$dir/gif_lib.h";
-    open H, "< $h" or next;
-    while (<H>) {
-      if (/GIF_LIB_VERSION\s+"\s*version\s*(\d+)\.(\d+)/i) {
-       $major = $1;
-       $minor = $2;
-       close H;
-       last FILES;
-      }
+  print "Automatic probing:\n" if $VERBOSE;
+
+  if (grep $_ eq "FT1", @enabled_bundled) {
+    my %probe =
+      (
+       name => "FT1",
+       inccheck => sub { -e File::Spec->catfile($_[0], "ftnameid.h") },
+       libbase => "ttf",
+       testcode => _ft1_test_code(),
+       testcodeheaders => [ "freetype.h", "stdio.h" ],
+       incpaths => \@incpaths,
+       libpaths => \@libpaths,
+       alternatives =>
+       [
+       {
+        incsuffix => "freetype",
+       }
+       ],
+       verbose => $VERBOSE,
+      );
+    my $probe_res = Imager::Probe->probe(\%probe);
+    $IMAGER_LIBS{FT1} = defined $probe_res;
+    if ($probe_res) {
+      $formats{FT1}{enabled} = 1;
+      @{$formats{FT1}}{qw/DEFINE INC LIBS/} =
+       @$probe_res{qw/DEFINE INC LIBS/};

     }
     }

-    close H;

   }
   }

-
-  # we need the version in a #ifdefable form
-
-  push @defines, [ IM_GIFMAJOR, $major, "Parsed giflib version" ];
-  push @defines, [ IM_GIFMINOR, $minor ];

 }
 
 }
 

-
-sub gd {
-  my($path,$chk)=@_;
-
-#    print "checking path $path\n";
-  if ( !opendir(DH,$path) ) {
-    warn "Cannot open dir $path: $!\n";
-    return;
-  }
-  my @l=grep { $chk->($_) } readdir(DH);
-  #    print @l;
-  close(DH);
-  return map $path, @l;
-}
-
-
-sub checkformat {
-  my $frm=shift;
-  
-  my $code = $formats{$frm}{'code'};
-  if ($code && !$noprobe) {
-    return 1 if $code->($formats{$frm}, $frm);
-  }
-
-  my $libchk=$formats{$frm}{'libcheck'};
-  my $incchk=$formats{$frm}{'inccheck'};
-
-  my @l;
-  for my $lp (@libs) {
-    push(@l, gd($lp,$libchk));
-  }
-
-  my @i;
-  for my $ip (@incs) {
-    push(@i, $ip) if $incchk->($ip,$frm);
-  }
-
-  printf("%10s: includes %s - libraries %s\n",$frm,(@i?'found':'not found'),(@l?'found':'not found'));
-  $formats{$frm}{incdir} = \@i;
-  $formats{$frm}{libdir} = \@l;
-  return scalar(@i && @l);
-}
-
-

 sub pathcheck {
   if ($VERBOSE) {
     print "pathcheck\n";
 sub pathcheck {
   if ($VERBOSE) {
     print "pathcheck\n";


@@ -359,15 +441,22 @@ sub pathcheck {
 
 sub init {
 
 
 sub init {
 

-  @definc{'/usr/include'}=();
-  @incs=(split(/\Q$Config{path_sep}/, $INCPATH),
-        map { split /\Q$Config{path_sep}/} @incpaths );
+  my @definc = qw(/usr/include);
+  @definc{@definc}=(1) x @definc;
+  @incs=
+    (
+     split(/\Q$Config{path_sep}/, $INCPATH),
+     map _tilde_expand($_), map { split /\Q$Config{path_sep}/ } @incpaths 
+    );

   if ($Config{locincpth}) {
     push @incs, grep -d, split ' ', $Config{locincpth};
   }
   if ($^O =~ /win32/i && $Config{cc} =~ /\bcl\b/i) {
     push(@incs, split /;/, $ENV{INCLUDE}) if exists $ENV{INCLUDE};
   }
   if ($Config{locincpth}) {
     push @incs, grep -d, split ' ', $Config{locincpth};
   }
   if ($^O =~ /win32/i && $Config{cc} =~ /\bcl\b/i) {
     push(@incs, split /;/, $ENV{INCLUDE}) if exists $ENV{INCLUDE};
   }

+  if ($Config{incpath}) {
+    push @incs, grep -d, split /\Q$Config{path_sep}/, $Config{incpath};
+  }

   push @incs, grep -d,
       qw(/sw/include 
          /usr/include/freetype2
   push @incs, grep -d,
       qw(/sw/include 
          /usr/include/freetype2


@@ -375,13 +464,20 @@ sub init {
          /usr/local/include/freetype1/freetype
          /usr/include /usr/local/include /usr/include/freetype
          /usr/local/include/freetype);
          /usr/local/include/freetype1/freetype
          /usr/include /usr/local/include /usr/include/freetype
          /usr/local/include/freetype);

+  if ($Config{ccflags}) {
+    my @hidden = map { /^-I(.*)$/ ? ($1) : () } split ' ', $Config{ccflags};
+    push @incs, @hidden;
+    @definc{@hidden} = (1) x @hidden;
+  }

 
   @libs= ( split(/\Q$Config{path_sep}/,$LIBPATH),
 
   @libs= ( split(/\Q$Config{path_sep}/,$LIBPATH),

-    map { split /\Q$Config{path_sep}/} @libpaths );
+    map _tilde_expand($_), map { split /\Q$Config{path_sep}/} @libpaths );

   if ($Config{loclibpth}) {
     push @libs, grep -d, split ' ', $Config{loclibpth};
   }
   if ($Config{loclibpth}) {
     push @libs, grep -d, split ' ', $Config{loclibpth};
   }

+  

   push @libs, grep -d, qw(/sw/lib),  split(/ /, $Config{'libpth'});
   push @libs, grep -d, qw(/sw/lib),  split(/ /, $Config{'libpth'});

+  push @libs, grep -d, split / /, $Config{libspath} if $Config{libspath};

   if ($^O =~ /win32/i && $Config{cc} =~ /\bcl\b/i) {
     push(@libs, split /;/, $ENV{LIB}) if exists $ENV{LIB};
   }
   if ($^O =~ /win32/i && $Config{cc} =~ /\bcl\b/i) {
     push(@libs, split /;/, $ENV{LIB}) if exists $ENV{LIB};
   }


@@ -389,135 +485,30 @@ sub init {
     push(@libs, '/usr/lib/w32api') if -d '/usr/lib/w32api';
     push(@incs, '/usr/include/w32api') if -d '/usr/include/w32api';
   }
     push(@libs, '/usr/lib/w32api') if -d '/usr/lib/w32api';
     push(@incs, '/usr/include/w32api') if -d '/usr/include/w32api';
   }

+  if ($Config{ldflags}) {
+    # some builds of perl put -Ldir into ldflags without putting it in
+    # loclibpth, let's extract them
+    my @hidden = grep -d, map { /^-L(.*)$/ ? ($1) : () }
+      split ' ', $Config{ldflags};
+    push @libs, @hidden;
+    # don't mark them as seen - EU::MM will remove any libraries
+    # it can't find and it doesn't look for -L in ldflags
+    #@deflib{@hidden} = @hidden;
+  }
+  push @libs, grep -d, qw(/usr/local/lib);

 
 

-  my $lext=$Config{'so'};   # Get extensions of libraries
-  my $aext=$Config{'_a'};
-
-  $formats{'jpeg'}={
-                   order=>'21',
-                   def=>'HAVE_LIBJPEG',
-                   inccheck=>sub { -e catfile($_[0], 'jpeglib.h') },
-                   libcheck=>sub { $_[0] eq "libjpeg$aext" or $_ eq "libjpeg.$lext" },
-                   libfiles=>'-ljpeg',
-                   objfiles=>'jpeg.o',
-                   docs=>q{
-                           In order to use jpeg with this module you need to have libjpeg
-                           installed on your computer}
-                  };
-
-  $formats{'tiff'}={
-                   order=>'23',
-                   def=>'HAVE_LIBTIFF',
-                   inccheck=>sub { -e catfile($_[0], 'tiffio.h') },
-                   libcheck=>sub { $_[0] eq "libtiff$aext" or $_ eq "libtiff.$lext" },
-                   libfiles=>'-ltiff',
-                   objfiles=>'tiff.o',
-                   docs=>q{
-                           In order to use tiff with this module you need to have libtiff
-                           installed on your computer}
-                  };
-
-  $formats{'png'}={
-                  order=>'22',
-                  def=>'HAVE_LIBPNG',
-                  inccheck=>sub { -e catfile($_[0], 'png.h') },
-                  libcheck=>sub { $_[0] eq "libpng$aext" or $_[0] eq "libpng.$lext" },
-                  libfiles=>'-lpng -lz',
-                  objfiles=>'png.o',
-                  docs=>q{
-                          Png stands for Portable Network Graphics and is intended as
-                          a replacement for gif on the web. It is patent free and
-                          is recommended by the w3c, you need libpng to use these formats},
-                   code => \&png_probe,
-                 };
-
-  $formats{'gif'}={
-                  order=>'20',
-                  def=>'HAVE_LIBGIF',
-                  inccheck=>sub { -e catfile($_[0], 'gif_lib.h') },
-                  libcheck=>sub { $_[0] eq "libgif$aext" or $_[0] eq "libgif.$lext" },
-                  libfiles=>'-lgif',
-                  objfiles=>'gif.o',
-                  docs=>q{
-                          gif is the de facto standard for webgraphics at the moment,
-                          it does have some patent problems. If you have giflib and
-                          are not in violation with the unisys patent you should use
-                          this instead of the 'ungif' option.  Note that they cannot
-                          be in use at the same time}
-                 };
-
-  $formats{'ungif'}={
-                    order=>'21',
-                    def=>'HAVE_LIBGIF',
-                    inccheck=>sub { -e catfile($_[0], 'gif_lib.h') },
-                    libcheck=>sub { $_[0] eq "libungif$aext" or $_[0] eq "libungif.$lext" },
-                    libfiles=>'-lungif',
-                    objfiles=>'gif.o',
-                    docs=>q{
-                            gif is the de facto standard for webgraphics at the moment,
-                            it does have some patent problems. If you have libungif and
-                            want to create images free from LZW patented compression you
-                            should use this option instead of the 'gif' option}
-                   };
-
-  $formats{'T1-fonts'}={
-                       order=>'30',
-                       def=>'HAVE_LIBT1',
-                       inccheck=>sub { -e catfile($_[0], 't1lib.h') },
-                       libcheck=>sub { $_[0] eq "libt1$aext" or $_[0] eq "libt1.$lext" },
-                       libfiles=>'-lt1',
-                       objfiles=>'',
-                       docs=>q{
-                               postscript t1 fonts are scalable fonts. They can include 
-                               ligatures and kerning information and generally yield good
-                               visual quality. We depend on libt1 to rasterize the fonts
-                               for use in images.}
-                      };
-
-  $formats{'TT-fonts'}=
+  $formats{FT1}=

     {
      order=>'31',
      def=>'HAVE_LIBTT',
     {
      order=>'31',
      def=>'HAVE_LIBTT',

-     inccheck=>sub { -e catfile($_[0], 'freetype.h')
-                       && !-e catfile($_[0], 'fterrors.h') },
-     libcheck=>sub { $_[0] eq "libttf$aext" or $_[0] eq "libttf.$lext" },
-     libfiles=>'-lttf',
-     objfiles=>'',
+     objfiles=>'fontft1.o',
+     LIBS => "-lttf",

      docs=>q{
      docs=>q{

-Truetype fonts are scalable fonts. They can include 
-kerning and hinting information and generally yield good
-visual quality esp on low resultions. The freetype library is
-used to rasterize for us. The only drawback is that there
-are alot of badly designed fonts out there.}
-                      };
-  $formats{'w32'} = {
-                    order=>40,
-                    def=>'HAVE_WIN32',
-                    inccheck=>sub { -e catfile($_[0], 'windows.h') },
-                    libcheck=>sub { lc $_[0] eq 'gdi32.lib' 
-                                      || lc $_[0] eq 'libgdi32.a' },
-                    libfiles=>$^O eq 'cygwin' ? '-lgdi32' : '',
-                    objfiles=>'win32.o',
-                    docs => <<DOCS
-Uses the Win32 GDI for rendering text.
-
-This currently only works on under normal Win32 and cygwin.
-DOCS
-                   };
-  $formats{'freetype2'} = {
-                           order=>'29',
-                           def=>'HAVE_FT2',
-                           inccheck=>sub { -e catfile($_[0], 'ft2build.h') },
-                           libcheck=>sub { $_[0] eq "libfreetype$aext" or $_[0] eq "libfreetype.$lext" },
-                           libfiles=>'-lfreetype',
-                           objfiles=>'freetyp2.o',
-                           docs=><<DOCS,
-Freetype 2 supports both Truetype and Type 1 fonts, both of which are
-scalable.  It also supports a variety of other fonts.
-DOCS
-                           code => \&freetype2_probe,
-                          };
+Freetype 1.x supports Truetype fonts and is obsoleted by Freetype 2.x.

 
 

+It's probably insecure.
+}
+                      };

   # Make fix indent
   for (keys %formats) { $formats{$_}->{docs} =~ s/^\s+/  /mg; }
 }
   # Make fix indent
   for (keys %formats) { $formats{$_}->{docs} =~ s/^\s+/  /mg; }
 }


@@ -526,6 +517,8 @@ DOCS
 
 sub gen {
   my $V = $ENV{$_[0]};
 
 sub gen {
   my $V = $ENV{$_[0]};

+  print "  $_[0]: '$V'\n"
+      if $VERBOSE && defined $V;

   defined($V) ? $V : "";
 }
 
   defined($V) ? $V : "";
 }
 


@@ -534,16 +527,18 @@ sub gen {
 
 sub getenv {
 
 
 sub getenv {
 

-  ($VERBOSE,
-   $INCPATH,
+  $VERBOSE ||= gen("IM_VERBOSE");
+
+  print "Environment config:\n" if $VERBOSE;
+
+  ($INCPATH,

    $LIBPATH,
    $NOLOG,
    $DEBUG_MALLOC,
    $MANUAL,
    $CFLAGS,
    $LFLAGS,
    $LIBPATH,
    $NOLOG,
    $DEBUG_MALLOC,
    $MANUAL,
    $CFLAGS,
    $LFLAGS,

-   $DFLAGS) = map { gen $_ } qw(IM_VERBOSE
-                               IM_INCPATH
+   $DFLAGS) = map { gen $_ } qw(IM_INCPATH

                                IM_LIBPATH
                                IM_NOLOG
                                IM_DEBUG_MALLOC
                                IM_LIBPATH
                                IM_NOLOG
                                IM_DEBUG_MALLOC


@@ -551,7 +546,13 @@ sub getenv {
                                IM_CFLAGS
                                IM_LFLAGS
                                IM_DFLAGS);
                                IM_CFLAGS
                                IM_LFLAGS
                                IM_DFLAGS);

+}

 
 

+# populate the environment so that sub-modules get the same info
+sub setenv {
+  $ENV{IM_VERBOSE} = 1 if $VERBOSE;
+  $ENV{IM_INCPATH} = join $Config{path_sep}, @incpaths if @incpaths;
+  $ENV{IM_LIBPATH} = join $Config{path_sep}, @libpaths if @libpaths;

 }
 
 sub make_imconfig {
 }
 
 sub make_imconfig {


@@ -572,106 +573,47 @@ EOS
     }
     print CONFIG "#define $define->[0] $define->[1]\n";
   }
     }
     print CONFIG "#define $define->[0] $define->[1]\n";
   }

-  print CONFIG "\n#endif\n";
-  close CONFIG;
-}
-
-# use pkg-config to probe for libraries
-# works around the junk that pkg-config dumps on FreeBSD
-sub _pkg_probe {
-  my ($pkg) = @_;
-
-  is_exe('pkg-config') or return;
+  if ($Config{gccversion} && $Config{gccversion} =~ /^([0-9]+)/ && $1 > 3) {
+    print CONFIG <<EOS;
+/*

 
 

-  my $redir = $^O eq 'MSWin32' ? '' : '2>/dev/null';
-
-  !system("pkg-config $pkg --exists $redir");
-}
+Compiler supports the GCC __attribute__((format...)) syntax.

 
 

-# probes for freetype2 by trying to run freetype-config
-sub freetype2_probe {
-  my ($frm, $frmkey) = @_;
+*/

 
 

-  is_exe('freetype-config') or return;
+#define IMAGER_FORMAT_ATTR 1

 
 

-  my $cflags = `freetype-config --cflags`
-    and !$? or return;
-  chomp $cflags;
-
-  my $lflags = `freetype-config --libs`
-    and !$? or return;
-  chomp $lflags;
-
-  # before 2.1.5 freetype-config --cflags could output
-  # the -I options in the wrong order, causing a conflict with
-  # freetype1.x installed with the same --prefix
-  #
-  # can happen iff:
-  #  - both -Iprefix/include and -Iprefix/include/freetype2 are in cflags
-  #    in that order
-  #  - freetype 1.x headers are in prefix/include/freetype
-  my @incdirs = map substr($_, 2), grep /^-I/, split ' ', $cflags;
-  if (@incdirs == 2 
-      && $incdirs[1] eq "$incdirs[0]/freetype2"
-      && -e "$incdirs[0]/freetype/freetype.h"
-      && -e "$incdirs[0]/freetype/fterrid.h") {
-    print "** freetype-config provided -I options out of order, correcting\n"
-      if $VERBOSE;
-    $cflags = join(' ', grep(!/-I/, split ' ', $cflags),
-                  map "-I$_", reverse @incdirs);
+EOS

   }
   }

-  $frm->{cflags} = $cflags;
-  $frm->{libfiles} = $lflags;
-
-  printf "%10s: configured via freetype-config\n", $frmkey;

 
 

-  return 1;
-}
-
-# probes for libpng via pkg-config
-sub png_probe {
-  my ($frm, $frmkey) = @_;
-
-  is_exe('pkg-config') or return;
+  if ($Config{d_snprintf}) {
+    print CONFIG <<EOS;
+/* We can use snprintf() */
+#define IMAGER_SNPRINTF 1

 
 

-  my $config;
-  for my $check_conf (qw(libpng libpng12 libpng10)) {
-    if (_pkg_probe($check_conf)) {
-      $config = $check_conf;
-      last;
-    }
+EOS

   }
   }

-  $config or return;

 
 

-  my $cflags = `pkg-config $config --cflags`
-    and !$? or return;
-
-  my $lflags = `pkg-config $config --libs`
-    and !$? or return;
-
-  chomp $cflags;
-  chomp $lflags;
-  $frm->{cflags} = $cflags;
-  $frm->{libfiles} = $lflags;
-
-  printf "%10s: configured via `pkg-config $config ...`\n", $frmkey;
-
-  return 1;
-}
+  if ($Config{d_vsnprintf}) {
+    print CONFIG <<EOS;
+/* We can use vsnprintf() */
+#define IMAGER_VSNPRINTF 1

 
 

-sub catfile {
-  return File::Spec->catfile(@_);
-}
+EOS
+  }

 
 

-sub is_exe {
-  my ($name) = @_;
+  print CONFIG <<EOS;
+/*
+ Type and format code for formatted output as with printf.

 
 

-  for my $dir (File::Spec->path) {
-    -x catfile($dir, "$name$Config{_exe}")
-      and return 1;
-  }
+ This is intended for formatting i_img_dim values.
+*/
+typedef $Config{ivtype} i_dim_format_t;
+#define i_DF $Config{ivdformat}
+EOS

 
 

-  return;
+  print CONFIG "\n#endif\n";
+  close CONFIG;

 }
 
 sub usage {
 }
 
 sub usage {


@@ -680,7 +622,7 @@ Usage: $0 [--enable feature1,feature2,...] [other options]
        $0 [--disable feature1,feature2,...]  [other options]
        $0 --help
 Possible feature names are:
        $0 [--disable feature1,feature2,...]  [other options]
        $0 --help
 Possible feature names are:

-  png gif ungif jpeg tiff T1-fonts TT-fonts freetype2
+  T1-fonts

 Other options:
   --verbose | -v
     Verbose library probing (or set IM_VERBOSE in the environment)
 Other options:
   --verbose | -v
     Verbose library probing (or set IM_VERBOSE in the environment)


@@ -690,8 +632,10 @@ Other options:
     Add to the include search path
   --libpath dir
     Add to the library search path
     Add to the include search path
   --libpath dir
     Add to the library search path

-  --noprobe
-    Don't use pkg-config or freetype2-config to probe for freetype2 and libpng
+  --coverage
+    Build for coverage testing.
+  --assert
+    Build with assertions active.

 EOS
   exit 1;
 
 EOS
   exit 1;
 


@@ -731,3 +675,56 @@ sub gen_PM {
 
   \%pm;
 }
 
   \%pm;
 }

+
+my $home;
+sub _tilde_expand {
+  my ($path) = @_;
+
+  if ($path =~ m!^~[/\\]!) {
+    defined $home or $home = $ENV{HOME};
+    if (!defined $home && $^O eq 'MSWin32'
+       && defined $ENV{HOMEDRIVE} && defined $ENV{HOMEPATH}) {
+      $home = $ENV{HOMEDRIVE} . $ENV{HOMEPATH};
+    }
+    unless (defined $home) {
+      $home = eval { (getpwuid($<))[7] };
+    }
+    defined $home or die "You supplied $path, but I can't find your home directory\n";
+    $path =~ s/^~//;
+    $path = File::Spec->catdir($home, $path);
+  }
+
+  $path;
+}
+
+sub _ft1_test_code {
+  return <<'CODE';
+TT_Engine engine;
+TT_Error error;
+
+error = TT_Init_FreeType(&engine);
+if (error) {
+   printf("FT1: Could not initialize engine\n");
+   exit(1);
+}
+
+return 0;
+CODE
+}
+
+sub map_bundled {
+  my (@names) = @_;
+
+  @names = map { split /,/ } @names;
+
+  my @outnames;
+  for my $name (@names) {
+    push @outnames, $name;
+    push @outnames, $bundled_names{$name}
+      if $bundled_names{$name};
+  }
+
+  @outnames;
+}
+
+1;