Author: brane
Date: Thu Feb 12 20:55:13 2015
New Revision: 1659397
URL: http://svn.apache.org/r1659397
Log:
Do not attempt to build bindings with Swig 3.0+. Current versions
break the Python bindings.
* build/ac-macros/swig.m4
(SVN_FIND_SWIG): Add an upper limite to supported Swig versions.
Do not configure bindings if the detected Swig is not suitable.
Removed:
subversion/trunk/TODO
Modified:
subversion/trunk/build/ac-macros/swig.m4
Modified: subversion/trunk/build/ac-macros/swig.m4
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/swig.m4?rev=1659397&r1=1659396&r2=1659397&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/swig.m4 (original)
+++ subversion/trunk/build/ac-macros/swig.m4 Thu Feb 12 20:55:13 2015
@@ -92,18 +92,25 @@ AC_DEFUN(SVN_FIND_SWIG,
# packages/rpm/redhat-7.x/subversion.spec
# packages/rpm/rhel-3/subversion.spec
# packages/rpm/rhel-4/subversion.spec
- if test -n "$SWIG_VERSION" && test "$SWIG_VERSION" -ge "103024"; then
+ if test -n "$SWIG_VERSION" \
+ && test "$SWIG_VERSION" -ge "103024" \
+ && test "$SWIG_VERSION" -lt "300000"; then
SWIG_SUITABLE=yes
else
SWIG_SUITABLE=no
AC_MSG_WARN([Detected SWIG version $SWIG_VERSION_RAW])
- AC_MSG_WARN([Subversion requires SWIG 1.3.24 or later])
+ if test "$SWIG_VERSION" -lt "300000"; then
+ AC_MSG_WARN([Subversion requires SWIG 1.3.24 or later])
+ else
+ AC_MSG_WARN([Subversion dos not support SWIG 3.0 and later])
+ fi
+ AC_MSG_WARN([Building Python, Perl and/or Ruby bindings is disabled])
fi
fi
-
+
SWIG_PY_COMPILE="none"
SWIG_PY_LINK="none"
- if test "$PYTHON" != "none"; then
+ if test "$PYTHON" != "none" && test "$SWIG_SUITABLE" = "yes"; then
AC_MSG_NOTICE([Configuring python swig binding])
AC_CACHE_CHECK([for Python includes], [ac_cv_python_includes],[
@@ -166,7 +173,7 @@ AC_DEFUN(SVN_FIND_SWIG,
[ for apr_int64_t])
fi
- if test "$PERL" != "none"; then
+ if test "$PERL" != "none" && test "$SWIG_SUITABLE" = "yes"; then
AC_MSG_CHECKING([perl version])
dnl Note that the q() bit is there to avoid unbalanced brackets
dnl which m4 really doesn't like.
@@ -181,7 +188,7 @@ AC_DEFUN(SVN_FIND_SWIG,
SWIG_RB_COMPILE="none"
SWIG_RB_LINK="none"
- if test "$RUBY" != "none"; then
+ if test "$RUBY" != "none" && test "$SWIG_SUITABLE" = "yes"; then
rbconfig="$RUBY -rrbconfig -e "
for var_name in arch archdir CC LDSHARED DLEXT LIBS LIBRUBYARG \
