svn commit: r1700844 - /subversion/trunk/build/ac-macros/swig.m4

[da...@apache.org]

Author: danielsh
Date: Wed Sep  2 15:39:13 2015
New Revision: 1700844

URL: http://svn.apache.org/r1700844
Log:
swig: Error out if --with-swig was passed but swig not found.

* build/ac-macros/swig.m4
  (SVN_FIND_SWIG): As above.
    Also, change the magic string used by SVN_CHECK_SWIG/SVN_FIND_SWIG to
    communicate the "--with-swig passed without value" case.

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=1700844&r1=1700843&r2=1700844&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/swig.m4 (original)
+++ subversion/trunk/build/ac-macros/swig.m4 Wed Sep  2 15:39:13 2015
@@ -38,7 +38,7 @@ AC_DEFUN(SVN_CHECK_SWIG,
         SVN_FIND_SWIG(no)
       ;;
       "yes")
-        SVN_FIND_SWIG(check)
+        SVN_FIND_SWIG(required)
       ;;
       *)
         SVN_FIND_SWIG($withval)
@@ -46,7 +46,7 @@ AC_DEFUN(SVN_CHECK_SWIG,
     esac
   ],
   [
-    SVN_FIND_SWIG(check)
+    SVN_FIND_SWIG(required)
   ])
 ])
 
@@ -56,8 +56,11 @@ AC_DEFUN(SVN_FIND_SWIG,
 
   if test $where = no; then
     SWIG=none
-  elif test $where = check; then
+  elif test $where = required; then
     AC_PATH_PROG(SWIG, swig, none)
+    if test "$SWIG" = "none"; then
+      AC_MSG_ERROR([SWIG required, but not found])
+    fi
   else
     if test -f "$where"; then
       SWIG="$where"