Problem with building python bindings on 0.35.0 release (+ fix)

Problem is that includes path for apr-util includes is missing when building bindings.

[misiek@arm ~/rpm/SPECS]$ apr-config --includes
 -I/usr/include/apr
[misiek@arm ~/rpm/SPECS]$ apu-config --includes
 -I/usr/include/apr-util -I/usr/include
(yes, -I/usr/include shouldn't be here but that doesn't matter)

[misiek@arm ~/rpm/BUILD/subversion-0.35.0]$ make swig-py
cd subversion/bindings/swig/python && /bin/sh /home/users/misiek/rpm/BUILD/subversion-0.35.0/libtool --silent --mode=link athlon-pld-linux-gcc -pthread -shared -rpath /usr/lib/svn-python/libsvn -avoid-version -module -o _client.la svn_client.lo -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la ../../../../subversion/libsvn_client/libsvn_client-1.la
/bin/sh /home/users/misiek/rpm/BUILD/subversion-0.35.0/libtool --silent --mode=compile athlon-pld-linux-gcc -pthread -DNDEBUG -g -I/usr/include/ncurses -O2 -march=athlon -Wstrict-prototypes -fPIC -DLINUX=2 -D_REENTRANT -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_SVID_SOURCE -D_GNU_SOURCE -I/home/users/misiek/rpm/BUILD/subversion-0.35.0/subversion/bindings/swig -I/home/users/misiek/rpm/BUILD/subversion-0.35.0/subversion/include -I/usr/include/apr -I/usr/include/python2.3 -prefer-pic -c -o subversion/bindings/swig/python/core.lo subversion/bindings/swig/python/core.c
In file included from /usr/include/python2.3/Python.h:8,
                 from subversion/bindings/swig/python/core.c:14:
/usr/include/python2.3/pyconfig.h:859:1: warning: "_XOPEN_SOURCE" redefined
<command line>:8:1: warning: this is the location of the previous definition
In file included from subversion/bindings/swig/python/core.c:766:
/home/users/misiek/rpm/BUILD/subversion-0.35.0/subversion/include/svn_md5.h:26:21: apr_md5.h: No such file or directory
make: *** [subversion/bindings/swig/python/core.lo] Bł±d 1
zsh: exit 2 make swig-py

and later the same problem with perl bindings.

apr_md5.h is in -I/usr/include/apr-util, so fix is

diff -urN subversion-0.35.0.org/Makefile.in subversion-0.35.0/Makefile.in
--- subversion-0.35.0.org/Makefile.in 2003-12-20 00:04:45.942677312 +0100
+++ subversion-0.35.0/Makefile.in 2003-12-20 00:07:14.926667242 +0100
@@ -94,7 +94,9 @@
 SWIG = @SWIG@
 SWIG_INCLUDES = -I$(SWIG_SRC_DIR) \
                 -I$(abs_srcdir)/subversion/include \
- $(SVN_APR_INCLUDES)
+ $(SVN_APR_INCLUDES) \
+ $(SVN_APRUTIL_INCLUDES)
+
 SWIG_LDFLAGS = @SWIG_LDFLAGS@
 SWIG_PY_INCLUDES = @SWIG_PY_INCLUDES@
 SWIG_PY_COMPILE = @SWIG_PY_COMPILE@
@@ -109,6 +111,8 @@
 SVN_APR_INCLUDES = @SVN_APR_INCLUDES@
 SVN_APR_PREFIX = @SVN_APR_PREFIX@
 
+SVN_APRUTIL_INCLUDES = @SVN_APRUTIL_INCLUDES@
+
 MKDIR = @MKDIR@
 
 # the EXTRA_ exist so that extra flags can be passed at 'make' time
diff -urN subversion-0.35.0.org/subversion/bindings/swig/perl/Makefile.PL subversion-0.35.0/subversion/bindings/swig/perl/Makefile.PL
--- subversion-0.35.0.org/subversion/bindings/swig/perl/Makefile.PL 2003-12-07 18:25:10.000000000 +0100
+++ subversion-0.35.0/subversion/bindings/swig/perl/Makefile.PL 2003-12-20 00:36:41.326711208 +0100
@@ -8,19 +8,23 @@
 
 my $apr_config = $ENV{APR_CONFIG} || '/usr/local/lib/apache2/apr-config';
 $apr_config = 'apr-config' unless -e $apr_config;
+my $apu_config = $ENV{APU_CONFIG} || '/usr/local/lib/apache2/apu-config';
+$apr_config = 'apu-config' unless -e $apu_config;
 
 my $apr_shlib_path_var = `$apr_config --shlib-path-var`;
 my $apr_cflags = `$apr_config --includes`;
+my $apu_cflags = `$apu_config --includes`;
 my $apr_ldflags = `$apr_config --cflags --link-ld --libs`
    if $^O eq 'darwin';
 
 chomp $apr_shlib_path_var;
 chomp $apr_cflags;
+chomp $apu_cflags;
 chomp $apr_ldflags;
 
 my %config = (
     ABSTRACT => 'Perl bindings for Subversion',
- CCFLAGS => join(' ', $apr_cflags, `perl -MExtUtils::Embed -e ccopts`,
+ CCFLAGS => join(' ', $apr_cflags, $apu_cflags, `perl -MExtUtils::Embed -e ccopts`,
                      ' -I.. -I../../../include -g'),
     OBJECT => q/$(O_FILES)/,
     dynamic_lib => {

While building perl bindings setting APU_CONFIG is also possible
env APR_CONFIG=%{_bindir}/apr-config \
        APU_CONFIG=%{_bindir}/apu-config \
        %{__perl} Makefile.PL \

It fixes building for me. Please apply.

-- 
Arkadiusz Mi¶kiewicz    CS at FoE, Wroclaw University of Technology
arekm.pld-linux.org AM2-6BONE, 1024/3DB19BBD, arekm(at)ircnet, PLD/Linux
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org