svn commit: r1162054 - /subversion/trunk/subversion/bindings/swig/perl/native/Makefile.PL.in

[da...@apache.org]

Author: danielsh
Date: Fri Aug 26 10:13:37 2011
New Revision: 1162054

URL: http://svn.apache.org/viewvc?rev=1162054&view=rev
Log:
swig-py: tweak the compiler flags.  This should address issue #2617
(which concerns compilation problems).

 * subversion/bindings/swig/perl/native/Makefile.PL.in
     Eliminate misnamed intermediate variables.  Add CPPFLAGS to MakeMaker's 'INC'.
     This doesn't break anything on my system, and hopefully unbreaks the 4-years-old
     breakage reported on the issue.

Modified:
    subversion/trunk/subversion/bindings/swig/perl/native/Makefile.PL.in

Modified: subversion/trunk/subversion/bindings/swig/perl/native/Makefile.PL.in
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/perl/native/Makefile.PL.in?rev=1162054&r1=1162053&r2=1162054&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/perl/native/Makefile.PL.in (original)
+++ subversion/trunk/subversion/bindings/swig/perl/native/Makefile.PL.in Fri Aug 26 10:13:37 2011
@@ -47,8 +47,7 @@ my @ldmodules = map {"-lsvn_$_-1"} (@mod
 my $apr_shlib_path_var = '@SVN_APR_SHLIB_PATH_VAR@';
 my $cppflags = '@CPPFLAGS@';
 my $cflags = '@CFLAGS@';
-my $apr_cflags = '@SVN_APR_INCLUDES@';
-my $apu_cflags = '@SVN_APRUTIL_INCLUDES@';
+my $includes = '@SVN_APR_INCLUDES@ @SVN_APRUTIL_INCLUDES@';
 
 # According to the log of r7937, the flags guarded by the conditional break
 # the build on FreeBSD if not conditionalized.
@@ -61,7 +60,7 @@ my %config = (
     ABSTRACT => 'Perl bindings for Subversion',
     DEFINE => $cppflags,
     CCFLAGS => join(' ', $cflags, $Config{ccflags}),
-    INC  => join(' ',$apr_cflags, $apu_cflags,
+    INC  => join(' ', $includes, $cppflags,
                  " -I$swig_srcdir/perl/libsvn_swig_perl",
                  " -I$svnlib_srcdir/include",
                  " -I$svnlib_builddir",