]>
Commit | Line | Data |
---|---|---|
a30bf8ca AM |
1 | diff -urN subversion-0.35.0.org/Makefile.in subversion-0.35.0/Makefile.in |
2 | --- subversion-0.35.0.org/Makefile.in 2003-12-20 00:04:45.942677312 +0100 | |
3 | +++ subversion-0.35.0/Makefile.in 2003-12-20 00:07:14.926667242 +0100 | |
4 | @@ -94,7 +94,9 @@ | |
5 | SWIG = @SWIG@ | |
6 | SWIG_INCLUDES = -I$(SWIG_SRC_DIR) \ | |
7 | -I$(abs_srcdir)/subversion/include \ | |
8 | - $(SVN_APR_INCLUDES) | |
9 | + $(SVN_APR_INCLUDES) \ | |
10 | + $(SVN_APRUTIL_INCLUDES) | |
11 | + | |
12 | SWIG_LDFLAGS = @SWIG_LDFLAGS@ | |
13 | SWIG_PY_INCLUDES = @SWIG_PY_INCLUDES@ | |
14 | SWIG_PY_COMPILE = @SWIG_PY_COMPILE@ | |
15 | @@ -109,6 +111,8 @@ | |
16 | SVN_APR_INCLUDES = @SVN_APR_INCLUDES@ | |
17 | SVN_APR_PREFIX = @SVN_APR_PREFIX@ | |
18 | ||
19 | +SVN_APRUTIL_INCLUDES = @SVN_APRUTIL_INCLUDES@ | |
20 | + | |
21 | MKDIR = @MKDIR@ | |
22 | ||
23 | # the EXTRA_ exist so that extra flags can be passed at 'make' time | |
24 | diff -urN subversion-0.35.0.org/subversion/bindings/swig/perl/Makefile.PL subversion-0.35.0/subversion/bindings/swig/perl/Makefile.PL | |
25 | --- subversion-0.35.0.org/subversion/bindings/swig/perl/Makefile.PL 2003-12-07 18:25:10.000000000 +0100 | |
26 | +++ subversion-0.35.0/subversion/bindings/swig/perl/Makefile.PL 2003-12-20 00:36:41.326711208 +0100 | |
27 | @@ -8,19 +8,23 @@ | |
28 | ||
29 | my $apr_config = $ENV{APR_CONFIG} || '/usr/local/lib/apache2/apr-config'; | |
30 | $apr_config = 'apr-config' unless -e $apr_config; | |
31 | +my $apu_config = $ENV{APU_CONFIG} || '/usr/local/lib/apache2/apu-config'; | |
2060714d | 32 | +$apu_config = 'apu-config' unless -e $apu_config; |
a30bf8ca AM |
33 | |
34 | my $apr_shlib_path_var = `$apr_config --shlib-path-var`; | |
35 | my $apr_cflags = `$apr_config --includes`; | |
36 | +my $apu_cflags = `$apu_config --includes`; | |
37 | my $apr_ldflags = `$apr_config --cflags --link-ld --libs` | |
38 | if $^O eq 'darwin'; | |
39 | ||
40 | chomp $apr_shlib_path_var; | |
41 | chomp $apr_cflags; | |
42 | +chomp $apu_cflags; | |
43 | chomp $apr_ldflags; | |
44 | ||
45 | my %config = ( | |
46 | ABSTRACT => 'Perl bindings for Subversion', | |
47 | - CCFLAGS => join(' ', $apr_cflags, `perl -MExtUtils::Embed -e ccopts`, | |
48 | + CCFLAGS => join(' ', $apr_cflags, $apu_cflags, `perl -MExtUtils::Embed -e ccopts`, | |
49 | ' -I.. -I../../../include -g'), | |
50 | OBJECT => q/$(O_FILES)/, | |
51 | dynamic_lib => { |