Bundle-OS2_default
view release on metacpan or search on metacpan
patches/diff_Curses-1.06 view on Meta::CPAN
+my @inc;
+if ($^O eq 'os2') { # form.h from Perl conflicts with one of NCurses
+ if (exists $ENV{C_INCLUDE_PATH}) {
+ require Config;
+ @inc = split /\Q$Config::Config{path_sep}/, $ENV{C_INCLUDE_PATH};
+ @inc = map "-I$_", grep -r "$_/form.h", @inc;
+ }
+}
+
## OS default guess for $inc default guess for $libs
#
my $guess_cfg = {
@@ -130,7 +139,7 @@ my $guess_cfg = {
'openbsd' => [ '' => '-lcurses -ltermcap' ],
'os2' => {
'bsd' => [ '' => '-lcurses -ltermcap' ],
- 'ncurses' => [ '' => '-lncurses' ],
+ 'ncurses' => [ "@inc", => '-lncurses -lncurses_s -lpanel_s -lmenu_s -lform_s'],
'default' => 'ncurses'
},
'sco' => [ '' => '-lcurses -ltermcap' ],
@@ -160,18 +169,6 @@ my $panels;
my $menus;
patches/diff_Curses-1.06 view on Meta::CPAN
- my $arg = shift;
-
- if ($arg eq 'GEN') { $gen = $arg }
- elsif ($arg eq 'PANELS') { $panels = $arg }
- elsif ($arg eq 'MENUS') { $menus = $arg }
- elsif ($arg eq 'FORMS') { $forms = $arg }
- else { push @argv, $arg }
-}
-@ARGV = @argv; # pass non-Curses arguments to MakeMaker
-
my $guess = $guess_cfg->{$^O};
my $source = "hints/c-$^O";
@@ -184,6 +181,29 @@ if (ref $guess eq 'HASH') {
if (ref $guess ne 'ARRAY') {
die "FATAL: internal error: guess_cfg is bad\n";
}
+
+if ($guess->[1] and $] >= 5.008001) {
+ require ExtUtils::Liblist; # Buggy before this
+ ($list) = ExtUtils::Liblist->ext($guess->[1]);
+ $panels = 'PANELS' if $list =~ /-lpanel/;
+ $menus = 'MENUS' if $list =~ /-lmenu/;
+ $forms = 'FORMS' if $list =~ /-lform/;
+}
+
+my @argv;
+while (@ARGV) {
+ my $arg = shift;
+
+ if ($arg eq 'GEN') { $gen = $arg }
( run in 0.999 second using v1.01-cache-2.11-cpan-748bfb374f4 )