You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2015/09/02 18:18:26 UTC
svn commit: r1700849 - /subversion/trunk/build/ac-macros/swig.m4
Author: danielsh
Date: Wed Sep 2 16:18:26 2015
New Revision: 1700849
URL: http://svn.apache.org/r1700849
Log:
Followup to r1700844: fix the build.
* build/ac-macros/swig.m4
(SVN_CHECK_SWIG, SVN_FIND_SWIG):
Only require swig when --with-swig was passed.
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=1700849&r1=1700848&r2=1700849&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/swig.m4 (original)
+++ subversion/trunk/build/ac-macros/swig.m4 Wed Sep 2 16:18:26 2015
@@ -46,7 +46,7 @@ AC_DEFUN(SVN_CHECK_SWIG,
esac
],
[
- SVN_FIND_SWIG(required)
+ SVN_FIND_SWIG(check)
])
])
@@ -56,9 +56,9 @@ AC_DEFUN(SVN_FIND_SWIG,
if test $where = no; then
SWIG=none
- elif test $where = required; then
+ elif test $where = required || test $where = check; then
AC_PATH_PROG(SWIG, swig, none)
- if test "$SWIG" = "none"; then
+ if test "$SWIG" = "none" && test $where = required; then
AC_MSG_ERROR([SWIG required, but not found])
fi
else