Reduce macro expansion, no functional change.
* build/ac-macros/swig.m4
everywhere: Remove trailing whitespaces.
(SVN_CHECK_SWIG): Gather the use of SVN_FIND_SWIG by using cache variable.
(SVN_CHECK_SWIG, SVN_FIND_SWIG): Remove unused variable SWIG_SUITABLE.
@@ -33,21 +33,18 @@ AC_DEFUN(SVN_CHECK_SWIG,
look for a 'swig' binary in your PATH.]),
[
case "$withval" in
- "no")
- SWIG_SUITABLE=no
- SVN_FIND_SWIG(no)
- ;;
- "yes")
- SVN_FIND_SWIG(required)
+ yes)
+ svn_find_swig_arg=required
;;
*)
- SVN_FIND_SWIG($withval)
+ svn_find_swig_arg=$withval
;;
esac
],
[
- SVN_FIND_SWIG(check)
+ svn_find_swig_arg=required
])
+ SVN_FIND_SWIG($svn_find_swig_arg)
])
AC_DEFUN(SVN_FIND_SWIG,
@@ -56,7 +53,7 @@ AC_DEFUN(SVN_FIND_SWIG,
if test $where = no; then
SWIG=none
- elif test $where = required || test $where = check; then
+ elif test $where = required; then
AC_PATH_PROG(SWIG, swig, none)
if test "$SWIG" = "none" && test $where = required; then
AC_MSG_ERROR([SWIG required, but not found])
@@ -91,10 +88,7 @@ AC_DEFUN(SVN_FIND_SWIG,
AC_MSG_RESULT([$SWIG_VERSION_RAW])
# If you change the required swig version number, don't forget to update:
# subversion/bindings/swig/INSTALL
- if test -n "$SWIG_VERSION" && test "$SWIG_VERSION" -ge "103024"; then
- SWIG_SUITABLE=yes
- else
- SWIG_SUITABLE=no
+ if test ! -n "$SWIG_VERSION" || test "$SWIG_VERSION" -lt "103024"; then
AC_MSG_WARN([Detected SWIG version $SWIG_VERSION_RAW])
AC_MSG_WARN([Subversion requires SWIG >= 1.3.24])
fi
