[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-commits
Subject:    svn commit: r1883722 - /subversion/trunk/build/ac-macros/swig.m4
From:       futatuki () apache ! org
Date:       2020-11-22 9:15:01
Message-ID: 20201122091502.2C0A617A67F () svn01-us-east ! apache ! org
[Download RAW message or body]

Author: futatuki
Date: Sun Nov 22 09:15:01 2020
New Revision: 1883722

URL: http://svn.apache.org/viewvc?rev=1883722&view=rev
Log:
Follow up to r1883719: Revert usage of 'check' in SVN_FIND_SWIG argment.

* build/ac-macros/swig.m4
  (SVN_CHECK_SWIG): Use 'check' as default value of --with-swig again.
  (SVN_FIND_SWIG): Warn only if when SWIG is required and SWIG is 'none' 

Found by: brane

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=1883722&r1=1883721&r2=1883722&view=diff
 ==============================================================================
--- subversion/trunk/build/ac-macros/swig.m4 (original)
+++ subversion/trunk/build/ac-macros/swig.m4 Sun Nov 22 09:15:01 2020
@@ -42,7 +42,7 @@ AC_DEFUN(SVN_CHECK_SWIG,
     esac
   ],
   [
-    svn_find_swig_arg=required
+    svn_find_swig_arg=check
   ])
   SVN_FIND_SWIG($svn_find_swig_arg)
 ])
@@ -53,7 +53,7 @@ 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" && test $where = required; then
       AC_MSG_ERROR([SWIG required, but not found])


[prev in list] [next in list] [prev in thread] [next in thread]