Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@subversion.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1397844 - /subversion/trunk/build.conf
Date: Sat, 13 Oct 2012 14:48:50 -0000
To: commits@subversion.apache.org
From: breser@apache.org
Message-Id: <20121013144850.433BE238890D@eris.apache.org>

Author: breser
Date: Sat Oct 13 14:48:49 2012
New Revision: 1397844

URL: http://svn.apache.org/viewvc?rev=1397844&view=rev
Log:
Fix building of SWIG bindings on OS X.

The GNOME Keyring support is not built if we are on DARWIN or Windows.
core.i of SWIG looks for SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_FUNC to
determine if GNOME Keyring support should be built.  DARWIN gets defined from
the CPPFLAGS.  However, we were not passing CPPFLAGS to SWIG (which is just a
glorified C Pre-Processor), so the constant we are looking for gets defined in
the SWIG pass and SWIG includes and wraps our helper function.  Then the C
compiler builds core.c and now the keyring support is not included since
we pass CPPFLAGS into the compiler.  Resulting in an error.

* build.conf: Need to pass the CPPFLAGS to SWIG.


Modified:
    subversion/trunk/build.conf

Modified: subversion/trunk/build.conf
URL: http://svn.apache.org/viewvc/subversion/trunk/build.conf?rev=1397844&r1=1397843&r2=1397844&view=diff
==============================================================================
--- subversion/trunk/build.conf (original)
+++ subversion/trunk/build.conf Sat Oct 13 14:48:49 2012
@@ -64,9 +64,9 @@ test-scripts =
 
 bdb-test-scripts =
 
-swig-python-opts = -python -classic
-swig-perl-opts = -perl -nopm -noproxy
-swig-ruby-opts = -ruby
+swig-python-opts = $(CPPFLAGS) -python -classic
+swig-perl-opts = $(CPPFLAGS) -perl -nopm -noproxy
+swig-ruby-opts = $(CPPFLAGS) -ruby
 swig-languages = python perl ruby
 swig-dirs = 
         subversion/bindings/swig/python