]>
Commit | Line | Data |
---|---|---|
5ac55730 AM |
1 | diff -urN subversion-0.33.1.org/subversion/bindings/swig/perl/Makefile.PL subversion-0.33.1/subversion/bindings/swig/perl/Makefile.PL |
2 | --- subversion-0.33.1.org/subversion/bindings/swig/perl/Makefile.PL 2003-11-30 10:35:26.391367742 +0100 | |
3 | +++ subversion-0.33.1/subversion/bindings/swig/perl/Makefile.PL 2003-11-30 10:37:38.074975507 +0100 | |
4 | @@ -2,14 +2,17 @@ | |
5 | use ExtUtils::MakeMaker; | |
6 | ||
7 | my @modules = qw/client delta fs ra repos wc/; | |
8 | +my @ldpaths = ('../.libs', map {"../../../libsvn_$_/.libs"} (@modules, qw/diff subr/)); | |
9 | my @ldmodules = map {"-lsvn_$_-1"} (@modules, qw/subr/); | |
10 | ||
11 | my $apr_config = $ENV{APR_CONFIG} || '/usr/local/lib/apache2/apr-config'; | |
12 | $apr_config = 'apr-config' unless -e $apr_config; | |
13 | ||
14 | +my $apr_shlib_path_var = `$apr_config --shlib-path-var`; | |
15 | my $apr_cflags = `$apr_config --includes`; | |
16 | -my $apr_ldflags = `$apr_config --cflags --libs`; | |
17 | +my $apr_ldflags = `$apr_config --cflags --link-ld --libs`; | |
18 | ||
19 | +chomp $apr_shlib_path_var; | |
20 | chomp $apr_cflags; | |
21 | chomp $apr_ldflags; | |
22 | ||
23 | @@ -19,7 +22,7 @@ | |
24 | ' -I.. -I../../../include -g'), | |
25 | OBJECT => q/$(O_FILES)/, | |
26 | dynamic_lib => { | |
27 | - OTHERLDFLAGS => join(' ', $apr_ldflags, '-L/usr/local/lib', | |
28 | + OTHERLDFLAGS => join(' ', $apr_ldflags, (map {"-L$_"} @ldpaths), | |
29 | @ldmodules, '-lsvn_swig_perl-1', | |
30 | `swig -perl -ldflags`), | |
31 | }, | |
32 | @@ -66,6 +69,7 @@ | |
33 | (map {"\nsvn_$_.c : ../svn_$_.i ra_plugin.hi ra_reporter.hi delta_editor.hi\n". | |
34 | "\tswig -c -nopm -perl -I.. -I../../../include $apr_cflags -module SVN::_".main::perlish($_)." -o svn_$_.c ../svn_$_.i\n"} | |
35 | @modules), | |
36 | - | |
37 | + "\nFULLPERLRUN=$apr_shlib_path_var=",join(':',@ldpaths), | |
38 | + " \$(FULLPERL)\n", | |
39 | ); | |
40 | } |