-# $Id: Embed.pm,v 1.2501 $
+# $Id: Embed.pm,v 1.1.1.1 2002/01/16 19:27:19 schwern Exp $
require 5.002;
package ExtUtils::Embed;
);
use strict;
-$VERSION = sprintf("%d.%02d", q$Revision: 1.2505 $ =~ /(\d+)\.(\d+)/);
+$VERSION = 1.2506_01;
@ISA = qw(Exporter);
@EXPORT = qw(&xsinit &ldopts
}
}
-sub is_perl_object {
- $Config{ccflags} =~ /-DPERL_OBJECT/;
-}
-
sub xsinit {
my($file, $std, $mods) = @_;
my($fh,@mods,%seen);
$file ||= "perlxsi.c";
- my $xsinit_proto = "pTHXo";
+ my $xsinit_proto = "pTHX";
if (@_) {
@mods = @$mods if $mods;
sub xsi_protos {
my(@exts) = @_;
my(@retval,%seen);
- my $boot_proto = "pTHXo_ CV* cv";
+ my $boot_proto = "pTHX_ CV* cv";
foreach $_ (@exts){
my($pname) = canon('/', $_);
my($mname, $cname);
@Extensions;
}
+sub _escape {
+ my $arg = shift;
+ $$arg =~ s/([\(\)])/\\$1/g;
+}
+
+sub _ldflags {
+ my $ldflags = $Config{ldflags};
+ _escape(\$ldflags);
+ return $ldflags;
+}
+
+sub _ccflags {
+ my $ccflags = $Config{ccflags};
+ _escape(\$ccflags);
+ return $ccflags;
+}
+
+sub _ccdlflags {
+ my $ccdlflags = $Config{ccdlflags};
+ _escape(\$ccdlflags);
+ return $ccdlflags;
+}
+
sub ldopts {
require ExtUtils::MakeMaker;
require ExtUtils::Liblist;
my(@mods,@link_args,@argv);
my($dllib,$config_libs,@potential_libs,@path);
local($") = ' ' unless $" eq ' ';
- my $MM = bless {} => 'MY';
if (scalar @_) {
@link_args = @$link_args if $link_args;
@mods = @$mods if $mods;
foreach $mod (@mods) {
@ns = split(/::|\/|\\/, $mod);
$sub = $ns[-1];
- $root = $MM->catdir(@ns);
+ $root = File::Spec->catdir(@ns);
print STDERR "searching for '$sub${lib_ext}'\n" if $Verbose;
foreach (@path) {
- next unless -e ($archive = $MM->catdir($_,"auto",$root,"$sub$lib_ext"));
+ next unless -e ($archive = File::Spec->catdir($_,"auto",$root,"$sub$lib_ext"));
push @archives, $archive;
- if(-e ($extra = $MM->catdir($_,"auto",$root,"extralibs.ld"))) {
+ if(-e ($extra = File::Spec->catdir($_,"auto",$root,"extralibs.ld"))) {
local(*FH);
if(open(FH, $extra)) {
my($libs) = <FH>; chomp $libs;
my $lpath = File::Spec->catdir($Config{archlibexp}, 'CORE');
$lpath = qq["$lpath"] if $^O eq 'MSWin32';
my($extralibs, $bsloadlibs, $ldloadlibs, $ld_run_path) =
- $MM->ext(join ' ', "-L$lpath", $libperl, @potential_libs);
+ MM->ext(join ' ', "-L$lpath", $libperl, @potential_libs);
my $ld_or_bs = $bsloadlibs || $ldloadlibs;
print STDERR "bs: $bsloadlibs ** ld: $ldloadlibs" if $Verbose;
- my $linkage = "$Config{ccdlflags} $Config{ldflags} @archives $ld_or_bs";
+ my $ccdlflags = _ccdlflags();
+ my $ldflags = _ldflags();
+ my $linkage = "$ccdlflags $ldflags @archives $ld_or_bs";
print STDERR "ldopts: '$linkage'\n" if $Verbose;
return $linkage if scalar @_;
}
sub ccflags {
- my_return(" $Config{ccflags} ");
+ my $ccflags = _ccflags();
+ my_return(" $ccflags ");
}
sub ccdlflags {
- my_return(" $Config{ccdlflags} ");
+ my $ccdlflags = _ccdlflags();
+ my_return(" $ccdlflags ");
}
sub perl_inc {