Permalink
Browse files

- check the correct directory when adding the cygwin Win32 API include

  path (Makefile.PL).  This was a later response to #16094
  Resolves: http://rt.cpan.org/NoAuth/Bug.html?16094
- add --nolog command-line switch to Makefile.PL to disable logging
  • Loading branch information...
1 parent 39f9403 commit 274cd32b80e1f01a1b5b51957faf8a102f946d95 Tony Cook committed Nov 29, 2005
Showing with 30 additions and 14 deletions.
  1. +4 −0 Changes
  2. +26 −14 Makefile.PL
View
@@ -1185,6 +1185,10 @@ Revision history for Perl extension Imager.
- added experimental antialiased support to arc()
- the order of the returned values for Imager::Font's align() method
was incorrect.
+- check the correct directory when adding the cygwin Win32 API include
+ path (Makefile.PL). This was a later response to #16094
+ Resolves: http://rt.cpan.org/NoAuth/Bug.html?16094
+- add --nolog command-line switch to Makefile.PL to disable logging
=================================================================
View
@@ -36,7 +36,8 @@ GetOptions("help" => \$help,
"incpath=s", \@incpaths,
"libpath=s" => \@libpaths,
"noprobe" => \$noprobe,
- "verbose|v" => \$VERBOSE);
+ "verbose|v" => \$VERBOSE,
+ "nolog" => \$NOLOG);
if ($VERBOSE) {
print "Verbose mode\n";
@@ -48,6 +49,16 @@ if ($help) {
usage();
}
+if ($NOLOG) { print "Logging not compiled into module\n"; }
+else {
+ push @defines, [ IMAGER_LOG => 1, "Logging system" ];
+}
+
+if ($DEBUG_MALLOC) {
+ push @defines, [ IMAGER_DEBUG_MALLOC => 1, "Use Imager's DEBUG malloc()" ];
+ print "Malloc debugging enabled\n";
+}
+
if (@enable && @disable) {
print STDERR "Only --enable or --disable can be used, not both, try --help\n";
exit 1;
@@ -379,7 +390,7 @@ sub init {
}
if ($^O eq 'cygwin') {
push(@libs, '/usr/lib/w32api') if -d '/usr/lib/w32api';
- push(@incs, '/usr/include/w32api') if -d '/usr/lib/w32api';
+ push(@incs, '/usr/include/w32api') if -d '/usr/include/w32api';
}
my $lext=$Config{'so'}; # Get extensions of libraries
@@ -543,16 +554,6 @@ sub getenv {
IM_LFLAGS
IM_DFLAGS);
- if ($NOLOG) { print "Logging not compiled into module\n"; }
- else {
- push @defines, [ IMAGER_LOG => 1, "Logging system" ];
- }
-
- if ($DEBUG_MALLOC) {
- push @defines, [ IMAGER_DEBUG_MALLOC => 1, "Use Imager's DEBUG malloc()" ];
- print "Malloc debugging enabled\n";
- }
-
}
sub make_imconfig {
@@ -658,11 +659,22 @@ sub is_exe {
sub usage {
print STDERR <<EOS;
-Usage: $0 [-v] [--enable feature1,feature2,...] [--incpath ...] [--libpath ...]
- $0 [-v] [--disable feature1,feature2,...] [--incpath ...] [--libpath ...]
+Usage: $0 [--enable feature1,feature2,...] [other options]
+ $0 [--disable feature1,feature2,...] [other options]
$0 --help
Possible feature names are:
png gif ungif jpeg tiff T1-fonts TT-fonts freetype2
+Other options:
+ --verbose | -v
+ Verbose library probing (or set IM_VERBOSE in the environment)
+ --nolog
+ Disable logging (or set IM_NOLOG in the environment)
+ --incpath dir
+ 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
EOS
exit 1;

0 comments on commit 274cd32

Please sign in to comment.